Changeset 4734 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2011-12-28T20:40:46+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r4689 r4734 18 18 import org.openstreetmap.josm.data.osm.Relation; 19 19 import org.openstreetmap.josm.data.osm.RelationMember; 20 import org.openstreetmap.josm.data.osm.RelationMemberData; 20 21 import org.openstreetmap.josm.data.osm.User; 21 22 import org.openstreetmap.josm.data.osm.Way; … … 42 43 import org.openstreetmap.josm.io.XmlWriter; 43 44 import org.openstreetmap.josm.tools.CheckParameterUtil; 44 import org.openstreetmap.josm.tools.Diff;45 45 46 46 /** … … 721 721 return false; 722 722 return 723 thisRelation.getMembers().get(row).get PrimitiveId() == oppositeRelation.getMembers().get(row).getPrimitiveId()723 thisRelation.getMembers().get(row).getMemberId() == oppositeRelation.getMembers().get(row).getMemberId() 724 724 && thisRelation.getMembers().get(row).getRole().equals(oppositeRelation.getMembers().get(row).getRole()); 725 725 } … … 881 881 HistoryRelation hr = (HistoryRelation)clone; 882 882 for (RelationMember rm : r.getMembers()) { 883 hr.addMember(new org.openstreetmap.josm.data.osm.history.RelationMember(rm.getRole(), rm.getType(), rm.getUniqueId()));883 hr.addMember(new RelationMemberData(rm.getRole(), rm.getType(), rm.getUniqueId())); 884 884 } 885 885 } -
trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
r4566 r4734 14 14 15 15 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 16 import org.openstreetmap.josm.data.osm. history.RelationMember;16 import org.openstreetmap.josm.data.osm.RelationMemberData; 17 17 import org.openstreetmap.josm.tools.ImageProvider; 18 18 … … 39 39 } 40 40 41 protected void renderIcon(RelationMember member) {41 protected void renderIcon(RelationMemberData member) { 42 42 if (member == null) { 43 43 setIcon(null); 44 44 } else { 45 setIcon(icons.get(member.get PrimitiveType()));45 setIcon(icons.get(member.getMemberType())); 46 46 } 47 47 } 48 48 49 protected void renderRole( HistoryBrowserModel.RelationMemberTableModel model, RelationMember member, int row, boolean isSelected) {49 protected void renderRole( HistoryBrowserModel.RelationMemberTableModel model, RelationMemberData member, int row, boolean isSelected) { 50 50 String text = ""; 51 51 Color bgColor = Color.WHITE; … … 67 67 } 68 68 69 protected void renderPrimitive( HistoryBrowserModel.RelationMemberTableModel model, RelationMember member, int row, boolean isSelected) {69 protected void renderPrimitive( HistoryBrowserModel.RelationMemberTableModel model, RelationMemberData member, int row, boolean isSelected) { 70 70 String text = ""; 71 71 Color bgColor = Color.WHITE; … … 74 74 } else { 75 75 text = ""; 76 switch(member.get PrimitiveType()) {77 case NODE: text = tr("Node {0}", member.get PrimitiveId()); break;78 case WAY: text = tr("Way {0}", member.get PrimitiveId()); break;79 case RELATION: text = tr("Relation {0}", member.get PrimitiveId()); break;76 switch(member.getMemberType()) { 77 case NODE: text = tr("Node {0}", member.getMemberId()); break; 78 case WAY: text = tr("Way {0}", member.getMemberId()); break; 79 case RELATION: text = tr("Relation {0}", member.getMemberId()); break; 80 80 } 81 81 if (model.isSameInOppositeWay(row)) { … … 97 97 98 98 HistoryBrowserModel.RelationMemberTableModel model = gteRelationMemberTableModel(table); 99 RelationMember member = (RelationMember)value;99 RelationMemberData member = (RelationMemberData)value; 100 100 renderIcon(member); 101 101 switch(column) {
Note:
See TracChangeset
for help on using the changeset viewer.