Changeset 6002


Ignore:
Timestamp:
02/20/15 15:08:41 (9 years ago)
Author:
Twan Goosen
Message:

Created a value converter for language codes. It is used by a new 'FieldValueLabel?', which is used in various panels. This way the language name is shown but the selection happens on basis of code.
TODO: generate link to language info page
Refs #553

Location:
vlo/trunk
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/LanguageCodeUtils.java

    r5997 r6002  
    5656    }
    5757
     58    /**
     59     *
     60     * @param langCode an upper case ISO639-3 language code
     61     * @return the name of the language if it is present in the language code
     62     * map
     63     */
    5864    public String getLanguageNameForLanguageCode(String langCode) {
    5965        String result = getIso639ToLanguageNameMap().get(langCode);

  • vlo/trunk/vlo-web-app/pom.xml

    r5991 r6002  
    221221                <version>2.5.1</version>
    222222                <configuration>
    223                     <source>1.6</source>
    224                     <target>1.6</target>
     223                    <source>1.7</source>
     224                    <target>1.7</target>
    225225                    <encoding>UTF-8</encoding>
    226226                    <showWarnings>true</showWarnings>

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloServicesSpringConfig.java

    r5231 r6002  
    1818
    1919import com.google.common.collect.Sets;
     20import eu.clarin.cmdi.vlo.LanguageCodeUtils;
    2021import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
    2122import eu.clarin.cmdi.vlo.pojo.SearchContext;
    … …  
    3738import eu.clarin.cmdi.vlo.service.impl.UriResolverImpl;
    3839import eu.clarin.cmdi.vlo.service.impl.XmlTransformationServiceImpl;
     40import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
     41import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProviderImpl;
    3942import java.util.Properties;
    4043import javax.inject.Inject;
    … …  
    126129                vloConfig.getTechnicalFields());
    127130    }
     131
     132    @Bean
     133    public LanguageCodeUtils languageCodeUtils() {
     134        return new LanguageCodeUtils(vloConfig);
     135    }
     136
     137    @Bean
     138    public FieldValueConverterProvider fieldValueConverters() {
     139        return new FieldValueConverterProviderImpl(languageCodeUtils());
     140    }
     141
    128142}

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java

    r5999 r6002  
    2424import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
    2525import eu.clarin.cmdi.vlo.service.PageParametersConverter;
     26import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
    2627import eu.clarin.cmdi.vlo.wicket.model.DescriptionFieldModel;
    2728import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
    … …  
    128129        } else {
    129130            // add a label for the facet value
    130             final Label fieldLabel = new Label(id, valueModel);
     131            final Label fieldLabel = new FieldValueLabel(id, valueModel, facetNameModel);
    131132
    132133            // some selected fields may have HTML that needs to be preserved...

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java

    r5136 r6002  
    2222import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
    2323import eu.clarin.cmdi.vlo.wicket.components.AjaxIndicatingForm;
     24import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
    2425import eu.clarin.cmdi.vlo.wicket.components.FieldValueOrderSelector;
    2526import eu.clarin.cmdi.vlo.wicket.model.BridgeModel;
    … …  
    123124
    124125    private DataView<FacetField.Count> createValuesView(String id) {
     126        final IModel<String> fieldNameModel = new PropertyModel<String>(getModel(), "name");
    125127        return new DataView<FacetField.Count>(id, valuesProvider, ITEMS_PER_PAGE) {
    126128
    … …  
    145147
    146148                // 'name' field from Count (name of value)
    147                 selectLink.add(new Label("name"));
     149                selectLink.add(new FieldValueLabel("name", fieldNameModel));
    148150
    149151                // 'count' field from Count (document count for value)

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

    r5177 r6002  
    2323import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
    2424import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
     25import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
    2526import eu.clarin.cmdi.vlo.wicket.provider.PartitionedDataProvider;
    2627import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
    … …  
    6970    private final IModel<FieldValuesFilter> filterModel;
    7071    private final int subListSize;
     72    private final IModel<String> fieldNameModel;
    7173
    7274    /**
    … …  
    114116        valuesWindow = createAllValuesWindow("allValues");
    115117        add(valuesWindow);
     118
     119        fieldNameModel = new PropertyModel<>(model, "name");
    116120    }
    117121
    … …  
    203207
    204208        // 'name' field from Count (name of value)
    205         selectLink.add(new Label("name"));
     209        selectLink.add(new FieldValueLabel("name", fieldNameModel));
    206210        // 'count' field from Count (document count for value)
    207211        selectLink.add(new Label("count"));

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SelectedFacetPanel.java

    r5105 r6002  
    1818
    1919import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
     20import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
    2021import java.util.Collection;
    2122import java.util.Collections;
    … …  
    2324import org.apache.wicket.ajax.AjaxRequestTarget;
    2425import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
    25 import org.apache.wicket.markup.html.basic.Label;
    2626import org.apache.wicket.markup.html.list.ListItem;
    2727import org.apache.wicket.markup.html.list.ListView;
    … …  
    5050        // Model of the list of selected values in this facet
    5151        final PropertyModel<List<String>> propertyModel = new PropertyModel<List<String>>(getModel(), "facetValues");
     52        final PropertyModel<String> fieldNameModel = new PropertyModel(getModel(), "facetField.name");
    5253        // Repeating container of value + unselection links
    5354        final ListView<String> listView = new ListView<String>(id, propertyModel) {
    … …  
    6162            protected void populateItem(final ListItem<String> item) {
    6263                // A label showing the name of the facet
    63                 item.add(new Label("facetValue", item.getModel()));
     64                item.add(new FieldValueLabel("facetValue", item.getModel(), fieldNameModel));
    6465                // A link to remove the value selection from this facet
    6566                item.add(new RemoveLink("unselectValue", item.getModel()));
Note: See TracChangeset for help on using the changeset viewer.