Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/data/conflict

Files:

• Conflict.java (modified) (1 diff)
• ConflictCollection.java (modified) (7 diffs)
• IConflictListener.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -103 +103 @@
         if (my != other.my)
             return false;
-        if(their != other.their)
+        if (their != other.their)
             return false;
         return true;

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -26 +26 @@
  *    ConflictCollection conflictCollection = ....
  *
- *    for(Conflict c : conflictCollection) {
+ *    for (Conflict c : conflictCollection) {
  *      // do something
  *    }
@@ -132 +132 @@
     public void add(Collection<Conflict<?>> otherConflicts) {
         if (otherConflicts == null) return;
-        for(Conflict<?> c : otherConflicts) {
+        for (Conflict<?> c : otherConflicts) {
             addConflict(c);
         }
@@ -167 +167 @@
     public void remove(OsmPrimitive my) {
         Iterator<Conflict<?>> it = iterator();
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             if (it.next().isMatchingMy(my)) {
                 it.remove();
@@ -184 +184 @@
      */
     public Conflict<?> getConflictForMy(OsmPrimitive my) {
-        for(Conflict<?> c : conflicts) {
+        for (Conflict<?> c : conflicts) {
             if (c.isMatchingMy(my))
                 return c;
@@ -199 +199 @@
      */
     public Conflict<?> getConflictForTheir(OsmPrimitive their) {
-        for(Conflict<?> c : conflicts) {
+        for (Conflict<?> c : conflicts) {
             if (c.isMatchingTheir(their))
                 return c;
@@ -243 +243 @@
     public void removeForMy(OsmPrimitive my) {
         Iterator<Conflict<?>> it = iterator();
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             if (it.next().isMatchingMy(my)) {
                 it.remove();
@@ -257 +257 @@
     public void removeForTheir(OsmPrimitive their) {
         Iterator<Conflict<?>> it = iterator();
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             if (it.next().isMatchingTheir(their)) {
                 it.remove();

trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java

@@ -4 +4 @@
 public interface IConflictListener {
     public void onConflictsAdded(ConflictCollection conflicts);
+
     public void onConflictsRemoved(ConflictCollection conflicts);
 }