Changeset 27008 in osm for applications/editors

Timestamp:

2011-11-04T20:02:13+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• panels/PanelLit.java (modified) (13 diffs)
• seamarks/SeaMark.java (modified) (4 diffs)

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

@@ -21 +21 @@
         private ActionListener alGroup = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        String str = groupBox.getText();
+                        dlg.mark.setLightGroup(groupBox.getText());
                 }
         };
@@ -28 +28 @@
         private ActionListener alPeriod = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        String str = periodBox.getText();
+                        dlg.mark.setLightPeriod(periodBox.getText());
                 }
         };
@@ -35 +35 @@
         private ActionListener alSequence = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        String str = sequenceBox.getText();
+                        dlg.mark.setLightSeq(sequenceBox.getText());
                 }
         };
@@ -43 +43 @@
         private ActionListener alVisibility = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
+                        for (Vis vis : visibilities.keySet()) {
+                                int idx = visibilities.get(vis);
+                                if (idx == visibilityBox.getSelectedIndex())
+                                        dlg.mark.setLightVisibility(vis);
+                        }
                 }
         };
@@ -49 +54 @@
         private ActionListener alHeight = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        String str = heightBox.getText();
+                        dlg.mark.setLightHeight(heightBox.getText());
                 }
         };
@@ -56 +61 @@
         private ActionListener alRange = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        String str = rangeBox.getText();
+                        dlg.mark.setLightRange(rangeBox.getText());
                 }
         };
@@ -63 +68 @@
         private ActionListener alOrientation = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        String str = orientationBox.getText();
+                        dlg.mark.setLightOrientation(orientationBox.getText());
                 }
         };
         public JLabel categoryLabel;
         public JComboBox categoryBox;
+        public EnumMap<Lit, Integer> categories = new EnumMap<Lit, Integer>(Lit.class);
         private ActionListener alCategory = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
+                        for (Lit lit : categories.keySet()) {
+                                int idx = categories.get(lit);
+                                if (idx == categoryBox.getSelectedIndex())
+                                        dlg.mark.setLightCategory(lit);
+                        }
                 }
         };
@@ -77 +88 @@
         private ActionListener alExhibition = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
+                        for (Exh exh : exhibitions.keySet()) {
+                                int idx = exhibitions.get(exh);
+                                if (idx == exhibitionBox.getSelectedIndex())
+                                        dlg.mark.setLightExhibition(exh);
+                        }
                 }
         };
@@ -171 +187 @@
                 categoryBox.setBounds(new Rectangle(185, 20, 165, 20));
                 this.add(categoryBox, null);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.UNKNOWN);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.VERT);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.HORIZ);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.UPPER);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.LOWER);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.REAR);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.FRONT);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.AERO);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.AIROBS);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.FOGDET);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.FLOOD);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.STRIP);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.SUBS);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.SPOT);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.MOIRE);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.EMERG);
+                addCatItem(Messages.getString("NoneSpecified"), Lit.BEAR);
                 categoryBox.addActionListener(alCategory);
-                categoryBox.addItem(Messages.getString("NoneSpecified"));
-                categoryBox.addItem(Messages.getString("Vert2"));
 
                 visibilityLabel = new JLabel(Messages.getString("Visibility"), SwingConstants.CENTER);
@@ -181 +212 @@
                 visibilityBox.setBounds(new Rectangle(185, 60, 165, 20));
                 this.add(visibilityBox, null);
-                visibilityBox.addActionListener(alVisibility);
                 addVisibItem(Messages.getString("NoneSpecified"), Vis.UNKNOWN);
                 addVisibItem(Messages.getString("Intensified"), Vis.INTEN);
                 addVisibItem(Messages.getString("Unintensified"), Vis.UNINTEN);
                 addVisibItem(Messages.getString("PartiallyObscured"), Vis.PARTOBS);
+                visibilityBox.addActionListener(alVisibility);
 
                 exhibitionLabel = new JLabel(Messages.getString("Exhibition"), SwingConstants.CENTER);
@@ -193 +224 @@
                 exhibitionBox.setBounds(new Rectangle(280, 100, 70, 20));
                 this.add(exhibitionBox, null);
-                exhibitionBox.addActionListener(alExhibition);
                 addExhibItem(Messages.getString("NotSet"), Exh.UNKNOWN);
                 addExhibItem(Messages.getString("24h"), Exh.H24);
@@ -199 +229 @@
                 addExhibItem(Messages.getString("Night"), Exh.NIGHT);
                 addExhibItem(Messages.getString("Fog"), Exh.FOG);
+                exhibitionBox.addActionListener(alExhibition);
 
                 orientationLabel = new JLabel(Messages.getString("Orientation"), SwingConstants.CENTER);
@@ -213 +244 @@
         }
 
+        private void addCatItem(String str, Lit lit) {
+                categories.put(lit, categoryBox.getItemCount());
+                categoryBox.addItem(str);
+        }
+
         private void addVisibItem(String str, Vis vis) {
                 visibilities.put(vis, visibilityBox.getItemCount());

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

@@ -50 +50 @@
         }
 
-        public void setName(String nam) {
-                name = nam.trim();
+        public void setName(String str) {
+                name = str.trim();
         }
 
@@ -772 +772 @@
                 VisMAP.put(EnumSet.of(Vis.PARTOBS), "part_obscured");
         }
-
+        
+        private Vis lightVisibility = Vis.UNKNOWN;
+        
+        public Vis getLightVisibility() {
+                return lightVisibility;
+        }
+
+        public void setLightVisibility(Vis vis) {
+                lightVisibility = vis;
+        }
+        
+        private String lightOrientation = "";
+        
+        public String getLightOrientation() {
+                return lightOrientation;
+        }
+        
+        public void setLightOrientation(String str) {
+                lightOrientation = validDecimal(str);
+        }
+        
         public enum Lit {
-                UNKNOWN, VERT, VERT2, VERT3, VERT4, HORIZ, HORIZ2, HORIZ3, HORIZ4, UPPER, LOWER, REAR, FRONT, AERO, AIROBS, FOGDET, FLOOD, STRIP, SUBS, SPOT, MOIRE, EMERG, BEAR
+                UNKNOWN, VERT, HORIZ, UPPER, LOWER, REAR, FRONT, AERO, AIROBS,
+                FOGDET, FLOOD, STRIP, SUBS, SPOT, MOIRE, EMERG, BEAR
         }
 
@@ -782 +803 @@
         }
 
+        private Lit lightCategory = Lit.UNKNOWN;
+        
+        public Lit getLightCategory() {
+                return lightCategory;
+        }
+
+        public void setLightCategory(Lit lit) {
+                lightCategory = lit;
+        }
+        
         public enum Exh { UNKNOWN, H24, DAY, NIGHT, FOG }
         public static final Map<EnumSet<Exh>, String> ExhMAP = new HashMap<EnumSet<Exh>, String>();
@@ -790 +821 @@
                 ExhMAP.put(EnumSet.of(Exh.NIGHT), "night");
                 ExhMAP.put(EnumSet.of(Exh.FOG), "fog");
+        }
+        
+        private Exh lightExhibition = Exh.UNKNOWN;
+        
+        public Exh getLightExhibition() {
+                return lightExhibition;
+        }
+
+        public void setLightExhibition(Exh exh) {
+                lightExhibition = exh;
         }