Changeset 22557 in osm for applications

Timestamp:

2010-08-03T18:33:20+02:00 (14 years ago)

Author:

malcolmh

Message:

daily

Location:

applications/editors/josm/plugins/toms/src

Files:

• images/shapes.xcf (modified) ( previous)
• toms/dialogs/SmpDialogAction.java (modified) (2 diffs)
• toms/seamarks/SeaMark.java (modified) (1 diff)
• toms/seamarks/buoys/BuoyIsol.java (modified) (1 diff)
• toms/seamarks/buoys/BuoyLat.java (modified) (8 diffs)
• toms/seamarks/buoys/BuoyNota.java (modified) (4 diffs)
• toms/seamarks/buoys/BuoySpec.java (modified) (6 diffs)

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

@@ -712 +712 @@
 
                         lM01Icon03 = new JLabel();
-                        lM01Icon03.setBounds(new Rectangle(205, 130, 60, 70));
+                        lM01Icon03.setBounds(new Rectangle(205, 135, 70, 60));
                         lM01Icon03.setIcon(null);
                         lM01Icon03.setText("");
@@ -1245 +1245 @@
                                         buoy.setLightChar(c);
                                         buoy.setLightGroup(g);
-//                                      buoy.setLightColour();
+                                        // buoy.setLightColour();
 
                                         buoy.paintSign();

applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java

@@ -91 +91 @@
         public final static int LIGHT_MAJOR = 1;
         public final static int LIGHT_MINOR = 2;
+        public final static int LIGHT_FLOAT = 3;
+        public final static int LIGHT_HOUSE = 4;
 
         /**

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

@@ -117 +117 @@
                 case ISOL_BEACON:
                         Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                        "seamark:buoy_isolated_danger:shape", "beacon"));
+                                        "seamark:beacon_isolated_danger:shape", "stake"));
                         break;
                 default:

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

@@ -488 +488 @@
                                 super.saveSign("beacon_lateral");
                                 Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                                "seamark:buoy_lateral:shape", "beacon"));
+                                                "seamark:buoy_lateral:shape", "stake"));
                                 break;
                         case LAT_TOWER:
@@ -563 +563 @@
                                 super.saveSign("beacon_lateral");
                                 Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                                "seamark:buoy_lateral:shape", "beacon"));
+                                                "seamark:buoy_lateral:shape", "stake"));
                                 break;
                         case LAT_TOWER:
@@ -621 +621 @@
                                 super.saveSign("buoy_lateral");
                                 Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                                "seamark:buoy_lateral:shape", "cone"));
+                                                "seamark:buoy_lateral:shape", "conical"));
                                 break;
                         case LAT_PILLAR:
@@ -636 +636 @@
                                 super.saveSign("beacon_lateral");
                                 Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                                "seamark:buoy_lateral:shape", "beacon"));
+                                                "seamark:buoy_lateral:shape", "stake"));
                                 break;
                         case LAT_TOWER:
@@ -695 +695 @@
                                 super.saveSign("buoy_lateral");
                                 Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                                "seamark:buoy_lateral:shape", "cone"));
+                                                "seamark:buoy_lateral:shape", "conical"));
                                 break;
                         case LAT_PILLAR:
@@ -710 +710 @@
                                 super.saveSign("beacon_lateral");
                                 Main.main.undoRedo.add(new ChangePropertyCommand(node,
-                                                "seamark:buoy_lateral:shape", "beacon"));
+                                                "seamark:buoy_lateral:shape", "stake"));
                                 break;
                         case LAT_TOWER:
@@ -939 +939 @@
 
                         case STARBOARD_HAND:
-                                if (str.compareTo("cone") == 0)
+                                if (str.compareTo("conical") == 0)
                                         setStyleIndex(LAT_CONE);
                                 else if (str.compareTo("pillar") == 0)
@@ -954 +954 @@
 
                         case PREF_STARBOARD_HAND:
-                                if (str.compareTo("cone") == 0)
+                                if (str.compareTo("conical") == 0)
                                         setStyleIndex(LAT_CONE);
                                 else if (str.compareTo("pillar") == 0)

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

@@ -57 +57 @@
                 dlg.cbM01StyleOfMark.addItem("Major Light");
                 dlg.cbM01StyleOfMark.addItem("Minor Light");
+                dlg.cbM01StyleOfMark.addItem("Light Float");
+                dlg.cbM01StyleOfMark.addItem("Lighthouse");
 
                 if (style >= dlg.cbM01StyleOfMark.getItemCount())
@@ -79 +81 @@
                 switch (getStyleIndex()) {
                 case SeaMark.LIGHT_MAJOR:
+                case SeaMark.LIGHT_HOUSE:
                         dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
                                         "/images/Light_Major.png")));
@@ -86 +89 @@
                         dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
                                         "/images/Light_Minor.png")));
+                        break;
+
+                case SeaMark.LIGHT_FLOAT:
+                        dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
+                                        "/images/Major_Float.png")));
                         break;
 
@@ -116 +124 @@
                 case LIGHT_MINOR:
                         super.saveSign("minor_light");
+                        break;
+                case LIGHT_FLOAT:
+                        super.saveSign("major_floating_light");
                         break;
                 default:

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

@@ -23 +23 @@
                 dlg.cbM01StyleOfMark.addItem("Pillar Buoy");
                 dlg.cbM01StyleOfMark.addItem("Spar Buoy");
-                dlg.cbM01StyleOfMark.addItem("Beacon Buoy");
+                dlg.cbM01StyleOfMark.addItem("Beacon");
                 dlg.cbM01StyleOfMark.addItem("Sphere Buoy");
                 dlg.cbM01StyleOfMark.addItem("Barrel");
@@ -65 +65 @@
                 case SPEC_BEACON:
                         if (isFired())
-                        dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
-                                        "/images/Special_Purpose_Beacon_Lit.png")));
+                                dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
+                                                "/images/Special_Purpose_Beacon_Lit.png")));
                         else
                                 dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
-                                "/images/Special_Purpose_Beacon.png")));
+                                                "/images/Special_Purpose_Beacon.png")));
                         break;
                 case SPEC_SPHERE:
@@ -91 +91 @@
                                 c = "";
                 }
-                
+
                 switch (getStyleIndex()) {
                 case SPEC_PILLAR:
@@ -115 +115 @@
                 }
 
-                super.saveSign("buoy_special_purpose");
+                if (getStyleIndex() == SPEC_BEACON)
+                        super.saveSign("beacon_special_purpose");
+                else
+                        super.saveSign("buoy_special_purpose");
 
                 switch (getStyleIndex()) {
@@ -129 +132 @@
                         Main.main.undoRedo.add(new ChangePropertyCommand(node,
                                         "seamark:buoy_special_purpose:shape", "sphere"));
+                        break;
+                case SPEC_BEACON:
+                        Main.main.undoRedo.add(new ChangePropertyCommand(node,
+                                        "seamark:beacon_special_purpose:shape", "stake"));
                         break;
                 case SPEC_BARREL:
@@ -224 +231 @@
                 if (keys.containsKey("seamark:buoy_special_purpose:shape")) {
                         str = keys.get("seamark:buoy_special_purpose:shape");
-                        
+
                         if (str.compareTo("pillar") == 0)
                                 setStyleIndex(SPEC_PILLAR);