Changeset 1530 in josm for trunk/src/org

Timestamp:

2009-04-17T15:25:57+02:00 (16 years ago)

Author:

framm

Message:

upload more precise version number in changeset. drop some "created_by" special cases.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (modified) (1 diff)
• actions/MergeNodesAction.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (2 diffs)
• io/OsmApi.java (modified) (2 diffs)

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

@@ -175 +175 @@
                 newWay.put(e.getKey(), combined);
             } else if (e.getValue().size() > 1) {
-                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
+                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

@@ -174 +174 @@
                 newNode.put(e.getKey(), combined);
             } else if (e.getValue().size() > 1) {
-                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
+                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());
+            }
         }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -152 +152 @@
      */
     public static Collection<String> getUninterestingKeys() {
-        if(uninteresting == null) {
+        if (uninteresting == null) {
             uninteresting = Main.pref.getCollection("tags.uninteresting",
                     Arrays.asList(new String[]{"source","note","comment","converted_by","created_by"}));
@@ -303 +303 @@
     /**
      * true if this object is considered "tagged". To be "tagged", an object
-     * must have one or more "non-standard" tags. "created_by" and "source"
-     * are typically considered "standard" tags and do not make an object
+     * must have one or more "interesting" tags. "created_by" and "source"
+     * are typically considered "uninteresting" and do not make an object
      * "tagged".
      */

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -20 +20 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Properties;
 import java.util.StringTokenizer;
 
@@ -264 +265 @@
         changeset = new Changeset();
         Main.pleaseWaitDlg.currentAction.setText(tr("Opening changeset..."));
-        changeset.put("created_by", "JOSM");
+        Properties sysProp = System.getProperties();
+        Object ua = sysProp.get("http.agent");
+        changeset.put("created_by", (ua == null) ? "JOSM" : ua.toString());
         changeset.put("comment", comment);
         createPrimitive(changeset);