Changeset 7674 in josm for trunk/src/org

Timestamp:

2014-10-29T20:48:08+01:00 (10 years ago)

Author:

Don-vip

Message:

code refactoring to avoid hacks in merge-overlap plugin

File:

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

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -113 +113 @@
     private AutoAdjustingSplitPane spTagConflictTypes;
     private TagConflictResolver pnlTagConflictResolver;
-    private RelationMemberConflictResolver pnlRelationMemberConflictResolver;
+    protected RelationMemberConflictResolver pnlRelationMemberConflictResolver;
     private boolean canceled;
     private JPanel pnlButtons;
-    private OsmPrimitive targetPrimitive;
+    protected OsmPrimitive targetPrimitive;
 
     /** the private help action */
@@ -191 +191 @@
     }
 
+    protected ApplyAction buildApplyAction() {
+        return new ApplyAction();
+    }
+
     protected JPanel buildButtonPanel() {
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
         // -- apply button
-        ApplyAction applyAction = new ApplyAction();
+        ApplyAction applyAction = buildApplyAction();
         pnlTagConflictResolver.getModel().addPropertyChangeListener(applyAction);
         pnlRelationMemberConflictResolver.getModel().addPropertyChangeListener(applyAction);
@@ -295 +299 @@
 
     protected void prepareDefaultTagDecisions() {
-        TagConflictResolverModel model = getTagConflictResolverModel();
-        model.prepareDefaultTagDecisions();
-        model.rebuild();
+        getTagConflictResolverModel().prepareDefaultTagDecisions();
     }
 
@@ -417 +419 @@
     }
 
-    class ApplyAction extends AbstractAction implements PropertyChangeListener {
+    protected class ApplyAction extends AbstractAction implements PropertyChangeListener {
 
         public ApplyAction() {