Changeset 27442 in osm for applications/editors/josm

Timestamp:

2012-01-14T10:38:26+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam

Files:

• panels/PanelLights.java (modified) (6 diffs)
• panels/PanelMain.java (modified) (1 diff)
• seamarks/SeaMark.java (modified) (7 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java

@@ -133 +133 @@
                         platformCatBox.setVisible(false);
                         pilotCatBox.setVisible(false);
+                        rescueCatBox.setVisible(false);
                         dlg.panelMain.mark.setCategory(Cat.NOCAT);
                         if (landButton.isSelected()) {
@@ -154 +155 @@
                                 pilotCatBox.setVisible(true);
                                 alPilotCatBox.actionPerformed(null);
+                        } else if (rescueButton.isSelected()) {
+                                categoryLabel.setVisible(true);
+                                rescueCatBox.setVisible(true);
+                                alRescueCatBox.actionPerformed(null);
                         }
                         dlg.panelMain.mark.testValid();
@@ -273 +278 @@
                 addPTItem(Messages.getString("FromShore"), Cat.PIL_SHORE);
                 pilotCatBox.setVisible(false);
+
+                rescueCatBox = new JComboBox();
+                rescueCatBox.setBounds(new Rectangle(5, 130, 160, 20));
+                add(rescueCatBox);
+                rescueCatBox.addActionListener(alRescueCatBox);
+                addRSItem("", Cat.NOCAT);
+                addRSItem(Messages.getString("Lifeboat"), Cat.RSC_LFB);
+                rescueCatBox.setVisible(false);
         }
 
@@ -282 +295 @@
                 platformCatBox.setVisible(false);
                 pilotCatBox.setVisible(false);
+                rescueCatBox.setVisible(false);
                 if ((dlg.panelMain.mark.getObject() == Obj.LNDMRK) && (dlg.panelMain.mark.getCategory() != Cat.NOCAT)) {
                         categoryLabel.setVisible(true);
@@ -322 +336 @@
                                         pilotCatBox.setSelectedIndex(item);
                         }
-                } else {
+                } else if (dlg.panelMain.mark.getObject() == Obj.RSCSTA) {
+                        categoryLabel.setVisible(true);
+                        rescueCatBox.setVisible(true);
+                        for (Cat cat : rescueCats.keySet()) {
+                                int item = rescueCats.get(cat);
+                                if (dlg.panelMain.mark.getCategory() == cat)
+                                        rescueCatBox.setSelectedIndex(item);
+                        }
                 }
                 for (Obj obj : objects.keySet()) {
@@ -354 +375 @@
                 pilotCats.put(cat, pilotCatBox.getItemCount());
                 pilotCatBox.addItem(str);
+        }
+
+        private void addRSItem(String str, Cat cat) {
+                rescueCats.put(cat, rescueCatBox.getItemCount());
+                rescueCatBox.addItem(str);
         }
 

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java

@@ -311 +311 @@
                                 break;
                         case LGT:
-                        case SIS:
+                        case STN:
                         case PLF:
-                        case CGS:
-                        case PLT:
                                 lightsButton.setBorderPainted(true);
                                 panelLights.setVisible(true);

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -137 +137 @@
 
         public enum Ent {
-                BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM,
-                COASTGUARD, PILOT
+                BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM
         }
 
@@ -169 +168 @@
                 EntMAP.put(Obj.SISTAW, Ent.STATION);
                 EntMAP.put(Obj.SISTAT, Ent.STATION);
-                EntMAP.put(Obj.CGUSTA, Ent.COASTGUARD);
-                EntMAP.put(Obj.PILBOP, Ent.PILOT);
+                EntMAP.put(Obj.CGUSTA, Ent.STATION);
+                EntMAP.put(Obj.PILBOP, Ent.STATION);
+                EntMAP.put(Obj.RSCSTA, Ent.STATION);
         }
 
         public enum Grp {
-                NUL, LAT, CAR, SAW, ISD, SPP, LGT, SIS, PLF, CGS, PLT
+                NUL, LAT, CAR, SAW, ISD, SPP, LGT, STN, PLF
         }
 
@@ -204 +204 @@
                 GrpMAP.put(Obj.BOYINB, Grp.SPP);
                 GrpMAP.put(Obj.OFSPLF, Grp.PLF);
-                GrpMAP.put(Obj.SISTAW, Grp.SIS);
-                GrpMAP.put(Obj.SISTAT, Grp.SIS);
-                GrpMAP.put(Obj.CGUSTA, Grp.CGS);
-                GrpMAP.put(Obj.PILBOP, Grp.PLT);
+                GrpMAP.put(Obj.SISTAW, Grp.STN);
+                GrpMAP.put(Obj.SISTAT, Grp.STN);
+                GrpMAP.put(Obj.CGUSTA, Grp.STN);
+                GrpMAP.put(Obj.PILBOP, Grp.STN);
+                GrpMAP.put(Obj.RSCSTA, Grp.STN);
         }
 
@@ -222 +223 @@
                 LMK_MAST, LMK_WNDS, LMK_CLMN, LMK_OBLK, LMK_STAT, LMK_CROS, LMK_DOME, LMK_SCNR, LMK_WNDL, LMK_SPIR,
                 OFP_OIL, OFP_PRD, OFP_OBS, OFP_ALP, OFP_SALM, OFP_MOR, OFP_ISL, OFP_FPSO, OFP_ACC, OFP_NCCB,
-                PIL_VESS, PIL_HELI, PIL_SHORE
-        }
-
+                PIL_VESS, PIL_HELI, PIL_SHORE, RSC_LFB, RSC_RKT, RSC_RSW, RSC_RIT, RSC_MLB, RSC_RAD, RSC_FAE, RSC_SPL, RSC_AIR, RSC_TUG
+        }
+                 
         public static final EnumMap<Cat, String> CatSTR = new EnumMap<Cat, String>(Cat.class);
         static {
@@ -320 +321 @@
                 CatSTR.put(Cat.PIL_HELI, "helicopter");
                 CatSTR.put(Cat.PIL_SHORE, "from_shore");
+                CatSTR.put(Cat.RSC_LFB, "lifeboat");
+                CatSTR.put(Cat.RSC_RKT, "rocket");
+                CatSTR.put(Cat.RSC_RSW, "refuge_shipwrecked");
+                CatSTR.put(Cat.RSC_RIT, "refuge_intertidal");
+                CatSTR.put(Cat.RSC_MLB, "lifeboat_moored");
+                CatSTR.put(Cat.RSC_RAD, "radio");
+                CatSTR.put(Cat.RSC_FAE, "firstaid");
+                CatSTR.put(Cat.RSC_SPL, "seaplane");
+                CatSTR.put(Cat.RSC_AIR, "aircraft");
+                CatSTR.put(Cat.RSC_TUG, "tug");
         }
 
@@ -1157 +1168 @@
                 case BOYINB:
                 case PILBOP:
+                case RSCSTA:
                         tmp = true;
                         break;
@@ -1943 +1955 @@
                         case PILBOP:
                                 imgStr += "Pilot";
+                                break;
+                        case RSCSTA:
+                                imgStr += "Rescue";
                                 break;
                         }