Changeset 4734 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2011-12-28T20:40:46+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #7194 - Reworking of osmChange downloads (Fail to update a way loaded from osmChange that have been deleted after)

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserModel.java (modified) (4 diffs)
• RelationMemberListTableCellRenderer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
@@ -42 +43 @@
 import org.openstreetmap.josm.io.XmlWriter;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Diff;
 
 /**
@@ -721 +721 @@
                 return false;
             return
-            thisRelation.getMembers().get(row).getPrimitiveId() == oppositeRelation.getMembers().get(row).getPrimitiveId()
+            thisRelation.getMembers().get(row).getMemberId() == oppositeRelation.getMembers().get(row).getMemberId()
             &&  thisRelation.getMembers().get(row).getRole().equals(oppositeRelation.getMembers().get(row).getRole());
         }
@@ -881 +881 @@
             HistoryRelation hr = (HistoryRelation)clone;
             for (RelationMember rm : r.getMembers()) {
-                hr.addMember(new org.openstreetmap.josm.data.osm.history.RelationMember(rm.getRole(), rm.getType(), rm.getUniqueId()));
+                hr.addMember(new RelationMemberData(rm.getRole(), rm.getType(), rm.getUniqueId()));
             }
         }

trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.history.RelationMember;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -39 +39 @@
     }
 
-    protected void renderIcon(RelationMember member) {
+    protected void renderIcon(RelationMemberData member) {
         if (member == null) {
             setIcon(null);
         } else {
-            setIcon(icons.get(member.getPrimitiveType()));
+            setIcon(icons.get(member.getMemberType()));
         }
     }
 
-    protected void renderRole( HistoryBrowserModel.RelationMemberTableModel model, RelationMember member, int row, boolean isSelected) {
+    protected void renderRole( HistoryBrowserModel.RelationMemberTableModel model, RelationMemberData member, int row, boolean isSelected) {
         String text = "";
         Color bgColor = Color.WHITE;
@@ -67 +67 @@
     }
 
-    protected void renderPrimitive( HistoryBrowserModel.RelationMemberTableModel model, RelationMember member, int row, boolean isSelected) {
+    protected void renderPrimitive( HistoryBrowserModel.RelationMemberTableModel model, RelationMemberData member, int row, boolean isSelected) {
         String text = "";
         Color bgColor = Color.WHITE;
@@ -74 +74 @@
         } else {
             text = "";
-            switch(member.getPrimitiveType()) {
-            case NODE: text = tr("Node {0}", member.getPrimitiveId()); break;
-            case WAY: text = tr("Way {0}", member.getPrimitiveId()); break;
-            case RELATION: text = tr("Relation {0}", member.getPrimitiveId()); break;
+            switch(member.getMemberType()) {
+            case NODE: text = tr("Node {0}", member.getMemberId()); break;
+            case WAY: text = tr("Way {0}", member.getMemberId()); break;
+            case RELATION: text = tr("Relation {0}", member.getMemberId()); break;
             }
             if (model.isSameInOppositeWay(row)) {
@@ -97 +97 @@
 
         HistoryBrowserModel.RelationMemberTableModel model = gteRelationMemberTableModel(table);
-        RelationMember member = (RelationMember)value;
+        RelationMemberData member = (RelationMemberData)value;
         renderIcon(member);
         switch(column) {