empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1180735 - /incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/TextInputControl.java
Date Sun, 09 Oct 2011 22:29:53 GMT
Author: doebele
Date: Sun Oct  9 22:29:52 2011
New Revision: 1180735

URL: http://svn.apache.org/viewvc?rev=1180735&view=rev
Log:
EMPIREDB-103
remaining changes

Modified:
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/TextInputControl.java

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/TextInputControl.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/TextInputControl.java?rev=1180735&r1=1180734&r2=1180735&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/TextInputControl.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/TextInputControl.java
Sun Oct  9 22:29:52 2011
@@ -130,7 +130,7 @@ public class TextInputControl extends In
             nf.setGroupingUsed(false);
             return nf.format(value);
         }
-        if (dataType == DataType.DECIMAL || dataType == DataType.DOUBLE)
+        if (dataType == DataType.DECIMAL || dataType == DataType.FLOAT)
         { // Dezimal oder Double
             NumberFormat nf = getNumberFormat(dataType, vi.getUserLocale(), column);
             return nf.format(value);
@@ -231,7 +231,7 @@ public class TextInputControl extends In
         if (type==DataType.AUTOINC ||
             type==DataType.INTEGER)
             return 10; 
-        if (type==DataType.DOUBLE)
+        if (type==DataType.FLOAT)
             return 18;
         if (type==DataType.DECIMAL)
         {   
@@ -262,13 +262,13 @@ public class TextInputControl extends In
         if (value instanceof Number)
         { // Check desired type
             if (desiredType == DataType.AUTOINC || desiredType == DataType.INTEGER || 
-                desiredType == DataType.DOUBLE || desiredType == DataType.DECIMAL)
+                desiredType == DataType.FLOAT || desiredType == DataType.DECIMAL)
                 return desiredType;
             // Detect type
             if (value instanceof Integer || value instanceof Long || value instanceof Short)
                 return DataType.INTEGER;
             if (value instanceof Float || value instanceof Double)
-                return DataType.DOUBLE;
+                return DataType.FLOAT;
             // default
             return DataType.DECIMAL;
         }



Mime
View raw message