Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (1 diff)
• MapStatus.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (1 diff)
• conflict/pair/nodes/NodeListMergeModel.java (modified) (1 diff)
• conflict/pair/properties/PropertiesMergeModel.java (modified) (7 diffs)
• conflict/pair/relation/RelationMemberListMergeModel.java (modified) (1 diff)
• dialogs/HistoryDialog.java (modified) (3 diffs)
• dialogs/relation/ChildRelationBrowser.java (modified) (3 diffs)
• dialogs/relation/GenericRelationEditor.java (modified) (5 diffs)
• dialogs/relation/MemberTableModel.java (modified) (1 diff)
• dialogs/relation/ParentRelationLoadingTask.java (modified) (1 diff)
• dialogs/relation/ReferringRelationsBrowserModel.java (modified) (1 diff)
• dialogs/relation/RelationEditor.java (modified) (1 diff)
• dialogs/relation/RelationTree.java (modified) (1 diff)
• io/UploadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -97 +97 @@
             }
             if (name == null) {
-                name = node.getId() == 0 ? tr("node") : ""+ node.getId();
+                name = node.isNew() ? tr("node") : ""+ node.getId();
             }
             name += " (" + node.getCoor().latToString(CoordinateFormat.getDefaultFormat()) + ", " + node.getCoor().lonToString(CoordinateFormat.getDefaultFormat()) + ")";

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -320 +320 @@
             // pressed. Cannot use "setSelected()" because it will cause a
             // fireSelectionChanged event which is unnecessary at this point.
-            if((mods & MouseEvent.SHIFT_DOWN_MASK) == 0)
+            if((mods & MouseEvent.SHIFT_DOWN_MASK) == 0) {
                 ds.clearSelection();
+            }
 
             // This will cycle through the available items.
@@ -415 +416 @@
             final StringBuilder text = new StringBuilder();
             String name = osm.getDisplayName(DefaultNameFormatter.getInstance());
-            if (osm.getId() == 0 || osm.isModified()) {
+            if (osm.isNew() || osm.isModified()) {
                 name = "<i><b>"+ name + "*</b></i>";
             }
             text.append(name);
 
-            if (osm.getId() != 0) {
+            if (!osm.isNew()) {
                 text.append(" [id="+osm.getId()+"]");
             }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -318 +318 @@
             // when multiple nodes on one point, prefer new or selected nodes
             else if(dist == minDistanceSq && minPrimitive != null
-                    && ((n.getId() == 0 && ds.isSelected(n))
-                            || (!ds.isSelected(minPrimitive) && (ds.isSelected(n) || n.getId() == 0)))) {
+                    && ((n.isNew() && ds.isSelected(n))
+                            || (!ds.isSelected(minPrimitive) && (ds.isSelected(n) || n.isNew())))) {
                 minPrimitive = n;
             }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -76 +76 @@
     @Override
     public boolean isEqualEntry(Node e1, Node e2) {
-        if (e1.getId() > 0)
+        if (!e1.isNew())
             return e1.getId() == e2.getId();
         else

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());
             }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -25 +25 @@
     public boolean isEqualEntry(RelationMember e1, RelationMember e2) {
         boolean ret = e1.getRole().equals(e2.getRole());
-        if (e1.getMember().getId() > 0 ) {
+        if (!e1.getMember().isNew() ) {
             ret = ret && (e1.getMember().getId() == e2.getMember().getId());
         } else {

trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

@@ -144 +144 @@
      *
      */
-    class HistoryItemTableModel extends DefaultTableModel implements SelectionChangedListener{
+    static class HistoryItemTableModel extends DefaultTableModel implements SelectionChangedListener{
         private ArrayList<OsmPrimitive> data;
         private DefaultListSelectionModel selectionModel;
@@ -196 +196 @@
                 return;
             for (OsmPrimitive primitive: Main.main.getCurrentDataSet().getSelected()) {
-                if (primitive.getId() == 0) {
+                if (primitive.isNew()) {
                     continue;
                 }
@@ -226 +226 @@
      * The column model
      */
-    class HistoryTableColumnModel extends DefaultTableColumnModel {
+    static class HistoryTableColumnModel extends DefaultTableColumnModel {
         protected void createColumns() {
             TableColumn col = null;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -365 +365 @@
                 if (member.isRelation()) {
                     Relation child = member.getRelation();
-                    if (!downloadedRelationIds.contains(child)) {
+                    if (!downloadedRelationIds.contains(child.getId())) {
                         relationsToDownload.push(child);
                     }
@@ -403 +403 @@
                 while(! relationsToDownload.isEmpty() && !cancelled) {
                     Relation r = relationsToDownload.pop();
-                    if (r.getId() == 0) {
+                    if (r.isNew()) {
                         continue;
                     }
@@ -514 +514 @@
                 while(it.hasNext() && !cancelled) {
                     Relation r = it.next();
-                    if (r.getId() == 0) {
+                    if (r.isNew()) {
                         continue;
                     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -592 +592 @@
             );
             switch(ret) {
-                case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return;
-                case JOptionPane.CLOSED_OPTION: return;
-                case JOptionPane.NO_OPTION: return;
-                case JOptionPane.YES_OPTION:
-                    memberTableModel.removeMembersReferringTo(toCheck);
-                    break;
+            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return;
+            case JOptionPane.CLOSED_OPTION: return;
+            case JOptionPane.NO_OPTION: return;
+            case JOptionPane.YES_OPTION:
+                memberTableModel.removeMembersReferringTo(toCheck);
+                break;
             }
         }
@@ -628 +628 @@
             );
             switch(ret) {
-                case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;
-                case JOptionPane.YES_OPTION: return true;
-                case JOptionPane.NO_OPTION: return false;
-                case JOptionPane.CLOSED_OPTION: return false;
-                case JOptionPane.CANCEL_OPTION: throw new AddAbortException();
+            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;
+            case JOptionPane.YES_OPTION: return true;
+            case JOptionPane.NO_OPTION: return false;
+            case JOptionPane.CLOSED_OPTION: return false;
+            case JOptionPane.CANCEL_OPTION: throw new AddAbortException();
             }
             // should not happen
@@ -1064 +1064 @@
             );
             switch(ret) {
-                case JOptionPane.CANCEL_OPTION: return false;
-                case JOptionPane.YES_OPTION: return true;
-                case JOptionPane.NO_OPTION: return false;
+            case JOptionPane.CANCEL_OPTION: return false;
+            case JOptionPane.YES_OPTION: return true;
+            case JOptionPane.NO_OPTION: return false;
             }
             return false;
@@ -1200 +1200 @@
 
         protected void updateEnabledState() {
-            setEnabled(getRelation() != null && getRelation().getId() > 0);
+            setEnabled(getRelation() != null && !getRelation().isNew());
         }
     }
@@ -1240 +1240 @@
             );
             switch(ret) {
-                case JOptionPane.YES_OPTION: return true;
-                case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true;
-                default:
-                    return false;
+            case JOptionPane.YES_OPTION: return true;
+            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true;
+            default:
+                return false;
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -202 +202 @@
         for (int i=0; i< members.size();i++) {
             RelationMember member = members.get(i);
-            if (member.getMember().getId() == 0) {
+            if (member.getMember().isNew()) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -79 +79 @@
         if (layer == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
-        if (child.getId() == 0)
+        if (child.isNew())
             throw new IllegalArgumentException(tr("Value of child.getId() > 0 expected. Got {1}.", child.getId()));
         referrers = null;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java

@@ -89 +89 @@
 
     public boolean canReload() {
-        return relation != null && relation.getId() > 0;
+        return relation != null && !relation.isNew();
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -117 +117 @@
         if (getRelation() == null) {
             setTitle(tr("Create new relation in layer ''{0}''", layer.getName()));
-        } else if (getRelation().getId() == 0) {
+        } else if (getRelation().isNew()) {
             setTitle(tr("Edit new relation in layer ''{0}''", layer.getName()));
         } else {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

@@ -91 +91 @@
             TreePath path  = event.getPath();
             Relation parent = (Relation)event.getPath().getLastPathComponent();
-            if (! parent.incomplete || parent.getId() == 0)
+            if (! parent.incomplete || parent.isNew())
                 // we don't load complete  or new relations
                 return;

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -362 +362 @@
     protected String getUploadComment() {
         switch(southTabbedPane.getSelectedIndex()) {
-            case 0:
-                return pnlChangesetSelection.getUploadComment();
-            case 1:
-                TagModel tm = tagEditorPanel.getModel().get("comment");
-                return tm == null? "" : tm.getValue();
+        case 0:
+            return pnlChangesetSelection.getUploadComment();
+        case 1:
+            TagModel tm = tagEditorPanel.getModel().get("comment");
+            return tm == null? "" : tm.getValue();
         }
         return "";