Changeset 8540 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2015-06-27T21:43:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix remaining checkstyle issues

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (1 diff)
• DataSetMerger.java (modified) (1 diff)
• Node.java (modified) (1 diff)
• history/HistoryOsmPrimitive.java (modified) (1 diff)
• history/HistoryRelation.java (modified) (1 diff)
• visitor/paint/AbstractMapRenderer.java (modified) (2 diffs)
• visitor/paint/MapRendererFactory.java (modified) (1 diff)

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

@@ -528 +528 @@
             for (int i = 0; i < keys.length; i += 2) {
                 if (keys[i].equals(key)) {
-                    keys[i+1] = value;  // This modifies the keys array but it doesn't make it invalidate for any time so its ok (see note no top)
+                    // This modifies the keys array but it doesn't make it invalidate for any time so its ok (see note no top)
+                    keys[i+1] = value;
                     keysChangedImpl(originalKeys);
                     return;

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

@@ -178 +178 @@
                 OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId());
                 if (source == null)
-                    throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset",
+                    throw new RuntimeException(
+                            tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset",
                             target.getType(), target.getUniqueId()));
 

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

@@ -374 +374 @@
                     final boolean containsN = visited.contains(n);
                     visited.add(n);
-                    if (!containsN && (predicate == null || predicate.evaluate(n)) && n.isConnectedTo(otherNodes, hops - 1, predicate, visited)) {
+                    if (!containsN && (predicate == null || predicate.evaluate(n))
+                            && n.isConnectedTo(otherNodes, hops - 1, predicate, visited)) {
                         return true;
                     }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -75 +75 @@
      * @since 5440
      */
-    public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) {
+    public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp,
+            boolean checkHistoricParams) {
         ensurePositiveLong(id, "id");
         ensurePositiveLong(version, "version");

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -70 +70 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<RelationMemberData> members) {
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp,
+            List<RelationMemberData> members) {
         this(id, version, visible, user, changesetId, timestamp);
         if (members != null) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -127 +127 @@
         try {
             // print highlighted virtual nodes. Since only the color changes, simply
-            // drawing them over the existing ones works fine (at least in their current
-            // simple style)
+            // drawing them over the existing ones works fine (at least in their current simple style)
             path = new GeneralPath();
             for (WaySegment wseg: data.getHighlightedVirtualNodes()) {
@@ -141 +140 @@
             // if the way has changed while being rendered (fix #7979)
             // TODO: proper solution ?
-            // Idea from bastiK: avoid the WaySegment class and add another data class with { Way way; Node firstNode, secondNode; int firstIdx; }.
-            // On read, it would first check, if the way still has firstIdx+2 nodes, then check if the corresponding way nodes are still the same
-            // and report changes in a more controlled manner.
+            // Idea from bastiK:
+            // avoid the WaySegment class and add another data class with { Way way; Node firstNode, secondNode; int firstIdx; }.
+            // On read, it would first check, if the way still has firstIdx+2 nodes, then check if the corresponding way nodes are still
+            // the same and report changes in a more controlled manner.
             if (Main.isTraceEnabled()) {
                 Main.trace(e.getMessage());

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -250 +250 @@
         if (!isRegistered(defaultRenderer))
             throw new IllegalStateException(
-                    MessageFormat.format("Class ''{0}'' not registered as renderer. Can''t activate default renderer.", defaultRenderer.getName())
+                    MessageFormat.format("Class ''{0}'' not registered as renderer. Can''t activate default renderer.",
+                            defaultRenderer.getName())
             );
         activate(defaultRenderer);