Changeset 11772 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

Timestamp:

2017-03-23T00:01:04+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14475 - Deadlock while starting unit tests: remove the need to construct a CombinePrimitiveDialog to detect conflicts

File:

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

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

@@ -58 +58 @@
     }
 
-    private final TagConflictResolver allPrimitivesResolver = new TagConflictResolver();
+    private final TagConflictResolverModel model = new TagConflictResolverModel();
     private final transient Map<OsmPrimitiveType, TagConflictResolver> resolvers = new EnumMap<>(OsmPrimitiveType.class);
     private final JTabbedPane tpResolvers = new JTabbedPane();
@@ -81 +81 @@
         setTitle(tr("Conflicts in pasted tags"));
         for (OsmPrimitiveType type: OsmPrimitiveType.dataValues()) {
-            resolvers.put(type, new TagConflictResolver());
-            resolvers.get(type).getModel().addPropertyChangeListener(this);
+            TagConflictResolverModel tagModel = new TagConflictResolverModel();
+            resolvers.put(type, new TagConflictResolver(tagModel));
+            tagModel.addPropertyChangeListener(this);
         }
         getContentPane().setLayout(new GridBagLayout());
@@ -106 +107 @@
         getContentPane().add(buildButtonPanel(), gc);
         InputMapUtils.addEscapeAction(getRootPane(), new CancelAction());
-
     }
 
@@ -114 +114 @@
         // -- apply button
         ApplyAction applyAction = new ApplyAction();
-        allPrimitivesResolver.getModel().addPropertyChangeListener(applyAction);
+        model.addPropertyChangeListener(applyAction);
         for (TagConflictResolver r : resolvers.values()) {
             r.getModel().addPropertyChangeListener(applyAction);
@@ -141 +141 @@
      */
     protected void initResolver(OsmPrimitiveType type, TagCollection tc, Map<OsmPrimitiveType, Integer> targetStatistics) {
-        resolvers.get(type).getModel().populate(tc, tc.getKeysWithMultipleValues());
-        resolvers.get(type).getModel().prepareDefaultTagDecisions();
+        TagConflictResolver resolver = resolvers.get(type);
+        resolver.getModel().populate(tc, tc.getKeysWithMultipleValues());
+        resolver.getModel().prepareDefaultTagDecisions();
         if (!tc.isEmpty() && targetStatistics.get(type) != null && targetStatistics.get(type) > 0) {
-            tpResolvers.add(PANE_TITLES.get(type), resolvers.get(type));
+            tpResolvers.add(PANE_TITLES.get(type), resolver);
         }
     }
@@ -164 +165 @@
         // init the resolver
         //
-        allPrimitivesResolver.getModel().populate(tagsForAllPrimitives, tagsForAllPrimitives.getKeysWithMultipleValues());
-        allPrimitivesResolver.getModel().prepareDefaultTagDecisions();
+        model.populate(tagsForAllPrimitives, tagsForAllPrimitives.getKeysWithMultipleValues());
+        model.prepareDefaultTagDecisions();
 
         // prepare the dialog with one tag resolver
         pnlTagResolver.removeAll();
-        pnlTagResolver.add(allPrimitivesResolver, BorderLayout.CENTER);
+        pnlTagResolver.add(new TagConflictResolver(model), BorderLayout.CENTER);
 
         statisticsModel.reset();
@@ -297 +298 @@
                 setEnabled(false);
             } else if (mode.equals(Mode.RESOLVING_ONE_TAGCOLLECTION_ONLY)) {
-                setEnabled(allPrimitivesResolver.getModel().isResolvedCompletely());
+                setEnabled(model.isResolvedCompletely());
             } else {
                 setEnabled(resolvers.values().stream().allMatch(val -> val.getModel().isResolvedCompletely()));
@@ -329 +330 @@
      */
     public TagCollection getResolution() {
-        return allPrimitivesResolver.getModel().getResolution();
+        return model.getResolution();
     }
 
@@ -340 +341 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
-            TagConflictResolverModel model = (TagConflictResolverModel) evt.getSource();
+            TagConflictResolverModel tagModel = (TagConflictResolverModel) evt.getSource();
             for (int i = 0; i < tpResolvers.getTabCount(); i++) {
                 TagConflictResolver resolver = (TagConflictResolver) tpResolvers.getComponentAt(i);
-                if (model == resolver.getModel()) {
+                if (tagModel == resolver.getModel()) {
                     tpResolvers.setIconAt(i,
                             (Integer) evt.getNewValue() == 0 ? iconResolved : iconUnresolved