Changeset 5342

Timestamp:

06/10/14 15:09:16 (10 years ago)

Author:

Twan Goosen

Message:

separated out the DateConverter? and made it work two-way. Using it in the 'creation date' column on a property model instead of a fixed model with one-time conversion

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/DateConverter.java (added)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/VirtualCollectionDetailsPage.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnCreated.java (modified) (3 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml

@@ -235 +235 @@
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.5</version>
-      <type>jar</type>
-    </dependency>
-
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.3.2</version>
+    </dependency>
+    
     <dependency>
         <groupId>commons-codec</groupId>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/VirtualCollectionDetailsPage.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages;
 
+import eu.clarin.cmdi.virtualcollectionregistry.gui.DateConverter;
 import java.sql.Date;
 import java.util.Collection;
@@ -63 +64 @@
         }
     };
-    private static final IConverter convDate = new IConverter() {
-        @Override
-        public String convertToString(Object o, Locale locale) {
-            return FastDateFormat.getInstance("yyyy-MM-dd")
-                .format((Date) o);
-        }
-
-        @Override
-        public Object convertToObject(String s, Locale locale) {
-            return null;
-        }
-    };
+    private static final IConverter convDate = new DateConverter();
+    
     private static final String CSS_CLASS = "collectionDetails";
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnCreated.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.table;
 
-import org.apache.commons.lang.time.FastDateFormat;
+import eu.clarin.cmdi.virtualcollectionregistry.gui.DateConverter;
+import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import java.util.Date;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
@@ -7 +9 @@
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.ResourceModel;
-
-import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import org.apache.wicket.util.convert.IConverter;
 
 @SuppressWarnings("serial")
 final class ColumnCreated extends AbstractColumn<VirtualCollection> {
-    private static final FastDateFormat df =
-        FastDateFormat.getInstance("yyyy-MM-dd");
+
+    private static final IConverter dateConverter = new DateConverter();
 
     ColumnCreated(VirtualCollectionTable table) {
@@ -24 +26 @@
             String componentId, IModel<VirtualCollection> model) {
         item.add(new Label(componentId,
-                df.format(model.getObject().getCreationDate())));
+                new PropertyModel<Date>(model, "creationDate")) {
+
+                    @Override
+                    public IConverter getConverter(Class<?> type) {
+                        if (Date.class.isAssignableFrom(type)) {
+                            return dateConverter;
+                        }
+                        return super.getConverter(type);
+                    }
+
+                });
     }