Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

Timestamp:

04.02.2010 21:04:02 (2 years ago)

Author:

jttt

Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -7 +7 @@
 import java.util.HashSet;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.table.DefaultTableModel;
@@ -29 +28 @@
  */
 public class TagMergeModel extends DefaultTableModel {
-    private static final Logger logger = Logger.getLogger(TagMergeModel.class.getName());
+    //private static final Logger logger = Logger.getLogger(TagMergeModel.class.getName());
 
     static public final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags";