Changeset 4878

Timestamp:

04/02/14 12:37:13 (11 years ago)

Author:

Twan Goosen

Message:

extracted behaviour that sets the css class for a resource type (in resource links panel) into a separate class

Location:

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

Files:

• java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/ResourceTypeCssBehaviour.java (added)
• java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java (modified) (3 diffs)
• resources/resourceTypeClasses.properties (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.properties)

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

@@ -58 +58 @@
         // register the resource of field names (used by eu.clarin.cmdi.vlo.wicket.componentsSolrFieldNameLabel)
         getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("fieldNames"));
+        // register the resource of resource type class properties
+        getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("resourceTypeClasses"));
         // register the resource of application properties (version information filtered at build time)
         getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("application"));

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.service.ResourceStringConverter;
+import eu.clarin.cmdi.vlo.wicket.ResourceTypeCssBehaviour;
+import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import eu.clarin.cmdi.vlo.wicket.model.ResourceInfoModel;
-import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
-import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import java.util.Collection;
 import java.util.List;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
-import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -33 +33 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -101 +100 @@
             // set the file name as the link's text content
             link.add(new Label("filename", new PropertyModel(resourceInfoModel, "fileName")));
-
-            // set the class attribute on the link from the value associated
-            // with the resource type as defined in the properties file
-            final StringResourceModel linkClass = new StringResourceModel("class.${resourceType}", ResourceLinksPanel.this, resourceInfoModel, "");
-            link.add(new AttributeAppender("class", linkClass).setSeparator(" "));
+            
+            // apply the css class matching the resource type
+            link.add(new ResourceTypeCssBehaviour(resourceInfoModel));
 
             return link;