Changeset 25549 in osm for applications/editors/josm

Timestamp:

2011-03-09T09:07:20+01:00 (14 years ago)

Author:

malcolmh

Message:

'Bug fix release'

File:

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

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

@@ -39 +39 @@
         }
 
-        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 = "";
 
@@ -197 +177 @@
         public void setFired(boolean fired) {
                 Fired = fired;
+        }
+
+        private String LitRef = "";
+
+        public String getLitRef() {
+                return LitRef;
+        }
+
+        public void setLitRef(String ref) {
+                LitRef = ref;
+        }
+
+        private String LitInf = "";
+
+        public String getLitInf() {
+                return LitInf;
+        }
+
+        public void setLitInf(String inf) {
+                LitInf = inf;
+        }
+
+        private String LitCat = "";
+
+        public String getLitCat() {
+                return LitCat;
+        }
+
+        public void setLitCat(String cat) {
+                LitCat = cat;
+        }
+
+        private String LitMul = "";
+
+        public String getLitMul() {
+                return LitMul;
+        }
+
+        public void setLitMul(String mul) {
+                LitMul = mul;
         }
 
@@ -484 +504 @@
                                         setSectored(true);
                                 if (key.equals("ref"))
-                                        setRef(value);
+                                        setLitRef(value);
                                 if (key.equals("inform"))
-                                        setInf(value);
+                                        setLitInf(value);
+                                if (key.equals("category"))
+                                        setLitCat(value);
+                                if (key.equals("multiple"))
+                                        setLitMul(value);
                                 if (key.equals("colour")) {
                                         if (value.equals("red"))
@@ -900 +924 @@
                                 }
 
-                        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 (!LitRef.isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:ref", LitRef));
+
+                        if (!LitInf.isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:inform", LitInf));
+
+                        if (!LitCat.isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:category", LitCat));
+
+                        if (!LitMul.isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:multiple", LitMul));
 
                         if (!LightPeriod[0].isEmpty())
@@ -1122 +1154 @@
                 setLongname("");
                 setFixme("");
-                setRef("");
-                setInf("");
+                setLitRef("");
+                setLitInf("");
+                setLitCat("");
+                setLitMul("");
                 dlg.cM01TopMark.setSelected(false);
                 dlg.cM01TopMark.setVisible(false);