Changeset 23410 in osm for applications/editors/josm

Timestamp:

2010-09-30T09:36:20+02:00 (14 years ago)

Author:

malcolmh

Message:

sync

Location:

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

Files:

• dialogs/SmpDialogAction.java (modified) (9 diffs)
• seamarks/buoys/BuoyCard.java (modified) (1 diff)

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

@@ -382 +382 @@
                 if (keys.containsKey("seamark:type")) //$NON-NLS-1$
                         type = keys.get("seamark:type"); //$NON-NLS-1$
-                
+
                 if (type.equals("buoy_lateral") || type.equals("beacon_lateral")) { //$NON-NLS-1$ //$NON-NLS-2$
                         buoy = new BuoyLat(this, node);
@@ -833 +833 @@
 
                                         case SeaMark.UNKNOWN_TYPE:
-                                                if (!(buoy instanceof BuoyUkn))
+                                                if (!(buoy instanceof BuoyUkn)) {
+                                                        buoy = null;
                                                         buoy = new BuoyUkn(dia, Messages.getString("SmpDialogAction.150")); //$NON-NLS-1$
+                                                }
                                                 buoy.setBuoyIndex(0);
                                                 break;
@@ -840 +842 @@
                                         case SeaMark.LATERAL:
                                                 if (!(buoy instanceof BuoyLat)) {
+                                                        buoy = null;
                                                         buoy = new BuoyLat(dia, n);
                                                         buoy.setBuoyIndex(0);
@@ -847 +850 @@
                                         case SeaMark.CARDINAL:
                                                 if (!(buoy instanceof BuoyCard)) {
+                                                        buoy = null;
                                                         buoy = new BuoyCard(dia, n);
                                                         buoy.setBuoyIndex(0);
@@ -854 +858 @@
                                         case SeaMark.SAFE_WATER:
                                                 if (!(buoy instanceof BuoySaw)) {
+                                                        buoy = null;
                                                         buoy = new BuoySaw(dia, n);
                                                 }
@@ -861 +866 @@
                                         case SeaMark.ISOLATED_DANGER:
                                                 if (!(buoy instanceof BuoyIsol)) {
+                                                        buoy = null;
                                                         buoy = new BuoyIsol(dia, n);
                                                 }
@@ -868 +874 @@
                                         case SeaMark.SPECIAL_PURPOSE:
                                                 if (!(buoy instanceof BuoySpec)) {
+                                                        buoy = null;
                                                         buoy = new BuoySpec(dia, n);
                                                 }
@@ -875 +882 @@
                                         case SeaMark.LIGHT:
                                                 if (!(buoy instanceof BuoyNota)) {
+                                                        buoy = null;
                                                         buoy = new BuoyNota(dia, n);
                                                         buoy.setBuoyIndex(0);
@@ -881 +889 @@
                                         }
 
-                                        buoy.refreshStyles();
                                         buoy.refreshLights();
                                         buoy.setLightColour();

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

@@ -142 +142 @@
         }
 
-        public void refreshLights() {
+                public void refreshLights() {
                 dlg.cbM01Kennung.removeAllItems();
                 dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$