X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FPrimitiveSpecAttribute.java;h=fe8412c814dc5793b1f0af11bff45a7781fff34e;hb=d1298659fe6f179d1cbbc8c89f108a0bbc5b4edf;hp=0186a1c3cb584be1a04c4eabdf299bed1b425fc8;hpb=ef08ee82dcb187f6e96114fc9a9568c1da329eca;p=gpl%2Fargeo-slc.git

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 0186a1c3c..fe8412c81 100644
--- 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
@@ -1,23 +1,41 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.core.execution;
 
 import org.argeo.slc.SlcException;
 
+/**
+ * A spec attribute wrapping a primitive value.
+ * 
+ * @see PrimitiveAccessor
+ */
 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 static final long serialVersionUID = -566676381839825483L;
 	private String type = "string";
 	private Object value = null;
 
+	public PrimitiveSpecAttribute() {
+	}
+
+	public PrimitiveSpecAttribute(String type, Object value) {
+		this.type = type;
+		this.value = value;
+	}
+
 	public Object getValue() {
 		return value;
 	}
@@ -30,33 +48,18 @@ public class PrimitiveSpecAttribute extends AbstractSpecAttribute implements
 		return type;
 	}
 
-	public Class<?> getTypeAsClass() {
-		return typeAsClass(type);
-	}
-
 	public void setType(String type) {
+		// check whether type is recognized.
+		if (PrimitiveUtils.typeAsClass(type) == null)
+			throw new SlcException("Unrecognized type " + 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
-			throw new SlcException("Unrecognized type " + type);
+	@Override
+	public String toString() {
+		return "Primitive spec attribute [" + type + "]"
+				+ (value != null ? "=" + value : "");
 	}
 
 }