Translating array into vector in C++; supporting only List/ArrayList/list for Collect...

[iot2.git] / iotjava / iotrmi / Java / IoTRMIUtil.java

diff --git a/iotjava/iotrmi/Java/IoTRMIUtil.java b/iotjava/iotrmi/Java/IoTRMIUtil.java
index 781610600d890f2a4916f74aed4a065059f2f1f1..91496ed6f38eeec902a24a3120de7061618a58f5 100644 (file)
--- a/iotjava/iotrmi/Java/IoTRMIUtil.java
+++ b/iotjava/iotrmi/Java/IoTRMIUtil.java
@@ -31,8 +31,7 @@ public class IoTRMIUtil {
         * Class Properties
         */
        private Map<String,String> mapPrimitives;
-       private Map<String,Integer> mapPrimitiveSizesJava;
-       private Map<String,Integer> mapPrimitiveSizesCplus;
+       private Map<String,Integer> mapPrimitiveSizes;
        private Map<String,String> mapNonPrimitives;
 
        /**
@@ -58,12 +57,9 @@ public class IoTRMIUtil {
                mapPrimitives = new HashMap<String,String>();
                        IoTRMITypes.arraysToMap(mapPrimitives, 
                                IoTRMITypes.primitivesJava, IoTRMITypes.primitivesCplus);
-               mapPrimitiveSizesJava = new HashMap<String,Integer>();
-                       IoTRMITypes.arraysToMap(mapPrimitiveSizesJava, 
-                               IoTRMITypes.primitivesJava, IoTRMITypes.primitivesJavaSizes);
-               mapPrimitiveSizesCplus = new HashMap<String,Integer>();
-                       IoTRMITypes.arraysToMap(mapPrimitiveSizesCplus, 
-                               IoTRMITypes.primitivesCplus, IoTRMITypes.primitivesCplusSizes);
+               mapPrimitiveSizes = new HashMap<String,Integer>();
+                       IoTRMITypes.arraysToMap(mapPrimitiveSizes, 
+                               IoTRMITypes.primitivesJava, IoTRMITypes.primitivesSizes);
                mapNonPrimitives = new HashMap<String,String>();
                        IoTRMITypes.arraysToMap(mapNonPrimitives, 
                                IoTRMITypes.nonPrimitivesJava, IoTRMITypes.nonPrimitivesCplus);
@@ -107,12 +103,10 @@ public class IoTRMIUtil {
         */
        public int getTypeSize(String type) {
 
-               if (mapPrimitiveSizesJava.containsKey(type))
-                       return mapPrimitiveSizesJava.get(type);
-               else if (mapPrimitiveSizesCplus.containsKey(type))
-                       return mapPrimitiveSizesCplus.get(type);
+               if (mapPrimitiveSizes.containsKey(type))
+                       return mapPrimitiveSizes.get(type);
                else
-                       return -1; // Size is unknown
+                       return -1; // Size is unknown (variable length)
        }