Changeset 4882

Timestamp:

04/02/14 15:17:26 (11 years ago)

Author:

Twan Goosen

Message:

simplified getting of string for resource type counts, now completely via StringResourceModel? (instead of converter)

Location:

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

Files:

• pojo/ResourceTypeCount.java (modified) (2 diffs)
• wicket/panels/search/SearchResultItemCollapsedPanel.java (modified) (4 diffs)
• wicket/panels/search/SearchResultItemCollapsedPanel.properties (added)

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

@@ -26 +26 @@
 public class ResourceTypeCount implements Serializable {
 
+    /**
+     * Enumeration for singular/plural distinction. {@link #toString() }
+     * returns "singular" or "plural" respectively to make the resource bundle
+     * files look clean (no screaming)
+     */
+    public enum Number {
+
+        SINGULAR("singular"),
+        PLURAL("plural");
+
+        private final String numberString;
+
+        Number(String numberString) {
+            this.numberString = numberString;
+        }
+
+        @Override
+        public String toString() {
+            return numberString;
+        }
+
+    }
+
     private final ResourceType resourceType;
     private final Integer count;
@@ -40 +63 @@
     public ResourceType getResourceType() {
         return resourceType;
+    }
+
+    /**
+     *
+     * @return {@link Number#SINGULAR } or {@link Number#PLURAL } depending on
+     * value of {@link #getCount() }
+     */
+    public Number getNumber() {
+        return getCount() == 1 ? Number.SINGULAR : Number.PLURAL;
     }
 

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

@@ -25 +25 @@
 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;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -35 +34 @@
 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;
-import org.apache.wicket.util.convert.IConverter;
 
 /**
@@ -47 +43 @@
 public class SearchResultItemCollapsedPanel extends Panel {
 
-    private final ResourceTypeCountConverter resourceTypeCountConverter = new ResourceTypeCountConverter();
     private static final int MAX_DESCRIPTION_LENGTH = 350;
     private static final int LONG_DESCRIPTION_TRUNCATE_POINT = 320;
@@ -103 +98 @@
         protected void populateItem(Item<ResourceTypeCount> item) {
             final Link resourceLink = new RecordPageLink("recordLink", documentModel, selectionModel);
-            final Label label = new Label("resourceCountLabel", item.getModel()) {
-
-                @Override
-                public <C> IConverter<C> getConverter(Class<C> type) {
-                    if (type == ResourceTypeCount.class) {
-                        return (IConverter<C>) resourceTypeCountConverter;
-                    } else {
-                        return super.getConverter(type);
-                    }
-                }
-
-            };
-
+            final Label label = new Label("resourceCountLabel", getResourceCountModel(item.getModel()));
             resourceLink.add(label);
             item.add(resourceLink);
         }
+
+        /**
+         *
+         * @param resourceTypeCountModel
+         * @return a string model that conveys the type of resource and number
+         * of instances
+         */
+        private IModel<String> getResourceCountModel(final IModel<ResourceTypeCount> resourceTypeCountModel) {
+            // first create a string model that provides the type of resources 
+            // in the right number (plural or singular, conveniently supplied by ResourceTypeCount)
+            final StringResourceModel resourceTypeModel = new StringResourceModel("resourcetype.${resourceType}.${number}", resourceTypeCountModel, "?");
+            // inject this into the resource string that combines it with count
+            return new StringResourceModel("resources.typecount", this, resourceTypeCountModel, resourceTypeModel);
+        }
     }
 
-    /**
-     * One-way converter for resource type counts that generates string
-     * representations like "1 video file", "2 video files" or "3 text
-     * documents"
-     */
-    private static class ResourceTypeCountConverter implements IConverter<ResourceTypeCount> {
-
-        @Override
-        public ResourceTypeCount convertToObject(String value, Locale locale) throws ConversionException {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public String convertToString(ResourceTypeCount value, Locale locale) {
-            final String resourceTypeString = getResourceTypeString(value);
-            return String.format("%d %s", value.getCount(), resourceTypeString);
-        }
-
-        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();
-        }
-
-    }
 }