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

Timestamp:

2012-06-25T21:25:50+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750 - conflict manager: select and zoom primitives with id:0

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/pair/ListMergeModel.java (modified) (1 diff)
• conflict/pair/PairTable.java (added)
• conflict/pair/nodes/NodeListMerger.java (modified) (3 diffs)
• conflict/pair/nodes/NodeListTable.java (modified) (1 diff)
• conflict/pair/relation/RelationMemberListMergeModel.java (modified) (1 diff)
• conflict/pair/relation/RelationMemberMerger.java (modified) (3 diffs)
• conflict/pair/relation/RelationMemberTable.java (modified) (1 diff)
• widgets/OsmPrimitivesTable.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -126 +126 @@
      * @return Primitive from my dataset referenced by entry
      */
-    protected OsmPrimitive getMyPrimitive(T entry) {
-        return getMyPrimitiveDefault(entry);
+    public OsmPrimitive getMyPrimitive(T entry) {
+        return getMyPrimitiveById(entry);
     }
     
-    protected final OsmPrimitive getMyPrimitiveDefault(PrimitiveId entry) {
+    public final OsmPrimitive getMyPrimitiveById(PrimitiveId entry) {
         OsmPrimitive result = myDataset.getPrimitiveById(entry);
         if (result == null && mergedMap != null) {

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

@@ -28 +28 @@
         myEntriesTable  = new NodeListTable(
                 "table.mynodes",
+                model,
                 model.getMyTableModel(),
                 model.getMySelectionModel()
@@ -38 +39 @@
         mergedEntriesTable  = new NodeListTable(
                 "table.mergednodes",
+                model,
                 model.getMergedTableModel(),
                 model.getMergedSelectionModel()
@@ -48 +50 @@
         theirEntriesTable  = new NodeListTable(
                 "table.theirnodes",
+                model,
                 model.getTheirTableModel(),
                 model.getTheirSelectionModel()

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.conflict.pair.nodes;
 
-import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 
 import org.openstreetmap.josm.actions.ZoomToAction;
-import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.PairTable;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 
-public class NodeListTable extends OsmPrimitivesTable {
+public class NodeListTable extends PairTable {
 
-    public NodeListTable(String name, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
-        super(dm, new NodeListColumnModel(new NodeListTableCellRenderer()), sm);
-        setName(name);
-        setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+    public NodeListTable(String name, ListMergeModel<Node> model, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
+        super(name, model, dm, new NodeListColumnModel(new NodeListTableCellRenderer()), sm);
     }
 

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

@@ -92 +92 @@
 
     @Override
-    protected OsmPrimitive getMyPrimitive(RelationMember entry) {
-        return getMyPrimitiveDefault(entry.getMember());
+    public OsmPrimitive getMyPrimitive(RelationMember entry) {
+        return getMyPrimitiveById(entry.getMember());
     }
 

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

@@ -19 +19 @@
         myEntriesTable  = new RelationMemberTable(
                 "table.mymembers",
+                model,
                 model.getMyTableModel(),
                 model.getMySelectionModel()
@@ -29 +30 @@
         mergedEntriesTable  = new RelationMemberTable(
                 "table.mergedmembers",
+                model,
                 model.getMergedTableModel(),
                 model.getMergedSelectionModel()
@@ -40 +42 @@
         theirEntriesTable  = new RelationMemberTable(
                 "table.theirmembers",
+                model,
                 model.getTheirTableModel(),
                 model.getTheirSelectionModel()

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair.relation;
 
-import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 
 import org.openstreetmap.josm.actions.ZoomToAction;
-import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.PairTable;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 
-public class RelationMemberTable extends OsmPrimitivesTable {
+public class RelationMemberTable extends PairTable {
 
-    public RelationMemberTable(String name, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
-        super(dm, new RelationMemberListColumnModel(), sm);
-        setName(name);
-        setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+    public RelationMemberTable(String name, ListMergeModel<RelationMember> model, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
+        super(name, model, dm, new RelationMemberListColumnModel(), sm);
     }
 

trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java

@@ -71 +71 @@
         MapView.removeLayerChangeListener(zoomToAction);
     }
+    
+    public OsmPrimitive getPrimitiveToZoomTo(int row, OsmDataLayer layer) {
+        return getOsmPrimitivesTableModel().getReferredPrimitive(row);
+    }
 
     protected class PopupListener extends MouseAdapter {