Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.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/gui/history/TwoColumnDiff.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

@@ -32 +32 @@
 
         public enum DiffItemType {
-            INSERTED(new Color(0xDD, 0xFF, 0xDD)), DELETED(new Color(255,197,197)), CHANGED(new Color(255,234,213)),
-            SAME(new Color(234,234,234)), EMPTY(new Color(234,234,234));
+            INSERTED(new Color(0xDD, 0xFF, 0xDD)),
+            DELETED(new Color(255, 197, 197)),
+            CHANGED(new Color(255, 234, 213)),
+            SAME(new Color(234, 234, 234)),
+            EMPTY(new Color(234, 234, 234));
 
             private final Color color;
@@ -39 +42 @@
                 this.color = color;
             }
+
             public Color getColor() {
                 return color;
@@ -91 +95 @@
         int ib = 0;
 
-        while(script != null) {
+        while (script != null) {
             int deleted = script.deleted;
             int inserted = script.inserted;
-            while(ia < script.line0 && ib < script.line1){
+            while (ia < script.line0 && ib < script.line1) {
                 Item cell = new Item(DiffItemType.SAME, a[ia]);
                 referenceDiff.add(cell);
@@ -102 +106 @@
             }
 
-            while(inserted > 0 || deleted > 0) {
-                if(inserted > 0 && deleted > 0) {
+            while (inserted > 0 || deleted > 0) {
+                if (inserted > 0 && deleted > 0) {
                     referenceDiff.add(new Item(DiffItemType.CHANGED, a[ia++]));
                     currentDiff.add(new Item(DiffItemType.CHANGED, b[ib++]));
-                } else if(inserted > 0) {
+                } else if (inserted > 0) {
                     referenceDiff.add(new Item(DiffItemType.EMPTY, null));
                     currentDiff.add(new Item(DiffItemType.INSERTED, b[ib++]));
@@ -118 +122 @@
             script = script.link;
         }
-        while(ia < a.length && ib < b.length) {
+        while (ia < a.length && ib < b.length) {
             referenceDiff.add(new Item(DiffItemType.SAME, a[ia++]));
             currentDiff.add(new Item(DiffItemType.SAME, b[ib++]));