Changeset 5166

Timestamp:

05/08/14 15:21:15 (10 years ago)

Author:

Twan Goosen

Message:

merged improved record file name resolution from trunk to 3.0

Location:

vlo/branches/vlo-3.0

Files:

• . (modified) (1 prop)
• vlo-web-app (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/ResourceInfo.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/LazyResourceInfoUpdateBehavior.java (copied) (copied from vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/LazyResourceInfoUpdateBehavior.java) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/ResourceInfoModel.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/LazyResourceInfoUpdateBehavior.java (deleted)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/ResourceInfo.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.pojo;
 
+import java.io.Serializable;
+
 /**
  *
  * @author twagoo
  */
-public class ResourceInfo {
+public class ResourceInfo implements Serializable {
 
     private final String href;

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

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.pojo.ResourceInfo;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
+import eu.clarin.cmdi.vlo.wicket.model.ResourceInfoModel;
 import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
 import org.apache.wicket.util.time.Duration;
 
@@ -35 +35 @@
 
     private final ResourceStringConverter converter;
-    private final IModel<String> resourceStringModel;
-    private final IModel<ResourceInfo> resourceInfoModel;
+    private final ResourceInfoModel resourceInfoModel;
 
     /**
      *
      * @param converter converter to get resource info object from
-     * @param resourceStringModel model that provides the raw resource string
      * @param resourceInfoModel model that should be updated
      */
-    public LazyResourceInfoUpdateBehavior(ResourceStringConverter converter, IModel<String> resourceStringModel, IModel<ResourceInfo> resourceInfoModel) {
+    public LazyResourceInfoUpdateBehavior(ResourceStringConverter converter, ResourceInfoModel resourceInfoModel) {
         super(Duration.ONE_SECOND);
         this.converter = converter;
-        this.resourceStringModel = resourceStringModel;
         this.resourceInfoModel = resourceInfoModel;
     }
@@ -56 +53 @@
         this.stop(target);
         
-        // get a fresh resource info object...
-        final ResourceInfo resourceInfo = converter.getResourceInfo(resourceStringModel.getObject());
-        // .,.and update the model with it
-        resourceInfoModel.setObject(resourceInfo);
+        // inject the advanced converter into the model
+        resourceInfoModel.setResourceStringConverter(converter);
         
         // AJAX update of components

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

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
 
 /**
@@ -27 +27 @@
  * {@link ResourceStringConverter}
  */
-public class ResourceInfoModel extends LoadableDetachableModel<ResourceInfo> {
+public class ResourceInfoModel extends Model<ResourceInfo> {
 
-    private final ResourceStringConverter resourceStringConverter;
+    private ResourceStringConverter resourceStringConverter;
     private final IModel<String> resourceStringModel;
 
+    /**
+     *
+     * @param resourceStringConverter converter to use to derive resource info
+     * from the resource string
+     * @param resourceStringModel
+     */
     public ResourceInfoModel(ResourceStringConverter resourceStringConverter, IModel<String> resourceStringModel) {
         this.resourceStringConverter = resourceStringConverter;
@@ -38 +44 @@
 
     @Override
-    protected ResourceInfo load() {
-        return resourceStringConverter.getResourceInfo(resourceStringModel.getObject());
+    public ResourceInfo getObject() {
+        final ResourceInfo cached = super.getObject();
+        if (cached == null) {
+            final ResourceInfo object = resourceStringConverter.getResourceInfo(resourceStringModel.getObject());
+            setObject(object);
+            return object;
+        } else {
+            return cached;
+        }
     }
 
-    @Override
-    public void detach() {
-        super.detach();
-        resourceStringModel.detach();
+    /**
+     * Replaces the converter used by this model to get a resource info object.
+     * This also invalidates the cached resource info object.
+     *
+     * @param resourceStringConverter
+     */
+    public void setResourceStringConverter(ResourceStringConverter resourceStringConverter) {
+        this.resourceStringConverter = resourceStringConverter;
+        // invalidate object
+        setObject(null);
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
+import eu.clarin.cmdi.vlo.wicket.LazyResourceInfoUpdateBehavior;
 import eu.clarin.cmdi.vlo.wicket.ResourceTypeCssBehaviour;
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
 import eu.clarin.cmdi.vlo.wicket.model.ResourceInfoModel;
-import eu.clarin.cmdi.vlo.wicket.panels.search.LazyResourceInfoUpdateBehavior;
 import java.util.Collection;
 import java.util.List;
@@ -85 +85 @@
 
             // make the link update via AJAX with resolved location (in case of handle)
-            link.add(new LazyResourceInfoUpdateBehavior(resolvingResourceStringConverter, item.getModel(), resourceInfoModel) {
+            link.add(new LazyResourceInfoUpdateBehavior(resolvingResourceStringConverter, resourceInfoModel) {
 
                 @Override

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java

@@ -21 +21 @@
 import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
+import eu.clarin.cmdi.vlo.wicket.LazyResourceInfoUpdateBehavior;
 import eu.clarin.cmdi.vlo.wicket.ResourceTypeCssBehaviour;
 import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
@@ -145 +146 @@
                 resourceLink.setOutputMarkupId(true);
 
-                // once loaded, make Ajax request to resolve handles and update
-                // resource link
-                resourceLink.add(new LazyResourceInfoUpdateBehavior(resolvingResourceStringConverter, item.getModel(), resourceInfoModel) {
+                // once loaded, make Ajax request to resolve handles and update resource link
+                resourceLink.add(new LazyResourceInfoUpdateBehavior(resolvingResourceStringConverter, resourceInfoModel) {
 
                     @Override