Improve execution core

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / PrimitiveSpecAttribute.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java
index 0186a1c3cb584be1a04c4eabdf299bed1b425fc8..bba3be7a0e2d65cb9fa228867894956f3c0f07be 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/PrimitiveSpecAttribute.java
@@ -4,17 +4,6 @@ import org.argeo.slc.SlcException;
 
 public class PrimitiveSpecAttribute extends AbstractSpecAttribute implements
                PrimitiveAccessor {
-       // public enum Type {
-       // string, integer
-       // }
-
-       public final static String TYPE_STRING = "string";
-       public final static String TYPE_INTEGER = "integer";
-       public final static String TYPE_LONG = "long";
-       public final static String TYPE_FLOAT = "float";
-       public final static String TYPE_DOUBLE = "double";
-       public final static String TYPE_BOOLEAN = "boolean";
-
        private String type = "string";
        private Object value = null;
 
@@ -30,33 +19,11 @@ public class PrimitiveSpecAttribute extends AbstractSpecAttribute implements
                return type;
        }
 
-       public Class<?> getTypeAsClass() {
-               return typeAsClass(type);
-       }
-
        public void setType(String type) {
-               this.type = type;
-
                // check whether type is recognized.
-               // TODO: make validation cleaner
-               typeAsClass(type);
-       }
-
-       public static Class<?> typeAsClass(String type) {
-               if (TYPE_STRING.equals(type))
-                       return String.class;
-               else if (TYPE_INTEGER.equals(type))
-                       return Integer.class;
-               else if (TYPE_LONG.equals(type))
-                       return Long.class;
-               else if (TYPE_FLOAT.equals(type))
-                       return Float.class;
-               else if (TYPE_DOUBLE.equals(type))
-                       return Double.class;
-               else if (TYPE_BOOLEAN.equals(type))
-                       return Boolean.class;
-               else
+               if (PrimitiveUtils.typeAsClass(type) == null)
                        throw new SlcException("Unrecognized type " + type);
-       }
+               this.type = type;
 
+       }
 }