Changeset 4537

Timestamp:

02/20/14 14:24:45 (10 years ago)

Author:

twagoo

Message:

created wrapper model to assign fallback value for null model objects

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• components/SearchResultsPanel.java (modified) (3 diffs)
• model/NullFallbackModel.java (added)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultsPanel.java

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import eu.clarin.cmdi.vlo.wicket.provider.SolrDocumentProvider;
@@ -58 +59 @@
             @Override
             protected void populateItem(Item<SolrDocument> item) {
-                //TODO: Wrap in model to deal with null values
-                item.add(new Label("title", new SolrFieldModel(item.getModel(), FacetConstants.FIELD_NAME)));
-                item.add(new Label("description", new SolrFieldModel(item.getModel(), FacetConstants.FIELD_DESCRIPTION)));
+                final IModel<SolrDocument> documentModel = item.getModel();
+                item.add(new SolrFieldLabel("title", documentModel, FacetConstants.FIELD_NAME));
+                item.add(new SolrFieldLabel("description", documentModel, FacetConstants.FIELD_DESCRIPTION, "<no description>"));
                 //TODO: get resource information
             }
@@ -68 +69 @@
     }
 
+    public static class SolrFieldLabel extends Label {
+
+        public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName) {
+            super(id, new SolrFieldModel(documentModel, fieldName));
+        }
+
+        public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName, String nullFallback) {
+            super(id,
+                    new NullFallbackModel(
+                            new SolrFieldModel(documentModel, fieldName), nullFallback));
+        }
+
+    }
+
 }