From: Bob J. <jac...@us...> - 2005-09-24 00:07:12
|
Update of /cvsroot/jmri/jmri/jmrit/symbolicprog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32748 Modified Files: DecVariableValue.java SpeedTableVarValue.java IndexedVariableValue.java Log Message: set, get value as int refactored Index: DecVariableValue.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/symbolicprog/DecVariableValue.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DecVariableValue.java 3 Aug 2005 12:20:02 -0000 1.18 --- DecVariableValue.java 24 Sep 2005 00:07:02 -0000 1.19 *************** *** 130,133 **** --- 130,137 ---- } + public int getIntValue() { + return Integer.valueOf(_value.getText()).intValue(); + } + public Component getValue() { if (getReadOnly()) { Index: IndexedVariableValue.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/symbolicprog/IndexedVariableValue.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** IndexedVariableValue.java 3 Aug 2005 12:21:21 -0000 1.6 --- IndexedVariableValue.java 24 Sep 2005 00:07:02 -0000 1.7 *************** *** 131,134 **** --- 131,138 ---- } + public int getIntValue() { + return (Integer.valueOf(_value.getText()).intValue()); + } + public Component getValue() { if (getReadOnly()) { Index: SpeedTableVarValue.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/symbolicprog/SpeedTableVarValue.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** SpeedTableVarValue.java 8 Jul 2005 16:26:03 -0000 1.25 --- SpeedTableVarValue.java 24 Sep 2005 00:07:02 -0000 1.26 *************** *** 209,212 **** --- 209,217 ---- } + public int getIntValue() { + log.warn("getValue doesn't make sense for a speed table"); + return 0; + } + public Component getValue() { log.warn("getValue not implemented yet"); *************** *** 217,221 **** log.warn("setValue doesn't make sense for a speed table: "+value); } ! Color _defaultColor; // implement an abstract member to set colors --- 222,226 ---- log.warn("setValue doesn't make sense for a speed table: "+value); } ! Color _defaultColor; // implement an abstract member to set colors |