Changeset 4881

Timestamp:

04/02/14 14:36:46 (11 years ago)

Author:

Twan Goosen

Message:

resource type names (singular and plural) are now read from properties file (shared with css 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 (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemCollapsedPanel.java (modified) (5 diffs)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.properties (modified) (1 diff)
• resources/resourceTypes.properties (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/resourceTypeClasses.properties) (1 diff)

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 resource type names and class properties
+        getResourceSettings().getStringResourceLoaders().add(new BundleStringResourceLoader("resourceTypes"));
         // 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/ResourceTypeCssBehaviour.java

@@ -35 +35 @@
                 // to one of the properties in resourceTypeClass.properties file
                 // (defaults to "")
-                new StringResourceModel("class.${resourceType}", resourceInfoModel, "", new Object[0]));
+                new StringResourceModel("resourcetype.${resourceType}.class", resourceInfoModel, "", new Object[0]));
         // separate CSS classes with a space
         setSeparator(" ");

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
-import eu.clarin.cmdi.vlo.wicket.provider.ResouceTypeCountDataProvider;
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.ResourceTypeCount;
@@ -25 +24 @@
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
+import eu.clarin.cmdi.vlo.wicket.provider.ResouceTypeCountDataProvider;
 import java.util.Locale;
 import org.apache.solr.common.SolrDocument;
@@ -35 +35 @@
 import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.convert.ConversionException;
@@ -45 +47 @@
 public class SearchResultItemCollapsedPanel extends Panel {
 
-    private final static ResourceTypeCountConverter resourceTypeCountConverter = new ResourceTypeCountConverter();
+    private final ResourceTypeCountConverter resourceTypeCountConverter = new ResourceTypeCountConverter();
     private static final int MAX_DESCRIPTION_LENGTH = 350;
     private static final int LONG_DESCRIPTION_TRUNCATE_POINT = 320;
@@ -133 +135 @@
         @Override
         public String convertToString(ResourceTypeCount value, Locale locale) {
-            final String resourceTypeString;
-            if (value.getCount() == 1) {
-                resourceTypeString = getSingularResourceTypeString(value);
-            } else {
-                resourceTypeString = getPluralResourceTypeString(value);
-            }
+            final String resourceTypeString = getResourceTypeString(value);
             return String.format("%d %s", value.getCount(), resourceTypeString);
         }
 
-        private String getSingularResourceTypeString(ResourceTypeCount value) {
-            //TODO: read from resource bundle
-            switch (value.getResourceType()) {
-                case ANNOTATION:
-                    return "annotation file";
-                case AUDIO:
-                    return "audio file";
-                case VIDEO:
-                    return "video file";
-                case IMAGE:
-                    return "image";
-                case TEXT:
-                    return "text document";
-                case OTHER:
-                    return "other";
-                default:
-                    return "unknown";
-            }
-        }
-
-        private String getPluralResourceTypeString(ResourceTypeCount value) {
-            //TODO: read from resource bundle
-            switch (value.getResourceType()) {
-                case ANNOTATION:
-                    return "annotation files";
-                case AUDIO:
-                    return "audio files";
-                case VIDEO:
-                    return "video files";
-                case IMAGE:
-                    return "images";
-                case TEXT:
-                    return "text documents";
-                case OTHER:
-                    return "other";
-                default:
-                    return "unknown";
-            }
+        private String getResourceTypeString(ResourceTypeCount value) {
+            final String count = value.getCount() == 1 ? "singular" : "plural";
+            final StringResourceModel resourceModel = new StringResourceModel("resourcetype.${resourceType}." + count, Model.of(value), "?");
+            return resourceModel.getObject();
         }
 

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

@@ -102 +102 @@
                         = new StringResourceModel("resource.tooltip", SearchResultItemExpandedPanel.this, null,
                                 new Object[]{
-                                    new PropertyModel(resourceInfoModel, "resourceType"),
+                                    new StringResourceModel("resourcetype.${resourceType}.singular", resourceInfoModel, "?"),
                                     new PropertyModel(resourceInfoModel, "mimeType")});
                 resourceLink.add(new AttributeAppender("title", tooltipModel));

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

@@ -14 +14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-resource.tooltip={0}. Mime type: {1}
+# {0} = resource type, {1} = mime type
+resource.tooltip={0} ({1})

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/resourceTypes.properties

@@ -14 +14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This maps values of ResourceType to CSS classes
+# This maps values of ResourceType to plural and singular names and CSS classes
 
-class.TEXT=writtenresource
-class.AUDIO=audioresource
-class.VIDEO=videoresource
-class.IMAGE=imageresource
-class.ANNOTATION=annotationresource
+resourcetype.ANNOTATION.class=annotationresource
+resourcetype.ANNOTATION.singular=annotation file
+resourcetype.ANNOTATION.plural=annotation files
+
+resourcetype.AUDIO.class=audioresource
+resourcetype.AUDIO.singular=audio file
+resourcetype.AUDIO.plural=audio files
+
+resourcetype.IMAGE.class=imageresource
+resourcetype.IMAGE.singular=image
+resourcetype.IMAGE.plural=images
+
 #make separate class for 'other'
-class.OTHER=writtenresource
+resourcetype.OTHER.class=writtenresource
+resourcetype.OTHER.singular=other
+resourcetype.OTHER.plural=other
+
+resourcetype.TEXT.class=writtenresource
+resourcetype.TEXT.singular=text document
+resourcetype.TEXT.plural=text documents
+
+resourcetype.VIDEO.class=videoresource
+resourcetype.VIDEO.singular=video file
+resourcetype.VIDEO.plural=video files