Changeset 4982

Timestamp:

04/15/14 14:01:30 (10 years ago)

Author:

Twan Goosen

Message:

Extracted reusable behaviour from Ajax file name update in expanded search result. Added to resource links in record page.

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java (modified) (4 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/LazyResourceInfoUpdateBehavior.java (added)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (4 diffs)
• test/java/eu/clarin/cmdi/vlo/service/impl/HandleClientRunner.java (modified) (1 diff)

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

@@ -22 +22 @@
 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;
-import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;
@@ -44 +45 @@
     @SpringBean(name = "resourceStringConverter")
     private ResourceStringConverter resourceStringConverter;
+    @SpringBean(name = "resolvingResourceStringConverter")
+    private ResourceStringConverter resolvingResourceStringConverter;
 
     /**
@@ -66 +69 @@
         protected void populateItem(ListItem<String> item) {
             final ResourceInfoModel resourceInfoModel = new ResourceInfoModel(resourceStringConverter, item.getModel());
+            
             // add a link that will show the resource details panel when clicked
-            item.add(createLink(resourceInfoModel));
-        }
-
-        private Component createLink(final ResourceInfoModel resourceInfoModel) {
+            
             // wrap href in model that transforms handle links
             final IModel<String> linkModel = new HandleLinkModel(new PropertyModel(resourceInfoModel, "href"));
@@ -83 +84 @@
             link.add(new ResourceTypeCssBehaviour(resourceInfoModel));
 
-            return link;
+            // make the link update via AJAX with resolved location (in case of handle)
+            link.add(new LazyResourceInfoUpdateBehavior(resolvingResourceStringConverter, item.getModel(), resourceInfoModel) {
+
+                @Override
+                protected void onUpdate(AjaxRequestTarget target) {
+                    target.add(link);
+                }
+            });
+
+            link.setOutputMarkupId(true);
+            item.add(link);
         }
     }

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

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.pojo.ResourceInfo;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
@@ -34 +33 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -47 +45 @@
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.wicket.util.time.Duration;
 
 /**
@@ -107 +104 @@
                 // once loaded, make Ajax request to resolve handles and update
                 // resource link
-                resourceLink.add(new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
+                resourceLink.add(new LazyResourceInfoUpdateBehavior(resolvingResourceStringConverter, item.getModel(), resourceInfoModel) {
 
                     @Override
-                    protected void onTimer(AjaxRequestTarget target) {
-                        this.stop(target);
-                        // this time get resource info from the resolving converter
-                        // which will take the file name from the resolved location
-                        final ResourceInfo newResourceInfo = resolvingResourceStringConverter.getResourceInfo(item.getModelObject());
-                        resourceInfoModel.setObject(newResourceInfo);
+                    protected void onUpdate(AjaxRequestTarget target) {
                         // update resource link
                         target.add(resourceLink);
                     }
-
                 });
 

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/HandleClientRunner.java

@@ -33 +33 @@
      */
     public static void main(String[] args) {
-        final HandleClient client = new HandleClientImpl("http://hdl.handle.net/api/handle/");
+        final HandleClient client = new HandleClientImpl();
 
         System.out.println("Requesting handle...");