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

Timestamp:

02/25/15 08:28:47 (9 years ago)

Author:

Twan Goosen

Message:

Changed strategy for removing language code prefix from descriptions: now using field value converter. This does away with the DescriptionFieldModel?. Converter now also used in SOLR field labels for multiple values. Removed some unused constructors & moved a regex constant into FacetConstants?
refs #699

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) (5 diffs)

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

@@ -26 +26 @@
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
-import eu.clarin.cmdi.vlo.wicket.model.DescriptionFieldModel;
+import eu.clarin.cmdi.vlo.wicket.components.SmartLinkFieldValueLabel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
@@ -35 +35 @@
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
-import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel;
 import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel;
 import org.apache.wicket.markup.html.basic.Label;
@@ -118 +117 @@
     }
 
-    private Component createValueLabel(String id, final IModel<String> facetNameModel, final IModel<String> originalValueModel) {
+    private Component createValueLabel(String id, final IModel<String> facetNameModel, final IModel<String> valueModel) {
         final String fieldName = facetNameModel.getObject();
-
-        // allow for postprocessing or wrapping of the value model depending on the field
-        final IModel<String> valueModel = getValueModel(facetNameModel, originalValueModel);
 
         if (FacetConstants.FIELD_LANGUAGE_CODE.equals(facetNameModel.getObject())) {
@@ -128 +124 @@
         } else if (SMART_LINK_FIELDS.contains(fieldName)) {
             // create label that generates links
-            return new SmartLinkLabel(id, new HandleLinkModel(valueModel));
+            return new SmartLinkFieldValueLabel(id, new HandleLinkModel(valueModel), facetNameModel);
         } else {
             // add a label for the facet value
@@ -164 +160 @@
     }
 
-    private IModel<String> getValueModel(IModel<String> facetNameModel, IModel<String> valueModel) {
-        if (FacetConstants.FIELD_DESCRIPTION.equals(facetNameModel.getObject())) {
-            //wrap in model that removes the language prefix
-            return new DescriptionFieldModel(valueModel);
-        }
-        return valueModel;
-    }
-
 }