Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags

Timestamp:

2015-06-02T16:41:37+02:00 (9 years ago)

Author:

Don-vip

Message:

remove extra whitespaces

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• MultiValueCellEditor.java (modified) (1 diff)
• RelationMemberConflictDecision.java (modified) (1 diff)
• RelationMemberConflictResolverModel.java (modified) (1 diff)
• TagConflictResolverModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -99 +99 @@
                         fireGotoNextDecision();
                     }
-                } else if ( e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_DELETE  || e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
+                } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_DELETE || e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
                     if (editorModel.getIndexOf(MultiValueDecisionType.KEEP_NONE) > 0) {
                         editorModel.setSelectedItem(MultiValueDecisionType.KEEP_NONE);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

@@ -62 +62 @@
 
     public boolean isDecided() {
-        return ! UNDECIDED.equals(decision);
+        return !UNDECIDED.equals(decision);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -246 +246 @@
                     final RelationMember newMember = new RelationMember(decision.getRole(),newPrimitive);
                     modifiedRelation.addMember(newMember);
-                    isChanged |= ! member.equals(newMember);
+                    isChanged |= !member.equals(newMember);
                     break;
                 case REMOVE:

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -71 +71 @@
                     @Override
                     public int compare(String key1, String key2) {
-                        if (decisions.get(key1).isDecided() && ! decisions.get(key2).isDecided())
+                        if (decisions.get(key1).isDecided() && !decisions.get(key2).isDecided())
                             return 1;
                         else if (!decisions.get(key1).isDecided() && decisions.get(key2).isDecided())