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

Timestamp:

2015-06-20T14:36:00+02:00 (9 years ago)

Author:

Don-vip

Message:

fix many checkstyle violations

Location:

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

Files:

• ContextSwitchTemplate.java (modified) (3 diffs)
• TemplateParser.java (modified) (1 diff)

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

@@ -220 +220 @@
                 return new OrSet((ContextProvider)lhs, (ContextProvider)rhs);
             else if (lhs instanceof ContextProvider)
-                throw new ParseError(tr("Error in search expression on position {0} - right side of or(|) expression must return set of primitives", searchExpressionPosition));
+                throw new ParseError(
+                        tr("Error in search expression on position {0} - right side of or(|) expression must return set of primitives",
+                                searchExpressionPosition));
             else if (rhs instanceof ContextProvider)
-                throw new ParseError(tr("Error in search expression on position {0} - left side of or(|) expression must return set of primitives", searchExpressionPosition));
+                throw new ParseError(
+                        tr("Error in search expression on position {0} - left side of or(|) expression must return set of primitives",
+                                searchExpressionPosition));
             else
                 return m;
@@ -228 +232 @@
             Match match = transform(((Not) m).getMatch(), searchExpressionPosition);
             if (match instanceof ContextProvider)
-                throw new ParseError(tr("Error in search expression on position {0} - not(-) cannot be used in this context", searchExpressionPosition));
+                throw new ParseError(
+                        tr("Error in search expression on position {0} - not(-) cannot be used in this context",
+                                searchExpressionPosition));
             else
                 return m;
@@ -238 +244 @@
         Match m = transform(match, searchExpressionPosition);
         if (!(m instanceof ContextProvider))
-            throw new ParseError(tr("Error in search expression on position {0} - expression must return different then current primitive", searchExpressionPosition));
+            throw new ParseError(
+                    tr("Error in search expression on position {0} - expression must return different then current primitive",
+                            searchExpressionPosition));
         else {
             context = (ContextProvider) m;

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

@@ -89 +89 @@
             } else {
                 try {
-                    result.getEntries().add(new SearchExpressionCondition(SearchCompiler.compile(searchExpression.getText(), false, false), condition));
+                    result.getEntries().add(new SearchExpressionCondition(
+                            SearchCompiler.compile(searchExpression.getText(), false, false), condition));
                 } catch (org.openstreetmap.josm.actions.search.SearchCompiler.ParseError e) {
                     throw new ParseError(searchExpression.getPosition(), e);