Changeset 5335 in josm

Timestamp:

Jul 14, 2012 3:25:45 AM (11 months ago)

Author:

Don-vip

Message:

fix #7855 - conflict dialog: CCE selecting a way in members tab

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• ListMergeModel.java (modified) (2 diffs)
• ListMerger.java (modified) (3 diffs)
• nodes/NodeListMerger.java (modified) (3 diffs)
• relation/RelationMemberMerger.java (modified) (1 diff)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -713 +714 @@
         @Override
         public OsmPrimitive getReferredPrimitive(int idx) {
-            return (OsmPrimitive) getValueAt(idx, 1);
+            Object value = getValueAt(idx, 1);
+            if (value instanceof OsmPrimitive) {
+                return (OsmPrimitive) value;
+            } else if (value instanceof RelationMember) {
+                return ((RelationMember)value).getMember();
+            } else {
+                System.err.println("Unknown object type: "+value);
+                return null;
+            }
         }
     }

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

@@ -18 +18 @@
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
@@ -36 +38 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -1024 +1031 @@
         }
     }
+    
+    protected final <P extends OsmPrimitive> OsmDataLayer findLayerFor(P primitive) {
+        if (primitive != null) {
+            List<OsmDataLayer> layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class);
+            // Find layer with same dataset
+            for (OsmDataLayer layer : layers) {
+                if (layer.data == primitive.getDataSet()) {
+                    return layer;
+                }
+            }
+            // Conflict after merging layers: a dataset could be no more in any layer, try to find another layer with same primitive
+            for (OsmDataLayer layer : layers) {
+                final Collection<? extends OsmPrimitive> collection;
+                if (primitive instanceof Way) {
+                    collection = layer.data.getWays();
+                } else if (primitive instanceof Relation) {
+                    collection = layer.data.getRelations();
+                } else {
+                    collection = layer.data.allPrimitives();
+                }
+                for (OsmPrimitive p : collection) {
+                    if (p.getPrimitiveId().equals(primitive.getPrimitiveId())) {
+                        return layer;
+                    }
+                }
+            }
+        }
+        return null;
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.conflict.pair.nodes;
 
-import java.util.List;
-
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -13 +10 @@
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -65 +61 @@
     }
     
-    protected OsmDataLayer findLayerFor(Way w) {
-        List<OsmDataLayer> layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class);
-        // Find layer with same dataset
-        for (OsmDataLayer layer : layers) {
-            if (layer.data == w.getDataSet()) {
-                return layer;
-            }
-        }
-        // Conflict after merging layers: a dataset could be no more in any layer, try to find another layer with same primitive
-        for (OsmDataLayer layer : layers) {
-            for (Way way : layer.data.getWays()) {
-                if (way.getPrimitiveId().equals(w.getPrimitiveId())) {
-                    return layer;
-                }
-            }
-        }
-        return null;
-    }
-
     public void deletePrimitive(boolean deleted) {
         if (deleted) {

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

@@ -50 +50 @@
 
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
-        RelationMemberListMergeModel model = (RelationMemberListMergeModel)getModel();
-        model.populate((Relation)conflict.getMy(), (Relation)conflict.getTheir(), conflict.getMergedMap());
+        Relation myRel = (Relation)conflict.getMy();
+        Relation theirRel = (Relation)conflict.getTheir();
+        ((RelationMemberListMergeModel)model).populate(myRel, theirRel, conflict.getMergedMap());
+        myEntriesTable.setLayer(findLayerFor(myRel));
+        theirEntriesTable.setLayer(findLayerFor(theirRel));
     }