use create TSLR exception message

JMRI · Apr 1, 2021 · e17e924 · e17e924
1 parent 3aea100
commit e17e924
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/java/src/jmri/jmrit/beantable/LightTableAction.java b/java/src/jmri/jmrit/beantable/LightTableAction.java
@@ -548,8 +548,9 @@ void createPressed(ActionEvent e) {
     }
 
     void handleCreateException(Exception ex, String sysName) {
+        status1.setText(ex.getLocalizedMessage());
         JOptionPane.showMessageDialog(addFrame,
-                Bundle.getMessage("ErrorLightAddFailed", sysName) + "\n" + Bundle.getMessage("ErrorAddFailedCheck"),
+                Bundle.getMessage("ErrorLightAddFailed", sysName) + "\n" + ex.getLocalizedMessage(),
                 Bundle.getMessage("ErrorTitle"),
                 JOptionPane.ERROR_MESSAGE);
     }

diff --git a/java/src/jmri/jmrit/beantable/ReporterTableAction.java b/java/src/jmri/jmrit/beantable/ReporterTableAction.java
@@ -391,11 +391,7 @@ void createPressed(ActionEvent e) {
                 r = reporterManager.provideReporter(rName);
             } catch (IllegalArgumentException ex) {
                 // user input no good
-                handleCreateException(rName); // displays message dialog to the user
-                // add to statusBarLabel as well
-                errorMessage = Bundle.getMessage("WarningInvalidEntry");
-                statusBarLabel.setText(errorMessage);
-                statusBarLabel.setForeground(Color.red);
+                handleCreateException(ex, rName); // displays message dialog to the user
                 return; // without creating
             }
 
@@ -462,9 +458,11 @@ private void canAddRange(ActionEvent e) {
         hardwareAddressValidator.verify(hardwareAddressTextField);
     }
 
-    void handleCreateException(String sysName) {
+    void handleCreateException(Exception ex, String sysName) {
+        statusBarLabel.setText(ex.getLocalizedMessage());
+        statusBarLabel.setForeground(Color.red);
         JOptionPane.showMessageDialog(addFrame,
-                Bundle.getMessage("ErrorReporterAddFailed", sysName) + "\n" + Bundle.getMessage("ErrorAddFailedCheck"),
+                Bundle.getMessage("ErrorReporterAddFailed", sysName) + "\n" + ex.getLocalizedMessage(),
                 Bundle.getMessage("ErrorTitle"),
                 JOptionPane.ERROR_MESSAGE);
     }

diff --git a/java/src/jmri/jmrit/beantable/SensorTableAction.java b/java/src/jmri/jmrit/beantable/SensorTableAction.java
@@ -218,11 +218,7 @@ void createPressed(ActionEvent e) {
                 s = InstanceManager.getDefault(SensorManager.class).provideSensor(sName);
             } catch (IllegalArgumentException ex) {
                 // user input no good
-                handleCreateException(sName);
-                // Show error message in statusBarLabel
-                errorMessage = Bundle.getMessage("WarningInvalidEntry");
-                statusBarLabel.setText(errorMessage);
-                statusBarLabel.setForeground(Color.gray);
+                handleCreateException(ex, sName);
                 return;   // return without creating
             }
 
@@ -291,9 +287,10 @@ private void canAddRange(ActionEvent e) {
         hardwareAddressValidator.verify(hardwareAddressTextField);
     }
 
-    void handleCreateException(String hwAddress) {
+    void handleCreateException(Exception ex, String hwAddress) {
+        statusBarLabel.setText(ex.getLocalizedMessage());
         JOptionPane.showMessageDialog(addFrame,
-                Bundle.getMessage("ErrorSensorAddFailed", hwAddress) + "\n" + Bundle.getMessage("ErrorAddFailedCheck"),
+                Bundle.getMessage("ErrorSensorAddFailed", hwAddress) + "\n" + ex.getLocalizedMessage(),
                 Bundle.getMessage("ErrorTitle"),
                 JOptionPane.ERROR_MESSAGE);
     }

diff --git a/java/src/jmri/jmrit/beantable/TurnoutTableAction.java b/java/src/jmri/jmrit/beantable/TurnoutTableAction.java
@@ -560,10 +560,6 @@ void createPressed(ActionEvent e) {
                 } catch (IllegalArgumentException ex) {
                     // user input no good
                     handleCreateException(ex, sName); // displays message dialog to the user
-                    // add to statusBarLabel as well
-                    errorMessage = Bundle.getMessage("WarningInvalidEntry");
-                    statusBarLabel.setText(errorMessage);
-                    statusBarLabel.setForeground(Color.red);
                     return; // without creating
                 }
                 if ((uName != null) && !uName.isEmpty()) {
@@ -650,18 +646,18 @@ private void canAddRange(ActionEvent e) {
 
     void handleCreateException(Exception ex, String sysName) {
         if (ex.getMessage() != null) {
+            statusBarLabel.setText(ex.getLocalizedMessage());
             JOptionPane.showMessageDialog(addFrame,
-                    ex.getMessage(),
+                    ex.getLocalizedMessage(),
                     Bundle.getMessage("ErrorTitle"),
                     JOptionPane.ERROR_MESSAGE);
         } else {
+            statusBarLabel.setText(Bundle.getMessage("WarningInvalidRange"));
             JOptionPane.showMessageDialog(addFrame,
                     Bundle.getMessage("ErrorTurnoutAddFailed", sysName) + "\n" + Bundle.getMessage("ErrorAddFailedCheck"),
                     Bundle.getMessage("ErrorTitle"),
                     JOptionPane.ERROR_MESSAGE);
         }
-        // provide feedback to uName
-        statusBarLabel.setText(Bundle.getMessage("WarningInvalidRange"));
         statusBarLabel.setForeground(Color.red);
     }