src/main/java/fr/soleil/actiongroup/collectiveaction/components/tangowrapping/DeviceAttributeWrapper.java

@@ -122,7 +122,7 @@ public class DeviceAttributeWrapper {
         return this.attribute.getQuality();
     }
 
-    public DevState extractState() throws DevFailed {
-        return attribute.extractState();
+    public DevState[] extractDevStateArray() throws DevFailed {
+        return attribute.extractDevStateArray();
     }
 }

src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/plugin/PersistencePlugin.java

-/*	Synchrotron Soleil 
- *  
- *   File          :  PersistencePluginAction.java
- *  
- *   Project       :  TangoParser
- *  
- *   Description   :  
- *  
- *   Author        :  CLAISSE
- *  
- *   Original      :  25 janv. 07 
- *  
- *   Revision:  					Author:  
- *   Date: 							State:  
- *  
- *   Log: PersistencePluginAction.java,v 
- *
- */
- /*
- * Created on 25 janv. 07
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
 package fr.soleil.actiongroup.collectiveaction.onattributes.plugin;
 
 import fr.soleil.actiongroup.collectiveaction.components.tangowrapping.DeviceAttributeWrapper;
@@ -37,19 +13,13 @@ import fr.soleil.actiongroup.collectiveaction.onattributes.plugin.persistance.Pe
  * <LI> storing the attribute
  * </UL>
  * The persistence management is delegated to the chosen IPersistenceManager implementation
+ *
  * @author CLAISSE
  */
-public class PersistencePlugin implements Plugin
-{
-    public PersistencePlugin ()
-    {
+public class PersistencePlugin implements Plugin {
 
-    }
-    
-    public void execute ( PluginContext context, String deviceName, DeviceAttributeWrapper attribute ) throws Exception 
-    {
+    public void execute(PluginContext context, String deviceName, DeviceAttributeWrapper attribute) throws Exception {
         AnyAttribute anyAttribute = new AnyAttribute(deviceName, attribute);
-        
         PersistenceContext persistenceContext = context.getPersistenceContext();
         PersistenceManager manager = persistenceContext.getManager();
         manager.store(anyAttribute, persistenceContext);

src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/plugin/persistance/AnyAttribute.java

@@ -111,7 +111,7 @@ public class AnyAttribute {
     /**
      * The attribute's State value
      */
-    private DevState rawValueState;
+    private DevState[] rawValueState;
 
     private final int numberOfComponents;
 
@@ -199,8 +199,8 @@ public class AnyAttribute {
             break;
 
         case TangoConst.Tango_DEV_STATE:
-            rawValueState = attribute.extractState();
-            _numberOfComponents = 1;
+            rawValueState = attribute.extractDevStateArray();
+            _numberOfComponents = rawValueState == null ? 0 : rawValueState.length;
             break;
 
         case TangoConst.Tango_DEV_STRING:
@@ -270,8 +270,8 @@ public class AnyAttribute {
                 break;
 
             case TangoConst.Tango_DEV_STATE:
-                convertedNumericValuesTable[i] = rawValueState.value();
-                convertedStringValuesTable[i] = TangoConst.Tango_DevStateName[rawValueState.value()];
+                convertedNumericValuesTable[i] = rawValueState[i].value();
+                convertedStringValuesTable[i] = rawValueState[i].value()+"";
                 break;
 
             case TangoConst.Tango_DEV_STRING:

src/main/java/fr/soleil/archiving/snap/api/persistence/SpringSnapshotPersistenceManagerImpl.java

 package fr.soleil.archiving.snap.api.persistence;
 
-import java.util.Arrays;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import fr.esrf.Tango.AttrDataFormat;
 import fr.esrf.Tango.AttrWriteType;
 import fr.esrf.TangoDs.TangoConst;
@@ -21,6 +16,10 @@ import fr.soleil.archiving.snap.api.persistence.spring.dto.ScStr1Val;
 import fr.soleil.archiving.snap.api.persistence.spring.dto.ScStr2Val;
 import fr.soleil.archiving.snap.api.persistence.spring.dto.Sp1Val;
 import fr.soleil.archiving.snap.api.persistence.spring.dto.Sp2Val;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
 
 public class SpringSnapshotPersistenceManagerImpl implements SnapshotPersistenceManager {
     private final Logger logger = LoggerFactory.getLogger(SpringSnapshotPersistenceManagerImpl.class);
@@ -33,8 +32,7 @@ public class SpringSnapshotPersistenceManagerImpl implements SnapshotPersistence
     @Override
     public void store(final AnyAttribute attribute, final PersistenceContext persistenceContext) throws Exception {
         final SnapshotPersistenceContext context = (SnapshotPersistenceContext) persistenceContext;
-	logger.debug(attribute.getCompleteName() + " - values: "
-		+ Arrays.toString(attribute.getConvertedStringValuesTable()));
+        logger.debug("storing {} with value: {}", attribute.getCompleteName(), Arrays.toString(attribute.getConvertedStringValuesTable()));
         switch (attribute.getFormat()) {
             case AttrDataFormat._SCALAR:
                 if (attribute.getWritable() == AttrWriteType._READ) {

src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScNum1Val.java

@@ -37,14 +37,18 @@ public class ScNum1Val extends Val {
 	public ScNum1Val(AnyAttribute attribute, SnapshotPersistenceContext context) {
 		super(attribute, context);
 		double[] val = attribute.getConvertedNumericValuesTable();
-		this.value = val[0];
+		if (val == null) {
+			value = Double.NaN;
+		} else {
+			value = val[0];
+		}
 	}
 
 	/**
 	 * @return the value
 	 */
 	public double getValue() {
-		return this.value;
+		return value;
 	}
 
 	/**

src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScNum2Val.java

@@ -43,8 +43,13 @@ public class ScNum2Val extends Val {
 		super(attribute, context);
 
 		double[] val = attribute.getConvertedNumericValuesTable();
-		this.readValue = val[0];
-		this.writeValue = val[1];
+		if (val == null) {
+			readValue = Double.NaN;
+			writeValue= Double.NaN;
+		} else {
+			readValue = val[0];
+			writeValue = val[1];
+		}
 	}
 
 	/**

src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScStr1Val.java

@@ -36,21 +36,23 @@ public class ScStr1Val extends Val {
 
     public ScStr1Val(AnyAttribute attribute, SnapshotPersistenceContext context) {
         super(attribute, context);
-
         String[] val = attribute.getConvertedStringValuesTable();
-		this.value = val[0];
+        if (val == null) {
+            value = null;
+        } else {
+            value = val[0];
+        }
     }
 
     /**
      * @return the value
      */
     public String getValue() {
-		return this.value;
+        return value;
     }
 
     /**
-	 * @param value
-	 *            the value to set
+     * @param value the value to set
      */
     public void setValue(String value) {
         this.value = value;

src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScStr2Val.java

@@ -39,9 +39,14 @@ public class ScStr2Val extends Val {
 		super(attribute, context);
 
 		String[] val = attribute.getConvertedStringValuesTable();
+		if (val == null) {
+			readValue = null;
+			writeValue= null;
+		} else {
 			this.readValue = val[0];
 			this.writeValue = val[1];
 		}
+	}
 
 	/**
 	 * @return the readValue