Changeset 211 in josm

Timestamp:

2007-04-04T14:23:22+02:00 (18 years ago)

Author:

imi

Message:

• fixed the please wait dialog not always above the main window

Files:

• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (modified) (2 diffs)
• test/org/openstreetmap/josm/io/IncompleteDownloaderTest.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -328 +328 @@
                         bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
 
-                        pleaseWaitDlg = new PleaseWaitDialog();
+                        // preinitialize a wait dialog for all early downloads (e.g. via command line)
+                        pleaseWaitDlg = new PleaseWaitDialog(null);
         }
 
         public void postConstructorProcessCmdLine(Map<String, Collection<String>> args) {
+                // initialize the pleaseWaitDialog with the application as parent to handle focus stuff
+                pleaseWaitDlg = new PleaseWaitDialog(parent);
+
                 if (args.containsKey("download"))
                         for (String s : args.get("download"))

src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -98 +98 @@
          * Draw an number of the order of the segment within the parents way
          */
-        private void drawOrderNumber(Segment ls, int orderNumber) {
+        protected void drawOrderNumber(Segment ls, int orderNumber) {
                 int strlen = (""+orderNumber).length();
                 Point p1 = nc.getPoint(ls.from.eastNorth);

src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui;
 
+import java.awt.Component;
 import java.awt.GridBagLayout;
 
@@ -24 +25 @@
         public final JButton cancel = new JButton(I18n.tr("Cancel"));
 
-        public PleaseWaitDialog() {
-                super(JOptionPane.getFrameForComponent(Main.parent), true);
+        public PleaseWaitDialog(Component parent) {
+                super(JOptionPane.getFrameForComponent(parent), true);
                 setLayout(new GridBagLayout());
                 JPanel pane = new JPanel(new GridBagLayout());

test/org/openstreetmap/josm/io/IncompleteDownloaderTest.java

@@ -30 +30 @@
                 };
 
-                Main.pleaseWaitDlg = new PleaseWaitDialog();
+                Main.pleaseWaitDlg = new PleaseWaitDialog(null);
 
                 downloader.parse();