Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/tools/template_engine

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/tools/template_engine

Files:

• ContextSwitchTemplate.java (modified) (4 diffs)
• TemplateEngineDataProvider.java (modified) (1 diff)
• TemplateEntry.java (modified) (1 diff)
• Tokenizer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

@@ -42 +42 @@
     private abstract class ContextProvider extends Match {
         protected Match condition;
+
         abstract List<OsmPrimitive> getPrimitives(OsmPrimitive root);
     }
@@ -51 +52 @@
             this.childCondition = child;
         }
-        @Override
-        public boolean match(OsmPrimitive osm) {
-            throw new UnsupportedOperationException();
-        }
+
+        @Override
+        public boolean match(OsmPrimitive osm) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         List<OsmPrimitive> getPrimitives(OsmPrimitive root) {
@@ -194 +197 @@
 
             if (lhs instanceof ContextProvider && rhs instanceof ContextProvider)
-                return new AndSet((ContextProvider)lhs, (ContextProvider)rhs);
+                return new AndSet((ContextProvider) lhs, (ContextProvider) rhs);
             else if (lhs instanceof ContextProvider) {
                 ContextProvider cp = (ContextProvider) lhs;
@@ -218 +221 @@
 
             if (lhs instanceof ContextProvider && rhs instanceof ContextProvider)
-                return new OrSet((ContextProvider)lhs, (ContextProvider)rhs);
+                return new OrSet((ContextProvider) lhs, (ContextProvider) rhs);
             else if (lhs instanceof ContextProvider)
                 throw new ParseError(

trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java

@@ -8 +8 @@
 public interface TemplateEngineDataProvider {
     Collection<String> getTemplateKeys();
+
     Object getTemplateValue(String name, boolean special);
+
     boolean evaluateCondition(Match condition);
 }

trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java

@@ -4 +4 @@
 public interface TemplateEntry {
     void appendText(StringBuilder result, TemplateEngineDataProvider dataProvider);
+
     boolean isValid(TemplateEngineDataProvider dataProvider);
 }

trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java

@@ -36 +36 @@
         @Override
         public String toString() {
-            return type + (text != null?" " + text:"");
+            return type + (text != null ? " " + text : "");
         }
     }
@@ -85 +85 @@
                 return new Token(TokenType.CONDITION_START, position);
             } else
-                throw ParseError.unexpectedChar('{', (char)c, position);
+                throw ParseError.unexpectedChar('{', (char) c, position);
         case '!':
             getChar();
@@ -92 +92 @@
                 return new Token(TokenType.CONTEXT_SWITCH_START, position);
             } else
-                throw ParseError.unexpectedChar('{', (char)c, position);
+                throw ParseError.unexpectedChar('{', (char) c, position);
         case '}':
             getChar();
@@ -103 +103 @@
             return new Token(TokenType.APOSTROPHE, position);
         default:
-            while (c != -1 && !specialCharaters.contains((char)c)) {
+            while (c != -1 && !specialCharaters.contains((char) c)) {
                 if (c == '\\') {
                     getChar();
@@ -110 +110 @@
                     }
                 }
-                text.append((char)c);
+                text.append((char) c);
                 getChar();
             }
@@ -132 +132 @@
                 getChar();
             }
-            result.append((char)c);
+            result.append((char) c);
             getChar();
         }
         return new Token(TokenType.TEXT, position, result.toString());
     }
-
 }