Changeset 211 in josm


Ignore:
Timestamp:
2007-04-04T14:23:22+02:00 (15 years ago)
Author:
imi
Message:
  • fixed the please wait dialog not always above the main window
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/org/openstreetmap/josm/Main.java

    r208 r211  
    328328                        bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
    329329
    330                         pleaseWaitDlg = new PleaseWaitDialog();
     330                        // preinitialize a wait dialog for all early downloads (e.g. via command line)
     331                        pleaseWaitDlg = new PleaseWaitDialog(null);
    331332        }
    332333
    333334        public void postConstructorProcessCmdLine(Map<String, Collection<String>> args) {
     335                // initialize the pleaseWaitDialog with the application as parent to handle focus stuff
     336                pleaseWaitDlg = new PleaseWaitDialog(parent);
     337
    334338                if (args.containsKey("download"))
    335339                        for (String s : args.get("download"))
  • src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

    r183 r211  
    9898         * Draw an number of the order of the segment within the parents way
    9999         */
    100         private void drawOrderNumber(Segment ls, int orderNumber) {
     100        protected void drawOrderNumber(Segment ls, int orderNumber) {
    101101                int strlen = (""+orderNumber).length();
    102102                Point p1 = nc.getPoint(ls.from.eastNorth);
  • src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

    r153 r211  
    11package org.openstreetmap.josm.gui;
    22
     3import java.awt.Component;
    34import java.awt.GridBagLayout;
    45
     
    2425        public final JButton cancel = new JButton(I18n.tr("Cancel"));
    2526
    26         public PleaseWaitDialog() {
    27                 super(JOptionPane.getFrameForComponent(Main.parent), true);
     27        public PleaseWaitDialog(Component parent) {
     28                super(JOptionPane.getFrameForComponent(parent), true);
    2829                setLayout(new GridBagLayout());
    2930                JPanel pane = new JPanel(new GridBagLayout());
  • test/org/openstreetmap/josm/io/IncompleteDownloaderTest.java

    r176 r211  
    3030                };
    3131
    32                 Main.pleaseWaitDlg = new PleaseWaitDialog();
     32                Main.pleaseWaitDlg = new PleaseWaitDialog(null);
    3333
    3434                downloader.parse();
Note: See TracChangeset for help on using the changeset viewer.