From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Mar 2010 08:08:24 +0000 (+0000)
Subject: Centralize primitive support
X-Git-Tag: argeo-slc-2.1.7~1391
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4d289f70ff0eae95c9d7c071c3251f67d62b9232;p=gpl%2Fargeo-slc.git

Centralize primitive support

git-svn-id: https://svn.argeo.org/slc/trunk@3426 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java
index 0df1a49ba..412a85183 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java
+++ b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java
@@ -1,7 +1,7 @@
 package org.argeo.slc.castor.execution;
 
 import org.argeo.slc.core.execution.PrimitiveAccessor;
-import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
+import org.argeo.slc.core.execution.PrimitiveUtils;
 import org.exolab.castor.mapping.AbstractFieldHandler;
 
 public class PrimitiveFieldHandler extends AbstractFieldHandler {
@@ -37,24 +37,7 @@ public class PrimitiveFieldHandler extends AbstractFieldHandler {
 		PrimitiveAccessor primitiveAccessor = (PrimitiveAccessor) object;
 		String type = primitiveAccessor.getType();
 		String str = value.toString();
-		primitiveAccessor.setValue(convert(type, str));
+		primitiveAccessor.setValue(PrimitiveUtils.convert(type, str));
 	}
 
-	protected Object convert(String type, String str) {
-		if (PrimitiveSpecAttribute.TYPE_STRING.equals(type)) {
-			return str;
-		} else if (PrimitiveSpecAttribute.TYPE_INTEGER.equals(type)) {
-			return (Integer.parseInt(str));
-		} else if (PrimitiveSpecAttribute.TYPE_LONG.equals(type)) {
-			return (Long.parseLong(str));
-		} else if (PrimitiveSpecAttribute.TYPE_FLOAT.equals(type)) {
-			return (Float.parseFloat(str));
-		} else if (PrimitiveSpecAttribute.TYPE_DOUBLE.equals(type)) {
-			return (Double.parseDouble(str));
-		} else if (PrimitiveSpecAttribute.TYPE_BOOLEAN.equals(type)) {
-			return (Boolean.parseBoolean(str));
-		} else {
-			return str;
-		}
-	}
 }