Changeset 22704 in osm for applications/editors/josm/plugins/toms/src

Timestamp:

2010-08-20T13:34:48+02:00 (14 years ago)

Author:

malcolmh

Message:

release candidate

Location:

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

Files:

• dialogs/SmpDialogAction.java (modified) (1 diff)
• seamarks/buoys/Buoy.java (modified) (2 diffs)
• seamarks/buoys/BuoyCard.java (modified) (3 diffs)
• seamarks/buoys/BuoyIsol.java (modified) (2 diffs)

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

@@ -893 +893 @@
                         lM01StyleOfMark.setBounds(new Rectangle(5, 90, 148, 16));
                         lM01StyleOfMark.setFont(new Font("Dialog", Font.PLAIN, 12));
-                        lM01StyleOfMark.setText("Style:");
+                        lM01StyleOfMark.setText("Shape:");
 
                         lM01TypeOfMark = new JLabel();

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

@@ -155 +155 @@
                         setErrMsg(null);
                 } else {
-                        setErrMsg("Als Periodendauer sind nur Zahlen erlaubt");
+                        setErrMsg("Must be a number");
                         dlg.tfM01RepeatTime.requestFocus();
                 }
@@ -294 +294 @@
 
         protected void saveLightData(String colour) {
-                if (colour.compareTo("") == 0) {
+                if (colour.equals("")) {
                         return;
                 }

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

@@ -213 +213 @@
                         }
 
-                        if (str.compareTo("white") == 0) {
+                        if (str.equals("white")) {
                                 setFired(true);
                                 setLightColour("W");
@@ -244 +244 @@
                         str = keys.get("seamark:buoy_cardinal:shape");
 
-                        if (str.compareTo("pillar") == 0)
+                        if (str.equals("pillar"))
                                 setStyleIndex(CARD_PILLAR);
-                        else if (str.compareTo("spar") == 0)
+                        else if (str.equals("spar"))
                                 setStyleIndex(CARD_SPAR);
                         else
@@ -254 +254 @@
                                 str = keys.get("seamark:beacon_cardinal:shape");
 
-                                if (str.compareTo("tower") == 0)
+                                if (str.equals("tower"))
                                         setStyleIndex(CARD_TOWER);
                                 else

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

@@ -233 +233 @@
                         str = keys.get("seamark:buoy_isolated_danger:shape");
 
-                        if (str.compareTo("pillar") == 0)
+                        if (str.equals("pillar"))
                                 setStyleIndex(ISOL_PILLAR);
-                        else if (str.compareTo("spar") == 0)
+                        else if (str.equals("spar"))
                                 setStyleIndex(ISOL_SPAR);
                         else
@@ -243 +243 @@
                                 str = keys.get("seamark:beacon_isolated_danger:shape");
 
-                                if (str.compareTo("tower") == 0)
+                                if (str.equals("tower"))
                                         setStyleIndex(ISOL_TOWER);
                                 else