Changeset 25542 in osm for applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java

Timestamp:

2011-03-08T13:34:45+01:00 (16 years ago)

Author:

malcolmh

Message:

'Bug fix release'

File:

• applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java (modified) (11 diffs)

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

@@ -28 +28 @@
          * private Variablen
          */
+
+        private String Longname = "";
+
+        public String getLongname() {
+                return Longname;
+        }
+
+        public void setLongname(String name) {
+                Longname = name;
+        }
+
+        private String Ref = "";
+
+        public String getRef() {
+                return Ref;
+        }
+
+        public void setRef(String ref) {
+                Ref = ref;
+        }
+
+        private String Inf = "";
+
+        public String getInf() {
+                return Inf;
+        }
+
+        public void setInf(String inf) {
+                Inf = inf;
+        }
+
+        private String Fixme = "";
+
+        public String getFixme() {
+                return Fixme;
+        }
+
+        public void setFixme(String name) {
+                Fixme = name;
+        }
+
+        private String LMheight = "";
+
+        public String getLMheight() {
+                return LMheight;
+        }
+
+        public void setLMheight(String height) {
+                LMheight = height;
+        }
 
         private int BuoyIndex = 0;
@@ -169 +219 @@
                         setBearing2("");
                         setRadius("");
+                        setSeq("");
                 }
         }
@@ -258 +309 @@
                         Range = new String[10];
                 Range[SectorIndex] = range;
+        }
+
+        private String[] Sequence = new String[10];
+
+        public String getSeq() {
+                if (Sequence[SectorIndex] == null)
+                        return (Sequence[0]);
+                return Sequence[SectorIndex];
+        }
+
+        public void setSeq(String seq) {
+                if (SectorIndex == 0)
+                        Sequence = new String[10];
+                Sequence[SectorIndex] = seq;
         }
 
@@ -418 +483 @@
                                 if (index != 0)
                                         setSectored(true);
+                                if (key.equals("ref"))
+                                        setRef(value);
+                                if (key.equals("inform"))
+                                        setInf(value);
                                 if (key.equals("colour")) {
                                         if (value.equals("red"))
@@ -435 +504 @@
                                 } else if (key.equals("range")) {
                                         Range[index] = value;
+                                } else if (key.equals("sequence")) {
+                                        Sequence[index] = value;
+                                } else if (key.equals("sector_start")) {
+                                        Bearing1[index] = value;
+                                } else if (key.equals("sector_end")) {
+                                        Bearing2[index] = value;
                                 }
                         }
@@ -801 +876 @@
                 String str = dlg.tfM01Name.getText();
                 if (!str.isEmpty())
-                        Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:name",
-                                        str));
+                        Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:name", str));
+                if (!Longname.isEmpty())
+                        Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:longname", Longname));
+                if (!Fixme.isEmpty())
+                        Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:fixme", Fixme));
                 Main.main.undoRedo
                                 .add(new ChangePropertyCommand(Node, "seamark:type", type));
@@ -810 +888 @@
                 String colour;
                 if (dlg.cM01Fired.isSelected()) {
-                        if (!(colour = LightColour[0]).isEmpty())
+                        if (!(colour = LightColour[0]).isEmpty() && !Sectored)
                                 if (colour.equals("R")) {
                                         Main.main.undoRedo.add(new ChangePropertyCommand(Node,
@@ -821 +899 @@
                                                         "seamark:light:colour", "white"));
                                 }
+
+                        if (!Ref.isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:ref", Ref));
+
+                        if (!Inf.isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:inform", Inf));
 
                         if (!LightPeriod[0].isEmpty())
@@ -841 +927 @@
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:range", Range[0]));
+
+                        if (!Sequence[0].isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:sequence", Sequence[0]));
 
                         for (int i = 1; i < 10; i++) {
@@ -886 +976 @@
                                                         "seamark:light:" + i + ":height", Height[i]));
 
+                                if (Sequence[i] != null)
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:" + i + ":sequence", Sequence[i]));
+
                                 if (Range[i] != null)
                                         Main.main.undoRedo.add(new ChangePropertyCommand(Node,
@@ -1026 +1120 @@
                 dlg.tfM01Name.setEnabled(false);
                 setName("");
+                setLongname("");
+                setFixme("");
+                setRef("");
+                setInf("");
                 dlg.cM01TopMark.setSelected(false);
                 dlg.cM01TopMark.setVisible(false);