Changeset 9930 in josm for trunk/src/org

Timestamp:

2016-03-05T16:25:52+01:00 (9 years ago)

Author:

simon04

Message:

Search: fix string representation of boolean connectives (parentheses)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -453 +453 @@
         @Override
         public String toString() {
-            return lhs + " && " + rhs;
+            return (lhs instanceof BinaryMatch && !(lhs instanceof And) ? "(" + lhs + ")" : lhs) + " && "
+                    + (rhs instanceof BinaryMatch && !(rhs instanceof And) ? "(" + rhs + ")" : rhs);
         }
     }
@@ -477 +478 @@
         @Override
         public String toString() {
-            return lhs + " || " + rhs;
+            return (lhs instanceof BinaryMatch && !(lhs instanceof Or) ? "(" + lhs + ")" : lhs) + " || "
+                    + (rhs instanceof BinaryMatch && !(rhs instanceof Or) ? "(" + rhs + ")" : rhs);
         }
     }
@@ -501 +503 @@
         @Override
         public String toString() {
-            return lhs + " ^ " + rhs;
+            return (lhs instanceof BinaryMatch && !(lhs instanceof Xor) ? "(" + lhs + ")" : lhs) + " ^ "
+                    + (rhs instanceof BinaryMatch && !(rhs instanceof Xor) ? "(" + rhs + ")" : rhs);
         }
     }