Skip to content
Snippets Groups Projects
Commit 8a92d10d authored by Gwenaelle ABEILLE's avatar Gwenaelle ABEILLE
Browse files

add missing types

parent 61d0ec69
Branches
Tags
No related merge requests found
...@@ -69,13 +69,8 @@ public abstract class ArchiverCollector { ...@@ -69,13 +69,8 @@ public abstract class ArchiverCollector {
try { try {
doArchive = m_modeHandler.isDataArchivable(mc, dataType, readValueObject, lastValueObject); doArchive = m_modeHandler.isDataArchivable(mc, dataType, readValueObject, lastValueObject);
} catch (IllegalArgumentException e) {
this.m_logger.trace(ILogger.LEVEL_ERROR, this.getClass().getSimpleName() + "/doArchiveEvent/catch " + e
+ " with the value of " + attCompleteName);
} catch (ClassCastException cce) {
this.m_logger.trace(ILogger.LEVEL_ERROR, this.getClass().getSimpleName() + "/doArchiveEvent/catch " + cce
+ " with the value of " + attCompleteName);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
this.m_logger.trace(ILogger.LEVEL_ERROR, this.getClass().getSimpleName() + "/doArchiveEvent/catch " + e this.m_logger.trace(ILogger.LEVEL_ERROR, this.getClass().getSimpleName() + "/doArchiveEvent/catch " + e
+ " with the value of " + attCompleteName); + " with the value of " + attCompleteName);
} }
......
...@@ -80,11 +80,14 @@ public abstract class ModeHandler { ...@@ -80,11 +80,14 @@ public abstract class ModeHandler {
// break; // break;
case TangoConst.Tango_DEV_LONG: case TangoConst.Tango_DEV_LONG:
case TangoConst.Tango_DEV_ULONG: case TangoConst.Tango_DEV_ULONG:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_ULONG64:
currentEventD = isCurrentNull ? -1 : ((Integer) currentEvent).doubleValue(); currentEventD = isCurrentNull ? -1 : ((Integer) currentEvent).doubleValue();
previousEventD = isPreviousNull ? -1 : ((Integer) previousEvent).doubleValue(); previousEventD = isPreviousNull ? -1 : ((Integer) previousEvent).doubleValue();
break; break;
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_ULONG64:
currentEventD = isCurrentNull ? -1 : ((Long) currentEvent).doubleValue();
previousEventD = isPreviousNull ? -1 : ((Long) previousEvent).doubleValue();
break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
currentEventD = isCurrentNull ? -1 : ((Boolean) currentEvent).booleanValue() ? 1 : 0; currentEventD = isCurrentNull ? -1 : ((Boolean) currentEvent).booleanValue() ? 1 : 0;
previousEventD = isPreviousNull ? -1 : ((Boolean) previousEvent).booleanValue() ? 1 : 0; previousEventD = isPreviousNull ? -1 : ((Boolean) previousEvent).booleanValue() ? 1 : 0;
......
...@@ -253,6 +253,7 @@ public class HdbCollectorFactory { ...@@ -253,6 +253,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
collector = new NumberScalar_RO(modeHandler); collector = new NumberScalar_RO(modeHandler);
break; break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
...@@ -264,9 +265,7 @@ public class HdbCollectorFactory { ...@@ -264,9 +265,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_STRING: case TangoConst.Tango_DEV_STRING:
collector = new StringScalar_RO(modeHandler); collector = new StringScalar_RO(modeHandler);
break; break;
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -281,6 +280,7 @@ public class HdbCollectorFactory { ...@@ -281,6 +280,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
collector = new NumberScalar_RW(modeHandler); collector = new NumberScalar_RW(modeHandler);
break; break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
...@@ -290,9 +290,6 @@ public class HdbCollectorFactory { ...@@ -290,9 +290,6 @@ public class HdbCollectorFactory {
collector = new StringScalar_RW(modeHandler); collector = new StringScalar_RW(modeHandler);
break; break;
case TangoConst.Tango_DEV_STATE: case TangoConst.Tango_DEV_STATE:
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -307,6 +304,7 @@ public class HdbCollectorFactory { ...@@ -307,6 +304,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
collector = new NumberScalar_WO(modeHandler); collector = new NumberScalar_WO(modeHandler);
break; break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
...@@ -315,9 +313,7 @@ public class HdbCollectorFactory { ...@@ -315,9 +313,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_STRING: case TangoConst.Tango_DEV_STRING:
collector = new StringScalar_WO(modeHandler); collector = new StringScalar_WO(modeHandler);
break; break;
case TangoConst.Tango_DEV_CHAR: case TangoConst.Tango_DEV_STATE:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -332,6 +328,7 @@ public class HdbCollectorFactory { ...@@ -332,6 +328,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
collector = new NumberScalar_RW(modeHandler); collector = new NumberScalar_RW(modeHandler);
break; break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
...@@ -340,9 +337,7 @@ public class HdbCollectorFactory { ...@@ -340,9 +337,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_STRING: case TangoConst.Tango_DEV_STRING:
collector = new StringScalar_RW(modeHandler); collector = new StringScalar_RW(modeHandler);
break; break;
case TangoConst.Tango_DEV_CHAR: case TangoConst.Tango_DEV_STATE:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -366,6 +361,7 @@ public class HdbCollectorFactory { ...@@ -366,6 +361,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
collector = new NumberSpectrum_RO(modeHandler); collector = new NumberSpectrum_RO(modeHandler);
break; break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
...@@ -374,9 +370,7 @@ public class HdbCollectorFactory { ...@@ -374,9 +370,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_STRING: case TangoConst.Tango_DEV_STRING:
collector = new StringSpectrum_RO(modeHandler); collector = new StringSpectrum_RO(modeHandler);
break; break;
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -391,6 +385,7 @@ public class HdbCollectorFactory { ...@@ -391,6 +385,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
collector = new NumberSpectrum_RO(modeHandler); collector = new NumberSpectrum_RO(modeHandler);
break; break;
case TangoConst.Tango_DEV_BOOLEAN: case TangoConst.Tango_DEV_BOOLEAN:
...@@ -399,9 +394,6 @@ public class HdbCollectorFactory { ...@@ -399,9 +394,6 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_STRING: case TangoConst.Tango_DEV_STRING:
collector = new StringSpectrum_RO(modeHandler); collector = new StringSpectrum_RO(modeHandler);
break; break;
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -417,6 +409,7 @@ public class HdbCollectorFactory { ...@@ -417,6 +409,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_STATE: case TangoConst.Tango_DEV_STATE:
...@@ -428,9 +421,7 @@ public class HdbCollectorFactory { ...@@ -428,9 +421,7 @@ public class HdbCollectorFactory {
case TangoConst.Tango_DEV_STRING: case TangoConst.Tango_DEV_STRING:
collector = new StringSpectrum_RW(modeHandler); collector = new StringSpectrum_RW(modeHandler);
break; break;
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
......
...@@ -88,6 +88,7 @@ public class NumberScalar_RO extends NumberScalar { ...@@ -88,6 +88,7 @@ public class NumberScalar_RO extends NumberScalar {
return AttrWriteType._READ; return AttrWriteType._READ;
} }
@Override
public void numberScalarChange(final NumberScalarEvent event) { public void numberScalarChange(final NumberScalarEvent event) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
final ScalarEvent scalarEvent = new ScalarEvent(); final ScalarEvent scalarEvent = new ScalarEvent();
...@@ -114,47 +115,41 @@ public class NumberScalar_RO extends NumberScalar { ...@@ -114,47 +115,41 @@ public class NumberScalar_RO extends NumberScalar {
// --------------------------------------------------------------------------// // --------------------------------------------------------------------------//
switch (scalarEvent.getData_type()) { switch (scalarEvent.getData_type()) {
case TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_SHORT:
scalarEvent.setValue(new Short((short) event.getNumberSource() case TangoConst.Tango_DEV_UCHAR:
.getNumberScalarValue())); scalarEvent.setValue((short) event.getNumberSource().getNumberScalarValue());
break; break;
case TangoConst.Tango_DEV_USHORT: case TangoConst.Tango_DEV_USHORT:
scalarEvent.setValue(new Short((short) event.getNumberSource() scalarEvent.setValue((short) event.getNumberSource().getNumberScalarValue());
.getNumberScalarValue()));
break; break;
case TangoConst.Tango_DEV_LONG: case TangoConst.Tango_DEV_LONG:
scalarEvent.setValue(new Integer((int) event.getNumberSource()
.getNumberScalarValue()));
break;
case TangoConst.Tango_DEV_ULONG: case TangoConst.Tango_DEV_ULONG:
scalarEvent.setValue(new Integer((int) event.getNumberSource() scalarEvent.setValue((int) event.getNumberSource().getNumberScalarValue());
.getNumberScalarValue()));
break; break;
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_LONG64:
scalarEvent.setValue(new Double(event.getNumberSource().getNumberScalarValue())); case TangoConst.Tango_DEV_ULONG64:
scalarEvent.setValue((long) event.getNumberSource().getNumberScalarValue());
break; break;
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
scalarEvent.setValue(new Float((float) event.getNumberSource() scalarEvent.setValue((float) event.getNumberSource().getNumberScalarValue());
.getNumberScalarValue()));
break; break;
case TangoConst.Tango_DEV_DOUBLE:
default: default:
scalarEvent.setValue(new Double(event.getNumberSource().getNumberScalarValue())); scalarEvent.setValue(event.getNumberSource().getNumberScalarValue());
break; break;
} }
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
System.err.println("NumberScalar_RO.numberScalarChange : " System.err.println("NumberScalar_RO.numberScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+ scalarEvent.getAttribute_complete_name() + " values..."); printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR, scalarEvent scalarEvent.getAttribute_complete_name(), devFailed);
.getAttribute_complete_name(), devFailed);
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final Exception exE) { } catch (final Exception exE) {
System.err.println("NumberScalar_RO.numberScalarChange : " System.err.println("NumberScalar_RO.numberScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+ scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+ ", source " + event.getSource()); + ", source " + event.getSource());
exE.printStackTrace(); exE.printStackTrace();
final Object value = null; final Object value = null;
...@@ -176,6 +171,7 @@ public class NumberScalar_RO extends NumberScalar { ...@@ -176,6 +171,7 @@ public class NumberScalar_RO extends NumberScalar {
* @author giacomo Implements the boolean scalar archive events for the read * @author giacomo Implements the boolean scalar archive events for the read
* only type * only type
*/ */
@Override
public void archive(final TangoArchiveEvent event) { public void archive(final TangoArchiveEvent event) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
DeviceAttribute attrib = null; DeviceAttribute attrib = null;
...@@ -197,8 +193,7 @@ public class NumberScalar_RO extends NumberScalar { ...@@ -197,8 +193,7 @@ public class NumberScalar_RO extends NumberScalar {
return; return;
} catch (final Exception e) /* Shouldn't be reached */ } catch (final Exception e) /* Shouldn't be reached */
{ {
System.out System.out.println("NumberScalar_RO.archive.getValue() failed, caught generic Exception, code failure");
.println("NumberScalar_RO.archive.getValue() failed, caught generic Exception, code failure");
e.printStackTrace(); e.printStackTrace();
return; return;
} }
...@@ -226,8 +221,7 @@ public class NumberScalar_RO extends NumberScalar { ...@@ -226,8 +221,7 @@ public class NumberScalar_RO extends NumberScalar {
scalarEvent.setWritable(AttrWriteType._READ); scalarEvent.setWritable(AttrWriteType._READ);
scalarEvent.setData_type(attrib.getType()); scalarEvent.setData_type(attrib.getType());
System.out.print(proxy.name() + ": " + attrib.getName() System.out.print(proxy.name() + ": " + attrib.getName() + "{scalar, RO} [\033[1;32mEVENT\033[0m]: ");
+ "{scalar, RO} [\033[1;32mEVENT\033[0m]: ");
switch (scalarEvent.getData_type()) { switch (scalarEvent.getData_type()) {
case TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_SHORT:
...@@ -271,16 +265,14 @@ public class NumberScalar_RO extends NumberScalar { ...@@ -271,16 +265,14 @@ public class NumberScalar_RO extends NumberScalar {
} }
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
print_exception("NumberScalar_RO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX print_exception("NumberScalar_RO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...", devFailed);
+ scalarEvent.getAttribute_complete_name() + " values...", devFailed);
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final Exception exE) { } catch (final Exception exE) {
System.err.println("NumberScalar_RO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX System.err.println("NumberScalar_RO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+ scalarEvent.getAttribute_complete_name() + " values...");
exE.printStackTrace(); exE.printStackTrace();
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
......
...@@ -94,14 +94,10 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -94,14 +94,10 @@ public class NumberScalar_RW extends NumberScalar {
return AttrWriteType._READ_WRITE; return AttrWriteType._READ_WRITE;
} }
@Override
public void numberScalarChange(final NumberScalarEvent event) { public void numberScalarChange(final NumberScalarEvent event) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
final ScalarEvent scalarEvent = new ScalarEvent(); final ScalarEvent scalarEvent = new ScalarEvent();
Double[] dvalue;
Float[] fvalue;
Integer[] ivalue;
Short[] svalue;
try { try {
scalarEvent.setAttribute_complete_name(event.getNumberSource().getName()); scalarEvent.setAttribute_complete_name(event.getNumberSource().getName());
...@@ -132,47 +128,53 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -132,47 +128,53 @@ public class NumberScalar_RW extends NumberScalar {
switch (scalarEvent.getData_type()) { switch (scalarEvent.getData_type()) {
case TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_SHORT:
case TangoConst.Tango_DEV_USHORT: case TangoConst.Tango_DEV_USHORT:
svalue = new Short[2]; case TangoConst.Tango_DEV_UCHAR:
svalue[0] = new Short((short) event.getNumberSource().getNumberScalarValue()); Short[] svalue = new Short[2];
svalue[1] = new Short((short) event.getNumberSource().getNumberScalarSetPoint()); svalue[0] = (short) event.getNumberSource().getNumberScalarValue();
svalue[1] = (short) event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(svalue); scalarEvent.setValue(svalue);
break; break;
case TangoConst.Tango_DEV_LONG: case TangoConst.Tango_DEV_LONG:
case TangoConst.Tango_DEV_ULONG: case TangoConst.Tango_DEV_ULONG:
ivalue = new Integer[2]; Integer[] ivalue = new Integer[2];
ivalue[0] = new Integer((int) event.getNumberSource().getNumberScalarValue()); ivalue[0] = (int) event.getNumberSource().getNumberScalarValue();
ivalue[1] = new Integer((int) event.getNumberSource().getNumberScalarSetPoint()); ivalue[1] = (int) event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(ivalue); scalarEvent.setValue(ivalue);
break; break;
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_ULONG64:
Long[] value = new Long[2];
value[0] = (long) event.getNumberSource().getNumberScalarValue();
value[1] = (long) event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(value);
break;
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
fvalue = new Float[2]; Float[] fvalue = new Float[2];
fvalue[0] = new Float((float) event.getNumberSource().getNumberScalarValue()); fvalue[0] = (float) event.getNumberSource().getNumberScalarValue();
fvalue[1] = new Float((float) event.getNumberSource().getNumberScalarSetPoint()); fvalue[1] = (float) event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(fvalue); scalarEvent.setValue(fvalue);
break; break;
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
default: default:
dvalue = new Double[2]; Double[] dvalue = new Double[2];
dvalue[0] = new Double(event.getNumberSource().getNumberScalarValue()); dvalue[0] = event.getNumberSource().getNumberScalarValue();
dvalue[1] = new Double(event.getNumberSource().getNumberScalarSetPoint()); dvalue[1] = event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(dvalue); scalarEvent.setValue(dvalue);
break; break;
} }
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
System.err.println("NumberScalar_RW.numberScalarChange : " System.err.println("NumberScalar_RW.numberScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+ scalarEvent.getAttribute_complete_name() + " values..."); printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR, scalarEvent scalarEvent.getAttribute_complete_name(), devFailed);
.getAttribute_complete_name(), devFailed);
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final Exception exE) { } catch (final Exception exE) {
System.err.println("NumberScalar_RW.numberScalarChange : " System.err.println("NumberScalar_RW.numberScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+ scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+ ", source " + event.getSource()); + ", source " + event.getSource());
exE.printStackTrace(); exE.printStackTrace();
final Object value = null; final Object value = null;
...@@ -194,6 +196,7 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -194,6 +196,7 @@ public class NumberScalar_RW extends NumberScalar {
* @author giacomo Implements the boolean scalar archive events for the read * @author giacomo Implements the boolean scalar archive events for the read
* only type * only type
*/ */
@Override
public void archive(final TangoArchiveEvent event) { public void archive(final TangoArchiveEvent event) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
DeviceAttribute attrib = null; DeviceAttribute attrib = null;
...@@ -209,16 +212,14 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -209,16 +212,14 @@ public class NumberScalar_RW extends NumberScalar {
try { try {
attrib = event.getValue(); attrib = event.getValue();
} catch (final DevFailed f) { } catch (final DevFailed f) {
System.out System.out.println("NumberScalar_RW.java: Error getting archive event value for the event \033[1;31m"
.println("NumberScalar_RW.java: Error getting archive event value for the event \033[1;31m"
+ event.toString() + "\033[0m"); + event.toString() + "\033[0m");
System.out.println(); System.out.println();
print_exception(f); print_exception(f);
return; return;
} catch (final Exception e) /* Shouldn't be reached */ } catch (final Exception e) /* Shouldn't be reached */
{ {
System.out System.out.println("NumberScalar_RW.archive.getValue() failed, caught generic Exception, code failure");
.println("NumberScalar_RW.archive.getValue() failed, caught generic Exception, code failure");
e.printStackTrace(); e.printStackTrace();
return; return;
} }
...@@ -241,8 +242,7 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -241,8 +242,7 @@ public class NumberScalar_RW extends NumberScalar {
return; return;
} }
System.out.print(proxy.name() + ": " + attrib.getName() System.out.print(proxy.name() + ": " + attrib.getName() + "{scalar, RW} [\033[1;32mEVENT\033[0m]: ");
+ "{scalar, RW} [\033[1;32mEVENT\033[0m]: ");
scalarEvent.setAttribute_complete_name(proxy.name() + "/" + attrib.getName()); scalarEvent.setAttribute_complete_name(proxy.name() + "/" + attrib.getName());
scalarEvent.setTimeStamp(attrib.getTime()); scalarEvent.setTimeStamp(attrib.getTime());
...@@ -298,8 +298,7 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -298,8 +298,7 @@ public class NumberScalar_RW extends NumberScalar {
bvalue[0] = bovalue[0]; bvalue[0] = bovalue[0];
bvalue[1] = bovalue[1]; bvalue[1] = bovalue[1];
scalarEvent.setValue(bvalue); scalarEvent.setValue(bvalue);
System.out.println("boolean (Here?!?! :o ) (R): " + bvalue[0] + " (W): " System.out.println("boolean (Here?!?! :o ) (R): " + bvalue[0] + " (W): " + bvalue[1]);
+ bvalue[1]);
break; break;
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
...@@ -314,17 +313,15 @@ public class NumberScalar_RW extends NumberScalar { ...@@ -314,17 +313,15 @@ public class NumberScalar_RW extends NumberScalar {
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
print_exception("NumberScalar_RW.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX print_exception("NumberScalar_RW.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values (DevFailed)...",
+ scalarEvent.getAttribute_complete_name() + " values (DevFailed)...",
devFailed); devFailed);
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final Exception exE) { } catch (final Exception exE) {
System.err.println("NumberScalar_RW.archive : " + GlobalConst.ARCHIVING_ERROR_PREFIX System.err.println("NumberScalar_RW.archive : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values (Exception)...");
+ scalarEvent.getAttribute_complete_name() + " values (Exception)...");
exE.printStackTrace(); exE.printStackTrace();
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
......
...@@ -84,6 +84,7 @@ public class NumberScalar_WO extends NumberScalar { ...@@ -84,6 +84,7 @@ public class NumberScalar_WO extends NumberScalar {
return AttrWriteType._WRITE; return AttrWriteType._WRITE;
} }
@Override
public void numberScalarChange(final NumberScalarEvent event) { public void numberScalarChange(final NumberScalarEvent event) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
final ScalarEvent scalarEvent = new ScalarEvent(); final ScalarEvent scalarEvent = new ScalarEvent();
...@@ -99,47 +100,39 @@ public class NumberScalar_WO extends NumberScalar { ...@@ -99,47 +100,39 @@ public class NumberScalar_WO extends NumberScalar {
switch (scalarEvent.getData_type()) { switch (scalarEvent.getData_type()) {
case TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_SHORT:
scalarEvent.setValue(new Short((short) event.getNumberSource()
.getNumberScalarSetPoint()));
break;
case TangoConst.Tango_DEV_USHORT: case TangoConst.Tango_DEV_USHORT:
scalarEvent.setValue(new Short((short) event.getNumberSource() case TangoConst.Tango_DEV_UCHAR:
.getNumberScalarSetPoint())); scalarEvent.setValue((short) event.getNumberSource().getNumberScalarSetPoint());
break; break;
case TangoConst.Tango_DEV_LONG: case TangoConst.Tango_DEV_LONG:
scalarEvent.setValue(new Integer((int) event.getNumberSource()
.getNumberScalarSetPoint()));
break;
case TangoConst.Tango_DEV_ULONG: case TangoConst.Tango_DEV_ULONG:
scalarEvent.setValue(new Integer((int) event.getNumberSource() scalarEvent.setValue((int) event.getNumberSource().getNumberScalarSetPoint());
.getNumberScalarSetPoint()));
break; break;
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_LONG64:
scalarEvent.setValue(new Double(event.getNumberSource().getNumberScalarSetPoint())); case TangoConst.Tango_DEV_ULONG64:
scalarEvent.setValue((long) event.getNumberSource().getNumberScalarValue());
break; break;
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
scalarEvent.setValue(new Float((float) event.getNumberSource() scalarEvent.setValue((float) event.getNumberSource().getNumberScalarSetPoint());
.getNumberScalarSetPoint()));
break; break;
case TangoConst.Tango_DEV_DOUBLE:
default: default:
scalarEvent.setValue(new Double(event.getNumberSource().getNumberScalarSetPoint())); scalarEvent.setValue(event.getNumberSource().getNumberScalarSetPoint());
break; break;
} }
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
System.err.println("NumberScalar_WO.numberScalarChange : " System.err.println("NumberScalar_WO.numberScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+ scalarEvent.getAttribute_complete_name() + " values..."); printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR, scalarEvent scalarEvent.getAttribute_complete_name(), devFailed);
.getAttribute_complete_name(), devFailed);
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final Exception exE) { } catch (final Exception exE) {
System.err.println("NumberScalar_WO.numberScalarChange : " System.err.println("NumberScalar_WO.numberScalarChange : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+ scalarEvent.getAttribute_complete_name() + " values. Event : " + event
+ ", source " + event.getSource()); + ", source " + event.getSource());
exE.printStackTrace(); exE.printStackTrace();
final Object value = null; final Object value = null;
...@@ -156,6 +149,7 @@ public class NumberScalar_WO extends NumberScalar { ...@@ -156,6 +149,7 @@ public class NumberScalar_WO extends NumberScalar {
// ELETTRA : Archiving Events // ELETTRA : Archiving Events
// --------------------------------------------------------------------------// // --------------------------------------------------------------------------//
/* Invoked on the reception of a tango archive event. */ /* Invoked on the reception of a tango archive event. */
@Override
public void archive(final TangoArchiveEvent event) { public void archive(final TangoArchiveEvent event) {
final int tryNumber = DEFAULT_TRY_NUMBER; final int tryNumber = DEFAULT_TRY_NUMBER;
DeviceAttribute attrib = null; DeviceAttribute attrib = null;
...@@ -169,14 +163,11 @@ public class NumberScalar_WO extends NumberScalar { ...@@ -169,14 +163,11 @@ public class NumberScalar_WO extends NumberScalar {
} catch (final DevFailed f) { } catch (final DevFailed f) {
System.out.println("Error getting archive event value"); System.out.println("Error getting archive event value");
System.out.println(); System.out.println();
print_exception( print_exception("\033[1;31mNumberScalar_WO.archive.getValue() failed, caught DevFailed\033[0m", f);
"\033[1;31mNumberScalar_WO.archive.getValue() failed, caught DevFailed\033[0m",
f);
return; return;
} catch (final Exception e) /* Shouldn't be reached */ } catch (final Exception e) /* Shouldn't be reached */
{ {
System.out System.out.println("NumberScalar_WO.archive.getValue() failed, caught generic Exception, code failure");
.println("NumberScalar_WO.archive.getValue() failed, caught generic Exception, code failure");
e.printStackTrace(); e.printStackTrace();
return; return;
} }
...@@ -198,8 +189,7 @@ public class NumberScalar_WO extends NumberScalar { ...@@ -198,8 +189,7 @@ public class NumberScalar_WO extends NumberScalar {
return; return;
} }
System.out.print(proxy.name() + ": " + attrib.getName() System.out.print(proxy.name() + ": " + attrib.getName() + "{scalar, WO} [\033[1;32mEVENT\033[0m]: ");
+ "{scalar, WO} [\033[1;32mEVENT\033[0m]: ");
scalarEvent.setAttribute_complete_name(proxy.name() + "/" + attrib.getName()); scalarEvent.setAttribute_complete_name(proxy.name() + "/" + attrib.getName());
scalarEvent.setTimeStamp(attrib.getTime()); scalarEvent.setTimeStamp(attrib.getTime());
...@@ -249,18 +239,16 @@ public class NumberScalar_WO extends NumberScalar { ...@@ -249,18 +239,16 @@ public class NumberScalar_WO extends NumberScalar {
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
System.err.println("NumberScalar_WO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX System.err.println("NumberScalar_WO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+ scalarEvent.getAttribute_complete_name() + " values..."); printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR,
printException(GlobalConst.DATA_TYPE_EXCEPTION, AttrDataFormat._SCALAR, scalarEvent scalarEvent.getAttribute_complete_name(), devFailed);
.getAttribute_complete_name(), devFailed);
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
processEventScalar(scalarEvent, tryNumber); processEventScalar(scalarEvent, tryNumber);
} catch (final Exception exE) { } catch (final Exception exE) {
System.err.println("NumberScalar_WO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX System.err.println("NumberScalar_WO.archive() : " + GlobalConst.ARCHIVING_ERROR_PREFIX + "\r\n\t"
+ "\r\n\t" + "Problem while reading " + "Problem while reading " + scalarEvent.getAttribute_complete_name() + " values...");
+ scalarEvent.getAttribute_complete_name() + " values...");
exE.printStackTrace(); exE.printStackTrace();
final Object value = null; final Object value = null;
scalarEvent.setValue(value); scalarEvent.setValue(value);
......
...@@ -245,6 +245,7 @@ public class TdbCollectorFactory { ...@@ -245,6 +245,7 @@ public class TdbCollectorFactory {
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
collector = new NumberScalar(modeHandler, m_currentDsPath, m_currentDbPath, collector = new NumberScalar(modeHandler, m_currentDsPath, m_currentDbPath,
AttrWriteType.from_int(writable)); AttrWriteType.from_int(writable));
...@@ -261,9 +262,6 @@ public class TdbCollectorFactory { ...@@ -261,9 +262,6 @@ public class TdbCollectorFactory {
collector = new StringScalar(modeHandler, m_currentDsPath, m_currentDbPath, collector = new StringScalar(modeHandler, m_currentDsPath, m_currentDbPath,
AttrWriteType.from_int(writable)); AttrWriteType.from_int(writable));
break; break;
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
...@@ -277,6 +275,7 @@ public class TdbCollectorFactory { ...@@ -277,6 +275,7 @@ public class TdbCollectorFactory {
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
case TangoConst.Tango_DEV_ULONG64: case TangoConst.Tango_DEV_ULONG64:
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_UCHAR: case TangoConst.Tango_DEV_UCHAR:
collector = new NumberSpectrum(modeHandler, m_currentDsPath, m_currentDbPath, collector = new NumberSpectrum(modeHandler, m_currentDsPath, m_currentDbPath,
AttrWriteType.from_int(writable)); AttrWriteType.from_int(writable));
...@@ -289,9 +288,6 @@ public class TdbCollectorFactory { ...@@ -289,9 +288,6 @@ public class TdbCollectorFactory {
collector = new StringSpectrum(modeHandler, m_currentDsPath, m_currentDbPath, collector = new StringSpectrum(modeHandler, m_currentDsPath, m_currentDbPath,
AttrWriteType.from_int(writable)); AttrWriteType.from_int(writable));
break; break;
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_CHAR:
case TangoConst.Tango_DEV_INT:
default: default:
generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name); generateException(GlobalConst.DATA_TYPE_EXCEPTION, data_type, name);
} }
......
...@@ -259,17 +259,18 @@ public class NumberScalar extends TdbCollector implements INumberScalarListener ...@@ -259,17 +259,18 @@ public class NumberScalar extends TdbCollector implements INumberScalarListener
if (getWritableValue().equals(AttrWriteType.READ)) { if (getWritableValue().equals(AttrWriteType.READ)) {
switch (scalarEvent.getData_type()) { switch (scalarEvent.getData_type()) {
case TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_SHORT:
scalarEvent.setValue((short) event.getNumberSource().getNumberScalarValue());
break;
case TangoConst.Tango_DEV_USHORT: case TangoConst.Tango_DEV_USHORT:
case TangoConst.Tango_DEV_UCHAR:
scalarEvent.setValue((short) event.getNumberSource().getNumberScalarValue()); scalarEvent.setValue((short) event.getNumberSource().getNumberScalarValue());
break; break;
case TangoConst.Tango_DEV_LONG: case TangoConst.Tango_DEV_LONG:
scalarEvent.setValue((int) event.getNumberSource().getNumberScalarValue());
break;
case TangoConst.Tango_DEV_ULONG: case TangoConst.Tango_DEV_ULONG:
scalarEvent.setValue((int) event.getNumberSource().getNumberScalarValue()); scalarEvent.setValue((int) event.getNumberSource().getNumberScalarValue());
break; break;
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_ULONG64:
scalarEvent.setValue((long) event.getNumberSource().getNumberScalarValue());
break;
case TangoConst.Tango_DEV_DOUBLE: case TangoConst.Tango_DEV_DOUBLE:
scalarEvent.setValue(event.getNumberSource().getNumberScalarValue()); scalarEvent.setValue(event.getNumberSource().getNumberScalarValue());
break; break;
...@@ -284,6 +285,7 @@ public class NumberScalar extends TdbCollector implements INumberScalarListener ...@@ -284,6 +285,7 @@ public class NumberScalar extends TdbCollector implements INumberScalarListener
switch (scalarEvent.getData_type()) { switch (scalarEvent.getData_type()) {
case TangoConst.Tango_DEV_SHORT: case TangoConst.Tango_DEV_SHORT:
case TangoConst.Tango_DEV_USHORT: case TangoConst.Tango_DEV_USHORT:
case TangoConst.Tango_DEV_UCHAR:
final Short[] svalue = new Short[2]; final Short[] svalue = new Short[2];
svalue[0] = (short) event.getNumberSource().getNumberScalarValue(); svalue[0] = (short) event.getNumberSource().getNumberScalarValue();
svalue[1] = (short) event.getNumberSource().getNumberScalarSetPoint(); svalue[1] = (short) event.getNumberSource().getNumberScalarSetPoint();
...@@ -296,6 +298,13 @@ public class NumberScalar extends TdbCollector implements INumberScalarListener ...@@ -296,6 +298,13 @@ public class NumberScalar extends TdbCollector implements INumberScalarListener
ivalue[1] = (int) event.getNumberSource().getNumberScalarSetPoint(); ivalue[1] = (int) event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(ivalue); scalarEvent.setValue(ivalue);
break; break;
case TangoConst.Tango_DEV_LONG64:
case TangoConst.Tango_DEV_ULONG64:
final Long[] lvalue = new Long[2];
lvalue[0] = (long) event.getNumberSource().getNumberScalarValue();
lvalue[1] = (long) event.getNumberSource().getNumberScalarSetPoint();
scalarEvent.setValue(lvalue);
break;
case TangoConst.Tango_DEV_FLOAT: case TangoConst.Tango_DEV_FLOAT:
final Float[] fvalue = new Float[2]; final Float[] fvalue = new Float[2];
fvalue[0] = (float) event.getNumberSource().getNumberScalarValue(); fvalue[0] = (float) event.getNumberSource().getNumberScalarValue();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment