From a313525c896a99e0aa188929a7bb60a5e4b2a8b7 Mon Sep 17 00:00:00 2001 From: Gregory-J-Bedlek Date: Wed, 5 Aug 2020 22:09:09 -0500 Subject: [PATCH] Hopefully reverted to proper state. --- .../src/jmri/jmrit/ctc/CodeButtonHandler.java | 2 +- java/src/jmri/jmrit/ctc/Fleeting.java | 2 +- .../ctc/ctcserialdata/ProjectsCommonSubs.java | 47 ++----------------- .../code/CodeButtonHandlerDataRoutines.java | 15 ++++-- .../jmrit/ctc/editor/code/CommonSubs.java | 8 +--- .../jmrit/ctc/editor/gui/FrmMainForm.form | 9 ++-- .../jmrit/ctc/editor/gui/FrmMainForm.java | 46 ++---------------- 7 files changed, 29 insertions(+), 100 deletions(-) diff --git a/java/src/jmri/jmrit/ctc/CodeButtonHandler.java b/java/src/jmri/jmrit/ctc/CodeButtonHandler.java index 808a441345d..cdb3a536c8a 100755 --- a/java/src/jmri/jmrit/ctc/CodeButtonHandler.java +++ b/java/src/jmri/jmrit/ctc/CodeButtonHandler.java @@ -344,7 +344,7 @@ private boolean allowSignalDirectionChangePart2(int presentSignalDirectionLever) private boolean trafficLockingValid(int presentSignalDirectionLever) { // If asking for a route and it indicates an error (a conflict), DO NOTHING! if (_mTrafficLocking != null) { - TrafficLockingInfo trafficLockingInfo = _mTrafficLocking.valid(presentSignalDirectionLever); + TrafficLockingInfo trafficLockingInfo = _mTrafficLocking.valid(presentSignalDirectionLever, _mFleeting.isFleetingEnabled()); _mLockedRoute = trafficLockingInfo._mLockedRoute; // Can be null! This is the bread crumb trail when running time expires. return trafficLockingInfo._mReturnStatus; } diff --git a/java/src/jmri/jmrit/ctc/Fleeting.java b/java/src/jmri/jmrit/ctc/Fleeting.java index 87244a9e2fc..57cde5eecfb 100755 --- a/java/src/jmri/jmrit/ctc/Fleeting.java +++ b/java/src/jmri/jmrit/ctc/Fleeting.java @@ -16,7 +16,7 @@ public Fleeting (String fleetingToggleInternalSensor, boolean defaultFleetingEna public void removeAllListeners() {} // None done. - public boolean isFleetingEnabled () { + public boolean isFleetingEnabled() { if (_mFleetingToggleInternalSensor.valid()) return _mFleetingToggleInternalSensor.getKnownState() == Sensor.ACTIVE; return _mDefaultFleetingEnabled; } diff --git a/java/src/jmri/jmrit/ctc/ctcserialdata/ProjectsCommonSubs.java b/java/src/jmri/jmrit/ctc/ctcserialdata/ProjectsCommonSubs.java index 9914e0a2d3f..a675274e3e0 100755 --- a/java/src/jmri/jmrit/ctc/ctcserialdata/ProjectsCommonSubs.java +++ b/java/src/jmri/jmrit/ctc/ctcserialdata/ProjectsCommonSubs.java @@ -6,10 +6,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.ListIterator; - import javax.swing.ButtonGroup; - import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVPrinter; @@ -21,18 +18,8 @@ public class ProjectsCommonSubs { static final public char SSV_SEPARATOR = ';'; - static final public char CSV_SEPARATOR = ','; // What "CSVFormat.DEFAULT.getDelimiter()" would return. - static public ArrayList getArrayListFromCSV(String csvString, boolean convert) { - ArrayList result = helper1(csvString, CSV_SEPARATOR); - if (convert) { - for (final ListIterator iterator = result.listIterator(); iterator.hasNext();) { - final String element = iterator.next(); - iterator.set(convertNonEscapeToEscape(element)); - } - } - return result; - } + static public ArrayList getArrayListFromCSV(String csvString) { return helper1(csvString, CSVFormat.DEFAULT.getDelimiter());} static public ArrayList getArrayListFromSSV(String ssvString) { return helper1(ssvString, SSV_SEPARATOR); } static private ArrayList helper1(String ssvString, char separator) { ArrayList list = new ArrayList<>(); @@ -43,28 +30,11 @@ static private ArrayList helper1(String ssvString, char separator) { } return list; } - - static final public String ESCAPE_CHARACTER = "~"; - static final public String ESCAPED_ESCAPE_STRING = "~~"; - static final public String CSV_SEPARATOR_STRING = ","; - static final public String ESCAPED_CSV_STRING = "~0"; - static final public String SSV_SEPARATOR_STRING = ";"; - static final public String ESCAPED_SSV_STRING = "~1"; - static public String convertNonEscapeToEscape(String nonEscapeString) { - String tempString = nonEscapeString.replace(ESCAPE_CHARACTER, ESCAPED_ESCAPE_STRING); - tempString = tempString.replace(CSV_SEPARATOR_STRING, ESCAPED_CSV_STRING); - return tempString.replace(SSV_SEPARATOR_STRING, ESCAPED_SSV_STRING); - } - static public String convertEscapeToNonEscape(String escapedString) { - String tempString = escapedString.replace(ESCAPED_ESCAPE_STRING, ESCAPE_CHARACTER); - tempString = tempString.replace(ESCAPED_CSV_STRING, CSV_SEPARATOR_STRING); - return tempString.replace(ESCAPED_SSV_STRING, SSV_SEPARATOR_STRING); - } -// Returns an ArrayList guaranteed to have A MINIMUM of "returnArrayListSize" entries (too many is OK!), +// Returns an ArrayList guaranteed to have exactly "returnArrayListSize" entries, // and if the passed "csvString" has too few entries, then those missing end values are set to "": - static public ArrayList getFixedArrayListSizeFromCSV(String csvString, int returnArrayListSize, boolean convert) { - ArrayList returnArray = getArrayListFromCSV(csvString, convert); + static public ArrayList getFixedArrayListSizeFromCSV(String csvString, int returnArrayListSize) { + ArrayList returnArray = getArrayListFromCSV(csvString); while (returnArray.size() < returnArrayListSize) returnArray.add(""); return returnArray; } @@ -75,14 +45,7 @@ static public int getIntFromStringNoThrow(String aString, int defaultValueIfProb return returnValue; } - static public String constructCSVStringFromArrayList(ArrayList stringArrayList, boolean convert) { - if (convert) { - String result = constructSeparatorStringFromArray(stringArrayList, ProjectsCommonSubs.CSV_SEPARATOR); - return convertEscapeToNonEscape(result); - } else { - return constructSeparatorStringFromArray(stringArrayList, ProjectsCommonSubs.CSV_SEPARATOR); - } - } + static public String constructCSVStringFromArrayList(ArrayList stringArrayList) { return constructSeparatorStringFromArray(stringArrayList, CSVFormat.DEFAULT.getDelimiter()); } static public String constructSSVStringFromArrayList(ArrayList stringArrayList) { return constructSeparatorStringFromArray(stringArrayList, ProjectsCommonSubs.SSV_SEPARATOR); } static private String constructSeparatorStringFromArray(ArrayList list, char separator) { try (CSVPrinter printer = new CSVPrinter(new StringBuilder(), CSVFormat.DEFAULT.withQuote(null).withDelimiter(separator).withRecordSeparator(null))) { diff --git a/java/src/jmri/jmrit/ctc/editor/code/CodeButtonHandlerDataRoutines.java b/java/src/jmri/jmrit/ctc/editor/code/CodeButtonHandlerDataRoutines.java index d829dcdbb2a..177d2adb3ec 100755 --- a/java/src/jmri/jmrit/ctc/editor/code/CodeButtonHandlerDataRoutines.java +++ b/java/src/jmri/jmrit/ctc/editor/code/CodeButtonHandlerDataRoutines.java @@ -103,11 +103,16 @@ public static CodeButtonHandlerData uECBHDWSD_TUL(ProgramProperties programPrope return returnValue; } -/* This is the "heart" of the pattern match system: It substitutes the passed - value whereever it see a single "#" in the passed template. It does not - support escapes, it will fix ALL "#" with that number in the passed template. - It is indescriminate. -*/ + /** + * This is the "heart" of the pattern match system: It substitutes the passed + * value where ever it see a single "#" in the passed template. It does not + * support escapes, it will fix ALL "#" with that number in the passed template. + * It is indiscriminate. + * + * @param value The "number" that will be substituted where the template parameter is + * @param template The pattern used to generate the result. + * @return Modified string. ALL locations modified indiscriminately. + */ private static String substituteValueForPoundSigns(int value, String template) { int indexOf; while (-1 != (indexOf = template.indexOf('#'))) { template = template.substring(0, indexOf) + Integer.toString(value) + template.substring(indexOf+1); } diff --git a/java/src/jmri/jmrit/ctc/editor/code/CommonSubs.java b/java/src/jmri/jmrit/ctc/editor/code/CommonSubs.java index 85762259b34..0578a844954 100755 --- a/java/src/jmri/jmrit/ctc/editor/code/CommonSubs.java +++ b/java/src/jmri/jmrit/ctc/editor/code/CommonSubs.java @@ -9,7 +9,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Vector; - import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; @@ -19,7 +18,6 @@ import javax.swing.JTextField; import javax.swing.table.DefaultTableModel; import javax.swing.text.NumberFormatter; - import jmri.InstanceManager; import jmri.BlockManager; import jmri.SensorManager; @@ -29,8 +27,6 @@ import jmri.jmrit.ctc.ctcserialdata.CTCSerialData; import jmri.jmrit.ctc.ctcserialdata.CodeButtonHandlerData; import jmri.jmrit.ctc.ctcserialdata.ProjectsCommonSubs; -import static jmri.jmrit.ctc.ctcserialdata.ProjectsCommonSubs.convertNonEscapeToEscape; - import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; @@ -91,9 +87,9 @@ public static String getCSVStringFromDefaultTableModel(DefaultTableModel default } } } - try (CSVPrinter printer = new CSVPrinter(new StringBuilder(), CSVFormat.DEFAULT.withQuote(null).withDelimiter(ProjectsCommonSubs.CSV_SEPARATOR).withRecordSeparator(null))) { + try (CSVPrinter printer = new CSVPrinter(new StringBuilder(), CSVFormat.DEFAULT.withQuote(null).withRecordSeparator(null))) { printer.printRecord(entries); - return ProjectsCommonSubs.convertEscapeToNonEscape(printer.getOut().toString()); + return printer.getOut().toString(); } catch (IOException ex) { log.error("Unable to create CSV", ex); return ""; diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.form b/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.form index e223fdc5a8c..a795304248f 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.form +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.form @@ -287,11 +287,12 @@ - - - + + + + - + diff --git a/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java b/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java index 7dab7925215..68996f91c7b 100755 --- a/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java +++ b/java/src/jmri/jmrit/ctc/editor/gui/FrmMainForm.java @@ -197,7 +197,6 @@ public void windowClosing(java.awt.event.WindowEvent evt) { _mPresentlyDefinedColumns.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); _mPresentlyDefinedColumns.addListSelectionListener(new javax.swing.event.ListSelectionListener() { - @Override public void valueChanged(javax.swing.event.ListSelectionEvent evt) { _mPresentlyDefinedColumnsValueChanged(evt); } @@ -206,7 +205,6 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) { addButton.setText(Bundle.getMessage("ButtonAdd")); addButton.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { addButtonActionPerformed(evt); } @@ -214,7 +212,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { deleteButton.setText(Bundle.getMessage("ButtonDelete")); deleteButton.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { deleteButtonActionPerformed(evt); } @@ -222,7 +219,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mSIDI_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mSIDI_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mSIDI_EnabledActionPerformed(evt); } @@ -230,7 +226,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SIDI.setText(Bundle.getMessage("ButtonEdit")); _mEdit_SIDI.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SIDIActionPerformed(evt); } @@ -242,7 +237,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mSIDL_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mSIDL_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mSIDL_EnabledActionPerformed(evt); } @@ -250,7 +244,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SIDL.setText(Bundle.getMessage("ButtonEdit")); _mEdit_SIDL.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SIDLActionPerformed(evt); } @@ -260,7 +253,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mSWDI_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mSWDI_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mSWDI_EnabledActionPerformed(evt); } @@ -268,7 +260,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SWDI.setText(Bundle.getMessage("ButtonEdit")); _mEdit_SWDI.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SWDIActionPerformed(evt); } @@ -278,7 +269,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mSWDL_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mSWDL_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mSWDL_EnabledActionPerformed(evt); } @@ -286,7 +276,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SWDL.setText(Bundle.getMessage("ButtonEdit")); _mEdit_SWDL.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_SWDLActionPerformed(evt); } @@ -296,7 +285,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mCO_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mCO_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mCO_EnabledActionPerformed(evt); } @@ -304,7 +292,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_CO.setText(Bundle.getMessage("ButtonEdit")); _mEdit_CO.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_COActionPerformed(evt); } @@ -314,7 +301,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mTUL_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mTUL_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mTUL_EnabledActionPerformed(evt); } @@ -322,7 +308,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_TUL.setText(Bundle.getMessage("ButtonEdit")); _mEdit_TUL.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_TULActionPerformed(evt); } @@ -332,7 +317,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mIL_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mIL_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mIL_EnabledActionPerformed(evt); } @@ -340,7 +324,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_IL.setText(Bundle.getMessage("ButtonEdit")); _mEdit_IL.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_ILActionPerformed(evt); } @@ -348,7 +331,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { reapplyPatternsButton.setText(Bundle.getMessage("ButtonReapplyItem")); reapplyPatternsButton.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { reapplyPatternsButtonActionPerformed(evt); } @@ -358,7 +340,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mTRL_Enabled.setText(Bundle.getMessage("LabelEnabled")); _mTRL_Enabled.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mTRL_EnabledActionPerformed(evt); } @@ -366,7 +347,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_TRL.setText(Bundle.getMessage("ButtonEdit")); _mEdit_TRL.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_TRLActionPerformed(evt); } @@ -376,7 +356,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_CB.setText(Bundle.getMessage("ButtonEdit")); _mEdit_CB.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mEdit_CBActionPerformed(evt); } @@ -386,7 +365,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { changeNumbersButton.setText(Bundle.getMessage("ButtonChange")); changeNumbersButton.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { changeNumbersButtonActionPerformed(evt); } @@ -394,7 +372,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mButtonWriteXMLFiles.setText(Bundle.getMessage("ButtonXmlFiles")); _mButtonWriteXMLFiles.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mButtonWriteXMLFilesActionPerformed(evt); } @@ -402,7 +379,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mMoveUp.setText(Bundle.getMessage("ButtonMoveUp")); _mMoveUp.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mMoveUpActionPerformed(evt); } @@ -410,7 +386,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mMoveDown.setText(Bundle.getMessage("ButtonMoveDown")); _mMoveDown.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mMoveDownActionPerformed(evt); } @@ -418,7 +393,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mCheckEverythingWithJMRI.setText(Bundle.getMessage("ButtonCheck")); _mCheckEverythingWithJMRI.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mCheckEverythingWithJMRIActionPerformed(evt); } @@ -434,7 +408,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mNew.setAccelerator(getAccelerator(KeyEvent.VK_N)); _mNew.setText(Bundle.getMessage("MenuNew")); _mNew.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mNewActionPerformed(evt); } @@ -444,7 +417,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mSave.setAccelerator(getAccelerator(KeyEvent.VK_S)); _mSave.setText(Bundle.getMessage("MenuSave")); _mSave.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mSaveActionPerformed(evt); } @@ -454,7 +426,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mQuitWithoutSaving.setAccelerator(getAccelerator(KeyEvent.VK_E)); _mQuitWithoutSaving.setText(Bundle.getMessage("MenuExit")); _mQuitWithoutSaving.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mQuitWithoutSavingActionPerformed(evt); } @@ -468,7 +439,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mFindAndReplace.setAccelerator(getAccelerator(KeyEvent.VK_F)); _mFindAndReplace.setText(Bundle.getMessage("MenuFind")); _mFindAndReplace.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mFindAndReplaceActionPerformed(evt); } @@ -477,7 +447,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mFixErrors.setText(Bundle.getMessage("MenuFix")); _mFixErrors.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mFixErrorsActionPerformed(evt); } @@ -490,7 +459,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mDebugging.setText(Bundle.getMessage("MenuDebugging")); _mDebugging.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mDebuggingActionPerformed(evt); } @@ -499,7 +467,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mDefaults.setText(Bundle.getMessage("MenuDefaults")); _mDefaults.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mDefaultsActionPerformed(evt); } @@ -508,7 +475,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mFleeting.setText(Bundle.getMessage("MenuFleeting")); _mFleeting.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mFleetingActionPerformed(evt); } @@ -517,7 +483,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mPatterns.setText(Bundle.getMessage("MenuPatterns")); _mPatterns.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mPatternsActionPerformed(evt); } @@ -526,7 +491,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mGUIDesign.setText(Bundle.getMessage("MenuDesign")); _mGUIDesign.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mGUIDesignActionPerformed(evt); } @@ -539,7 +503,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { _mHelpAbout.setText(Bundle.getMessage("MenuAbout")); _mHelpAbout.addActionListener(new java.awt.event.ActionListener() { - @Override public void actionPerformed(java.awt.event.ActionEvent evt) { _mHelpAboutActionPerformed(evt); } @@ -619,10 +582,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(_mButtonWriteXMLFiles) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(deleteButton) - .addComponent(addButton, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(4, 4, 4) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(addButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(deleteButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(_mCheckEverythingWithJMRI)) .addComponent(changeNumbersButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(reapplyPatternsButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))