Changeset 2715 in josm for trunk/src

Timestamp:

2009-12-30T22:02:32+01:00 (15 years ago)

Author:

stoecker

Message:

fixed #3772, #4139 - fixed help browser - the external start never worked for official releases, the blocking of helpbrowser for dialogs will be fixed after Java 1.6 switch

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/ExitAction.java (modified) (1 diff)
• actions/HelpAction.java (modified) (2 diffs)
• gui/ExtendedDialog.java (modified) (2 diffs)
• gui/HelpAwareOptionPane.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (1 diff)
• gui/dialogs/ConflictResolutionDialog.java (modified) (2 diffs)
• gui/help/ContextSensitiveHelpAction.java (modified) (1 diff)
• gui/help/HelpApplication.java (deleted)
• gui/help/HelpBrowser.java (modified) (6 diffs)
• gui/help/HelpBrowserCommandProcessor.java (deleted)
• gui/help/HelpBrowserHistory.java (modified) (1 diff)
• gui/help/HelpBrowserProxy.java (deleted)

trunk/src/org/openstreetmap/josm/Main.java

@@ -50 +50 @@
 import org.openstreetmap.josm.gui.SplashScreen;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
-import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -392 +392 @@
             }
         }
-    }
-
-    /**
-     * Run any cleanup operation before exit
-     *
-     */
-    public static  void cleanupBeforeExit() {
-        // try to close and exit the help browser running in another process
-        //
-        HelpBrowserProxy.getInstance().exit();
     }
 

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

@@ -29 +29 @@
         if (Main.saveUnsavedModifications()) {
             Main.saveGuiGeometry();
-            Main.cleanupBeforeExit();
             System.exit(0);
         }

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

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -43 +43 @@
             }
             if (topic == null) {
-                HelpBrowserProxy.getInstance().setUrlForHelpTopic("/");
+                HelpBrowser.setUrlForHelpTopic("/");
             } else {
-                HelpBrowserProxy.getInstance().setUrlForHelpTopic(topic);
+                HelpBrowser.setUrlForHelpTopic(topic);
             }
         } else {
-            HelpBrowserProxy.getInstance().setUrlForHelpTopic("/");
+            HelpBrowser.setUrlForHelpTopic("/");
         }
     }

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

@@ -23 +23 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.GBC;
@@ -486 +486 @@
 
         public void actionPerformed(ActionEvent e) {
-            HelpBrowserProxy.getInstance().setUrlForHelpTopic(helpTopic);
+            HelpBrowser.setUrlForHelpTopic(helpTopic);
         }
     }

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

@@ -22 +22 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -111 +111 @@
         Action a = new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
-                HelpBrowserProxy.getInstance().setUrlForHelpTopic(helpTopic);
+                HelpBrowser.setUrlForHelpTopic(helpTopic);
             }
         };

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

@@ -55 +55 @@
                     return;
                 Main.saveGuiGeometry();
-                Main.cleanupBeforeExit();
                 System.exit(0);
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException;
-import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -188 +188 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            HelpBrowserProxy.getInstance().setUrlForHelpTopic("/Dialog/ConflictDialog");
+            HelpBrowser.setUrlForHelpTopic("/Dialog/ConflictDialog");
         }
     }

trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java

@@ -52 +52 @@
     public void actionPerformed(ActionEvent e) {
         if (helpTopic != null) {
-            HelpBrowserProxy.getInstance().setUrlForHelpTopic(helpTopic);
+            HelpBrowser.setUrlForHelpTopic(helpTopic);
         }
     }

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -7 +7 @@
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -32 +35 @@
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
@@ -48 +52 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.WindowGeometry;
 
 public class HelpBrowser extends JFrame {
@@ -66 +71 @@
         return instance;
     }
+
+    /**
+     * Show the help page for help topic <code>helpTopic</code>.
+     *
+     * @param helpTopic the help topic
+     */
+    public static void setUrlForHelpTopic(final String helpTopic) {
+        final HelpBrowser browser = getInstance();
+        Runnable r = new Runnable() {
+            public void run() {
+                browser.openHelpTopic(helpTopic);
+                browser.setVisible(true);
+                browser.toFront();
+            }
+        };
+        SwingUtilities.invokeLater(r);
+    }
+
 
     /**
@@ -101 +124 @@
         BufferedReader reader = new BufferedReader(
                 new InputStreamReader(
-                        getClass().getResourceAsStream("help-browser.css")
+                        getClass().getResourceAsStream("/data/help-browser.css")
                 )
         );
@@ -162 +185 @@
         });
 
+        setMinimumSize(new Dimension(400, 200));
         setTitle(tr("JOSM Help Browser"));
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+        if (visible) {
+            new WindowGeometry(
+                    getClass().getName() + ".geometry",
+                    WindowGeometry.centerInWindow(
+                            getParent(),
+                            new Dimension(600,400)
+                    )
+            ).apply(this);
+        } else if (!visible && isShowing()){
+            new WindowGeometry(this).remember(getClass().getName() + ".geometry");
+        }
+        super.setVisible(visible);
     }
 

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -11 +11 @@
     private int historyPos = 0;
 
-    public HelpBrowserHistory(HelpBrowser brower) {
-        this.browser = brower;
+    public HelpBrowserHistory(HelpBrowser browser) {
+        this.browser = browser;
         history = new ArrayList<String>();
     }