add missing types

src/main/java/Common/Archiver/Collector/ModeHandler.java

@@ -45,8 +45,8 @@ public abstract class ModeHandler {
 	return m_mode;
     }
 
-    public boolean isDataArchivable(final ModesCounters attModeCounter, final int data_type,
-	    final Object currentEvent, final Object previousEvent) {
+    public boolean isDataArchivable(final ModesCounters attModeCounter, final int data_type, final Object currentEvent,
+	    final Object previousEvent) {
 	double currentEventD = -1;
 	double previousEventD = -1;
 
@@ -72,12 +72,16 @@ public abstract class ModeHandler {
 	    // "TdbModeHandler/isDataArchivable/currentEventD/"+currentEventD+"/previousEventD/"+previousEventD
 	    // );
 	    break;
-	case TangoConst.Tango_DEV_UCHAR:
-	    currentEventD = isCurrentNull ? -1 : ((Byte) currentEvent).doubleValue();
-	    previousEventD = isPreviousNull ? -1 : ((Byte) previousEvent).doubleValue();
-	    break;
+	// case TangoConst.Tango_DEV_UCHAR:
+	// currentEventD = isCurrentNull ? -1 : ((Byte)
+	// currentEvent).doubleValue();
+	// previousEventD = isPreviousNull ? -1 : ((Byte)
+	// previousEvent).doubleValue();
+	// break;
 	case TangoConst.Tango_DEV_LONG:
 	case TangoConst.Tango_DEV_ULONG:
+	case TangoConst.Tango_DEV_LONG64:
+	case TangoConst.Tango_DEV_ULONG64:
 	    currentEventD = isCurrentNull ? -1 : ((Integer) currentEvent).doubleValue();
 	    previousEventD = isPreviousNull ? -1 : ((Integer) previousEvent).doubleValue();
 	    break;
@@ -85,6 +89,7 @@ public abstract class ModeHandler {
 	    currentEventD = isCurrentNull ? -1 : ((Boolean) currentEvent).booleanValue() ? 1 : 0;
 	    previousEventD = isPreviousNull ? -1 : ((Boolean) previousEvent).booleanValue() ? 1 : 0;
 	    break;
+	case TangoConst.Tango_DEV_UCHAR:
 	case TangoConst.Tango_DEV_SHORT:
 	case TangoConst.Tango_DEV_USHORT:
 	    currentEventD = isCurrentNull ? -1 : ((Short) currentEvent).doubleValue();
@@ -102,15 +107,13 @@ public abstract class ModeHandler {
 	    try {
 		currentEventD = isCurrentNull ? -1 : ((Double) currentEvent).doubleValue();
 	    } catch (final Exception e) {
-		throw new IllegalArgumentException(m_myName
-			+ "/isDataArchivable/failed to convert currentEvent/"
+		throw new IllegalArgumentException(m_myName + "/isDataArchivable/failed to convert currentEvent/"
 			+ currentEvent.getClass().toString() + "/data_type/" + data_type);
 	    }
 	    try {
 		previousEventD = isPreviousNull ? -1 : ((Double) previousEvent).doubleValue();
 	    } catch (final Exception e) {
-		throw new IllegalArgumentException(m_myName
-			+ "/isDataArchivable/failed to convert previousEvent/"
+		throw new IllegalArgumentException(m_myName + "/isDataArchivable/failed to convert previousEvent/"
 			+ previousEvent.getClass().toString() + "/data_type/" + data_type);
 	    }
 	    break;
@@ -122,27 +125,22 @@ public abstract class ModeHandler {
 	if (isDataArchivableModeP(attModeCounter)) {
 	    result = true;
 	}
-	if (isDataArchivableModeA(attModeCounter, isCurrentNull, isPreviousNull, currentEventD,
-		previousEventD)) {
+	if (isDataArchivableModeA(attModeCounter, isCurrentNull, isPreviousNull, currentEventD, previousEventD)) {
 	    result = true;
 	}
-	if (isDataArchivableModeR(attModeCounter, isCurrentNull, isPreviousNull, currentEventD,
-		previousEventD)) {
+	if (isDataArchivableModeR(attModeCounter, isCurrentNull, isPreviousNull, currentEventD, previousEventD)) {
 	    result = true;
 	}
 	if (isDataArchivableModeT(attModeCounter, isCurrentNull, currentEventD)) {
 	    result = true;
 	}
-	if (isDataArchivableModeC(attModeCounter, isCurrentNull, isPreviousNull, currentEventD,
-		previousEventD)) {
+	if (isDataArchivableModeC(attModeCounter, isCurrentNull, isPreviousNull, currentEventD, previousEventD)) {
 	    result = true;
 	}
-	if (isDataArchivableModeD(attModeCounter, isCurrentNull, isPreviousNull, currentEventD,
-		previousEventD)) {
+	if (isDataArchivableModeD(attModeCounter, isCurrentNull, isPreviousNull, currentEventD, previousEventD)) {
 	    result = true;
 	}
-	if (isDataArchivableModeE(attModeCounter, isCurrentNull, isPreviousNull, currentEventD,
-		previousEventD)) {
+	if (isDataArchivableModeE(attModeCounter, isCurrentNull, isPreviousNull, currentEventD, previousEventD)) {
 	    result = true;
 	}
 	return result;
@@ -170,9 +168,8 @@ public abstract class ModeHandler {
 	}
     }
 
-    private boolean isDataArchivableModeA(final ModesCounters attModeCounter,
-	    final boolean isCurrentNull, final boolean isPreviousNull, final double currentEvent,
-	    double previousEvent) {
+    private boolean isDataArchivableModeA(final ModesCounters attModeCounter, final boolean isCurrentNull,
+	    final boolean isPreviousNull, final double currentEvent, double previousEvent) {
 	if (m_mode.getModeA() == null) {
 	    return false;
 	}
@@ -201,12 +198,11 @@ public abstract class ModeHandler {
 	    final double upper_limit = previousEvent + Math.abs(m_mode.getModeA().getValSup());
 
 	    if (currentEvent < lower_limit || currentEvent > upper_limit) {
-		Util.out4.println(m_myName + ".isDataArchivableModeA \r\n\t" + "\r\n\t"
-			+ "DeltaInf() : " + Math.abs(m_mode.getModeA().getValInf()) + "\r\n\t"
-			+ "DeltaSup() : " + Math.abs(m_mode.getModeA().getValSup()) + "\r\n\t"
-			+ "current value : " + currentEvent + "\r\n\t" + "previous value : "
-			+ previousEvent + "\r\n\t" + "lower_limit : " + lower_limit + "\r\n\t"
-			+ "upper_limit  : " + upper_limit + "\r\n\t" + "status   :   OK");
+		Util.out4.println(m_myName + ".isDataArchivableModeA \r\n\t" + "\r\n\t" + "DeltaInf() : "
+			+ Math.abs(m_mode.getModeA().getValInf()) + "\r\n\t" + "DeltaSup() : "
+			+ Math.abs(m_mode.getModeA().getValSup()) + "\r\n\t" + "current value : " + currentEvent
+			+ "\r\n\t" + "previous value : " + previousEvent + "\r\n\t" + "lower_limit : " + lower_limit
+			+ "\r\n\t" + "upper_limit  : " + upper_limit + "\r\n\t" + "status   :   OK");
 
 		// System.out.println("TRUE");
 
@@ -226,9 +222,8 @@ public abstract class ModeHandler {
 	}
     }
 
-    private boolean isDataArchivableModeR(final ModesCounters attModeCounter,
-	    final boolean isCurrentNull, final boolean isPreviousNull, final double currentEvent,
-	    double previousEvent) {
+    private boolean isDataArchivableModeR(final ModesCounters attModeCounter, final boolean isCurrentNull,
+	    final boolean isPreviousNull, final double currentEvent, double previousEvent) {
 	if (m_mode.getModeR() == null) {
 	    return false;
 	}
@@ -266,13 +261,11 @@ public abstract class ModeHandler {
 	    upper_limit = previousEvent + deltaSup;
 
 	    if (currentEvent < lower_limit || currentEvent > upper_limit) {
-		Util.out4.println(m_myName + ".isDataArchivableModeR \r\n\t" + "\r\n\t"
-			+ "PercentInf() : " + Math.abs(m_mode.getModeR().getPercentInf())
-			+ "\r\n\t" + "PercentSup() : "
-			+ Math.abs(m_mode.getModeR().getPercentSup()) + "\r\n\t"
-			+ "current value : " + currentEvent + "\r\n\t" + "previous value : "
-			+ previousEvent + "\r\n\t" + "lower_limit : " + lower_limit + "\r\n\t"
-			+ "upper_limit  : " + upper_limit + "\r\n\t" + "status   :   OK");
+		Util.out4.println(m_myName + ".isDataArchivableModeR \r\n\t" + "\r\n\t" + "PercentInf() : "
+			+ Math.abs(m_mode.getModeR().getPercentInf()) + "\r\n\t" + "PercentSup() : "
+			+ Math.abs(m_mode.getModeR().getPercentSup()) + "\r\n\t" + "current value : " + currentEvent
+			+ "\r\n\t" + "previous value : " + previousEvent + "\r\n\t" + "lower_limit : " + lower_limit
+			+ "\r\n\t" + "upper_limit  : " + upper_limit + "\r\n\t" + "status   :   OK");
 
 		if (m_mode.getModeR().isSlow_drift()) {
 		    m_mode.getModeR().setPrev_stored_val(currentEvent);
@@ -287,8 +280,8 @@ public abstract class ModeHandler {
 	}
     }
 
-    private boolean isDataArchivableModeT(final ModesCounters attModeCounter,
-	    final boolean isCurrentNull, final double currentEvent) {
+    private boolean isDataArchivableModeT(final ModesCounters attModeCounter, final boolean isCurrentNull,
+	    final double currentEvent) {
 	if (m_mode.getModeT() == null) {
 	    return false;
 	}
@@ -311,8 +304,8 @@ public abstract class ModeHandler {
 
 	    if (currentEvent < m_mode.getModeT().getThresholdInf()
 		    || currentEvent > m_mode.getModeT().getThresholdSup()) {
-		Util.out4.println(m_myName + ".isDataArchivableModeT \r\n\t" + "\r\n\t"
-			+ "current value :" + currentEvent);
+		Util.out4.println(m_myName + ".isDataArchivableModeT \r\n\t" + "\r\n\t" + "current value :"
+			+ currentEvent);
 
 		// System.out.println ("TRUE");
 		return true;
@@ -323,9 +316,8 @@ public abstract class ModeHandler {
 	}
     }
 
-    private boolean isDataArchivableModeD(final ModesCounters attModeCounter,
-	    final boolean isCurrentNull, final boolean isPreviousNull, final double currentEvent,
-	    final double previousEvent) {
+    private boolean isDataArchivableModeD(final ModesCounters attModeCounter, final boolean isCurrentNull,
+	    final boolean isPreviousNull, final double currentEvent, final double previousEvent) {
 	if (m_mode.getModeD() == null) {
 	    return false;
 	}
@@ -355,9 +347,8 @@ public abstract class ModeHandler {
 	     */
 
 	    if (currentEvent != previousEvent) {
-		Util.out4.println(m_myName + ".isDataArchivableModeD \r\n\t" + "\r\n\t"
-			+ "current value : " + currentEvent + "\r\n\t" + "previous value : "
-			+ previousEvent);
+		Util.out4.println(m_myName + ".isDataArchivableModeD \r\n\t" + "\r\n\t" + "current value : "
+			+ currentEvent + "\r\n\t" + "previous value : " + previousEvent);
 		// System.out.println("TRUE");
 		return true;
 	    } else {
@@ -368,15 +359,13 @@ public abstract class ModeHandler {
     }
 
     // todo faire la suite ...
-    private boolean isDataArchivableModeC(final ModesCounters attModeCounter,
-	    final boolean isCurrentNull, final boolean isPreviousNull, final double currentEvent,
-	    final double previousEvent) {
+    private boolean isDataArchivableModeC(final ModesCounters attModeCounter, final boolean isCurrentNull,
+	    final boolean isPreviousNull, final double currentEvent, final double previousEvent) {
 	return false;
     }
 
-    private boolean isDataArchivableModeE(final ModesCounters attModeCounter,
-	    final boolean isCurrentNull, final boolean isPreviousNull, final double currentEvent,
-	    final double previousEvent) {
+    private boolean isDataArchivableModeE(final ModesCounters attModeCounter, final boolean isCurrentNull,
+	    final boolean isPreviousNull, final double currentEvent, final double previousEvent) {
 	return false;
     }
 
@@ -389,32 +378,27 @@ public abstract class ModeHandler {
     }
 
     private void initFactorWithRounding() {
-	m_factorModePeriodic = (int) Math.round(m_mode.getModeP().getPeriod() * 1.0
-		/ (m_refresherInterval * 1.0));
+	m_factorModePeriodic = (int) Math.round(m_mode.getModeP().getPeriod() * 1.0 / (m_refresherInterval * 1.0));
 
 	if (m_mode.getModeA() != null) {
-	    m_factorModeAbsolute = (int) Math.round(m_mode.getModeA().getPeriod() * 1.0
-		    / (m_refresherInterval * 1.0));
+	    m_factorModeAbsolute = (int) Math.round(m_mode.getModeA().getPeriod() * 1.0 / (m_refresherInterval * 1.0));
 	}
 
 	if (m_mode.getModeR() != null) {
-	    m_factorModeRelative = (int) Math.round(m_mode.getModeR().getPeriod() * 1.0
-		    / (m_refresherInterval * 1.0));
+	    m_factorModeRelative = (int) Math.round(m_mode.getModeR().getPeriod() * 1.0 / (m_refresherInterval * 1.0));
 	}
 
 	if (m_mode.getModeT() != null) {
-	    m_factorModeThreshold = (int) Math.round(m_mode.getModeT().getPeriod() * 1.0
-		    / (m_refresherInterval * 1.0));
+	    m_factorModeThreshold = (int) Math.round(m_mode.getModeT().getPeriod() * 1.0 / (m_refresherInterval * 1.0));
 	}
 
 	if (m_mode.getModeD() != null) {
-	    m_factorModeDifference = (int) Math.round(m_mode.getModeD().getPeriod() * 1.0
-		    / (m_refresherInterval * 1.0));
+	    m_factorModeDifference = (int) Math
+		    .round(m_mode.getModeD().getPeriod() * 1.0 / (m_refresherInterval * 1.0));
 	}
 
 	if (m_mode.getModeC() != null) {
-	    m_factorModeCalcul = (int) Math.round(m_mode.getModeC().getPeriod() * 1.0
-		    / (m_refresherInterval * 1.0));
+	    m_factorModeCalcul = (int) Math.round(m_mode.getModeC().getPeriod() * 1.0 / (m_refresherInterval * 1.0));
 	}
     }