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

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

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

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

@@ -148 +148 @@
         String msg = "";
         switch(type) {
-            case NODE: msg= trn("{0} node", "{0} nodes", count, count); break;
-            case WAY: msg= trn("{0} way", "{0} ways", count, count); break;
-            case RELATION: msg= trn("{0} relation", "{0} relations", count, count); break;
+        case NODE: msg= trn("{0} node", "{0} nodes", count, count); break;
+        case WAY: msg= trn("{0} way", "{0} ways", count, count); break;
+        case RELATION: msg= trn("{0} relation", "{0} relations", count, count); break;
         }
         return msg;
@@ -295 +295 @@
 
         public void propertyChange(PropertyChangeEvent evt) {
-            if (evt.getPropertyName().equals(TagConflictResolverModel.RESOLVED_COMPLETELY_PROP)) {
+            if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
                 updateEnabledState();
             }
@@ -324 +324 @@
 
     public void propertyChange(PropertyChangeEvent evt) {
-        if (evt.getPropertyName().equals(TagConflictResolverModel.RESOLVED_COMPLETELY_PROP)) {
+        if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
             TagConflictResolverModel model = (TagConflictResolverModel)evt.getSource();
             for (int i=0; i < tpResolvers.getTabCount();i++) {
@@ -446 +446 @@
                 String msg = "";
                 switch(type) {
-                    case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
-                    case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
-                    case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
+                case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
+                case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
+                case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
                 }
                 text = text.equals("") ? msg : text + ", " + msg;
@@ -472 +472 @@
                 String msg = "";
                 switch(type) {
-                    case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
-                    case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
-                    case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
+                case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
+                case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
+                case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
                 }
                 text = text.equals("") ? msg : text + ", " + msg;
@@ -491 +491 @@
 
                 switch(column) {
-                    case 0: renderNumTags(info); break;
-                    case 1: renderFrom(info); break;
-                    case 2: renderTo(info); break;
+                case 0: renderNumTags(info); break;
+                case 1: renderFrom(info); break;
+                case 2: renderTo(info); break;
                 }
             }