Changeset 26903 in osm for applications/editors/josm

Timestamp:

2011-10-18T19:57:18+02:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• msg/messages.properties (modified) (1 diff)
• panels/PanelCol.java (modified) (1 diff)
• panels/PanelMore.java (modified) (2 diffs)
• seamarks/SeaMark.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

@@ -175 +175 @@
 Source=Source
 Elevation=Elevation
-StructureHeight=Structure Height
+Visibility=Visibility
+Reflectivity=Reflectivity
+Construction=Construction
 
+NotSet=Not set

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

@@ -129 +129 @@
 
                         stack = new JPanel();
-                        stack.setBorder(BorderFactory.createLoweredBevelBorder());
+                        stack.setBorder(BorderFactory.createLineBorder(Color.black, 2));
                         stack.setBounds(38, 87, 34, 64);
                         stack.setLayout(null);

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

@@ -51 +51 @@
         public JLabel statusLabel;
         public JComboBox statusBox;
+        public EnumMap<Sts, Integer> statuses = new EnumMap<Sts, Integer>(Sts.class);
         private ActionListener alStatus = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        if (dlg.mark == null)
-                                return;
+                        for (Sts sts : statuses.keySet()) {
+                                int idx = statuses.get(sts);
+                                if (dlg.mark != null && (idx == statusBox.getSelectedIndex()))
+                                        dlg.mark.setStatus(sts);
+                        }
                 }
         };
@@ -194 +198 @@
                 elevBox.addActionListener(alElev);
 
-                heightLabel = new JLabel(Messages.getString("StructureHeight"), SwingConstants.CENTER);
-                heightLabel.setBounds(new Rectangle(230, 0, 100, 20));
+                heightLabel = new JLabel(Messages.getString("Height"), SwingConstants.CENTER);
+                heightLabel.setBounds(new Rectangle(140, 40, 90, 20));
                 this.add(heightLabel, null);
                 heightBox = new JTextField();
-                heightBox.setBounds(new Rectangle(250, 20, 50, 20));
+                heightBox.setBounds(new Rectangle(160, 60, 50, 20));
                 this.add(heightBox, null);
                 heightBox.addActionListener(alHeight);
 
                 sourceLabel = new JLabel(Messages.getString("Source"), SwingConstants.CENTER);
-                sourceLabel.setBounds(new Rectangle(110, 120, 140, 20));
+                sourceLabel.setBounds(new Rectangle(110, 80, 130, 20));
                 this.add(sourceLabel, null);
                 sourceBox = new JTextField();
-                sourceBox.setBounds(new Rectangle(110, 100, 140, 20));
+                sourceBox.setBounds(new Rectangle(110, 100, 130, 20));
                 this.add(sourceBox, null);
                 sourceBox.addActionListener(alSource);
 
                 infoLabel = new JLabel(Messages.getString("Information"), SwingConstants.CENTER);
-                infoLabel.setBounds(new Rectangle(110, 120, 140, 20));
+                infoLabel.setBounds(new Rectangle(110, 120, 130, 20));
                 this.add(infoLabel, null);
                 infoBox = new JTextField();
-                infoBox.setBounds(new Rectangle(110, 140, 140, 20));
+                infoBox.setBounds(new Rectangle(110, 140, 130, 20));
                 this.add(infoBox, null);
                 infoBox.addActionListener(alInfo);
 
-/*              statusLabel = new JLabel(Messages.getString("Status"), SwingConstants.CENTER);
-                statusLabel.setBounds(new Rectangle(150, 0, 100, 20));
+                statusLabel = new JLabel(Messages.getString("Status"), SwingConstants.CENTER);
+                statusLabel.setBounds(new Rectangle(250, 0, 100, 20));
                 this.add(statusLabel, null);
                 statusBox = new JComboBox();
-                statusBox.setBounds(new Rectangle(150, 20, 100, 20));
+                statusBox.setBounds(new Rectangle(250, 20, 100, 20));
+                addStsItem(Messages.getString("NotSet"), Sts.UNKNOWN);
                 this.add(statusBox, null);
                 statusBox.addActionListener(alStatus);
-*/
+
+                constrLabel = new JLabel(Messages.getString("Construction"), SwingConstants.CENTER);
+                constrLabel.setBounds(new Rectangle(250, 40, 100, 20));
+                this.add(constrLabel, null);
+                constrBox = new JComboBox();
+                constrBox.setBounds(new Rectangle(250, 60, 100, 20));
+                this.add(constrBox, null);
+                constrBox.addActionListener(alConstr);
+
+                conspLabel = new JLabel(Messages.getString("Reflectivity"), SwingConstants.CENTER);
+                conspLabel.setBounds(new Rectangle(250, 80, 100, 20));
+                this.add(conspLabel, null);
+                conspBox = new JComboBox();
+                conspBox.setBounds(new Rectangle(250, 100, 100, 20));
+                this.add(conspBox, null);
+                conspBox.addActionListener(alConsp);
+
+                visLabel = new JLabel(Messages.getString("Visibility"), SwingConstants.CENTER);
+                visLabel.setBounds(new Rectangle(250, 120, 100, 20));
+                this.add(visLabel, null);
+                visBox = new JComboBox();
+                visBox.setBounds(new Rectangle(250, 140, 100, 20));
+                this.add(visBox, null);
+                visBox.addActionListener(alVis);
+
                 }
 
         public void clearSelections() {
                 panelPat.clearSelections();
+        }
+
+        private void addStsItem(String str, Sts sts) {
+                statuses.put(sts, statusBox.getItemCount());
+                statusBox.addItem(str);
         }
 

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

@@ -188 +188 @@
                 CatSTR.put(Cat.SIS_PTCL, "control");
                 CatSTR.put(Cat.SIS_PTED, "entry");
-                CatSTR.put(Cat.SIS_IPT, "ipt");
+                CatSTR.put(Cat.SIS_IPT, "IPT");
                 CatSTR.put(Cat.SIS_BRTH, "berthing");
                 CatSTR.put(Cat.SIS_DOCK, "dock");
@@ -624 +624 @@
         }
 
+        public enum Sts {
+                UNKNOWN, PERM, OCC, REC, NIU, INT, RESV, TEMP, PRIV, MAND, DEST, EXT, ILLUM, HIST, PUB, SYNC, WATCH, UNWAT, DOUBT
+        }
+        
+        public static final EnumMap<Sts, String> StsSTR = new EnumMap<Sts, String>(Sts.class);
+        static {
+                StsSTR.put(Sts.PERM, "permanent");
+                StsSTR.put(Sts.OCC, "occasional");
+                StsSTR.put(Sts.REC, "recommended");
+                StsSTR.put(Sts.NIU, "not_in_use");
+                StsSTR.put(Sts.INT, "intermittent");
+                StsSTR.put(Sts.RESV, "reserved");
+                StsSTR.put(Sts.TEMP, "tempory");
+                StsSTR.put(Sts.PRIV, "private");
+                StsSTR.put(Sts.MAND, "mandatory");
+                StsSTR.put(Sts.DEST, "destroyed");
+                StsSTR.put(Sts.EXT, "extinguished");
+                StsSTR.put(Sts.ILLUM, "illuminated");
+                StsSTR.put(Sts.HIST, "historic");
+                StsSTR.put(Sts.PUB, "public");
+                StsSTR.put(Sts.SYNC, "synchronized");
+                StsSTR.put(Sts.WATCH, "watched");
+                StsSTR.put(Sts.UNWAT, "unwatched");
+                StsSTR.put(Sts.DOUBT, "existence_doubtful");
+        }
+
+        private Sts status = Sts.UNKNOWN;
+        
+        public Sts getStatus() {
+                return status;
+        }
+
+        public void setStatus(Sts sts) {
+                status = sts;
+        }
+
+        // **********************!!!!!!!!!
         public Light light = new Light(dlg);