Changeset 23109 in osm for applications/editors/josm/plugins/toms

Timestamp:

2010-09-11T09:49:36+02:00 (14 years ago)

Author:

malcolmh

Message:

more lights

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (4 diffs)
• seamarks/buoys/Buoy.java (modified) (8 diffs)
• seamarks/buoys/BuoyCard.java (modified) (1 diff)
• seamarks/buoys/BuoyLat.java (modified) (1 diff)
• seamarks/buoys/BuoyNota.java (modified) (1 diff)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -216 +216 @@
                 String str = Main.pref.get("mappaint.style.sources"); //$NON-NLS-1$
                 if (!str.contains("dev.openseamap.org")) { //$NON-NLS-1$
-                        if (!str.equals("")) //$NON-NLS-1$
+                        if (!str.isEmpty()) //$NON-NLS-1$
                                 str += new String(new char[] { 0x1e });
                         Main.pref.put("mappaint.style.sources", str //$NON-NLS-1$
@@ -222 +222 @@
                 }
                 str = Main.pref.get("color.background"); //$NON-NLS-1$
-                if (str.equals("#000000") || str.equals("")) //$NON-NLS-1$ //$NON-NLS-2$
+                if (str.equals("#000000") || str.isEmpty()) //$NON-NLS-1$ //$NON-NLS-2$
                         Main.pref.put("color.background", "#606060"); //$NON-NLS-1$ //$NON-NLS-2$
         }
@@ -1157 +1157 @@
                                                 if (i1 >= 0) {
                                                         g = it.substring(i1 + 1, i2);
-                                                        if (g.equals("")) //$NON-NLS-1$
+                                                        if (g.isEmpty()) //$NON-NLS-1$
                                                                 tfM01Group.setEnabled(true);
                                                 }
@@ -1164 +1164 @@
                                                 i1 = it.indexOf("+"); //$NON-NLS-1$
                                                 i2 = it.length();
-                                                if (c.equals("")) //$NON-NLS-1$
+                                                if (c.isEmpty()) //$NON-NLS-1$
                                                         c = it;
                                                 else
                                                         c = c + it.substring(i1, i2);
                                         }
-                                        if (c.equals("")) //$NON-NLS-1$
+                                        if (c.isEmpty()) //$NON-NLS-1$
                                                 c = it;
                                         buoy.setLightChar(c);

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java

@@ -236 +236 @@
                 String regex = "^[\\d\\s.]+$";
 
-                if (lightPeriod.length() == 0)
-                        lightPeriod = " ";
-
-                Pattern pat = Pattern.compile(regex);
-                Matcher matcher = pat.matcher(lightPeriod);
-
-                if (matcher.find()) {
-                        LightPeriod[getSectorIndex()] = lightPeriod;
-                        setErrMsg(null);
-                } else {
-                        setErrMsg("Must be a number");
-                        dlg.tfM01RepeatTime.requestFocus();
-                }
+                if (!lightPeriod.isEmpty()) {
+
+                        Pattern pat = Pattern.compile(regex);
+                        Matcher matcher = pat.matcher(lightPeriod);
+
+                        if (matcher.find()) {
+                                setErrMsg(null);
+                        } else {
+                                setErrMsg("Must be a number");
+                                lightPeriod = "";
+                                dlg.tfM01RepeatTime.requestFocus();
+                        }
+                }
+                LightPeriod[getSectorIndex()] = lightPeriod;
         }
 
@@ -262 +263 @@
 
         public void parseLights(Map<String, String> k) {
-    Iterator it = k.entrySet().iterator();
-    while (it.hasNext()) {
-        String key = (String)((Map.Entry)it.next()).getKey();
-        if (key.contains("seamark:light:")) {
-          String value = ((String)((Map.Entry)it.next()).getValue()).trim();
-                
-        }
-    }
-}
-        
+                Iterator it = k.entrySet().iterator();
+                while (it.hasNext()) {
+                        String key = (String) ((Map.Entry) it.next()).getKey();
+                        if (key.contains("seamark:light:")) {
+                                String value = ((String) ((Map.Entry) it.next()).getValue()).trim();
+
+                        }
+                }
+        }
+
         private Node Node = null;
 
@@ -419 +420 @@
                                 }
 
-                                if (!getLightGroup().equals(""))
+                                if (!getLightGroup().isEmpty())
                                         c = c + "(" + getLightGroup() + ")";
                                 if (tmp != null)
@@ -426 +427 @@
                                 c = c + " " + getLightColour();
                                 lp = getLightPeriod();
-                                if (!lp.equals(""))
+                                if (!lp.isEmpty())
                                         c = c + " " + lp + "s";
                                 dlg.lM01FireMark.setText(c);
+
+                                dlg.cM01Fired.setVisible(true);
+                                dlg.cM01Fired.setEnabled(false);
+                                dlg.cM01Fired.setSelected(true);
+                                dlg.lM01Kennung.setVisible(true);
+                                dlg.cbM01Kennung.setVisible(true);
+                                dlg.lM01Group.setVisible(true);
+                                dlg.tfM01Group.setVisible(true);
+                                dlg.lM01RepeatTime.setVisible(true);
+                                dlg.tfM01RepeatTime.setVisible(true);
+                                if (isSectored()) {
+                                        dlg.lM01Sector.setVisible(true);
+                                        dlg.cbM01Sector.setVisible(true);
+                                        dlg.lM01Bearing.setVisible(true);
+                                        dlg.tfM01Bearing.setVisible(true);
+                                        dlg.tfM02Bearing.setVisible(true);
+                                        dlg.tfM01Radius.setVisible(true);
+                                } else {
+                                        dlg.lM01Sector.setVisible(false);
+                                        dlg.cbM01Sector.setVisible(false);
+                                        dlg.lM01Bearing.setVisible(false);
+                                        dlg.tfM01Bearing.setVisible(false);
+                                        dlg.tfM02Bearing.setVisible(false);
+                                        dlg.tfM01Radius.setVisible(false);
+                                }
                         } else {
-                                dlg.tfM01RepeatTime.setEnabled(false);
-                                dlg.cbM01Kennung.setEnabled(false);
                                 dlg.lM01FireMark.setText("");
                         }
@@ -477 +501 @@
 
                 String str = dlg.tfM01Name.getText();
-                if (str.compareTo("") != 0)
+                if (!str.isEmpty())
                         Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:name",
                                         str));
@@ -485 +509 @@
 
         protected void saveLightData(String colour) {
-                if (colour.equals("")) {
+                if (colour.isEmpty()) {
                         return;
                 }
@@ -537 +561 @@
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:radar_transponder:category", "racon"));
-                                if (!getRaconGroup().equals(""))
+                                if (!getRaconGroup().isEmpty())
                                         Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                         "seamark:radar_transponder:group", getRaconGroup()));
@@ -589 +613 @@
                                         break;
                                 }
-                                if (!getFogGroup().equals(""))
+                                if (!getFogGroup().isEmpty())
                                         Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                         "seamark:fog_group:group", getFogGroup()));
-                                if (!getFogPeriod().equals(""))
+                                if (!getFogPeriod().isEmpty())
                                         Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                         "seamark:fog_period:group", getFogPeriod()));

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java

@@ -70 +70 @@
                         col = keys.get("seamark:light_float:colour"); //$NON-NLS-1$
 
-                if (cat.equals("")) { //$NON-NLS-1$
+                if (cat.isEmpty()) { //$NON-NLS-1$
                         if (col.equals("black;yellow")) { //$NON-NLS-1$
                                 setBuoyIndex(CARD_NORTH);

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java

@@ -82 +82 @@
                         cat = keys.get("seamark:beacon_lateral:category"); //$NON-NLS-1$
 
-                if (cat.equals("")) { //$NON-NLS-1$
+                if (cat.isEmpty()) { //$NON-NLS-1$
                         if (col.equals("red")) { //$NON-NLS-1$
                                 setColour(RED);

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java

@@ -54 +54 @@
                         dlg.cM01Fog.setVisible(true);
 
-                        dlg.cM01Fired.setVisible(true);
-                        dlg.cM01Fired.setEnabled(false);
-                        dlg.cM01Fired.setSelected(true);
                         dlg.rbM01Fired1.setVisible(true);
                         dlg.rbM01FiredN.setVisible(true);
-                        dlg.lM01Kennung.setVisible(true);
-                        dlg.cbM01Kennung.setVisible(true);
                         dlg.lM01Height.setVisible(true);
                         dlg.tfM01Height.setVisible(true);
                         dlg.lM01Range.setVisible(true);
                         dlg.tfM01Range.setVisible(true);
-                        dlg.lM01Group.setVisible(true);
-                        dlg.tfM01Group.setVisible(true);
-                        dlg.lM01RepeatTime.setVisible(true);
-                        dlg.tfM01RepeatTime.setVisible(true);
                         dlg.lM01Colour.setVisible(true);
                         dlg.cbM01Colour.setVisible(true);
-                        if (isSectored()) {
-                                dlg.lM01Sector.setVisible(true);
-                                dlg.cbM01Sector.setVisible(true);
-                                dlg.lM01Bearing.setVisible(true);
-                                dlg.tfM01Bearing.setVisible(true);
-                                dlg.tfM02Bearing.setVisible(true);
-                                dlg.tfM01Radius.setVisible(true);
-                        } else {
-                                dlg.lM01Sector.setVisible(false);
-                                dlg.cbM01Sector.setVisible(false);
-                                dlg.lM01Bearing.setVisible(false);
-                                dlg.tfM01Bearing.setVisible(false);
-                                dlg.tfM02Bearing.setVisible(false);
-                                dlg.tfM01Radius.setVisible(false);
-                        }
 
                         switch (getBuoyIndex()) {