From ae090551b4f4f6c066397748f85c7924687493a3 Mon Sep 17 00:00:00 2001 From: dsand47 Date: Sat, 2 Mar 2019 00:45:36 -0600 Subject: [PATCH] Complete the rename changes including .form files --- .../ctc/editor/code/CheckJMRIObject.java | 2 +- .../jmri/jmrit/ctc/editor/code/Columns.java | 116 +++++++++--------- .../editor/code/InternalSensorManager.java | 28 ++--- .../jmri/jmrit/ctc/editor/gui/FrmAbout.form | 2 +- .../jmri/jmrit/ctc/editor/gui/FrmAbout.java | 9 +- .../ctc/editor/gui/FrmAddModifyCTCColumn.form | 5 +- .../ctc/editor/gui/FrmAddModifyCTCColumn.java | 8 +- java/src/jmri/jmrit/ctc/editor/gui/FrmCB.form | 2 +- java/src/jmri/jmrit/ctc/editor/gui/FrmCB.java | 26 ++-- java/src/jmri/jmrit/ctc/editor/gui/FrmCO.form | 2 +- java/src/jmri/jmrit/ctc/editor/gui/FrmCO.java | 8 +- .../jmrit/ctc/editor/gui/FrmDebugging.form | 2 +- .../jmrit/ctc/editor/gui/FrmDebugging.java | 17 ++- .../jmrit/ctc/editor/gui/FrmDefaults.form | 2 +- .../jmrit/ctc/editor/gui/FrmDefaults.java | 19 ++- .../ctc/editor/gui/FrmFindAndReplace.form | 2 +- .../ctc/editor/gui/FrmFindAndReplace.java | 9 +- .../jmrit/ctc/editor/gui/FrmFixErrors.form | 2 +- .../jmrit/ctc/editor/gui/FrmFixErrors.java | 11 +- .../jmrit/ctc/editor/gui/FrmFleeting.form | 2 +- .../jmrit/ctc/editor/gui/FrmFleeting.java | 19 ++- .../jmrit/ctc/editor/gui/FrmGUIDesign.form | 2 +- .../jmrit/ctc/editor/gui/FrmGUIDesign.java | 21 ++-- java/src/jmri/jmrit/ctc/editor/gui/FrmIL.form | 4 +- java/src/jmri/jmrit/ctc/editor/gui/FrmIL.java | 10 +- .../jmrit/ctc/editor/gui/FrmMainForm.java | 43 +++---- .../jmrit/ctc/editor/gui/FrmPatterns.form | 2 +- .../jmrit/ctc/editor/gui/FrmPatterns.java | 19 ++- .../jmri/jmrit/ctc/editor/gui/FrmSIDI.form | 2 +- .../jmri/jmrit/ctc/editor/gui/FrmSIDI.java | 10 +- .../jmri/jmrit/ctc/editor/gui/FrmSIDL.form | 2 +- .../jmri/jmrit/ctc/editor/gui/FrmSIDL.java | 26 ++-- .../jmri/jmrit/ctc/editor/gui/FrmSWDI.form | 2 +- .../jmri/jmrit/ctc/editor/gui/FrmSWDI.java | 26 ++-- .../jmri/jmrit/ctc/editor/gui/FrmSWDL.form | 2 +- .../jmri/jmrit/ctc/editor/gui/FrmSWDL.java | 26 ++-- .../src/jmri/jmrit/ctc/editor/gui/FrmTRL.form | 2 +- .../src/jmri/jmrit/ctc/editor/gui/FrmTRL.java | 26 ++-- .../jmrit/ctc/editor/gui/FrmTRL_Rules.form | 2 +- .../jmrit/ctc/editor/gui/FrmTRL_Rules.java | 42 +++---- .../src/jmri/jmrit/ctc/editor/gui/FrmTUL.form | 2 +- .../src/jmri/jmrit/ctc/editor/gui/FrmTUL.java | 25 ++-- 42 files changed, 272 insertions(+), 317 deletions(-) diff --git a/java/src/jmri/jmrit/ctc/editor/code/CheckJMRIObject.java b/java/src/jmri/jmrit/ctc/editor/code/CheckJMRIObject.java index 511be1ee88c..0122da851e8 100755 --- a/java/src/jmri/jmrit/ctc/editor/code/CheckJMRIObject.java +++ b/java/src/jmri/jmrit/ctc/editor/code/CheckJMRIObject.java @@ -129,7 +129,7 @@ private VerifyClassReturnValue verifyClassCommon(String prefix, Object object) { // Only JTextField's and JTable's are checked. // A LIST of errors is returned, i.e. it checks ALL fields. // Gotcha: All JTextField's in a dialog are declared "private" by the IDE, ergo the need for "field.setAccessible(true);" - public void analyzeForm(String prefix, javax.swing.JDialog dialog, ArrayList errors) { + public void analyzeForm(String prefix, javax.swing.JFrame dialog, ArrayList errors) { Field[] objFields = dialog.getClass().getDeclaredFields(); for (Field field : objFields) { // For all fields in the class Class fieldType = field.getType(); diff --git a/java/src/jmri/jmrit/ctc/editor/code/Columns.java b/java/src/jmri/jmrit/ctc/editor/code/Columns.java index 1234dcba0d4..228ea4e93a1 100755 --- a/java/src/jmri/jmrit/ctc/editor/code/Columns.java +++ b/java/src/jmri/jmrit/ctc/editor/code/Columns.java @@ -1,14 +1,14 @@ package jmri.jmrit.ctc.editor.code; -import jmri.jmrit.ctc.editor.gui.DlgCB; -import jmri.jmrit.ctc.editor.gui.DlgCO; -import jmri.jmrit.ctc.editor.gui.DlgIL; -import jmri.jmrit.ctc.editor.gui.DlgSIDI; -import jmri.jmrit.ctc.editor.gui.DlgSIDL; -import jmri.jmrit.ctc.editor.gui.DlgSWDI; -import jmri.jmrit.ctc.editor.gui.DlgSWDL; -import jmri.jmrit.ctc.editor.gui.DlgTRL; -import jmri.jmrit.ctc.editor.gui.DlgTUL; +import jmri.jmrit.ctc.editor.gui.FrmCB; +import jmri.jmrit.ctc.editor.gui.FrmCO; +import jmri.jmrit.ctc.editor.gui.FrmIL; +import jmri.jmrit.ctc.editor.gui.FrmSIDI; +import jmri.jmrit.ctc.editor.gui.FrmSIDL; +import jmri.jmrit.ctc.editor.gui.FrmSWDI; +import jmri.jmrit.ctc.editor.gui.FrmSWDL; +import jmri.jmrit.ctc.editor.gui.FrmTRL; +import jmri.jmrit.ctc.editor.gui.FrmTUL; import java.awt.Color; import java.util.ArrayList; import java.util.Enumeration; @@ -25,14 +25,14 @@ /** * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 - + This represents all of the codeButtonHandlerData data in a CTC machine relating to the GUI interface. It maintains the state of the screen for the higher level functions. */ public class Columns { public final static String REFERENCES_PRESENT_INDICATOR = " ("; private final static String ERROR_STRING = " ***ERROR***"; - + private final CTCSerialData _mCTCSerialData; private final CheckJMRIObject _mCheckJMRIObject; private final DefaultListModel _mDefaultListModel; @@ -68,9 +68,9 @@ public class Columns { private final JLabel _mEdit_IL_Prompt; private final JCheckBox _mIL_Enabled; private final JButton _mEdit_IL; - private int _mSelectedCodeButtonHandlerDataIndex; + private int _mSelectedCodeButtonHandlerDataIndex; private CodeButtonHandlerData _mSelectedCodeButtonHandlerData; - + public Columns( CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject, DefaultListModel defaultListModel, JButton deleteButton, JButton reapplyNumbersButton, JButton changeNumbersButton, JButton moveUpButton, JButton moveDownButton, @@ -91,7 +91,7 @@ public Columns( CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject, De _mChangeNumbersButton = changeNumbersButton; _mMoveUpButton = moveUpButton; _mMoveDownButton = moveDownButton; - _mEdit_CB_Prompt = edit_CB_Prompt; + _mEdit_CB_Prompt = edit_CB_Prompt; _mCB_EditAlwaysEnabled = cb_EditAlwaysEnabled; _mEdit_CB = edit_CB; _mEdit_SIDI_Prompt = edit_SIDI_Prompt; @@ -120,9 +120,9 @@ public Columns( CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject, De _mEdit_IL = edit_IL; updateFrame(); } - + public CodeButtonHandlerData getSelectedCodeButtonHandlerData() { return _mSelectedCodeButtonHandlerData; } - + public final void updateFrame() { _mDefaultListModel.clear(); _mCTCSerialData.getCodeButtonHandlerDataArrayList().forEach((codeButtonHandlerData) -> { @@ -152,23 +152,23 @@ public final void updateFrame() { _mIL_Enabled.setEnabled(false); _mEdit_IL.setEnabled(false); } - + public int getEntrySelectedIndex() { return _mSelectedCodeButtonHandlerDataIndex; } - + public void fixAllErrors() { for (CodeButtonHandlerData codeButtonHandlerData : _mCTCSerialData.getCodeButtonHandlerDataArrayList()) { - if (!DlgSIDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSIDI_Enabled = false; - if (!DlgSIDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSIDL_Enabled = false; - if (!DlgSWDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSWDI_Enabled = false; - if (!DlgSWDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSWDL_Enabled = false; - if (!DlgCO.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mCO_Enabled = false; - if (!DlgTRL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mTRL_Enabled = false; - if (!DlgTUL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mTUL_Enabled = false; - if (!DlgIL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mIL_Enabled = false; + if (!FrmSIDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSIDI_Enabled = false; + if (!FrmSIDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSIDL_Enabled = false; + if (!FrmSWDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSWDI_Enabled = false; + if (!FrmSWDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mSWDL_Enabled = false; + if (!FrmCO.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mCO_Enabled = false; + if (!FrmTRL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mTRL_Enabled = false; + if (!FrmTUL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mTUL_Enabled = false; + if (!FrmIL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, codeButtonHandlerData)) codeButtonHandlerData._mIL_Enabled = false; } updateFrame(); } - + public boolean anyErrorsPresent() { Enumeration enumerationOfStrings = _mDefaultListModel.elements(); while (enumerationOfStrings.hasMoreElements()) { @@ -178,18 +178,18 @@ public boolean anyErrorsPresent() { } public void updateCurrentlySelectedColumnErrorStatus() { - lazy1(_mEdit_CB_Prompt, DlgCB.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_SIDI_Prompt, DlgSIDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_SIDL_Prompt, DlgSIDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_SWDI_Prompt, DlgSWDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_SWDL_Prompt, DlgSWDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_CO_Prompt, DlgCO.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_TRL_Prompt, DlgTRL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_TUL_Prompt, DlgTUL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); - lazy1(_mEdit_IL_Prompt, DlgIL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_CB_Prompt, FrmCB.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_SIDI_Prompt, FrmSIDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_SIDL_Prompt, FrmSIDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_SWDI_Prompt, FrmSWDI.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_SWDL_Prompt, FrmSWDL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_CO_Prompt, FrmCO.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_TRL_Prompt, FrmTRL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_TUL_Prompt, FrmTUL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); + lazy1(_mEdit_IL_Prompt, FrmIL.dialogCodeButtonHandlerDataValid(_mCheckJMRIObject, _mSelectedCodeButtonHandlerData) ? Color.black : Color.red); _mDefaultListModel.set(_mSelectedCodeButtonHandlerDataIndex, constructSingleColumnDisplayLine(_mSelectedCodeButtonHandlerData)); } - + public void clearCurrentlySelectedColumnErrorStatus() { lazy1(_mEdit_CB_Prompt, Color.black); lazy1(_mEdit_SIDI_Prompt, Color.black); @@ -201,11 +201,11 @@ public void clearCurrentlySelectedColumnErrorStatus() { lazy1(_mEdit_TUL_Prompt, Color.black); lazy1(_mEdit_IL_Prompt, Color.black); } - + private static void lazy1(JLabel label, Color foreground) { label.setForeground(foreground); } - + public void setEntrySelected(int selectedIndex) { if (selectedIndex >= 0) { _mDeleteButton.setEnabled(true); @@ -230,13 +230,13 @@ public void setEntrySelected(int selectedIndex) { clearCurrentlySelectedColumnErrorStatus(); } } - + static private void lazy1(JCheckBox jCheckBox, JButton jButton, boolean value) { jCheckBox.setEnabled(true); jCheckBox.setSelected(value); jButton.setEnabled(value); } - + public void sidi_EnabledClicked(boolean newState) { _mSelectedCodeButtonHandlerData._mSIDI_Enabled = newState; lazy2(_mEdit_SIDI, newState); @@ -261,7 +261,7 @@ public void co_EnabledClicked(boolean newState) { _mSelectedCodeButtonHandlerData._mCO_Enabled = newState; lazy2(_mEdit_CO, newState); } - + public void trl_EnabledClicked(boolean newState) { _mSelectedCodeButtonHandlerData._mTRL_Enabled = newState; lazy2(_mEdit_TRL, newState); @@ -276,7 +276,7 @@ public void il_EnabledClicked(boolean newState) { _mSelectedCodeButtonHandlerData._mIL_Enabled = newState; lazy2(_mEdit_IL, newState); } - + private void lazy2(JButton jButton, boolean value) { jButton.setEnabled(value); _mCTCSerialData.setCodeButtonHandlerData(_mSelectedCodeButtonHandlerDataIndex, _mSelectedCodeButtonHandlerData); @@ -295,7 +295,7 @@ public String checkForDups(int newSwitchNumber, int newGUIColumnNumber, boolean } return null; } - + private String getListOfTrafficLockingRulesOSSectionsReferenced(CodeButtonHandlerData currentCodeButtonHandlerData, ArrayList codeButtonHandlerDataArrayList) { StringBuffer returnString = new StringBuffer(""); @@ -312,7 +312,7 @@ private String getListOfTrafficLockingRulesOSSectionsReferenced(CodeButtonHandle if (returnString.length() > 0) returnString.append("TrL: " + returnString.substring(0, returnString.length() - 2)); //NOI18N return returnString.toString(); } - + private void checkThisSSVList(int ourUniqueID, int otherUniqueID, String lr, String trafficLockingRulesSSVList, TreeSet setOfUniqueIDs) { for (String trafficLockingRulesSSV : ProjectsCommonSubs.getArrayListFromSSV(trafficLockingRulesSSVList)) { TrafficLockingEntry trafficLockingEntry = new TrafficLockingEntry(trafficLockingRulesSSV); @@ -323,14 +323,14 @@ private void checkThisSSVList(int ourUniqueID, int otherUniqueID, String lr, Str lazy3(ourUniqueID, otherUniqueID, lr, trafficLockingEntry._mUniqueID5, setOfUniqueIDs); } } - + private void lazy3(int ourUniqueID, int otherUniqueID, String lr, String value, TreeSet setOfUniqueIDs) { int uniqueID = ProjectsCommonSubs.getIntFromStringNoThrow(value, -1); // Technically should NEVER throw or return default, but for safety. Default will NEVER be found! if (ourUniqueID == uniqueID) { setOfUniqueIDs.add(_mCTCSerialData.getMyShortStringNoCommaViaUniqueID(otherUniqueID) + lr + ", "); } } - + private String getListOfSwitchSlavedToOSSectionsReferenced( CodeButtonHandlerData currentCodeButtonHandlerData, ArrayList codeButtonHandlerDataArrayList) { StringBuffer returnString = new StringBuffer(""); @@ -349,21 +349,21 @@ private String getListOfSwitchSlavedToOSSectionsReferenced( CodeButtonHandlerDat if (returnString.length() > 0) returnString.append("Sw: " + returnString.substring(0, returnString.length() - 2)); //NOI18N return returnString.toString(); } - + // Anything in error, return ERROR_STRING private static String generatePossibleErrorString(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData currentCodeButtonHandlerData) { - if (!DlgCB.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgSIDI.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgSIDL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgSWDI.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgSWDL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgCO.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgTRL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgTUL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; - if (!DlgIL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmCB.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmSIDI.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmSIDL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmSWDI.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmSWDL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmCO.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmTRL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmTUL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; + if (!FrmIL.dialogCodeButtonHandlerDataValid(checkJMRIObject, currentCodeButtonHandlerData)) return ERROR_STRING; return ""; // No error (string) } - + private String constructSingleColumnDisplayLine(CodeButtonHandlerData codeButtonHandlerData) { String referencesString1 = getListOfTrafficLockingRulesOSSectionsReferenced(codeButtonHandlerData, _mCTCSerialData.getCodeButtonHandlerDataArrayList()); String referencesString2 = getListOfSwitchSlavedToOSSectionsReferenced(codeButtonHandlerData, _mCTCSerialData.getCodeButtonHandlerDataArrayList()); diff --git a/java/src/jmri/jmrit/ctc/editor/code/InternalSensorManager.java b/java/src/jmri/jmrit/ctc/editor/code/InternalSensorManager.java index ef552a18c3f..fc605791260 100755 --- a/java/src/jmri/jmrit/ctc/editor/code/InternalSensorManager.java +++ b/java/src/jmri/jmrit/ctc/editor/code/InternalSensorManager.java @@ -5,50 +5,50 @@ /** * @author Gregory J. Bedlek Copyright (C) 2018, 2019 - * + * * The purpose of this class is to internally manage the sensors needed by the * CTC system. All routines that modify either "OtherData" or * "CodeButtonHandlerData" in any way will ultimately call this routine, so that * it can determine if any internal sensors need to be deleted and/or created * dynamically. This is for integration into JMRI internally. - * + * * This also includes the "search and replace" function. - * + * * Right now this routine just makes two "delete" and "create" lists, but does * nothing since there is no integration with JMRI at this time (12/6/18). - * + * */ public class InternalSensorManager { private final HashSet _mInternalSensorsToDelete; - + public InternalSensorManager(CTCSerialData ctcSerialData) { _mInternalSensorsToDelete = ctcSerialData.getAllInternalSensors(); } - + public void checkForChanges(CTCSerialData ctcSerialData) { HashSet internalSensorsToCreate = ctcSerialData.getAllInternalSensors(); process(internalSensorsToCreate, _mInternalSensorsToDelete); } - - static public void doDialog(javax.swing.JDialog dialog, CTCSerialData ctcSerialData) { -// Get "before" image (anything left in here after analysis will be deleted): + + static public void doDialog(javax.swing.JFrame dialog, CTCSerialData ctcSerialData) { +// Get "before" image (anything left in here after analysis will be deleted): HashSet internalSensorsToDelete = ctcSerialData.getAllInternalSensors(); -// Let the dialog hack the data any way it wants, without regard for us: +// Let the dialog hack the data any way it wants, without regard for us: dialog.setVisible(true); -// Get "after" image (anything left in here after analysis will be created): +// Get "after" image (anything left in here after analysis will be created): HashSet internalSensorsToCreate = ctcSerialData.getAllInternalSensors(); process(internalSensorsToCreate, internalSensorsToDelete); } - + static private void process(HashSet internalSensorsToCreate, HashSet internalSensorsToDelete) { // Now, find out what was modified ANYWHERE: HashSet intersection = new HashSet<>(internalSensorsToDelete); intersection.retainAll(internalSensorsToCreate); - + internalSensorsToDelete.removeAll(intersection); internalSensorsToCreate.removeAll(intersection); -/* +/* PrintWriter printWriter; try { printWriter = new PrintWriter(new FileWriter("junkit.txt")); diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.form index f895df6fe21..6ccb70f9c60 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.form @@ -1,6 +1,6 @@ -
+ diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.java index ef5295d31b7..54d552e47c6 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmAbout.java @@ -7,19 +7,19 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgAbout extends javax.swing.JDialog { +public class FrmAbout extends javax.swing.JFrame { private static final String FORM_PROPERTIES = "dlgAbout"; private final AwtWindowProperties _mAwtWindowProperties; /** * Creates new form dlgAbout */ - public DlgAbout(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties) { - super(parent, modal); + public FrmAbout(AwtWindowProperties awtWindowProperties) { + super(); initComponents(); _mHelpTitle.setText(_mHelpTitle.getText() + CTCSerialData.CTCVersion); _mAwtWindowProperties = awtWindowProperties; - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mOK); } @@ -41,7 +41,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle("About"); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.form index da4dbdf844d..8bb39069870 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.form @@ -1,11 +1,8 @@ - + - - - diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.java index e5dcb078683..5e43d548a7e 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmAddModifyCTCColumn.java @@ -9,7 +9,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgAddModifyCTCColumn extends javax.swing.JDialog { +public class FrmAddModifyCTCColumn extends javax.swing.JFrame { private static final String FORM_PROPERTIES = "DlgAddModifyCTCColumn"; // NOI18N private final AwtWindowProperties _mAwtWindowProperties; @@ -26,8 +26,8 @@ public class DlgAddModifyCTCColumn extends javax.swing.JDialog { private boolean _mClosedNormally = false; public boolean closedNormally() { return _mClosedNormally; } - public DlgAddModifyCTCColumn(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, Columns columns, boolean isModify, int existingSwitchNumber, int existingGUIColumnNumber, boolean existingGUIGeneratedAtLeastOnceAlready) { - super(parent, modal); + public FrmAddModifyCTCColumn(AwtWindowProperties awtWindowProperties, Columns columns, boolean isModify, int existingSwitchNumber, int existingGUIColumnNumber, boolean existingGUIGeneratedAtLeastOnceAlready) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mColumns = columns; @@ -66,9 +66,7 @@ private void initComponents() { _mGUIGeneratedAtLeastOnceAlready = new javax.swing.JCheckBox(); setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); - setModalityType(java.awt.Dialog.ModalityType.DOCUMENT_MODAL); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.form index 5ef05ba7d51..9416118fa06 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.java index 943a81600f7..fc64d1fad88 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmCB.java @@ -14,10 +14,10 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgCB extends javax.swing.JDialog { +public class FrmCB extends javax.swing.JFrame { /** - * + * */ private static final String FORM_PROPERTIES = "DlgCB"; // NOI18N private static final String PREFIX = "_mOS"; // NOI18N @@ -29,7 +29,7 @@ public class DlgCB extends javax.swing.JDialog { private final CTCSerialData _mCTCSerialData; private final CheckJMRIObject _mCheckJMRIObject; private final ArrayList _mArrayListOfSelectableOSSectionUniqueIDs; - + private String _mCodeButtonInternalSensorOrig; private String _mOSSectionOccupiedExternalSensorOrig; private String _mOSSectionOccupiedExternalSensor2Orig; @@ -51,10 +51,9 @@ private boolean dataChanged() { return false; } - public DlgCB( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, + public FrmCB( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -69,27 +68,27 @@ public DlgCB( java.awt.Frame parent, boolean modal, CommonSubs.setMillisecondsEdit(_mCodeButtonDelayTime); _mCodeButtonDelayTime.setText(Integer.toString(_mCodeButtonHandlerData._mCodeButtonDelayTime)); initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + public static boolean dialogCodeButtonHandlerDataValid(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData codeButtonHandlerData) { -// Checks: +// Checks: if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mCodeButtonInternalSensor)) return false; if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mOSSectionOccupiedExternalSensor)) return false; return checkJMRIObject.validClassWithPrefix(PREFIX, codeButtonHandlerData); } - + // Validate all internal fields as much as possible: private ArrayList formFieldsValid() { ArrayList errors = new ArrayList<>(); -// Checks: +// Checks: CommonSubs.checkJTextFieldNotEmpty(_mCodeButtonInternalSensor, _mCodeButtonInternalSensorPrompt, errors); CommonSubs.checkJComboBoxNotEmpty(_mOSSectionOccupiedExternalSensor, _mOSSectionOccupiedExternalSensorPrompt, errors); _mCheckJMRIObject.analyzeForm(PREFIX, this, errors); return errors; } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -123,7 +122,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgCB")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -324,7 +322,7 @@ private void _mOSSectionSwitchSlavedToUniqueIDActionPerformed(java.awt.event.Act } } }//GEN-LAST:event__mOSSectionSwitchSlavedToUniqueIDActionPerformed - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JFormattedTextField _mCodeButtonDelayTime; private javax.swing.JTextField _mCodeButtonInternalSensor; diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.form index 7b742930d3a..9f61dcfab41 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.java index 505e17c207a..0509886cd24 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmCO.java @@ -23,7 +23,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgCO extends javax.swing.JDialog { +public class FrmCO extends javax.swing.JFrame { /** * Creates new form DlgCO */ @@ -60,10 +60,9 @@ private boolean dataChanged() { return false; } - public DlgCO( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, + public FrmCO( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject, boolean signalHeadSelected) { - super(parent, modal); + super(); initComponents(); _mSignalFacingDirection.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { Bundle.getMessage("InfoDlgCOLeftTraffic"), // NOI18N Bundle.getMessage("InfoDlgCORightTraffic") })); // NOI18N @@ -182,7 +181,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgCO")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.form index 7b684a198dd..dd681cfeb2d 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.java index 7541cd48807..2b20ce6b21e 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmDebugging.java @@ -9,7 +9,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgDebugging extends javax.swing.JDialog { +public class FrmDebugging extends javax.swing.JFrame { /** * Creates new form dlgProperties @@ -19,10 +19,10 @@ public class DlgDebugging extends javax.swing.JDialog { private final OtherData _mOtherData; private boolean _mClosedNormally = false; public boolean closedNormally() { return _mClosedNormally; } - + private String _mCTCDebugSystemReloadInternalSensorOrig; private String _mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensorOrig; - + private void initOrig(OtherData otherData) { _mCTCDebugSystemReloadInternalSensorOrig = otherData._mCTCDebugSystemReloadInternalSensor; _mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensorOrig = otherData._mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensor; @@ -32,19 +32,19 @@ private boolean dataChanged() { if (!_mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensorOrig.equals(_mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensor.getText())) return true; return false; } - - public DlgDebugging(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, OtherData otherData) { - super(parent, modal); + + public FrmDebugging(AwtWindowProperties awtWindowProperties, OtherData otherData) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mOtherData = otherData; _mCTCSystemReloadInternalSensor.setText(otherData._mCTCDebugSystemReloadInternalSensor); _mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensor.setText(otherData._mCTCDebug_TrafficLockingRuleTriggeredDisplayInternalSensor); initOrig(otherData); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -66,7 +66,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgDeb")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.form index c25c38091df..b0edd17a014 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.java index 5041674e5cf..ab672354e99 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmDefaults.java @@ -9,7 +9,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgDefaults extends javax.swing.JDialog { +public class FrmDefaults extends javax.swing.JFrame { private static final String FORM_PROPERTIES = "DlgDefaults"; // NOI18N private final AwtWindowProperties _mAwtWindowProperties; @@ -17,14 +17,14 @@ public class DlgDefaults extends javax.swing.JDialog { private final OtherData _mOtherData; private boolean _mClosedNormally = false; public boolean closedNormally() { return _mClosedNormally; } - + private int _mSIDI_CodingTimeInMillisecondsOrig; private int _mSIDI_TimeLockingTimeInMillisecondsOrig; private int _mSWDI_CodingTimeInMillisecondsOrig; private boolean _mTUL_EnabledAtStartupOrig; private int _mCodeButtonDelayTimeOrig; private OtherData.SIGNAL_SYSTEM_TYPE _mSignalSystemTypeOrig; - + private void initOrig(ProgramProperties programProperties, OtherData otherData) { _mSIDI_CodingTimeInMillisecondsOrig = programProperties._mSIDI_CodingTimeInMilliseconds; _mSIDI_TimeLockingTimeInMillisecondsOrig = programProperties._mSIDI_TimeLockingTimeInMilliseconds; @@ -39,12 +39,12 @@ private boolean dataChanged() { if (CommonSubs.getIntFromJTextFieldNoThrow(_mSWDI_CodingTimeInMilliseconds) != _mSWDI_CodingTimeInMillisecondsOrig) return true; if (_mTUL_EnabledAtStartupOrig != _mTUL_EnabledAtStartup.isSelected()) return true; if (CommonSubs.getIntFromJTextFieldNoThrow(_mCodeButtonDelayTime) != _mCodeButtonDelayTimeOrig) return true; - if (_mSignalSystemTypeOrig != OtherData.SIGNAL_SYSTEM_TYPE.getSignalSystemType(_mSignalSystemType)) return true; + if (_mSignalSystemTypeOrig != OtherData.SIGNAL_SYSTEM_TYPE.getSignalSystemType(_mSignalSystemType)) return true; return false; } - - public DlgDefaults(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, ProgramProperties programProperties, OtherData otherData) { - super(parent, modal); + + public FrmDefaults(AwtWindowProperties awtWindowProperties, ProgramProperties programProperties, OtherData otherData) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mProgramProperties = programProperties; @@ -61,10 +61,10 @@ public DlgDefaults(java.awt.Frame parent, boolean modal, AwtWindowProperties awt _mTUL_EnabledAtStartup.setSelected(_mOtherData._mTUL_EnabledAtStartup); _mCodeButtonDelayTime.setText(Integer.toString(programProperties._mCodeButtonDelayTime)); initOrig(_mProgramProperties, _mOtherData); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -98,7 +98,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgDef")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.form index 2cb6ff37b4f..a290bb9fce9 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.java index a412a5ffbc2..09404142521 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmFindAndReplace.java @@ -18,7 +18,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgFindAndReplace extends javax.swing.JDialog { +public class FrmFindAndReplace extends javax.swing.JFrame { /** * Creates new form DlgFindAndReplace @@ -31,8 +31,8 @@ public class DlgFindAndReplace extends javax.swing.JDialog { private ArrayList _mSearchResults = null; - public DlgFindAndReplace(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, CTCSerialData ctcSerialData) { - super(parent, modal); + public FrmFindAndReplace(AwtWindowProperties awtWindowProperties, CTCSerialData ctcSerialData) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCTCSerialData = ctcSerialData; @@ -104,7 +104,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgFind")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -171,12 +170,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { false, false, false }; - @Override public Class getColumnClass(int columnIndex) { return types [columnIndex]; } - @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return canEdit [columnIndex]; } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.form index f8735c845b3..a6fc5a0623e 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.java index ce558fcdb92..c497ac27828 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmFixErrors.java @@ -12,14 +12,14 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgFixErrors extends javax.swing.JDialog { +public class FrmFixErrors extends javax.swing.JFrame { private static final String FORM_PROPERTIES = "DlgFixErrors"; // NOI18N private final AwtWindowProperties _mAwtWindowProperties; private final Columns _mColumns; - - public DlgFixErrors(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, Columns columns) { - super(parent, modal); + + public FrmFixErrors(AwtWindowProperties awtWindowProperties, Columns columns) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mColumns = columns; @@ -43,7 +43,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgFix")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -116,7 +115,7 @@ private void exitDialog() { _mAwtWindowProperties.saveWindowState(this, FORM_PROPERTIES); dispose(); } - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton _mCancel; private javax.swing.JLabel _mInfo; diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.form index 92770056000..8d0b67f883e 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.java index 54937289b9d..ee13c505c17 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmFleeting.java @@ -13,20 +13,20 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgFleeting extends javax.swing.JDialog { +public class FrmFleeting extends javax.swing.JFrame { /** * Creates new form dlgProperties */ - private static final String FORM_PROPERTIES = "DlgFleeting"; // NOI18N + private static final String FORM_PROPERTIES = "DlgFleeting"; // NOI18N private final AwtWindowProperties _mAwtWindowProperties; private final OtherData _mOtherData; private boolean _mClosedNormally = false; public boolean closedNormally() { return _mClosedNormally; } - + private String _mFleetingToggleInternalSensorOrig; private boolean _mDefaultFleetingEnabledOrig; - + private void initOrig(OtherData otherData) { _mFleetingToggleInternalSensorOrig = otherData._mFleetingToggleInternalSensor; _mDefaultFleetingEnabledOrig = otherData._mDefaultFleetingEnabled; @@ -36,19 +36,19 @@ private boolean dataChanged() { if (_mDefaultFleetingEnabledOrig != _mDefaultFleetingEnabled.isSelected()) return true; return false; } - - public DlgFleeting(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, OtherData otherData) { - super(parent, modal); + + public FrmFleeting(AwtWindowProperties awtWindowProperties, OtherData otherData) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mOtherData = otherData; _mFleetingToggleInternalSensor.setText(otherData._mFleetingToggleInternalSensor); _mDefaultFleetingEnabled.setSelected(otherData._mDefaultFleetingEnabled); initOrig(otherData); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -68,7 +68,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgFleet")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.form index d0902f5d4a3..ddd0f276b09 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.java index 2b110fcc4f4..7ed1bcf9f0a 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmGUIDesign.java @@ -9,7 +9,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgGUIDesign extends javax.swing.JDialog { +public class FrmGUIDesign extends javax.swing.JFrame { /* * Creates new form dlgProperties @@ -19,7 +19,7 @@ public class DlgGUIDesign extends javax.swing.JDialog { private final OtherData _mOtherData; private boolean _mClosedNormally = false; public boolean closedNormally() { return _mClosedNormally; } - + private int _mGUIDesign_NumberOfEmptyColumnsAtEndOrig; private OtherData.CTC_PANEL_TYPE _mGUIDesign_CTCPanelTypeOrig; private boolean _mGUIDesign_BuilderPlateOrig; @@ -32,7 +32,7 @@ public class DlgGUIDesign extends javax.swing.JDialog { private OtherData.VERTICAL_SIZE _mGUIDesign_VerticalSizeOrig; private boolean _mGUIDesign_OSSectionUnknownInconsistentRedBlinkOrig; private boolean _mGUIDesign_TurnoutsOnPanelOrig; - + private void initOrig(OtherData otherData) { _mGUIDesign_NumberOfEmptyColumnsAtEndOrig = otherData._mGUIDesign_NumberOfEmptyColumnsAtEnd; _mGUIDesign_CTCPanelTypeOrig = otherData._mGUIDesign_CTCPanelType; @@ -47,7 +47,7 @@ private void initOrig(OtherData otherData) { _mGUIDesign_OSSectionUnknownInconsistentRedBlinkOrig = otherData._mGUIDesign_OSSectionUnknownInconsistentRedBlink; _mGUIDesign_TurnoutsOnPanelOrig = otherData._mGUIDesign_TurnoutsOnPanel; } - + private boolean dataChanged() { if (CommonSubs.getIntFromJTextFieldNoThrow(_mGUIDesign_NumberOfEmptyColumnsAtEnd) != _mGUIDesign_NumberOfEmptyColumnsAtEndOrig) return true; if (_mGUIDesign_CTCPanelTypeOrig != OtherData.CTC_PANEL_TYPE.getRadioGroupValue(ProjectsCommonSubs.getButtonSelectedInt(_mGUIDesign_CTCPanelType))) return true; @@ -63,13 +63,13 @@ private boolean dataChanged() { if (_mGUIDesign_TurnoutsOnPanelOrig != _mGUIDesign_TurnoutsOnPanel.isSelected()) return true; return false; } - - public DlgGUIDesign(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, OtherData otherData) { - super(parent, modal); + + public FrmGUIDesign(AwtWindowProperties awtWindowProperties, OtherData otherData) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mOtherData = otherData; - + _mGUIDesign_NumberOfEmptyColumnsAtEnd.setText(Integer.toString(_mOtherData._mGUIDesign_NumberOfEmptyColumnsAtEnd)); CommonSubs.numberButtonGroup(_mGUIDesign_CTCPanelType); CommonSubs.setButtonSelected(_mGUIDesign_CTCPanelType, _mOtherData._mGUIDesign_CTCPanelType.getRadioGroupValue()); @@ -86,10 +86,10 @@ public DlgGUIDesign(java.awt.Frame parent, boolean modal, AwtWindowProperties aw _mGUIDesign_OSSectionUnknownInconsistentRedBlink.setSelected(otherData._mGUIDesign_OSSectionUnknownInconsistentRedBlink); _mGUIDesign_TurnoutsOnPanel.setSelected(otherData._mGUIDesign_TurnoutsOnPanel); initOrig(otherData); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -131,7 +131,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgGUI")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.form index b97f7ce6d98..fdb665671c6 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.form @@ -1,6 +1,6 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.java index 600e09b0d14..286842b3626 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmIL.java @@ -13,7 +13,7 @@ /** * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgIL extends javax.swing.JDialog { +public class FrmIL extends javax.swing.JFrame { /** * Creates new form DlgIL @@ -45,11 +45,11 @@ private boolean dataChanged() { private final DefaultTableModel _mIL_TableOfExternalSignalNamesDefaultTableModel; - public DlgIL( java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, + public FrmIL( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, CheckJMRIObject checkJMRIObject, boolean signalHeadSelected) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -139,7 +139,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgIL")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -263,7 +262,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { java.lang.String.class }; - @Override public Class getColumnClass(int columnIndex) { return types [columnIndex]; } @@ -320,7 +318,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(jLabel5) - .addGap(46, 46, 46) + .addGap(47, 47, 47) .addComponent(jLabel4) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jButton1) diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java index 7c54a15492c..993fe837ac9 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java @@ -211,7 +211,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setLocation(new java.awt.Point(0, 0)); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -702,7 +701,7 @@ private void addButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR int highestSwitchNumber = _mCTCSerialData.findHighestSwitchNumberUsedSoFar(); int highestColumnNumber = _mCTCSerialData.findHighestColumnNumberUsedSoFar(); InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgAddModifyCTCColumn dialog = new DlgAddModifyCTCColumn(this, true, _mAwtWindowProperties, _mColumns, false, highestSwitchNumber + 2, highestColumnNumber + 1, false); + FrmAddModifyCTCColumn dialog = new FrmAddModifyCTCColumn(_mAwtWindowProperties, _mColumns, false, highestSwitchNumber + 2, highestColumnNumber + 1, false); dialog.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { @@ -778,8 +777,7 @@ private void _mIL_EnabledActionPerformed(java.awt.event.ActionEvent evt) {//GEN- private void _mEdit_SIDIActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_SIDIActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgSIDI dialog = new DlgSIDI( this, true, - _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject, + FrmSIDI dialog = new FrmSIDI( _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject, _mCTCSerialData.getOtherData()._mSignalSystemType == OtherData.SIGNAL_SYSTEM_TYPE.SIGNALHEAD); dialog.addWindowListener(new WindowAdapter() { @Override @@ -795,7 +793,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_SIDLActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_SIDLActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgSIDL dialog = new DlgSIDL(this, true, _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); + FrmSIDL dialog = new FrmSIDL(_mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { @@ -810,7 +808,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_SWDIActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_SWDIActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgSWDI dialog = new DlgSWDI(this, true, _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); + FrmSWDI dialog = new FrmSWDI(_mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { @@ -825,7 +823,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_SWDLActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_SWDLActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgSWDL dialog = new DlgSWDL(this, true, _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); + FrmSWDL dialog = new FrmSWDL(_mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { @@ -840,8 +838,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_COActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_COActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgCO dialog = new DlgCO( this, true, - _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), + FrmCO dialog = new FrmCO( _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCTCSerialData, _mCheckJMRIObject, _mCTCSerialData.getOtherData()._mSignalSystemType == OtherData.SIGNAL_SYSTEM_TYPE.SIGNALHEAD); dialog.addWindowListener(new WindowAdapter() { @@ -858,7 +855,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_TULActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_TULActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgTUL dialog = new DlgTUL(this, true, _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); + FrmTUL dialog = new FrmTUL(_mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { @@ -873,8 +870,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_ILActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_ILActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgIL dialog = new DlgIL( this, true, - _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mCheckJMRIObject, + FrmIL dialog = new FrmIL( _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mCheckJMRIObject, _mCTCSerialData.getOtherData()._mSignalSystemType == OtherData.SIGNAL_SYSTEM_TYPE.SIGNALHEAD); dialog.addWindowListener(new WindowAdapter() { @Override @@ -904,8 +900,7 @@ private void _mTRL_EnabledActionPerformed(java.awt.event.ActionEvent evt) {//GEN private void _mEdit_TRLActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_TRLActionPerformed CodeButtonHandlerData codeButtonHandlerDataSelected = _mColumns.getSelectedCodeButtonHandlerData(); InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgTRL dialog = new DlgTRL( this, true, - _mAwtWindowProperties, codeButtonHandlerDataSelected, + FrmTRL dialog = new FrmTRL( _mAwtWindowProperties, codeButtonHandlerDataSelected, _mCTCSerialData, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override @@ -921,7 +916,7 @@ public void windowClosed(WindowEvent e) { private void _mEdit_CBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEdit_CBActionPerformed InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgCB dialog = new DlgCB( this, true, _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), + FrmCB dialog = new FrmCB( _mAwtWindowProperties, _mColumns.getSelectedCodeButtonHandlerData(), _mProgramProperties, _mCTCSerialData, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override @@ -938,7 +933,7 @@ public void windowClosed(WindowEvent e) { private void changeNumbersButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeNumbersButtonActionPerformed CodeButtonHandlerData temp = _mColumns.getSelectedCodeButtonHandlerData(); InternalSensorManager internalSensorManager = new InternalSensorManager(_mCTCSerialData); - DlgAddModifyCTCColumn dialog = new DlgAddModifyCTCColumn(this, true, _mAwtWindowProperties, _mColumns, true, temp._mSwitchNumber, temp._mGUIColumnNumber, temp._mGUIGeneratedAtLeastOnceAlready); + FrmAddModifyCTCColumn dialog = new FrmAddModifyCTCColumn(_mAwtWindowProperties, _mColumns, true, temp._mSwitchNumber, temp._mGUIColumnNumber, temp._mGUIGeneratedAtLeastOnceAlready); dialog.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { @@ -1001,32 +996,32 @@ private boolean validToSaveAtThisTime(String whatIsTriggeringSave, String hint) } private void _mFindAndReplaceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mFindAndReplaceActionPerformed - DlgFindAndReplace dialog = new DlgFindAndReplace(this, true, _mAwtWindowProperties, _mCTCSerialData); + FrmFindAndReplace dialog = new FrmFindAndReplace(_mAwtWindowProperties, _mCTCSerialData); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mFindAndReplaceActionPerformed private void _mFleetingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mFleetingActionPerformed - DlgFleeting dialog = new DlgFleeting(this, true, _mAwtWindowProperties, _mCTCSerialData.getOtherData()); + FrmFleeting dialog = new FrmFleeting(_mAwtWindowProperties, _mCTCSerialData.getOtherData()); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mFleetingActionPerformed private void _mPatternsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mPatternsActionPerformed - DlgPatterns dialog = new DlgPatterns(this, true, _mAwtWindowProperties, _mProgramProperties); + FrmPatterns dialog = new FrmPatterns(_mAwtWindowProperties, _mProgramProperties); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mPatternsActionPerformed private void _mDefaultsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mDefaultsActionPerformed - DlgDefaults dialog = new DlgDefaults(this, true, _mAwtWindowProperties, _mProgramProperties, _mCTCSerialData.getOtherData()); + FrmDefaults dialog = new FrmDefaults(_mAwtWindowProperties, _mProgramProperties, _mCTCSerialData.getOtherData()); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mDefaultsActionPerformed private void _mDebuggingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mDebuggingActionPerformed - DlgDebugging dialog = new DlgDebugging(this, true, _mAwtWindowProperties, _mCTCSerialData.getOtherData()); + FrmDebugging dialog = new FrmDebugging(_mAwtWindowProperties, _mCTCSerialData.getOtherData()); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mDebuggingActionPerformed private void _mGUIDesignActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mGUIDesignActionPerformed - DlgGUIDesign dialog = new DlgGUIDesign(this, true, _mAwtWindowProperties, _mCTCSerialData.getOtherData()); + FrmGUIDesign dialog = new FrmGUIDesign(_mAwtWindowProperties, _mCTCSerialData.getOtherData()); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mGUIDesignActionPerformed @@ -1061,12 +1056,12 @@ private void _mQuitWithoutSavingActionPerformed(java.awt.event.ActionEvent evt) }//GEN-LAST:event__mQuitWithoutSavingActionPerformed private void _mFixErrorsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mFixErrorsActionPerformed - DlgFixErrors dialog = new DlgFixErrors(this, true, _mAwtWindowProperties, _mColumns); + FrmFixErrors dialog = new FrmFixErrors(_mAwtWindowProperties, _mColumns); InternalSensorManager.doDialog(dialog, _mCTCSerialData); }//GEN-LAST:event__mFixErrorsActionPerformed private void _mHelpAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mHelpAboutActionPerformed - DlgAbout dialog = new DlgAbout(this, true, _mAwtWindowProperties); + FrmAbout dialog = new FrmAbout(_mAwtWindowProperties); InternalSensorManager.doDialog(dialog, _mCTCSerialData); // Technically don't modify anything, but for consistency }//GEN-LAST:event__mHelpAboutActionPerformed diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.form index c7c18a75b85..2945f78b274 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.java index 416b3428aa3..ce3237fcb29 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmPatterns.java @@ -12,7 +12,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgPatterns extends javax.swing.JDialog { +public class FrmPatterns extends javax.swing.JFrame { /** * Creates new form dlgProperties @@ -22,7 +22,7 @@ public class DlgPatterns extends javax.swing.JDialog { private final ProgramProperties _mProgramProperties; private boolean _mClosedNormally = false; public boolean closedNormally() { return _mClosedNormally; } - + private String _mCodeButtonInternalSensorPatternOrig; private String _mSIDI_LeftInternalSensorPatternOrig; private String _mSIDI_NormalInternalSensorPatternOrig; @@ -36,7 +36,7 @@ public class DlgPatterns extends javax.swing.JDialog { private String _mCO_CallOnToggleInternalSensorPatternOrig; private String _mTUL_DispatcherInternalSensorLockTogglePatternOrig; private String _mTUL_DispatcherInternalSensorUnlockedIndicatorPatternOrig; - + private void initOrig(ProgramProperties programProperties) { _mCodeButtonInternalSensorPatternOrig = programProperties._mCodeButtonInternalSensorPattern; _mSIDI_LeftInternalSensorPatternOrig = programProperties._mSIDI_LeftInternalSensorPattern; @@ -68,13 +68,13 @@ private boolean dataChanged() { if (!_mTUL_DispatcherInternalSensorUnlockedIndicatorPatternOrig.equals(_mTUL_DispatcherInternalSensorUnlockedIndicatorPattern.getText())) return true; return false; } - - public DlgPatterns(java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, ProgramProperties programProperties) { - super(parent, modal); + + public FrmPatterns(AwtWindowProperties awtWindowProperties, ProgramProperties programProperties) { + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mProgramProperties = programProperties; - + _mCodeButtonInternalSensorPattern.setText(programProperties._mCodeButtonInternalSensorPattern); _mSIDI_LeftInternalSensorPattern.setText(programProperties._mSIDI_LeftInternalSensorPattern); _mSIDI_NormalInternalSensorPattern.setText(programProperties._mSIDI_NormalInternalSensorPattern); @@ -89,10 +89,10 @@ public DlgPatterns(java.awt.Frame parent, boolean modal, AwtWindowProperties awt _mTUL_DispatcherInternalSensorLockTogglePattern.setText(programProperties._mTUL_DispatcherInternalSensorLockTogglePattern); _mTUL_DispatcherInternalSensorUnlockedIndicatorPattern.setText(programProperties._mTUL_DispatcherInternalSensorUnlockedIndicatorPattern); initOrig(programProperties); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -140,7 +140,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TItleDlgPat")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.form index e1b2d179383..b2b033df359 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.java index 69f4104d90e..108efa7edf6 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDI.java @@ -16,7 +16,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgSIDI extends javax.swing.JDialog { +public class FrmSIDI extends javax.swing.JFrame { /** * Creates new form dlgSIDI @@ -75,11 +75,10 @@ private boolean dataChanged() { private final DefaultTableModel _mSIDI_TableOfLeftToRightTrafficExternalSignalNamesDefaultTableModel; private final DefaultTableModel _mSIDI_TableOfRightToLeftTrafficExternalSignalNamesDefaultTableModel; - public DlgSIDI( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + public FrmSIDI( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CheckJMRIObject checkJMRIObject, boolean signalHeadSelected) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -230,7 +229,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleSIDI")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -371,7 +369,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { java.lang.String.class }; - @Override public Class getColumnClass(int columnIndex) { return types [columnIndex]; } @@ -492,7 +489,6 @@ public Class getColumnClass(int columnIndex) { java.lang.String.class }; - @Override public Class getColumnClass(int columnIndex) { return types [columnIndex]; } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.form index 4e56a9a42f9..4c5f967767f 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.java index 37f976ec083..45014f675f6 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSIDL.java @@ -13,7 +13,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgSIDL extends javax.swing.JDialog { +public class FrmSIDL extends javax.swing.JFrame { /** * Creates new form DlgSIDL @@ -26,7 +26,7 @@ public class DlgSIDL extends javax.swing.JDialog { private final CodeButtonHandlerData _mCodeButtonHandlerData; private final ProgramProperties _mProgramProperties; private final CheckJMRIObject _mCheckJMRIObject; - + private String _mSIDL_LeftInternalSensorOrig; private String _mSIDL_NormalInternalSensorOrig; private String _mSIDL_RightInternalSensorOrig; @@ -41,11 +41,10 @@ private boolean dataChanged() { if (!_mSIDL_RightInternalSensorOrig.equals(_mSIDL_RightInternalSensor.getText())) return true; return false; } - - public DlgSIDL( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + + public FrmSIDL( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -55,28 +54,28 @@ public DlgSIDL( java.awt.Frame parent, boolean modal, _mSIDL_NormalInternalSensor.setText(_mCodeButtonHandlerData._mSIDL_NormalInternalSensor); _mSIDL_RightInternalSensor.setText(_mCodeButtonHandlerData._mSIDL_RightInternalSensor); initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + public static boolean dialogCodeButtonHandlerDataValid(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData codeButtonHandlerData) { if (!codeButtonHandlerData._mSIDL_Enabled) return true; // Not enabled, can be no error! -// For interrelationship(s) checks: +// For interrelationship(s) checks: boolean leftInternalSensorPresent = !ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSIDL_LeftInternalSensor); boolean rightInternalSensorPresent = !ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSIDL_RightInternalSensor); -// Checks: +// Checks: if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSIDL_NormalInternalSensor)) return false; if (!leftInternalSensorPresent && !rightInternalSensorPresent) return false; return checkJMRIObject.validClassWithPrefix(PREFIX, codeButtonHandlerData); } - + // Validate all internal fields as much as possible: private ArrayList formFieldsValid() { ArrayList errors = new ArrayList<>(); -// For interrelationship(s) checks: +// For interrelationship(s) checks: boolean leftInternalSensorPresent = CommonSubs.isJTextFieldNotEmpty(_mSIDL_LeftInternalSensor); boolean rightInternalSensorPresent = CommonSubs.isJTextFieldNotEmpty(_mSIDL_RightInternalSensor); -// Checks: +// Checks: CommonSubs.checkJTextFieldNotEmpty(_mSIDL_NormalInternalSensor, _mSIDL_NormalInternalSensorPrompt, errors); if (!leftInternalSensorPresent && !rightInternalSensorPresent) errors.add(Bundle.getMessage("OneOrBothOf") + " \"" + _mSIDL_LeftInternalSensorPrompt.getText() + "\" " + Bundle.getMessage("And") + " \"" + _mSIDL_RightInternalSensorPrompt.getText() + "\" " + Bundle.getMessage("MustBePresent")); // NOI18N _mCheckJMRIObject.analyzeForm(PREFIX, this, errors); @@ -104,7 +103,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgSIDL")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.form index 5cdc1e72a4a..21427c5f393 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.java index 94533deeb92..df7fc4acb99 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDI.java @@ -13,7 +13,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgSWDI extends javax.swing.JDialog { +public class FrmSWDI extends javax.swing.JFrame { private static final String FORM_PROPERTIES = "DlgSWDI"; // NOI18N private static final String PREFIX = "_mSWDI_"; // NOI18N @@ -23,7 +23,7 @@ public class DlgSWDI extends javax.swing.JDialog { private final CodeButtonHandlerData _mCodeButtonHandlerData; private final ProgramProperties _mProgramProperties; private final CheckJMRIObject _mCheckJMRIObject; - + private String _mSWDI_NormalInternalSensorOrig; private String _mSWDI_ReversedInternalSensorOrig; private String _mSWDI_ExternalTurnoutOrig; @@ -32,7 +32,7 @@ public class DlgSWDI extends javax.swing.JDialog { private CodeButtonHandlerData.TURNOUT_TYPE _mSWDI_GUITurnoutTypeOrig; private boolean _mSWDI_GUITurnoutLeftHandOrig; private boolean _mSWDI_GUICrossoverLeftHandOrig; - + private void initOrig() { _mSWDI_NormalInternalSensorOrig = _mCodeButtonHandlerData._mSWDI_NormalInternalSensor; _mSWDI_ReversedInternalSensorOrig = _mCodeButtonHandlerData._mSWDI_ReversedInternalSensor; @@ -54,11 +54,10 @@ private boolean dataChanged() { if (_mSWDI_GUICrossoverLeftHandOrig != _mSWDI_GUICrossoverLeftHand.isSelected()) return true; return false; } - - public DlgSWDI( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + + public FrmSWDI( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -75,23 +74,23 @@ public DlgSWDI( java.awt.Frame parent, boolean modal, _mSWDI_GUITurnoutLeftHand.setSelected(_mCodeButtonHandlerData._mSWDI_GUITurnoutLeftHand); _mSWDI_GUICrossoverLeftHand.setSelected(_mCodeButtonHandlerData._mSWDI_GUICrossoverLeftHand); initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + public static boolean dialogCodeButtonHandlerDataValid(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData codeButtonHandlerData) { if (!codeButtonHandlerData._mSWDI_Enabled) return true; // Not enabled, can be no error! -// Checks: +// Checks: if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSWDI_NormalInternalSensor)) return false; if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSWDI_ReversedInternalSensor)) return false; if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSWDI_ExternalTurnout)) return false; return checkJMRIObject.validClassWithPrefix(PREFIX, codeButtonHandlerData); } - + // Validate all internal fields as much as possible: private ArrayList formFieldsValid() { ArrayList errors = new ArrayList<>(); -// Checks: +// Checks: CommonSubs.checkJTextFieldNotEmpty(_mSWDI_NormalInternalSensor, _mSWDI_NormalInternalSensorPrompt, errors); CommonSubs.checkJTextFieldNotEmpty(_mSWDI_ReversedInternalSensor, _mSWDI_ReversedInternalSensorPrompt, errors); CommonSubs.checkJComboBoxNotEmpty(_mSWDI_ExternalTurnout, _mSWDI_ActualTurnoutPrompt, errors); @@ -131,7 +130,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleSWDI")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -330,7 +328,7 @@ private void _mDoubleCrossoverActionPerformed(java.awt.event.ActionEvent evt) {/ _mSWDI_GUITurnoutLeftHand.setEnabled(false); _mSWDI_GUICrossoverLeftHand.setEnabled(false); }//GEN-LAST:event__mDoubleCrossoverActionPerformed - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JRadioButton _mCrossover; private javax.swing.JRadioButton _mDoubleCrossover; diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.form index a865107715f..066124d1f2b 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.java index 0d759236954..bfe87d285b0 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmSWDL.java @@ -13,7 +13,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgSWDL extends javax.swing.JDialog { +public class FrmSWDL extends javax.swing.JFrame { /** * Creates new form DlgSWDL @@ -25,8 +25,8 @@ public class DlgSWDL extends javax.swing.JDialog { public boolean closedNormally() { return _mClosedNormally; } private final CodeButtonHandlerData _mCodeButtonHandlerData; private final ProgramProperties _mProgramProperties; - private final CheckJMRIObject _mCheckJMRIObject; - + private final CheckJMRIObject _mCheckJMRIObject; + private String _mSWDL_InternalSensorOrig; private void initOrig() { _mSWDL_InternalSensorOrig = _mCodeButtonHandlerData._mSWDL_InternalSensor; @@ -35,11 +35,10 @@ private boolean dataChanged() { if (!_mSWDL_InternalSensorOrig.equals(_mSWDL_InternalSensor.getText())) return true; return false; } - - public DlgSWDL( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + + public FrmSWDL( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -47,26 +46,26 @@ public DlgSWDL( java.awt.Frame parent, boolean modal, _mCheckJMRIObject = checkJMRIObject; _mSWDL_InternalSensor.setText(_mCodeButtonHandlerData._mSWDL_InternalSensor); initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } public static boolean dialogCodeButtonHandlerDataValid(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData codeButtonHandlerData) { if (!codeButtonHandlerData._mSWDL_Enabled) return true; // Not enabled, can be no error! -// Checks: +// Checks: if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mSWDL_InternalSensor)) return false; return checkJMRIObject.validClassWithPrefix(PREFIX, codeButtonHandlerData); } - + // Validate all internal fields as much as possible: private ArrayList formFieldsValid() { ArrayList errors = new ArrayList<>(); -// Checks: +// Checks: CommonSubs.checkJTextFieldNotEmpty(_mSWDL_InternalSensor, _mSWDL_InternalSensorPrompt, errors); - _mCheckJMRIObject.analyzeForm(PREFIX, this, errors); + _mCheckJMRIObject.analyzeForm(PREFIX, this, errors); return errors; } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -84,7 +83,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgSWDL")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.form index 932d7c0f1a8..f821b353863 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.java index 1aeb1782cc4..68bb7b09998 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL.java @@ -15,12 +15,11 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgTRL extends javax.swing.JDialog { +public class FrmTRL extends javax.swing.JFrame { /** * Creates new form DlgTRL */ - private final java.awt.Frame _mParent; private static final String FORM_PROPERTIES = "DlgTRL"; // NOI18N private final AwtWindowProperties _mAwtWindowProperties; private boolean _mClosedNormally = false; @@ -28,43 +27,41 @@ public class DlgTRL extends javax.swing.JDialog { private final CodeButtonHandlerData _mCodeButtonHandlerData; private final CTCSerialData _mCTCSerialData; private final CheckJMRIObject _mCheckJMRIObject; - + private void initOrig() { } private boolean dataChanged() { return false; } - public DlgTRL( java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + public FrmTRL( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); - _mParent = parent; _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; _mCTCSerialData = ctcSerialData; _mCheckJMRIObject = checkJMRIObject; initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mOK); updateRuleCounts(); this.setTitle(Bundle.getMessage("TitleDlgTRL") + " " + codeButtonHandlerData.myShortStringNoComma()); // NOI18N } - + public static boolean dialogCodeButtonHandlerDataValid(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData codeButtonHandlerData) { if (!valid(checkJMRIObject, codeButtonHandlerData._mTRL_LeftTrafficLockingRulesSSVList)) return false; if (!valid(checkJMRIObject, codeButtonHandlerData._mTRL_RightTrafficLockingRulesSSVList)) return false; return true; } - + private void updateRuleCounts() { _mLeftNumberOfRules.setText(Bundle.getMessage("InfoDlgTRLRules") + " " + Integer.toString(ProjectsCommonSubs.getArrayListFromSSV(_mCodeButtonHandlerData._mTRL_LeftTrafficLockingRulesSSVList).size())); // NOI18N _mRightNumberOfRules.setText(Bundle.getMessage("InfoDlgTRLRules") + " " + Integer.toString(ProjectsCommonSubs.getArrayListFromSSV(_mCodeButtonHandlerData._mTRL_RightTrafficLockingRulesSSVList).size())); // NOI18N _mLeftNumberOfRulesPrompt.setForeground(valid(_mCheckJMRIObject, _mCodeButtonHandlerData._mTRL_LeftTrafficLockingRulesSSVList) ? Color.black : Color.red); _mRightNumberOfRulesPrompt.setForeground(valid(_mCheckJMRIObject, _mCodeButtonHandlerData._mTRL_RightTrafficLockingRulesSSVList) ? Color.black : Color.red); } - + private static boolean valid(CheckJMRIObject checkJMRIObject, String trafficLockingRulesSSVList) { for (String groupingListString : ProjectsCommonSubs.getArrayListFromSSV(trafficLockingRulesSSVList)) { if (!checkJMRIObject.validClass(new TrafficLockingEntry(groupingListString))) return false; // Error @@ -95,7 +92,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgTRL")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -204,8 +200,7 @@ private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:even }//GEN-LAST:event_formWindowClosing private void _mEditLeftTrafficLockingRulesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEditLeftTrafficLockingRulesActionPerformed - DlgTRL_Rules dialog = new DlgTRL_Rules( _mParent, true, - _mAwtWindowProperties, _mCodeButtonHandlerData, + FrmTRL_Rules dialog = new FrmTRL_Rules( _mAwtWindowProperties, _mCodeButtonHandlerData, true, _mCTCSerialData, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override @@ -220,8 +215,7 @@ public void windowClosed(WindowEvent e) { }//GEN-LAST:event__mEditLeftTrafficLockingRulesActionPerformed private void _mEditRightTrafficLockingRulesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mEditRightTrafficLockingRulesActionPerformed - DlgTRL_Rules dialog = new DlgTRL_Rules( _mParent, true, - _mAwtWindowProperties, _mCodeButtonHandlerData, + FrmTRL_Rules dialog = new FrmTRL_Rules( _mAwtWindowProperties, _mCodeButtonHandlerData, false, _mCTCSerialData, _mCheckJMRIObject); dialog.addWindowListener(new WindowAdapter() { @Override diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.form index 4c4a1d60baa..4ea1444c95e 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.java index 2f6ec38f9e2..9156fa619d0 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmTRL_Rules.java @@ -15,9 +15,9 @@ /** * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 - * + * */ -public class DlgTRL_Rules extends javax.swing.JDialog { +public class FrmTRL_Rules extends javax.swing.JFrame { /** * Creates new form DlgTRL_Rules @@ -34,7 +34,7 @@ public class DlgTRL_Rules extends javax.swing.JDialog { private final ArrayList _mArrayListOfSelectableOSSectionUniqueIDs; private final DefaultListModel _mDefaultListModel; private boolean _mAddNewPressed; - + private final ArrayList _mDefaultListModelOrig = new ArrayList<> (); private void initOrig() { int defaultListModelSize = _mDefaultListModel.getSize(); @@ -50,12 +50,11 @@ private boolean dataChanged() { } return false; } - - public DlgTRL_Rules(java.awt.Frame parent, boolean modal, - AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + + public FrmTRL_Rules(AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, boolean isLeftTraffic, CTCSerialData ctcSerialData, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -65,7 +64,7 @@ public DlgTRL_Rules(java.awt.Frame parent, boolean modal, _mArrayListOfSelectableOSSectionUniqueIDs = CommonSubs.getArrayListOfSelectableOSSectionUniqueIDs(_mCTCSerialData.getCodeButtonHandlerDataArrayList()); _mDefaultListModel = new DefaultListModel<>(); _mTRL_TrafficLockingRulesSSVList.setModel(_mDefaultListModel); - + String trafficLockingRulesSSVList; String identifier = codeButtonHandlerData.myShortStringNoComma(); if (isLeftTraffic) { @@ -86,7 +85,7 @@ public DlgTRL_Rules(java.awt.Frame parent, boolean modal, _mDefaultListModel.addElement(aString); } initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); CommonSubs.populateJComboBoxWithBeans(_mOccupancyExternalSensor1, "Sensor", null, true); CommonSubs.populateJComboBoxWithBeans(_mOccupancyExternalSensor2, "Sensor", null, true); CommonSubs.populateJComboBoxWithBeans(_mOccupancyExternalSensor3, "Sensor", null, true); @@ -113,7 +112,7 @@ public DlgTRL_Rules(java.awt.Frame parent, boolean modal, _mEditBelow.setEnabled(false); _mDelete.setEnabled(false); } - + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -167,7 +166,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgTRLRules")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } @@ -424,13 +422,13 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { @SuppressFBWarnings(value = "SBSC_USE_STRINGBUFFER_CONCATENATION", justification = "I don't want to introduce bugs, CPU no big deal here.") private void _mSaveAndCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event__mSaveAndCloseActionPerformed int size = _mDefaultListModel.getSize(); - + String resultString = ""; for (int index = 0; index < size; index++) { String thisEntry = _mDefaultListModel.getElementAt(index); resultString = (0 == index) ? thisEntry : resultString + ProjectsCommonSubs.SSV_SEPARATOR + thisEntry; } - + if (_mIsLeftTraffic) { _mCodeButtonHandlerData._mTRL_LeftTrafficLockingRulesSSVList = resultString; } else { _mCodeButtonHandlerData._mTRL_RightTrafficLockingRulesSSVList = resultString; } _mClosedNormally = true; @@ -445,10 +443,10 @@ private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:even private void _mTRL_TrafficLockingRulesSSVListValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event__mTRL_TrafficLockingRulesSSVListValueChanged if (_mTRL_TrafficLockingRulesSSVList.isSelectionEmpty()) { - _mEditBelow.setEnabled(false); + _mEditBelow.setEnabled(false); _mDelete.setEnabled(false); } else { - _mEditBelow.setEnabled(true); + _mEditBelow.setEnabled(true); _mDelete.setEnabled(true); } }//GEN-LAST:event__mTRL_TrafficLockingRulesSSVListValueChanged @@ -501,7 +499,7 @@ private void _mEditBelowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F int selectedIndex = _mTRL_TrafficLockingRulesSSVList.getSelectedIndex(); enableTopPart(false); _mTRL_TrafficLockingRulesSSVList.setEnabled(false); - + TrafficLockingEntry trafficLockingEntry = new TrafficLockingEntry(_mDefaultListModel.get(selectedIndex)); // _mOccupancyExternalSensor1.setText(trafficLockingEntry._mOccupancyExternalSensor1); // _mOccupancyExternalSensor2.setText(trafficLockingEntry._mOccupancyExternalSensor2); @@ -573,13 +571,13 @@ private void _mGroupingListAddReplaceActionPerformed(java.awt.event.ActionEvent (String)_mOccupancyExternalSensor9.getSelectedItem(), (String)_mOptionalExternalSensor1.getSelectedItem(), (String)_mOptionalExternalSensor2.getSelectedItem()); - + CheckJMRIObject.VerifyClassReturnValue verifyClassReturnValue = _mCheckJMRIObject.verifyClass(trafficLockingEntry); if (verifyClassReturnValue != null) { // Error: JOptionPane.showMessageDialog(this, verifyClassReturnValue.toString(), Bundle.getMessage("Error"), JOptionPane.ERROR_MESSAGE); // NOI18N return; } - + // Any uninitialized are null, and thats OK for "constructCSVStringFromArrayList": int osNumberSelectedIndex; @@ -608,7 +606,7 @@ private void _mGroupingListAddReplaceActionPerformed(java.awt.event.ActionEvent trafficLockingEntry._mUserText5 = (String)_mOS_NumberEntry5.getSelectedItem(); trafficLockingEntry._mUniqueID5 = _mArrayListOfSelectableOSSectionUniqueIDs.get(osNumberSelectedIndex - 1).toString(); } - + _mGroupingListAddReplace.setEnabled(false); enableTopPart(true); if (_mAddNewPressed) { @@ -652,7 +650,7 @@ private String renumberCSVString(String aString, int ruleNumber) { return trafficLockingEntry.toCSVString(); } private String getRuleNumberString(int ruleNumber) { return " " + Bundle.getMessage("InfoDlgTRLRuleNumber") + Integer.toString(ruleNumber); } // NOI18N - + private void enableTopPart(boolean enabled) { _mAddNew.setEnabled(enabled); _mOccupancyExternalSensor1.setEnabled(!enabled); @@ -680,7 +678,7 @@ private void enableTopPart(boolean enabled) { _mGroupingListAddReplace.setEnabled(!enabled); _mCancel.setEnabled(!enabled); _mSaveAndClose.setEnabled(enabled); - + if (enabled) this.getRootPane().setDefaultButton(_mSaveAndClose); else this.getRootPane().setDefaultButton(_mGroupingListAddReplace); } @@ -695,7 +693,7 @@ private void enableTopPart(boolean enabled) { // } // return returnValue; // } - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton _mAddNew; private javax.swing.JButton _mCancel; diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.form index bc3b9fb7f57..d0302a6b80f 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.form @@ -1,6 +1,6 @@ - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.java index 255dfa071e3..940149e881d 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmTUL.java @@ -13,7 +13,7 @@ * * @author Gregory J. Bedlek Copyright (C) 2018, 2019 */ -public class DlgTUL extends javax.swing.JDialog { +public class FrmTUL extends javax.swing.JFrame { /** * Creates new form DlgTUL @@ -26,7 +26,7 @@ public class DlgTUL extends javax.swing.JDialog { private final CodeButtonHandlerData _mCodeButtonHandlerData; private final ProgramProperties _mProgramProperties; private final CheckJMRIObject _mCheckJMRIObject; - + private String _mTUL_DispatcherInternalSensorLockToggleOrig; private String _mTUL_ExternalTurnoutOrig; private boolean _mTUL_ExternalTurnoutFeedbackDifferentOrig; @@ -40,7 +40,7 @@ public class DlgTUL extends javax.swing.JDialog { private boolean _mTUL_AdditionalExternalTurnout2FeedbackDifferentOrig; private String _mTUL_AdditionalExternalTurnout3Orig; private boolean _mTUL_AdditionalExternalTurnout3FeedbackDifferentOrig; - + private void initOrig() { _mTUL_DispatcherInternalSensorLockToggleOrig = _mCodeButtonHandlerData._mTUL_DispatcherInternalSensorLockToggle; _mTUL_ExternalTurnoutOrig = _mCodeButtonHandlerData._mTUL_ExternalTurnout; @@ -72,10 +72,10 @@ private boolean dataChanged() { if (_mTUL_AdditionalExternalTurnout3FeedbackDifferentOrig != _mTUL_AdditionalExternalTurnout3FeedbackDifferent.isSelected()) return true; return false; } - - public DlgTUL( java.awt.Frame parent, boolean modal, AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, + + public FrmTUL( AwtWindowProperties awtWindowProperties, CodeButtonHandlerData codeButtonHandlerData, ProgramProperties programProperties, CheckJMRIObject checkJMRIObject) { - super(parent, modal); + super(); initComponents(); _mAwtWindowProperties = awtWindowProperties; _mCodeButtonHandlerData = codeButtonHandlerData; @@ -96,23 +96,23 @@ public DlgTUL( java.awt.Frame parent, boolean modal, AwtWindowProperties awtWin CommonSubs.populateJComboBoxWithBeans(_mTUL_AdditionalExternalTurnout3, "Turnout", _mCodeButtonHandlerData._mTUL_AdditionalExternalTurnout3, true); _mTUL_AdditionalExternalTurnout3FeedbackDifferent.setSelected(_mCodeButtonHandlerData._mTUL_AdditionalExternalTurnout3FeedbackDifferent); initOrig(); - _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); + _mAwtWindowProperties.setWindowState(this, FORM_PROPERTIES); this.getRootPane().setDefaultButton(_mSaveAndClose); } - + public static boolean dialogCodeButtonHandlerDataValid(CheckJMRIObject checkJMRIObject, CodeButtonHandlerData codeButtonHandlerData) { if (!codeButtonHandlerData._mTUL_Enabled) return true; // Not enabled, can be no error! -// Checks: +// Checks: if (ProjectsCommonSubs.isNullOrEmptyString(codeButtonHandlerData._mTUL_ExternalTurnout)) return false; return checkJMRIObject.validClassWithPrefix(PREFIX, codeButtonHandlerData); } - + // Validate all internal fields as much as possible: private ArrayList formFieldsValid() { ArrayList errors = new ArrayList<>(); -// Checks: +// Checks: CommonSubs.checkJComboBoxNotEmpty(_mTUL_ExternalTurnout, _mTUL_ActualTurnoutPrompt, errors); - _mCheckJMRIObject.analyzeForm(PREFIX, this, errors); + _mCheckJMRIObject.analyzeForm(PREFIX, this, errors); return errors; } @@ -157,7 +157,6 @@ private void initComponents() { setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle(Bundle.getMessage("TitleDlgTUL")); addWindowListener(new java.awt.event.WindowAdapter() { - @Override public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); }