Changeset 8582 in josm for trunk/src/org

Timestamp:

2015-07-08T13:30:32+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (1 diff)
• gui/mappaint/ElemStyles.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)
• tools/date/DateUtils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -122 +122 @@
                     tree.getSelectedLayers(), (String) formats.getSelectedItem());
             Set<String> supportedCrs = new HashSet<>();
-            {
-                boolean first = true;
-                for(LayerDetails layer: tree.getSelectedLayers()) {
-                    if (first) {
-                        supportedCrs.addAll(layer.getProjections());
-                        first = false;
-                    }
-                    supportedCrs.retainAll(layer.getProjections());
+            boolean first = true;
+            for (LayerDetails layer: tree.getSelectedLayers()) {
+                if (first) {
+                    supportedCrs.addAll(layer.getProjections());
+                    first = false;
                 }
+                supportedCrs.retainAll(layer.getProjections());
             }
             ImageryInfo ret = new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies());

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -655 +655 @@
     public final Collection<String> keySet() {
         final String[] keys = this.keys;
-        if (keys == null){
+        if (keys == null) {
             return Collections.emptySet();
         }
-        if (keys.length == 1){
+        if (keys.length == 1) {
             return Collections.singleton(keys[0]);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -130 +130 @@
             osm.mappaintStyle = style.put(p.a, p.b);
         } catch (StyleCache.RangeViolatedError e) {
-            throw new AssertionError("Range violated: " + e.getMessage() + " (object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+            throw new AssertionError("Range violated: " + e.getMessage()
+                    + " (object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
                     + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b + ")", e);
         }

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -439 +439 @@
         String time = parser.getAttributeValue(null, "timestamp");
         if (time != null && !time.isEmpty()) {
-            current.setRawTimestamp((int)(DateUtils.tsFromString(time)/1000));
+            current.setRawTimestamp((int) (DateUtils.tsFromString(time)/1000));
         }
 

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -108 +108 @@
                 parsePart2(str, 17));
             long millis = parsePart3(str, 20);
-            if (str.length() == 29){
+            if (str.length() == 29) {
                 millis += parsePart2(str, 24) * (str.charAt(23) == '+' ? -3600000 : 3600000);
             }