Changeset 6302

Timestamp:

06/17/15 07:34:42 (9 years ago)

Author:

Twan Goosen

Message:

'Modelised' some models and components that took static String values

Location:

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

Files:

• components/SolrFieldLabel.java (modified) (1 diff)
• model/NullFallbackModel.java (modified) (4 diffs)
• model/SolrDocumentModel.java (modified) (4 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SolrFieldLabel.java

@@ -40 +40 @@
         super(id, new NullFallbackModel(new SolrFieldStringModel(documentModel, fieldName), nullFallback));
     }
+    
+    public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName, IModel<String> nullFallback) {
+        super(id, new NullFallbackModel(new SolrFieldStringModel(documentModel, fieldName), nullFallback));
+    }
 
     /**

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/NullFallbackModel.java

@@ -18 +18 @@
 
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 /**
@@ -29 +30 @@
 
     private final IModel<String> wrappedModel;
-    private final String fallbackValue;
+    private final IModel<String> fallbackModel;
 
     public NullFallbackModel(IModel<String> wrappedModel, String fallbackValue) {
+        this(wrappedModel, Model.of(fallbackValue));
+    }
+
+    public NullFallbackModel(IModel<String> wrappedModel, IModel<String> fallbackModel) {
         this.wrappedModel = wrappedModel;
-        this.fallbackValue = fallbackValue;
+        this.fallbackModel = fallbackModel;
     }
 
@@ -40 +45 @@
         final String wrappedValue = wrappedModel.getObject();
         if (wrappedValue == null) {
-            return fallbackValue;
+            return fallbackModel.getObject();
         } else {
             return wrappedValue;
@@ -54 +59 @@
     public void detach() {
         wrappedModel.detach();
+        fallbackModel.detach();
     }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModel.java

@@ -21 +21 @@
 import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
 
 /**
@@ -32 +34 @@
 public class SolrDocumentModel extends LoadableDetachableModel<SolrDocument> {
 
-    private final String docId;
+    private final IModel<String> docId;
 
     public SolrDocumentModel(SolrDocument document) {
         super(document);
-        this.docId = (String) document.getFieldValue(FacetConstants.FIELD_ID);
+        this.docId = Model.of((String) document.getFieldValue(FacetConstants.FIELD_ID));
     }
 
     public SolrDocumentModel(String docId) {
+        this(Model.of(docId));
+    }
+
+    public SolrDocumentModel(IModel<String> docId) {
         this.docId = docId;
     }
@@ -48 +54 @@
             return null;
         } else {
-            return getDocumentService().getDocument(docId);
+            final String id = docId.getObject();
+            if (id == null) {
+                return null;
+            } else {
+                return getDocumentService().getDocument(id);
+            }
         }
     }
@@ -54 +65 @@
     @Override
     public String toString() {
-        return String.format("%s docId=%s attached=%b", super.toString(), docId, isAttached());
+        return String.format("%s docId=%s attached=%b", super.toString(), docId.getObject(), isAttached());
     }