Changeset 2250 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-10-05T21:39:15+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3653: History for anonymous users should not be clickable
fixed #3518: Provide a new feature for uploading the currently selected primitives

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HelpAction.java (modified) (3 diffs)
• actions/UploadAction.java (modified) (2 diffs)
• actions/UploadSelectionAction.java (added)
• data/APIDataSet.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (3 diffs)
• gui/history/HistoryBrowser.java (modified) (1 diff)
• gui/history/VersionInfoPanel.java (modified) (2 diffs)
• gui/history/VersionTableCellRenderer.java (modified) (1 diff)
• gui/io/UploadSelectionDialog.java (added)
• tools/UrlLabel.java (modified) (1 diff)

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

@@ -123 +123 @@
         } else if (e.getActionCommand() == null) {
             String topic = null;
-            Point mouse = Main.parent.getMousePosition();
-            if (mouse != null) {
+            if (e.getSource() instanceof Component) {
+                Component c = SwingUtilities.getRoot((Component)e.getSource());
+                Point mouse = c.getMousePosition();
+                c = SwingUtilities.getDeepestComponentAt(c, mouse.x, mouse.y);
+                topic = contextSensitiveHelp(c);
+            } else {
+                Point mouse = Main.parent.getMousePosition();
                 topic = contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y));
             }
@@ -143 +148 @@
      */
     private String contextSensitiveHelp(Object c) {
+        if (c == null)
+            return null;
         if (c instanceof Helpful)
             return ((Helpful)c).helpTopic();
@@ -159 +166 @@
         if (c instanceof Action)
             return (String)((Action)c).getValue("help");
+        if (c instanceof JComponent && ((JComponent)c).getClientProperty("help") != null)
+            return (String)((JComponent)c).getClientProperty("help");
         if (c instanceof Component)
             return contextSensitiveHelp(((Component)c).getParent());

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

@@ -152 +152 @@
     }
 
+    public void uploadData(OsmDataLayer layer, APIDataSet apiData) {
+        if (apiData.isEmpty()) {
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("No changes to upload."),
+                    tr("Warning"),
+                    JOptionPane.INFORMATION_MESSAGE
+            );
+            return;
+        }
+        if (!checkPreUploadConditions(layer, apiData))
+            return;
+        Main.worker.execute(
+                createUploadTask(
+                        layer,
+                        apiData.getPrimitives(),
+                        UploadDialog.getUploadDialog().getChangeset(),
+                        UploadDialog.getUploadDialog().isDoCloseAfterUpload()
+                )
+        );
+    }
+
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled())
@@ -164 +186 @@
             return;
         }
-
         APIDataSet apiData = new APIDataSet(Main.main.getCurrentDataSet());
-        if (apiData.isEmpty()) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("No changes to upload."),
-                    tr("Warning"),
-                    JOptionPane.INFORMATION_MESSAGE
-            );
-            return;
-        }
-        if (!checkPreUploadConditions(Main.map.mapView.getEditLayer(), apiData))
-            return;
-        Main.worker.execute(
-                createUploadTask(
-                        Main.map.mapView.getEditLayer(),
-                        apiData.getPrimitives(),
-                        UploadDialog.getUploadDialog().getChangeset(),
-                        UploadDialog.getUploadDialog().isDoCloseAfterUpload()
-                )
-        );
+        uploadData(Main.map.mapView.getEditLayer(), apiData);
     }
 

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -66 +66 @@
             }
         }
-    }
-
+        sortDeleted();
+    }
+
+    /**
+     * Ensures that primitives are deleted in the following order: Relations, then Ways,
+     * then Nodes.
+     * 
+     */
+    protected void sortDeleted() {
+        Collections.sort(
+                toDelete,
+                new Comparator<OsmPrimitive>() {
+                    public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+                        if (o1 instanceof Node && o2 instanceof Node)
+                            return 0;
+                        else if (o1 instanceof Node)
+                            return 1;
+                        else if (o2 instanceof Node)
+                            return -1;
+
+                        if (o1 instanceof Way && o2 instanceof Way)
+                            return 0;
+                        else if (o1 instanceof Way && o2 instanceof Relation)
+                            return 1;
+                        else if (o2 instanceof Way && o1 instanceof Relation)
+                            return -1;
+
+                        return 0;
+                    }
+                }
+        );
+    }
     /**
      * initializes the API data set with the modified primitives in <code>ds</code>
@@ -76 +106 @@
         this();
         init(ds);
+    }
+
+    /**
+     * initializes the API data set with the primitives in <code>primitives</code>
+     * 
+     * @param primitives the collection of primitives
+     */
+    public APIDataSet(Collection<OsmPrimitive> primitives) {
+        this();
+        toAdd.clear();
+        toUpdate.clear();
+        toDelete.clear();
+        for (OsmPrimitive osm: primitives) {
+            if (osm.getId() == 0 && !osm.isDeleted()) {
+                toAdd.addLast(osm);
+            } else if (osm.isModified() && !osm.isDeleted()) {
+                toUpdate.addLast(osm);
+            } else if (osm.isDeleted() && osm.getId() != 0 && osm.isModified()) {
+                toDelete.addFirst(osm);
+            }
+        }
+        sortDeleted();
     }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -66 +66 @@
 import org.openstreetmap.josm.actions.UpdateSelectionAction;
 import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.actions.UploadSelectionAction;
 import org.openstreetmap.josm.actions.ZoomInAction;
 import org.openstreetmap.josm.actions.ZoomOutAction;
@@ -104 +105 @@
     public final JosmAction updateSelection = new UpdateSelectionAction();
     public final JosmAction upload = new UploadAction();
+    public final JosmAction uploadSelection = new UploadSelectionAction();
     public final JosmAction exit = new ExitAction();
 
@@ -206 +208 @@
         add(fileMenu, downloadReferrers);
         add(fileMenu, upload);
+        add(fileMenu, uploadSelection);
         add(fileMenu, update);
         add(fileMenu, updateSelection);

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java

@@ -96 +96 @@
 
         pane.setOneTouchExpandable(true);
-        pane.setDividerLocation(150);
+        pane.setDividerLocation(200);
 
         Dimension minimumSize = new Dimension(100, 50);

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -7 +7 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Observable;
@@ -108 +110 @@
         String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + getPrimitive().getChangesetId();
         lblChangeset.setUrl(url);
-        lblChangeset.setDescription(tr("{0}", getPrimitive().getChangesetId()));
+        lblChangeset.setDescription(Long.toString(getPrimitive().getChangesetId()));
 
-        url = AbstractInfoAction.getBaseUserUrl() + "/" + getPrimitive().getUser();
-        lblUser.setUrl(url);
-        lblUser.setDescription(tr("{0}", getPrimitive().getUser()));
+        try {
+            if (getPrimitive().getUid() != -1) {
+                url = AbstractInfoAction.getBaseUserUrl() + "/" +  URLEncoder.encode(getPrimitive().getUser(), "UTF-8").replaceAll("\\+", "%20");
+                lblUser.setUrl(url);
+            } else {
+                lblUser.setUrl(null);
+            }
+        } catch(UnsupportedEncodingException e) {
+            e.printStackTrace();
+            lblUser.setUrl(null);
+        }
+        lblUser.setDescription(getPrimitive().getUser());
     }
 }

trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java

@@ -59 +59 @@
             sb.append("");
         } else {
-            sb.append(tr("Version {0}", Long.toString(primitive.getVersion())));
+            String msg = tr(
+                    "Version {0}, {1} (by {2})",
+                    Long.toString(primitive.getVersion()),
+                    new SimpleDateFormat().format(primitive.getTimestamp()),
+                    primitive.getUser()
+            );
+            sb.append(msg);
         }
         setText(sb.toString());

trunk/src/org/openstreetmap/josm/tools/UrlLabel.java

@@ -34 +34 @@
     protected void refresh() {
         setContentType("text/html");
-        setText("<html><a href=\""+url+"\">"+description+"</a></html>");
+        if (url != null) {
+            setText("<html><a href=\""+url+"\">"+description+"</a></html>");
+        } else {
+            setText("<html>" + description + "</html>");
+        }
         setToolTipText(url);
     }