Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

Timestamp:

06.02.2010 09:37:48 (2 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) (4 diffs)

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

@@ -231 +231 @@
         setMy(my);
         setTheir(their);
-        propertiesMerger.getModel().populate(my, their);
+        propertiesMerger.populate(my, their);
         if (propertiesMerger.getModel().hasVisibleStateConflict()) {
             tabbedPane.setEnabledAt(1, false);
@@ -239 +239 @@
         }
         tabbedPane.setEnabledAt(0, true);
-        tagMerger.getModel().populate(my, their);
+        tagMerger.populate(my, their);
         tabbedPane.setEnabledAt(1, true);
 
@@ -246 +246 @@
             tabbedPane.setEnabledAt(3,false);
         } else if (my instanceof Way) {
-            nodeListMerger.populate((Way)my, (Way)their);
+            nodeListMerger.populate(my, their);
             tabbedPane.setEnabledAt(2, true);
             tabbedPane.setEnabledAt(3, false);
@@ -252 +252 @@
             tabbedPane.setIconAt(3, null);
         } else if (my instanceof Relation) {
-            relationMemberMerger.populate((Relation)my, (Relation)their);
+            relationMemberMerger.populate(my, their);
             tabbedPane.setEnabledAt(2, false);
             tabbedPane.setTitleAt(2,tr("Nodes"));