TangoStateTranslation removed

src/main/java/HdbArchiver/Collector/scalar/StateScalar_RO.java

@@ -32,13 +32,13 @@ import fr.esrf.Tango.AttrWriteType;
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.TangoApi.DeviceAttribute;
 import fr.esrf.TangoApi.DeviceProxy;
+import fr.esrf.TangoApi.StateUtilities;
 import fr.esrf.TangoApi.events.TangoArchive;
 import fr.esrf.TangoApi.events.TangoArchiveEvent;
 import fr.esrf.tangoatk.core.DevStateScalarEvent;
 import fr.esrf.tangoatk.core.IDevStateScalar;
 import fr.soleil.commonarchivingapi.ArchivingTools.Diary.ILogger;
 import fr.soleil.commonarchivingapi.ArchivingTools.Tools.GlobalConst;
-import fr.soleil.commonarchivingapi.ArchivingTools.Tools.TangoStateTranslation;
 import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.ScalarEvent;
 
 //--------------------------------------------------------------------------//
@@ -60,6 +60,7 @@ public class StateScalar_RO extends StateScalar {
 	return AttrWriteType._READ;
     }
 
+    @Override
     public void devStateScalarChange(final DevStateScalarEvent event) {
 	final int tryNumber = DEFAULT_TRY_NUMBER;
 	final ScalarEvent scalarEvent = new ScalarEvent();
@@ -69,8 +70,7 @@ public class StateScalar_RO extends StateScalar {
 
 	    scalarEvent.setData_format(AttrDataFormat._SCALAR);
 	    scalarEvent.setWritable(getWritableValue());
-	    scalarEvent
-		    .setData_type(((IDevStateScalar) event.getSource()).getAttribute().getType());
+	    scalarEvent.setData_type(((IDevStateScalar) event.getSource()).getAttribute().getType());
 
 	    scalarEvent.setTimeStamp(event.getTimeStamp());
 	    // --------------------------------------------------------------------------//
@@ -83,22 +83,20 @@ public class StateScalar_RO extends StateScalar {
 	    // ELETTRA : Archiving Events
 	    // --------------------------------------------------------------------------//
 	    final String value = ((IDevStateScalar) event.getSource()).getValue();
-	    scalarEvent.setValue(TangoStateTranslation.getTangoDevState(value));
+	    scalarEvent.setValue(StateUtilities.getStateForName(value));
 	    processEventScalar(scalarEvent, tryNumber);
 
 	} catch (final DevFailed devFailed) {
-	    System.err.println("StateScalar_RO.devStateScalarChange : "
-		    + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading "
-		    + scalarEvent.getAttribute_complete_name() + " values...");
-	    printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR, scalarEvent
-		    .getAttribute_complete_name(), devFailed);
+	    System.err.println("StateScalar_RO.devStateScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+		    + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+	    printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
+		    scalarEvent.getAttribute_complete_name(), devFailed);
 	    final Object value = null;
 	    scalarEvent.setValue(value);
 	    processEventScalar(scalarEvent, tryNumber);
 	} catch (final Exception exE) {
-	    System.err.println("StateScalar_RO.devStateScalarChange : "
-		    + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading "
-		    + scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+	    System.err.println("StateScalar_RO.devStateScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+		    + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values. Event : " + event
 		    + ", source " + event.getSource());
 	    exE.printStackTrace();
 	    final Object value = null;
@@ -114,6 +112,7 @@ public class StateScalar_RO extends StateScalar {
     // --------------------------------------------------------------------------//
     // ELETTRA : Archiving Events
     // --------------------------------------------------------------------------//
+    @Override
     public void archive(final TangoArchiveEvent event) {
 	final int tryNumber = DEFAULT_TRY_NUMBER;
 	DeviceAttribute attrib = null;
@@ -128,13 +127,11 @@ public class StateScalar_RO extends StateScalar {
 	    System.out.println("Error getting archive event value");
 	    System.out.println();
 	    printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
-		    "\033[1;31mStateScalar_RO.archive.getValue() failed, caught DevFailed\033[0m",
-		    f);
+		    "\033[1;31mStateScalar_RO.archive.getValue() failed, caught DevFailed\033[0m", f);
 	    return;
 	} catch (final Exception e) /* Shouldn't be reached */
 	{
-	    System.out
-		    .println("StateScalar_RO.archive.getValue() failed, caught generic Exception, code failure");
+	    System.out.println("StateScalar_RO.archive.getValue() failed, caught generic Exception, code failure");
 	    e.printStackTrace();
 	    return;
 	}
@@ -155,8 +152,8 @@ public class StateScalar_RO extends StateScalar {
 			.println("\033[1;31mStateScalar_RO: event.getValue() or event.getSource() or event.getSource().getEventSupplier()) returned null!\033[0m");
 		return;
 	    }
-	    System.out.println(proxy.name() + ": " + attrib.getName()
-		    + "{state scalar, RO} [\033[1;32mEVENT\033[0m]: ");
+	    System.out
+		    .println(proxy.name() + ": " + attrib.getName() + "{state scalar, RO} [\033[1;32mEVENT\033[0m]: ");
 
 	    scalarEvent.setAttribute_complete_name(proxy.name() + "/" + attrib.getName());
 	    scalarEvent.setTimeStamp(attrib.getTime());
@@ -169,18 +166,16 @@ public class StateScalar_RO extends StateScalar {
 	    System.out.println(attrib.extractState());
 
 	} catch (final DevFailed devFailed) {
-	    System.err.println("NumberScalar_RO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX
-		    + "\r\n\t" + "Problem while reading "
-		    + scalarEvent.getAttribute_complete_name() + " values...");
-	    printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR, scalarEvent
-		    .getAttribute_complete_name(), devFailed);
+	    System.err.println("NumberScalar_RO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+		    + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+	    printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
+		    scalarEvent.getAttribute_complete_name(), devFailed);
 	    final Object value = null;
 	    scalarEvent.setValue(value);
 	    processEventScalar(scalarEvent, tryNumber);
 	} catch (final Exception exE) {
-	    System.err.println("NumberScalar_RO.archive : " + GlobalConst.ARCHIVING_ERROR_PREFIX
-		    + "\r\n\t" + "Problem while reading "
-		    + scalarEvent.getAttribute_complete_name() + " values...");
+	    System.err.println("NumberScalar_RO.archive : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+		    + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
 	    exE.printStackTrace();
 	    final Object value = null;
 	    scalarEvent.setValue(value);

src/main/java/TdbArchiver/Collector/scalar/StateScalar.java

@@ -25,6 +25,7 @@ import fr.esrf.Tango.AttrDataFormat;
 import fr.esrf.Tango.AttrWriteType;
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.Tango.ErrSeverity;
+import fr.esrf.TangoApi.StateUtilities;
 import fr.esrf.TangoDs.TangoConst;
 import fr.esrf.TangoDs.Util;
 import fr.esrf.tangoatk.core.AttributeStateEvent;
@@ -35,7 +36,6 @@ import fr.esrf.tangoatk.core.IDevStateScalarListener;
 import fr.esrf.tangoatk.core.IEntity;
 import fr.soleil.commonarchivingapi.ArchivingTools.Diary.ILogger;
 import fr.soleil.commonarchivingapi.ArchivingTools.Tools.GlobalConst;
-import fr.soleil.commonarchivingapi.ArchivingTools.Tools.TangoStateTranslation;
 import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.ArchivingException;
 import fr.soleil.hdbtdbArchivingApi.ArchivingTools.Tools.ScalarEvent;
 
@@ -126,7 +126,7 @@ public class StateScalar extends TdbCollector implements IDevStateScalarListener
 		scalarEvent.setTimeStamp(event.getTimeStamp());
 
 		final String value = ((IDevStateScalar) event.getSource()).getValue();
-		scalarEvent.setValue(TangoStateTranslation.getTangoDevState(value));
+		scalarEvent.setValue(StateUtilities.getStateForName(value));
 		processEventScalar(scalarEvent, DEFAULT_TRY_NUMBER);
 
 	    } catch (final DevFailed devFailed) {