Changeset 734 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2008-07-24T08:41:19+02:00 (16 years ago)

Author:

stoecker

Message:

No longer make a created_by conflict for way or node joining. In case of conflicts use JOSM as new value.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -171 +171 @@
                                 newWay.put(e.getKey(), combined);
                         } else if (e.getValue().size() > 1) {
-                                JComboBox c = new JComboBox(e.getValue().toArray());
-                                c.setEditable(true);
-                                p.add(new JLabel(e.getKey()), GBC.std());
-                                p.add(Box.createHorizontalStrut(10), GBC.std());
-                                p.add(c, GBC.eol());
-                                components.put(e.getKey(), c);
+                                if("created_by".equals(e.getKey()))
+                                {
+                                        newWay.put("created_by", "JOSM");
+                                }
+                                else
+                                {
+                                        JComboBox c = new JComboBox(e.getValue().toArray());
+                                        c.setEditable(true);
+                                        p.add(new JLabel(e.getKey()), GBC.std());
+                                        p.add(Box.createHorizontalStrut(10), GBC.std());
+                                        p.add(c, GBC.eol());
+                                        components.put(e.getKey(), c);
+                                }
                         } else
                                 newWay.put(e.getKey(), e.getValue().iterator().next());

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -171 +171 @@
                                 newNode.put(e.getKey(), combined);
                         } else if (e.getValue().size() > 1) {
-                                JComboBox c = new JComboBox(e.getValue().toArray());
-                                c.setEditable(true);
-                                p.add(new JLabel(e.getKey()), GBC.std());
-                                p.add(Box.createHorizontalStrut(10), GBC.std());
-                                p.add(c, GBC.eol());
-                                components.put(e.getKey(), c);
+                                if("created_by".equals(e.getKey()))
+                                {
+                                        newNode.put("created_by", "JOSM");
+                                }
+                                else
+                                {
+                                        JComboBox c = new JComboBox(e.getValue().toArray());
+                                        c.setEditable(true);
+                                        p.add(new JLabel(e.getKey()), GBC.std());
+                                        p.add(Box.createHorizontalStrut(10), GBC.std());
+                                        p.add(c, GBC.eol());
+                                        components.put(e.getKey(), c);
+                                }
                         } else
                                 newNode.put(e.getKey(), e.getValue().iterator().next());