Changeset 4877

Timestamp:

04/02/14 11:45:24 (10 years ago)

Author:

Twan Goosen

Message:

moved inner ResourceInfoModel? out of ResourceLinksPanel?

Location:

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

Files:

• model/ResourceInfoModel.java (added)
• panels/record/ResourceLinksPanel.java (modified) (4 diffs)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.record;
 
-import eu.clarin.cmdi.vlo.pojo.ResourceInfo;
+import eu.clarin.cmdi.vlo.wicket.model.ResourceInfoModel;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
@@ -32 +32 @@
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
@@ -79 +78 @@
         @Override
         protected void populateItem(ListItem<String> item) {
-            final ResourceInfoModel resourceInfoModel = new ResourceInfoModel(item.getModel());
+            final ResourceInfoModel resourceInfoModel = new ResourceInfoModel(resourceStringConverter, item.getModel());
             // add a link that will show the resource details panel when clicked
             item.add(createLink(resourceInfoModel));
@@ -112 +111 @@
     }
 
-    /**
-     * Model for {@link ResourceInfo} that dynamically instantiates its objects
-     * from a resource string (as retrieved from the Solr index) using the
-     * {@link ResourceStringConverter}
-     */
-    private class ResourceInfoModel extends LoadableDetachableModel<ResourceInfo> {
-
-        private final IModel<String> resourceStringModel;
-
-        public ResourceInfoModel(IModel<String> resourceStringModel) {
-            this.resourceStringModel = resourceStringModel;
-        }
-
-        @Override
-        protected ResourceInfo load() {
-            return resourceStringConverter.getResourceInfo(resourceStringModel.getObject());
-        }
-
-        @Override
-        public void detach() {
-            super.detach();
-            resourceStringModel.detach();
-        }
-
-    }
-
 }