Index: applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22703)
+++ applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22704)
@@ -893,5 +893,5 @@
 			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();
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 22703)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 22704)
@@ -155,5 +155,5 @@
 			setErrMsg(null);
 		} else {
-			setErrMsg("Als Periodendauer sind nur Zahlen erlaubt");
+			setErrMsg("Must be a number");
 			dlg.tfM01RepeatTime.requestFocus();
 		}
@@ -294,5 +294,5 @@
 
 	protected void saveLightData(String colour) {
-		if (colour.compareTo("") == 0) {
+		if (colour.equals("")) {
 			return;
 		}
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 22703)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 22704)
@@ -213,5 +213,5 @@
 			}
 
-			if (str.compareTo("white") == 0) {
+			if (str.equals("white")) {
 				setFired(true);
 				setLightColour("W");
@@ -244,7 +244,7 @@
 			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,5 +254,5 @@
 				str = keys.get("seamark:beacon_cardinal:shape");
 
-				if (str.compareTo("tower") == 0)
+				if (str.equals("tower"))
 					setStyleIndex(CARD_TOWER);
 				else
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 22703)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 22704)
@@ -233,7 +233,7 @@
 			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,5 +243,5 @@
 				str = keys.get("seamark:beacon_isolated_danger:shape");
 
-				if (str.compareTo("tower") == 0)
+				if (str.equals("tower"))
 					setStyleIndex(ISOL_TOWER);
 				else