Changeset 7661 in josm for trunk/src

Timestamp:

2014-10-27T23:25:38+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10668 - code refactoring to avoid hacks in merge-overlap plugin

Location:

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

Files:

• CombinePrimitiveResolverDialog.java (modified) (1 diff)
• RelationMemberConflictResolver.java (modified) (3 diffs)
• RelationMemberConflictResolverModel.java (modified) (3 diffs)

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

@@ -187 +187 @@
 
     protected JPanel buildRelationMemberConflictResolverPanel() {
-        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver();
+        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new RelationMemberConflictResolverModel());
         return pnlRelationMemberConflictResolver;
     }

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

@@ -44 +44 @@
     private AutoCompletingTextField tfValue;
     private JCheckBox cbTagRelations;
-    private RelationMemberConflictResolverModel model;
+    private final RelationMemberConflictResolverModel model;
     private RelationMemberConflictResolverTable tblResolver;
     private JMultilineLabel lblHeader;
@@ -59 +59 @@
         gc.insets = new Insets(5,5,5,5);
         add(pnl, gc);
-        model = new RelationMemberConflictResolverModel();
 
         gc.gridy = 1;
@@ -118 +117 @@
     /**
      * Constructs a new {@code RelationMemberConflictResolver}.
+     * @param model model managing a list of conflicting relation members
+     * @since 7661
      */
-    public RelationMemberConflictResolver() {
+    public RelationMemberConflictResolver(RelationMemberConflictResolverModel model) {
+        this.model = model;
         build();
     }

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

@@ -31 +31 @@
 
     /** the list of conflict decisions */
-    private List<RelationMemberConflictDecision> decisions;
+    protected final List<RelationMemberConflictDecision> decisions;
     /** the collection of relations for which we manage conflicts */
-    private Collection<Relation> relations;
+    protected Collection<Relation> relations;
     /** the number of conflicts */
     private int numConflicts;
-    private PropertyChangeSupport support;
+    private final PropertyChangeSupport support;
 
     /**
      * Replies true if each {@link MultiValueResolutionDecision} is decided.
      *
-     * @return true if each {@link MultiValueResolutionDecision} is decided; false
-     * otherwise
+     * @return true if each {@link MultiValueResolutionDecision} is decided; false otherwise
      */
     public boolean isResolvedCompletely() {
@@ -72 +71 @@
         numConflicts = count;
         if (numConflicts != oldValue) {
-            support.firePropertyChange(NUM_CONFLICTS_PROP, oldValue, numConflicts);
-        }
+            support.firePropertyChange(getProperty(), oldValue, numConflicts);
+        }
+    }
+
+    protected String getProperty() {
+        return NUM_CONFLICTS_PROP;
     }
 
@@ -307 +310 @@
      */
     public Set<Relation> getModifiedRelations(OsmPrimitive newPrimitive) {
-        HashSet<Relation> ret = new HashSet<>();
+        Set<Relation> ret = new HashSet<>();
         for (Relation relation: relations) {
             if (isChanged(relation, newPrimitive)) {