Changeset 190 in josm for src/org/openstreetmap

Timestamp:

2007-01-08T03:29:11+01:00 (18 years ago)

Author:

imi

Message:

• fixed bug in annotation preset that inverted the logic of delete_if_empty

File:

• src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java (modified) (3 diffs)

src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java

@@ -184 +184 @@
                                 current.add(new Text(a.getValue("key"), a.getValue("text"), a.getValue("default"), parseBoolean(a.getValue("delete_if_empty"))));
                         else if (qname.equals("check")) {
-                                String s = a.getValue("default");
-                                boolean clear = parseBoolean(s);
-                                current.add(new Check(a.getValue("key"), a.getValue("text"), !clear));
+                                boolean checked = parseBoolean(a.getValue("default"));
+                                current.add(new Check(a.getValue("key"), a.getValue("text"), checked));
                         } else if (qname.equals("label"))
                                 current.add(new Label(a.getValue("text")));
@@ -193 +192 @@
                                 String s = a.getValue("readonly");
                                 String dvstr = a.getValue("display_values");
-                                boolean editable = parseBoolean(s);
+                                boolean editable = !parseBoolean(s);
                                 if (dvstr != null) {
                                         if (editable && s != null)
@@ -212 +211 @@
 
                 private boolean parseBoolean(String s) {
-                        return s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
+                        return s != null && 
+                                !s.equals("0") && 
+                                !s.startsWith("off") && 
+                                !s.startsWith("false") &&
+                                !s.startsWith("no");
                 }