Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties

Timestamp:

2009-10-11T16:37:08+02:00 (15 years ago)

Author:

jttt

Message:

Replace testing for id <= 0 with isNew() method

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -212 +212 @@
     public LatLon getMergedCoords() {
         switch(coordMergeDecision) {
-            case KEEP_MINE: return myCoords;
-            case KEEP_THEIR: return theirCoords;
-            case UNDECIDED: return null;
+        case KEEP_MINE: return myCoords;
+        case KEEP_THEIR: return theirCoords;
+        case UNDECIDED: return null;
         }
         // should not happen
@@ -246 +246 @@
     public Boolean getMergedDeletedState() {
         switch(deletedMergeDecision) {
-            case KEEP_MINE: return myDeletedState;
-            case KEEP_THEIR: return theirDeletedState;
-            case UNDECIDED: return null;
+        case KEEP_MINE: return myDeletedState;
+        case KEEP_THEIR: return theirDeletedState;
+        case UNDECIDED: return null;
         }
         // should not happen
@@ -279 +279 @@
     public Boolean getMergedVisibleState() {
         switch(visibleMergeDecision) {
-            case KEEP_MINE: return myVisibleState;
-            case KEEP_THEIR: return theirVisibleState;
-            case UNDECIDED: return null;
+        case KEEP_MINE: return myVisibleState;
+        case KEEP_THEIR: return theirVisibleState;
+        case UNDECIDED: return null;
         }
         // should not happen
@@ -484 +484 @@
 
         switch(ret) {
-            case JOptionPane.CLOSED_OPTION: return false;
-            case JOptionPane.YES_OPTION: return true;
-            case JOptionPane.NO_OPTION: return false;
+        case JOptionPane.CLOSED_OPTION: return false;
+        case JOptionPane.YES_OPTION: return true;
+        case JOptionPane.NO_OPTION: return false;
         }
         return false;
@@ -513 +513 @@
 
         switch(ret) {
-            case JOptionPane.CLOSED_OPTION: return false;
-            case JOptionPane.YES_OPTION: return true;
-            case JOptionPane.NO_OPTION: return false;
+        case JOptionPane.CLOSED_OPTION: return false;
+        case JOptionPane.YES_OPTION: return true;
+        case JOptionPane.NO_OPTION: return false;
         }
         return false;
@@ -535 +535 @@
         HashMap<Long,OsmPrimitive> candidates = new HashMap<Long,OsmPrimitive>();
         for (Node n : way.getNodes()) {
-            if (n.getId() > 0 && ! candidates.values().contains(n)) {
+            if (!n.isNew() && !candidates.values().contains(n)) {
                 candidates.put(n.getId(), n);
             }
@@ -572 +572 @@
         HashMap<Long,OsmPrimitive> candidates = new HashMap<Long, OsmPrimitive>();
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().getId() > 0 && !candidates.values().contains(m.getMember())) {
+            if (!m.getMember().isNew() && !candidates.values().contains(m.getMember())) {
                 candidates.put(m.getMember().getId(), m.getMember());
             }