Revision: 22682
http://sourceforge.net/p/jmri/code/22682
Author: rhwood
Date: 2013-01-31 11:58:02 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
Use SymbolicProgBundle.getMessage().
Modified Paths:
--------------
trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelPane.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelTreePane.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvTableModel.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedCvTableModel.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/KnownLocoSelPane.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/NewLocoSelPane.java
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelPane.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelPane.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelPane.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -57,8 +57,6 @@
*/
public class CombinedLocoSelPane extends LocoSelPane implements PropertyChangeListener {
- static final java.util.ResourceBundle rbt = jmri.jmrit.symbolicprog.SymbolicProgBundle.bundle();
-
public CombinedLocoSelPane(JLabel s) {
_statusLabel = s;
init();
@@ -89,10 +87,10 @@
go2.setEnabled(true);
go2.setRequestFocusEnabled(true);
go2.requestFocus();
- go2.setToolTipText(rbt.getString("CLICK TO OPEN THE PROGRAMMER"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("CLICK TO OPEN THE PROGRAMMER"));
} else {
go2.setEnabled(false);
- go2.setToolTipText(rbt.getString("SELECT A LOCOMOTIVE OR DECODER TO ENABLE"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("SELECT A LOCOMOTIVE OR DECODER TO ENABLE"));
}
}
});
@@ -106,14 +104,14 @@
}
JToggleButton addDecoderIdentButton() {
- JToggleButton iddecoder = new JToggleButton(rbt.getString("ButtonReadType"));
- iddecoder.setToolTipText(rbt.getString("TipSelectType"));
+ JToggleButton iddecoder = new JToggleButton(SymbolicProgBundle.getMessage("ButtonReadType"));
+ iddecoder.setToolTipText(SymbolicProgBundle.getMessage("TipSelectType"));
if (jmri.InstanceManager.programmerManagerInstance()!= null
&& jmri.InstanceManager.programmerManagerInstance().getGlobalProgrammer()!=null
&& !jmri.InstanceManager.programmerManagerInstance().getGlobalProgrammer().getCanRead()) {
// can't read, disable the button
iddecoder.setEnabled(false);
- iddecoder.setToolTipText(rbt.getString("TipNoRead"));
+ iddecoder.setToolTipText(SymbolicProgBundle.getMessage("TipNoRead"));
}
iddecoder.addActionListener( new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -155,8 +153,8 @@
protected JPanel layoutRosterSelection() {
JPanel pane2a = new JPanel();
pane2a.setLayout(new BoxLayout(pane2a, BoxLayout.X_AXIS));
- pane2a.add(new JLabel(rbt.getString("USE LOCOMOTIVE SETTINGS FOR: ")));
- locoBox.setNonSelectedItem(rbt.getString("<NONE - NEW LOCO>"));
+ pane2a.add(new JLabel(SymbolicProgBundle.getMessage("USE LOCOMOTIVE SETTINGS FOR: ")));
+ locoBox.setNonSelectedItem(SymbolicProgBundle.getMessage("<NONE - NEW LOCO>"));
Roster.instance().addPropertyChangeListener(this);
pane2a.add(locoBox);
locoBox.addPropertyChangeListener(RosterEntrySelector.SELECTED_ROSTER_ENTRIES, new PropertyChangeListener() {
@@ -169,21 +167,21 @@
go2.setEnabled(true);
go2.setRequestFocusEnabled(true);
go2.requestFocus();
- go2.setToolTipText(rbt.getString("CLICK TO OPEN THE PROGRAMMER"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("CLICK TO OPEN THE PROGRAMMER"));
} else {
go2.setEnabled(false);
- go2.setToolTipText(rbt.getString("SELECT A LOCOMOTIVE OR DECODER TO ENABLE"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("SELECT A LOCOMOTIVE OR DECODER TO ENABLE"));
}
}
});
- idloco = new JToggleButton(rbt.getString("IDENT"));
- idloco.setToolTipText(rbt.getString("READ THE LOCOMOTIVE'S ADDRESS AND ATTEMPT TO SELECT THE RIGHT SETTINGS"));
+ idloco = new JToggleButton(SymbolicProgBundle.getMessage("IDENT"));
+ idloco.setToolTipText(SymbolicProgBundle.getMessage("READ THE LOCOMOTIVE'S ADDRESS AND ATTEMPT TO SELECT THE RIGHT SETTINGS"));
if (jmri.InstanceManager.programmerManagerInstance() != null &&
jmri.InstanceManager.programmerManagerInstance().getGlobalProgrammer()!= null
&& !jmri.InstanceManager.programmerManagerInstance().getGlobalProgrammer().getCanRead()) {
// can't read, disable the button
idloco.setEnabled(false);
- idloco.setToolTipText(rbt.getString("BUTTON DISABLED BECAUSE CONFIGURED COMMAND STATION CAN'T READ CVS"));
+ idloco.setToolTipText(SymbolicProgBundle.getMessage("BUTTON DISABLED BECAUSE CONFIGURED COMMAND STATION CAN'T READ CVS"));
}
idloco.addActionListener( new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -219,7 +217,7 @@
// create the programmer box
JPanel progFormat = new JPanel();
progFormat.setLayout(new BoxLayout(progFormat, BoxLayout.X_AXIS));
- progFormat.add(new JLabel(rbt.getString("ProgrammerFormat")));
+ progFormat.add(new JLabel(SymbolicProgBundle.getMessage("ProgrammerFormat")));
progFormat.setAlignmentX(JLabel.RIGHT_ALIGNMENT);
programmerBox = new JComboBox(ProgDefault.findListOfProgFiles());
@@ -227,7 +225,7 @@
if (ProgDefault.getDefaultProgFile()!=null) programmerBox.setSelectedItem(ProgDefault.getDefaultProgFile());
progFormat.add(programmerBox);
- go2 = new JButton(rbt.getString("OpenProgrammer"));
+ go2 = new JButton(SymbolicProgBundle.getMessage("OpenProgrammer"));
go2.addActionListener( new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
if (log.isDebugEnabled()) log.debug("Open programmer pressed");
@@ -236,7 +234,7 @@
});
go2.setAlignmentX(JLabel.RIGHT_ALIGNMENT);
go2.setEnabled(false);
- go2.setToolTipText(rbt.getString("SELECT A LOCOMOTIVE OR DECODER TO ENABLE"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("SELECT A LOCOMOTIVE OR DECODER TO ENABLE"));
pane3a.add(progFormat);
pane3a.add(go2);
return pane3a;
@@ -324,7 +322,7 @@
locoBox.setSelectedItem(r);
} else {
log.warn("Read address "+dccAddress+", but no such loco in roster");
- _statusLabel.setText(rbt.getString("READ ADDRESS ")+dccAddress+rbt.getString(", BUT NO SUCH LOCO IN ROSTER"));
+ _statusLabel.setText(SymbolicProgBundle.getMessage("READ ADDRESS ")+dccAddress+SymbolicProgBundle.getMessage(", BUT NO SUCH LOCO IN ROSTER"));
}
}
@@ -476,7 +474,7 @@
RosterEntry re = new RosterEntry();
re.setDecoderFamily(decoderFile.getFamily());
re.setDecoderModel(decoderFile.getModel());
- re.setId(jmri.jmrit.symbolicprog.SymbolicProgBundle.bundle().getString("LabelNewDecoder"));
+ re.setId(SymbolicProgBundle.getMessage("LabelNewDecoder"));
// note that we're leaving the filename null
// add the new roster entry to the in-memory roster
Roster.instance().addEntry(re);
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelTreePane.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelTreePane.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/CombinedLocoSelTreePane.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -69,7 +69,7 @@
*/
protected JPanel layoutDecoderSelection() {
JPanel pane1a = new JPanel(new BorderLayout());
- pane1a.add(new JLabel(rbt.getString("LabelDecoderInstalled")), BorderLayout.NORTH);
+ pane1a.add(new JLabel(SymbolicProgBundle.getMessage("LabelDecoderInstalled")), BorderLayout.NORTH);
// create the list of manufacturers; get the list of decoders, and add elements
dRoot = new DecoderTreeNode("Root");
dModel = new InvisibleTreeModel(dRoot);
@@ -186,11 +186,11 @@
go2.setEnabled(true);
go2.setRequestFocusEnabled(true);
go2.requestFocus();
- go2.setToolTipText(rbt.getString("TipClickToOpen"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("TipClickToOpen"));
} else {
// decoder not selected - require one
go2.setEnabled(false);
- go2.setToolTipText(rbt.getString("TipSelectLoco"));
+ go2.setToolTipText(SymbolicProgBundle.getMessage("TipSelectLoco"));
}
}
});
@@ -199,7 +199,7 @@
dTree.addMouseListener(new MouseAdapter(){
public void mouseClicked(MouseEvent me){
// Clear any status messages and ensure the tree is in single path select mode
- if (_statusLabel != null) _statusLabel.setText(rbt.getString("StateIdle"));
+ if (_statusLabel != null) _statusLabel.setText(SymbolicProgBundle.getMessage("StateIdle"));
dTree.getSelectionModel().setSelectionMode(DefaultTreeSelectionModel.SINGLE_TREE_SELECTION);
if (me.getClickCount() == 2){
@@ -215,9 +215,9 @@
}
if (jmri.InstanceManager.programmerManagerInstance() != null &&
jmri.InstanceManager.programmerManagerInstance().isGlobalProgrammerAvailable()){
- showAll = new JRadioButton(rbt.getString("LabelAll"));
+ showAll = new JRadioButton(SymbolicProgBundle.getMessage("LabelAll"));
showAll.setSelected(true);
- showMatched = new JRadioButton(rbt.getString("LabelMatched"));
+ showMatched = new JRadioButton(SymbolicProgBundle.getMessage("LabelMatched"));
ButtonGroup group = new ButtonGroup();
group.add(showAll);
group.add(showMatched);
@@ -299,7 +299,7 @@
// and issue a warning instruction in the status bar
if (pList.size()>1) {
dTree.getSelectionModel().setSelectionMode(DefaultTreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
- _statusLabel.setText(rbt.getString("StateMultipleMatch"));
+ _statusLabel.setText(SymbolicProgBundle.getMessage("StateMultipleMatch"));
}
else dTree.getSelectionModel().setSelectionMode(DefaultTreeSelectionModel.SINGLE_TREE_SELECTION);
ArrayList<DecoderTreeNode> selectedNode = new ArrayList<DecoderTreeNode>();
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvTableModel.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvTableModel.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvTableModel.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -22,8 +22,6 @@
*/
public class CvTableModel extends javax.swing.table.AbstractTableModel implements ActionListener, PropertyChangeListener {
- static final java.util.ResourceBundle rbt = jmri.jmrit.symbolicprog.SymbolicProgBundle.bundle();
-
private int _numRows = 0; // must be zero until Vectors are initialized
static final int MAXCVNUM = 1024;
private Vector<CvValue> _cvDisplayVector = new Vector<CvValue>(); // vector of CvValue objects, in display order
@@ -85,12 +83,12 @@
public String getColumnName(int col) {
switch (col) {
- case NUMCOLUMN: return rbt.getString("ColumnNameNumber");
- case VALCOLUMN: return rbt.getString("ColumnNameValue");
- case STATECOLUMN: return rbt.getString("ColumnNameState");
- case READCOLUMN: return rbt.getString("ColumnNameRead");
- case WRITECOLUMN: return rbt.getString("ColumnNameWrite");
- case COMPARECOLUMN: return rbt.getString("ColumnNameCompare");
+ case NUMCOLUMN: return SymbolicProgBundle.getMessage("ColumnNameNumber");
+ case VALCOLUMN: return SymbolicProgBundle.getMessage("ColumnNameValue");
+ case STATECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameState");
+ case READCOLUMN: return SymbolicProgBundle.getMessage("ColumnNameRead");
+ case WRITECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameWrite");
+ case COMPARECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameCompare");
default: return "unknown";
}
}
@@ -145,13 +143,13 @@
case STATECOLUMN:
int state = _cvDisplayVector.elementAt(row).getState();
switch (state) {
- case CvValue.UNKNOWN: return rbt.getString("CvStateUnknown");
- case CvValue.READ: return rbt.getString("CvStateRead");
- case CvValue.EDITED: return rbt.getString("CvStateEdited");
- case CvValue.STORED: return rbt.getString("CvStateStored");
- case CvValue.FROMFILE: return rbt.getString("CvStateFromFile");
- case CvValue.SAME: return rbt.getString("CvStateSame");
- case CvValue.DIFF: return rbt.getString("CvStateDiff")+ " " +
+ case CvValue.UNKNOWN: return SymbolicProgBundle.getMessage("CvStateUnknown");
+ case CvValue.READ: return SymbolicProgBundle.getMessage("CvStateRead");
+ case CvValue.EDITED: return SymbolicProgBundle.getMessage("CvStateEdited");
+ case CvValue.STORED: return SymbolicProgBundle.getMessage("CvStateStored");
+ case CvValue.FROMFILE: return SymbolicProgBundle.getMessage("CvStateFromFile");
+ case CvValue.SAME: return SymbolicProgBundle.getMessage("CvStateSame");
+ case CvValue.DIFF: return SymbolicProgBundle.getMessage("CvStateDiff")+ " " +
_cvDisplayVector.elementAt(row).getDecoderValue();
default: return "inconsistent";
}
@@ -207,11 +205,11 @@
_cvDisplayVector.addElement(cv);
// connect to this CV to ensure the table display updates
cv.addPropertyChangeListener(this);
- JButton bw = new JButton(rbt.getString("ButtonWrite"));
+ JButton bw = new JButton(SymbolicProgBundle.getMessage("ButtonWrite"));
_writeButtons.addElement(bw);
- JButton br = new JButton(rbt.getString("ButtonRead"));
+ JButton br = new JButton(SymbolicProgBundle.getMessage("ButtonRead"));
_readButtons.addElement(br);
- JButton bc = new JButton(rbt.getString("ButtonCompare"));
+ JButton bc = new JButton(SymbolicProgBundle.getMessage("ButtonCompare"));
_compareButtons.addElement(bc);
if (infoOnly || readOnly) {
if (writeOnly) {
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -27,8 +27,6 @@
*/
public class CvValue extends AbstractValue implements ProgListener {
- static final java.util.ResourceBundle rbt = jmri.jmrit.symbolicprog.SymbolicProgBundle.bundle();
-
public CvValue(int num, Programmer pProgrammer) {
_num = num;
mProgrammer = pProgrammer;
@@ -256,7 +254,7 @@
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateReadingCV"),
+ SymbolicProgBundle.getMessage("StateReadingCV"),
new Object[]{""+_num}));
if (mProgrammer != null) {
@@ -268,14 +266,14 @@
} catch (Exception e) {
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringRead"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringRead"),
new Object[]{e.toString()}));
log.warn("Exception during CV read: "+e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -287,7 +285,7 @@
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateReadingIndexedCV"),
+ SymbolicProgBundle.getMessage("StateReadingIndexedCV"),
new Object[]{""+_iCv, ""+_piVal+(_siVal>=0?"."+_siVal:"")}));
if (mProgrammer != null) {
@@ -302,13 +300,13 @@
setState(UNKNOWN);
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringIndexedRead"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringIndexedRead"),
new Object[]{e.toString()}));
log.warn("Exception during IndexedCV read: " + e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -320,7 +318,7 @@
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateConfirmIndexedCV"),
+ SymbolicProgBundle.getMessage("StateConfirmIndexedCV"),
new Object[]{""+_iCv, ""+_piVal+(_siVal>=0?"."+_siVal:"")}));
if (mProgrammer != null) {
@@ -335,13 +333,13 @@
setState(UNKNOWN);
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringIndexedRead"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringIndexedRead"),
new Object[]{e.toString()}));
log.warn("Exception during IndexedCV read: " + e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -354,7 +352,7 @@
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateConfirmingCV"),
+ SymbolicProgBundle.getMessage("StateConfirmingCV"),
new Object[]{""+_num}));
if (mProgrammer != null) {
@@ -366,13 +364,13 @@
} catch (Exception e) {
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringConfirm"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringConfirm"),
new Object[]{e.toString()}));
log.warn("Exception during CV read: "+e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -385,7 +383,7 @@
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateWritingCV"),
+ SymbolicProgBundle.getMessage("StateWritingCV"),
new Object[]{""+_num}));
if (mProgrammer != null) {
setBusy(true);
@@ -398,13 +396,13 @@
setState(UNKNOWN);
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringWrite"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringWrite"),
new Object[]{e.toString()}));
log.warn("Exception during CV write: "+e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -415,7 +413,7 @@
_status = status;
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateWritingPICV"),
+ SymbolicProgBundle.getMessage("StateWritingPICV"),
new Object[]{""+_num}));
if (mProgrammer != null) {
setBusy(true);
@@ -428,13 +426,13 @@
setState(UNKNOWN);
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringWrite"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringWrite"),
new Object[]{e.toString()}));
log.warn("Exception during CV write: "+e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -445,7 +443,7 @@
_status = status;
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateWritingSICV"),
+ SymbolicProgBundle.getMessage("StateWritingSICV"),
new Object[]{""+_num}));
if (mProgrammer != null) {
setBusy(true);
@@ -463,14 +461,14 @@
setState(UNKNOWN);
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringWrite"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringWrite"),
new Object[]{e.toString()}));
log.warn("Exception during CV write: " + e);
setBusy(false);
}
}
else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -483,7 +481,7 @@
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateWritingIndexedCV"),
+ SymbolicProgBundle.getMessage("StateWritingIndexedCV"),
new Object[]{""+_iCv, ""+_piVal+(_siVal>=0?"."+_siVal:"")}));
if (mProgrammer != null) {
@@ -497,13 +495,13 @@
setState(UNKNOWN);
if (status != null) status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateExceptionDuringIndexedWrite"),
+ SymbolicProgBundle.getMessage("StateExceptionDuringIndexedWrite"),
new Object[]{e.toString()}));
log.warn("Exception during CV write: "+e);
setBusy(false);
}
} else {
- if (status != null) status.setText(rbt.getString("StateNoProgrammer"));
+ if (status != null) status.setText(SymbolicProgBundle.getMessage("StateNoProgrammer"));
log.error("No programmer available!");
}
}
@@ -516,7 +514,7 @@
if (!_busy) log.error("opReply when not busy!");
boolean oldBusy = _busy;
if (retval == OK) {
- if (_status != null) _status.setText(rbt.getString("StateOK"));
+ if (_status != null) _status.setText(SymbolicProgBundle.getMessage("StateOK"));
if (_reading) {
// set & notify value directly to avoid state going to EDITED
_value = value;
@@ -545,7 +543,7 @@
} else {
if (_status != null) _status.setText(
java.text.MessageFormat.format(
- rbt.getString("StateProgrammerError"),
+ SymbolicProgBundle.getMessage("StateProgrammerError"),
new Object[]{mProgrammer.decodeErrorCode(retval)}));
// delay to ensure that the message appears!
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedCvTableModel.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedCvTableModel.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedCvTableModel.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -23,8 +23,6 @@
*/
public class IndexedCvTableModel extends javax.swing.table.AbstractTableModel implements ActionListener, PropertyChangeListener {
- static final java.util.ResourceBundle rbt = jmri.jmrit.symbolicprog.SymbolicProgBundle.bundle();
-
private int _numRows = 0; // must be zero until Vectors are initialized
static final int MAXCVNUM = 512;
private Vector<CvValue> _indxCvDisplayVector = new Vector<CvValue>(); // vector of CvValue objects, in display order
@@ -97,15 +95,15 @@
public String getColumnName(int col) {
switch (col) {
- case NAMECOLUMN: return rbt.getString("ColumnNameNumber");
+ case NAMECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameNumber");
case PICOLUMN: return "PI Val";
case SICOLUMN: return "SI Val";
case CVCOLUMN: return "CV Num";
- case VALCOLUMN: return rbt.getString("ColumnNameValue");
- case STATECOLUMN: return rbt.getString("ColumnNameState");
- case READCOLUMN: return rbt.getString("ColumnNameRead");
- case WRITECOLUMN: return rbt.getString("ColumnNameWrite");
- case COMPARECOLUMN: return rbt.getString("ColumnNameCompare");
+ case VALCOLUMN: return SymbolicProgBundle.getMessage("ColumnNameValue");
+ case STATECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameState");
+ case READCOLUMN: return SymbolicProgBundle.getMessage("ColumnNameRead");
+ case WRITECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameWrite");
+ case COMPARECOLUMN: return SymbolicProgBundle.getMessage("ColumnNameCompare");
default: return "unknown";
}
}
@@ -188,13 +186,13 @@
case STATECOLUMN:
int state = (_indxCvDisplayVector.elementAt(row)).getState();
switch (state) {
- case CvValue.UNKNOWN: return rbt.getString("CvStateUnknown");
- case CvValue.READ: return rbt.getString("CvStateRead");
- case CvValue.EDITED: return rbt.getString("CvStateEdited");
- case CvValue.STORED: return rbt.getString("CvStateStored");
- case CvValue.FROMFILE: return rbt.getString("CvStateFromFile");
- case CvValue.SAME: return rbt.getString("CvStateSame");
- case CvValue.DIFF: return rbt.getString("CvStateDiff")+ " " +
+ case CvValue.UNKNOWN: return SymbolicProgBundle.getMessage("CvStateUnknown");
+ case CvValue.READ: return SymbolicProgBundle.getMessage("CvStateRead");
+ case CvValue.EDITED: return SymbolicProgBundle.getMessage("CvStateEdited");
+ case CvValue.STORED: return SymbolicProgBundle.getMessage("CvStateStored");
+ case CvValue.FROMFILE: return SymbolicProgBundle.getMessage("CvStateFromFile");
+ case CvValue.SAME: return SymbolicProgBundle.getMessage("CvStateSame");
+ case CvValue.DIFF: return SymbolicProgBundle.getMessage("CvStateDiff")+ " " +
(_indxCvDisplayVector.elementAt(row)).getDecoderValue();
default: return "inconsistent";
}
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/KnownLocoSelPane.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/KnownLocoSelPane.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/KnownLocoSelPane.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -64,7 +64,7 @@
addProgrammerBox();
- JButton go2 = new JButton(SymbolicProgBundle.bundle().getString("OpenProgrammer"));
+ JButton go2 = new JButton(SymbolicProgBundle.getMessage("OpenProgrammer"));
go2.addActionListener( new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
if (log.isDebugEnabled()) log.debug("Open programmer pressed");
@@ -81,7 +81,7 @@
private void addProgrammerBox() {
JPanel pane3a = new JPanel();
pane3a.setLayout(new BoxLayout(pane3a, BoxLayout.X_AXIS));
- pane3a.add(new JLabel(SymbolicProgBundle.bundle().getString("ProgrammerFormat")));
+ pane3a.add(new JLabel(SymbolicProgBundle.getMessage("ProgrammerFormat")));
// create the programmer box
programmerBox = new JComboBox(ProgDefault.findListOfProgFiles());
@@ -146,8 +146,8 @@
startProgrammer(null, re, (String)programmerBox.getSelectedItem());
} else {
JOptionPane.showMessageDialog(this,
- SymbolicProgBundle.bundle().getString("LocoMustSelected"),
- SymbolicProgBundle.bundle().getString("NoSelection"),
+ SymbolicProgBundle.getMessage("LocoMustSelected"),
+ SymbolicProgBundle.getMessage("NoSelection"),
JOptionPane.ERROR_MESSAGE);
}
}
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/NewLocoSelPane.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/NewLocoSelPane.java 2013-01-31 11:38:15 UTC (rev 22681)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/NewLocoSelPane.java 2013-01-31 11:58:02 UTC (rev 22682)
@@ -177,7 +177,7 @@
RosterEntry re = new RosterEntry();
re.setDecoderFamily(decoderFile.getFamily());
re.setDecoderModel(decoderFile.getModel());
- re.setId(SymbolicProgBundle.bundle().getString("LabelNewDecoder"));
+ re.setId(SymbolicProgBundle.getMessage("LabelNewDecoder"));
// note we're leaving the filename information as null
// add the new roster entry to the in-memory roster
Roster.instance().addEntry(re);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|