Changeset 29854 in osm for applications/editors/josm/plugins/merge-overlap/src

Timestamp:

2013-08-21T03:47:16+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap

Files:

• MergeOverlapAction.java (modified) (1 diff)
• MyCombinePrimitiveResolverDialog.java (modified) (1 diff)

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

@@ -695 +695 @@
                 }
         }
-
+/*
         private Way getOld(Way r) {
                 return getOld(r, oldWays);
-        }
+        }*/
 
         public static Way getOld(Way w, Map<Way, Way> oldWays) {

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java

@@ -173 +173 @@
     protected void updateTitle() {
         if (targetPrimitive == null) {
-            setTitle(tr("Conflicts when combining primitives", null));
+            setTitle(tr("Conflicts when combining primitives"));
             return;
         }