Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23108)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23109)
@@ -216,5 +216,5 @@
 		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,5 +222,5 @@
 		}
 		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,5 +1157,5 @@
 						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,10 +1164,10 @@
 						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);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23108)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23109)
@@ -236,17 +236,18 @@
 		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,14 +263,14 @@
 
 	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,5 +420,5 @@
 				}
 
-				if (!getLightGroup().equals(""))
+				if (!getLightGroup().isEmpty())
 					c = c + "(" + getLightGroup() + ")";
 				if (tmp != null)
@@ -426,10 +427,33 @@
 				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,5 +501,5 @@
 
 		String str = dlg.tfM01Name.getText();
-		if (str.compareTo("") != 0)
+		if (!str.isEmpty())
 			Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:name",
 					str));
@@ -485,5 +509,5 @@
 
 	protected void saveLightData(String colour) {
-		if (colour.equals("")) {
+		if (colour.isEmpty()) {
 			return;
 		}
@@ -537,5 +561,5 @@
 				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,8 +613,8 @@
 					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()));
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23108)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23109)
@@ -70,5 +70,5 @@
 			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);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23108)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23109)
@@ -82,5 +82,5 @@
 			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);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23108)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23109)
@@ -54,36 +54,12 @@
 			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()) {