use layoutEditor's default track colors when invalid

JMRI · Mar 12, 2020 · 2c97940 · 2c97940
1 parent f1c0f79
commit 2c97940
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/java/src/jmri/jmrit/display/layoutEditor/LayoutBlock.java b/java/src/jmri/jmrit/display/layoutEditor/LayoutBlock.java
@@ -101,9 +101,9 @@ public void disableDeleteRouteLog() {
     private String occupancySensorName = "";
     private String memoryName = "";
     private int occupiedSense = Sensor.ACTIVE;
-    private Color blockTrackColor = Color.black;
-    private Color blockOccupiedColor = Color.black;
-    private Color blockExtraColor = Color.black;
+    private Color blockTrackColor = Color.darkGray;
+    private Color blockOccupiedColor = Color.red;
+    private Color blockExtraColor = Color.white;
 
     /*
      * Creates a LayoutBlock object.

diff --git a/java/src/jmri/jmrit/display/layoutEditor/configurexml/LayoutBlockManagerXml.java b/java/src/jmri/jmrit/display/layoutEditor/configurexml/LayoutBlockManagerXml.java
@@ -157,23 +157,23 @@ public void loadLayoutBlocks(Element layoutblocks) {
                     color = ColorUtil.stringToColor(e.getAttribute("trackcolor").getValue());
                     b.setBlockTrackColor(color);
                 } catch (IllegalArgumentException ex) {
-                    b.setBlockTrackColor(Color.BLACK);
-                    log.error("Invalid trackcolor {}; using black", e.getAttribute("trackcolor").getValue());
+                    b.setBlockTrackColor(Color.darkGray);
+                    log.error("Invalid trackcolor '{}'; using 'darkGray'", e.getAttribute("trackcolor").getValue());
                 }
                 try {
                     color = ColorUtil.stringToColor(e.getAttribute("occupiedcolor").getValue());
                     b.setBlockOccupiedColor(color);
                 } catch (IllegalArgumentException ex) {
-                    b.setBlockOccupiedColor(Color.BLACK);
-                    log.error("Invalid occupiedcolor {}; using black", e.getAttribute("occupiedcolor").getValue());
+                    b.setBlockOccupiedColor(Color.red);
+                    log.error("Invalid occupiedcolor '{}'; using 'red'", e.getAttribute("occupiedcolor").getValue());
                 }
                 Attribute a = e.getAttribute("extracolor");
                 if (a != null) {
                     try {
                         b.setBlockExtraColor(ColorUtil.stringToColor(a.getValue()));
                     } catch (IllegalArgumentException ex) {
-                        b.setBlockExtraColor(Color.BLACK);
-                        log.error("Invalid extracolor {}; using black", a.getValue());
+                        b.setBlockExtraColor(Color.white);
+                        log.error("Invalid extracolor '{}'; using 'white'", e.getAttribute("extracolor").getValue());
                     }
                 }
                 a = e.getAttribute("occupancysensor");

diff --git a/java/src/jmri/jmrit/display/layoutEditor/configurexml/LayoutEditorXml.java b/java/src/jmri/jmrit/display/layoutEditor/configurexml/LayoutEditorXml.java
@@ -590,26 +590,26 @@ public boolean load(Element shared, Element perNode) {
             try {
                 panel.setDefaultTrackColor(ColorUtil.stringToColor(a.getValue()));
             } catch (IllegalArgumentException e) {
-                panel.setDefaultTrackColor(Color.BLACK);
-                log.error("Invalid color {}; using black", a.getValue());
+                panel.setDefaultTrackColor(Color.darkGray);
+                log.error("Invalid defaulttrackcolor {}; using 'darkGray'", a.getValue());
             }
         }
         // set default occupied track color
         if ((a = shared.getAttribute("defaultoccupiedtrackcolor")) != null) {
             try {
                 panel.setDefaultOccupiedTrackColor(ColorUtil.stringToColor(a.getValue()));
             } catch (IllegalArgumentException e) {
-                panel.setDefaultOccupiedTrackColor(Color.BLACK);
-                log.error("Invalid color {}; using black", a.getValue());
+                panel.setDefaultOccupiedTrackColor(Color.red);
+                log.error("Invalid defaultoccupiedtrackcolor {}; using 'red'", a.getValue());
             }
         }
         // set default alternative track color
         if ((a = shared.getAttribute("defaultalternativetrackcolor")) != null) {
             try {
                 panel.setDefaultAlternativeTrackColor(ColorUtil.stringToColor(a.getValue()));
             } catch (IllegalArgumentException e) {
-                panel.setDefaultAlternativeTrackColor(Color.BLACK);
-                log.error("Invalid color {}; using black", a.getValue());
+                panel.setDefaultAlternativeTrackColor(Color.white);
+                log.error("Invalid defaultalternativetrackcolor {}; using 'white'", a.getValue());
             }
         }
         try {