Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/command/conflict

Timestamp:

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

Author:

Don-vip

Message:

remove extra whitespaces

Location:

trunk/src/org/openstreetmap/josm/command/conflict

Files:

• ConflictAddCommand.java (modified) (1 diff)
• ConflictResolveCommand.java (modified) (2 diffs)
• RelationMemberConflictResolverCommand.java (modified) (1 diff)
• TagConflictResolveCommand.java (modified) (1 diff)
• WayNodesConflictResolverCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

@@ -61 +61 @@
     @Override
     public void undoCommand() {
-        if (! Main.map.mapView.hasLayer(getLayer())) {
+        if (!Main.map.mapView.hasLayer(getLayer())) {
             Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),

trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

@@ -45 +45 @@
      */
     protected void rememberConflict(Conflict<?> c) {
-        if (! resolvedConflicts.hasConflictForMy(c.getMy())) {
+        if (!resolvedConflicts.hasConflictForMy(c.getMy())) {
             resolvedConflicts.add(c);
         }
@@ -68 +68 @@
         super.undoCommand();
 
-        if (! Main.map.mapView.hasLayer(getLayer())) {
+        if (!Main.map.mapView.hasLayer(getLayer())) {
             Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),

trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

@@ -74 +74 @@
     public void undoCommand() {
         OsmDataLayer layer = getLayer();
-        if (! Main.map.mapView.hasLayer(layer)) {
+        if (!Main.map.mapView.hasLayer(layer)) {
             Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),

trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

@@ -84 +84 @@
         //
         for (TagMergeItem item: mergeItems) {
-            if (! item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
                 item.applyToMyPrimitive(conflict.getMy());
             }

trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java

@@ -58 +58 @@
         //
         for (Node n:mergedNodeList) {
-            if (! getLayer().data.getNodes().contains(n)) {
+            if (!getLayer().data.getNodes().contains(n)) {
                 Main.warn(tr("Main dataset does not include node {0}", n.toString()));
             }