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

Timestamp:

2009-10-05T21:39:15+02:00 (17 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/actions

Files:

• HelpAction.java (modified) (3 diffs)
• UploadAction.java (modified) (2 diffs)
• UploadSelectionAction.java (added)

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);
     }