You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/10/15 19:18:45 UTC

svn commit: r464229 - in /myfaces/tomahawk/trunk/sandbox15: core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/ core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/myfaces/ examples/src/main/java/org/apache/myfa...

Author: imario
Date: Sun Oct 15 10:18:43 2006
New Revision: 464229

URL: http://svn.apache.org/viewvc?view=rev&rev=464229
Log:
fixed date/time converter stuff

Modified:
    myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java
    myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java
    myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java

Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java?view=diff&rev=464229&r1=464228&r2=464229
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java Sun Oct 15 10:18:43 2006
@@ -60,6 +60,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.Date;
 
 /**
  * concrete gui builder which knows how to build JSF forms
@@ -332,9 +333,11 @@
 		return cmp;
 	}
 
-	public Converter doCreateConverter(Class type)
+	public Converter doCreateConverter(FieldInterface field)
 	{
-		if (Boolean.class.isAssignableFrom(type))
+        Class type = field.getType();
+
+        if (Boolean.class.isAssignableFrom(type))
 		{
 			return context.getApplication().createConverter(BooleanConverter.CONVERTER_ID);
 		}
@@ -375,6 +378,10 @@
 		{
 			return context.getApplication().createConverter(BigDecimalConverter.CONVERTER_ID);
 		}
+        if (Date.class.isAssignableFrom(type))
+        {
+            return doCreateDateConverter(field);
+        }
 
 		return null;
 	}
@@ -403,7 +410,7 @@
 			cnv.setType("both");
 		}
 		cnv.setDateStyle("short");
-		cnv.setTimeStyle("long");
+		cnv.setTimeStyle("medium");
 		return cnv;
 	}
 
@@ -974,7 +981,7 @@
 		// For a map JSF cant determine the wanted value type
 		if (cmp.getConverter() == null && field.getType() != null)
 		{
-			Converter converter = doCreateConverter(field.getType());
+			Converter converter = doCreateConverter(field);
 			if (converter != null)
 			{
 				cmp.setConverter(converter);

Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java?view=diff&rev=464229&r1=464228&r2=464229
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java Sun Oct 15 10:18:43 2006
@@ -40,9 +40,11 @@
 	}
 
 	@Override
-	public Converter doCreateConverter(Class type)
+	public Converter doCreateConverter(FieldInterface field)
 	{
-		if (Float.class.isAssignableFrom(type)
+        Class type = field.getType();
+
+        if (Float.class.isAssignableFrom(type)
             || Double.class.isAssignableFrom(type)
             || float.class.isAssignableFrom(type)
             || double.class.isAssignableFrom(type)
@@ -51,7 +53,7 @@
 			return getContext().getApplication().createConverter(TypedNumberConverter.CONVERTER_ID);
 		}
 
-		return super.doCreateConverter(type);
+		return super.doCreateConverter(field);
 	}
 
 	@Override

Modified: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java?view=diff&rev=464229&r1=464228&r2=464229
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java Sun Oct 15 10:18:43 2006
@@ -15,9 +15,8 @@
  */
 package org.apache.myfaces.examples.dynaForm;
 
-import org.apache.myfaces.custom.dynaForm.annot.ui.Temporal;
-
 import javax.persistence.TemporalType;
+import javax.persistence.Temporal;
 import java.util.Date;
 
 public class SimpleBean