[ogsa-dai svn] SF.net SVN: ogsa-dai:[1977] ogsa-dai/trunk/core/clientserver/src/main/java/ uk/org/ogsadai/tuple/TypeConverter.java

[<all...@us...>]

Revision: 1977
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=1977&view=rev
Author:   allyhume
Date:     2012-01-20 10:44:51 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Fixed bugs due to missing switches and also added conversion between objects and strings using the object's toString method.

Modified Paths:
--------------
    ogsa-dai/trunk/core/clientserver/src/main/java/uk/org/ogsadai/tuple/TypeConverter.java

Modified: ogsa-dai/trunk/core/clientserver/src/main/java/uk/org/ogsadai/tuple/TypeConverter.java
===================================================================
--- ogsa-dai/trunk/core/clientserver/src/main/java/uk/org/ogsadai/tuple/TypeConverter.java	2012-01-16 14:37:08 UTC (rev 1976)
+++ ogsa-dai/trunk/core/clientserver/src/main/java/uk/org/ogsadai/tuple/TypeConverter.java	2012-01-20 10:44:51 UTC (rev 1977)
@@ -65,7 +65,7 @@
         {
             return value;
         } 
-        
+
         switch (fromType)
         {
             // Conversions between numbers and to string
@@ -139,6 +139,16 @@
                         throw new TypeConversionException(
                             new TypeMismatchException(fromType, toType));
                 }
+                
+            case TupleTypes._OBJECT:
+                switch(toType)
+                {
+                    case TupleTypes._STRING:
+                        return value.toString();
+                    default:
+                        throw new TypeConversionException(
+                            new TypeMismatchException(fromType, toType));
+                }
             default:
                 throw new TypeConversionException(
                     new TypeMismatchException(fromType, toType));
@@ -419,6 +429,7 @@
                         case TupleTypes._TIMESTAMP:
                             return TupleTypes._TIME;
                     }
+                    break;
                 case TupleTypes._DATE:
                     switch(rhsType)
                     {
@@ -426,12 +437,14 @@
                         case TupleTypes._TIMESTAMP:
                             return TupleTypes._DATE;
                     }
+                    break;
                 case TupleTypes._TIMESTAMP:
                     switch(rhsType)
                     {
                         case TupleTypes._STRING:
                             return TupleTypes._TIMESTAMP;
                     }
+                    break;
                 case TupleTypes._STRING:
                     switch(rhsType)
                     {
@@ -443,13 +456,24 @@
                             return TupleTypes._TIMESTAMP;
                         case TupleTypes._CHAR:
                             return TupleTypes._STRING;
+                        case TupleTypes._OBJECT:
+                            return TupleTypes._STRING;
                     }
+                    break;
                 case TupleTypes._CHAR:
                     switch(rhsType)
                     {
                         case TupleTypes._STRING:
                             return TupleTypes._STRING;
                     }
+                    break;
+                case TupleTypes._OBJECT:
+                    switch(rhsType)
+                    {
+                        case TupleTypes._STRING:
+                            return TupleTypes._STRING;
+                    }
+                    break;
             }
             throw new TypeMismatchException(lhsType, rhsType);
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.