Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

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

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

@@ -89 +89 @@
             // TODO: check for keyword collisions
             if (factory instanceof SimpleMatchFactory) {
-                simpleMatchFactoryMap.put(keyword, (SimpleMatchFactory)factory);
+                simpleMatchFactoryMap.put(keyword, (SimpleMatchFactory) factory);
             } else if (factory instanceof UnaryMatchFactory) {
-                unaryMatchFactoryMap.put(keyword, (UnaryMatchFactory)factory);
+                unaryMatchFactoryMap.put(keyword, (UnaryMatchFactory) factory);
             } else if (factory instanceof BinaryMatchFactory) {
-                binaryMatchFactoryMap.put(keyword, (BinaryMatchFactory)factory);
+                binaryMatchFactoryMap.put(keyword, (BinaryMatchFactory) factory);
             } else
                 throw new AssertionError("Unknown match factory");
@@ -326 +326 @@
             super(match);
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
             return !match.match(osm);
         }
+
         @Override
         public String toString() {
             return "!" + match;
         }
+
         public Match getMatch() {
             return match;
@@ -350 +353 @@
             this.defaultValue = defaultValue;
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -367 +371 @@
             super(lhs, rhs);
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
             return lhs.match(osm) && rhs.match(osm);
         }
+
         @Override
         public String toString() {
@@ -384 +390 @@
             super(lhs, rhs);
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
             return lhs.match(osm) || rhs.match(osm);
         }
+
         @Override
         public String toString() {
@@ -401 +409 @@
             super(lhs, rhs);
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
             return lhs.match(osm) ^ rhs.match(osm);
         }
+
         @Override
         public String toString() {
@@ -418 +428 @@
             super(range);
         }
+
         public Id(PushbackTokenizer tokenizer) throws ParseError {
             this(tokenizer.readRange(tr("Range of primitive ids expected")));
         }
+
         @Override
         protected Long getNumber(OsmPrimitive osm) {
             return osm.isNew() ? 0 : osm.getUniqueId();
         }
+
         @Override
         protected String getString() {
@@ -438 +451 @@
             super(range);
         }
+
         public ChangesetId(PushbackTokenizer tokenizer) throws ParseError {
             this(tokenizer.readRange(tr("Range of changeset ids expected")));
         }
+
         @Override
         protected Long getNumber(OsmPrimitive osm) {
             return (long) osm.getChangesetId();
         }
+
         @Override
         protected String getString() {
@@ -458 +474 @@
             super(range);
         }
+
         public Version(PushbackTokenizer tokenizer) throws ParseError {
             this(tokenizer.readRange(tr("Range of versions expected")));
         }
+
         @Override
         protected Long getNumber(OsmPrimitive osm) {
             return (long) osm.getVersion();
         }
+
         @Override
         protected String getString() {
@@ -551 +570 @@
                 } else {
                     mv = osm.get(key);
-                    if(!caseSensitive && mv == null) {
+                    if (!caseSensitive && mv == null) {
                         for (String k: osm.keySet()) {
-                            if(key.equalsIgnoreCase(k)) {
+                            if (key.equalsIgnoreCase(k)) {
                                 mv = osm.get(k);
                                 break;
@@ -574 +593 @@
             return false;
         }
+
         @Override
         public String toString() {
@@ -628 +648 @@
                 throw new ParseError(tr("Key cannot be empty when tag operator is used. Sample use: key=value"));
             this.key = key;
-            this.value = value == null?"":value;
+            this.value = value == null ? "" : value;
             if ("".equals(this.value) && "*".equals(key)) {
                 mode = Mode.NONE;
@@ -800 +820 @@
             return false;
         }
+
         @Override
         public String toString() {
@@ -808 +829 @@
     private static class ExactType extends Match {
         private final OsmPrimitiveType type;
+
         public ExactType(String type) throws ParseError {
             this.type = OsmPrimitiveType.from(type);
@@ -814 +836 @@
                         type));
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
             return type.equals(osm.getType());
         }
+
         @Override
         public String toString() {
@@ -829 +853 @@
     private static class UserMatch extends Match {
         private String user;
+
         public UserMatch(String user) {
             if ("anonymous".equals(user)) {
@@ -856 +881 @@
     private static class RoleMatch extends Match {
         private String role;
+
         public RoleMatch(String role) {
             if (role == null) {
@@ -871 +897 @@
                         if (m.getMember() == osm) {
                             String testRole = m.getRole();
-                            if(role.equals(testRole == null ? "" : testRole))
+                            if (role.equals(testRole == null ? "" : testRole))
                                 return true;
                         }
@@ -1068 +1094 @@
             return "timestamp";
         }
-
     }
 
@@ -1079 +1104 @@
             return osm.isNew();
         }
+
         @Override
         public String toString() {
@@ -1093 +1119 @@
             return osm.isModified() || osm.isNewOrUndeleted();
         }
+
         @Override
         public String toString() {
@@ -1107 +1134 @@
             return Main.main.getCurrentDataSet().isSelected(osm);
         }
+
         @Override
         public String toString() {
@@ -1123 +1151 @@
             return osm.isIncomplete();
         }
+
         @Override
         public String toString() {
@@ -1139 +1168 @@
             return !osm.isTagged() && !osm.isIncomplete();
         }
+
         @Override
         public String toString() {
@@ -1153 +1183 @@
             return osm instanceof Way && ((Way) osm).isClosed();
         }
+
         @Override
         public String toString() {
@@ -1166 +1197 @@
             super(m);
         }
+
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1171 +1203 @@
 
             if (osm instanceof Way) {
-                for (Node n : ((Way)osm).getNodes()) {
+                for (Node n : ((Way) osm).getNodes()) {
                     isParent |= match.match(n);
                 }
             } else if (osm instanceof Relation) {
-                for (RelationMember member : ((Relation)osm).getMembers()) {
+                for (RelationMember member : ((Relation) osm).getMembers()) {
                     isParent |= match.match(member.getMember());
                 }
@@ -1181 +1213 @@
             return isParent;
         }
+
         @Override
         public String toString() {
@@ -1204 +1237 @@
             return isChild;
         }
+
         @Override
         public String toString() {
@@ -1271 +1305 @@
     private abstract static class InArea extends Match {
 
-        protected abstract Bounds getBounds();
         protected final boolean all;
 
@@ -1280 +1313 @@
             this.all = all;
         }
+
+        protected abstract Bounds getBounds();
 
         @Override
@@ -1337 +1372 @@
             super(msg);
         }
+
         public ParseError(String msg, Throwable cause) {
             super(msg, cause);
         }
+
         public ParseError(Token expected, Token found) {
             this(tr("Unexpected token. Expected {0}, found {1}", expected, found));