Changeset 17 in josm for src/org/openstreetmap/josm/gui/Main.java

Timestamp:

2005-10-09T04:14:40+02:00 (21 years ago)

Author:

imi

Message:

• added Layer support
• added support for raw GPS data
• fixed tooltips
• added options for loading gpx files

File:

• src/org/openstreetmap/josm/gui/Main.java (modified) (4 diffs)

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

@@ -5 +5 @@
 import java.awt.Container;
 
-import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
@@ -36 +35 @@
          * Global application preferences
          */
-        public static Preferences pref = new Preferences();
+        public final static Preferences pref = new Preferences();
         
         /**
@@ -141 +140 @@
                 //TODO: Check for changes and ask user
                 this.name = name;
+                if (this.mapFrame != null)
+                        this.mapFrame.setVisible(false);
                 this.mapFrame = mapFrame;
                 panel.setVisible(false);
                 panel.removeAll();
-                panel.add(mapFrame, BorderLayout.CENTER);
-                panel.add(mapFrame.toolBarActions, BorderLayout.WEST);
-                panel.add(mapFrame.statusLine, BorderLayout.SOUTH);
-                panel.setVisible(true);
+                if (mapFrame != null) {
+                        mapFrame.fillPanel(panel);
+                        panel.setVisible(true);
+                        mapFrame.setVisible(true);
+                }
         }
         /**
@@ -167 +169 @@
          */
         private static void setupUiDefaults() {
-                UIManager.put("OptionPane.okIcon", new ImageIcon(Main.class.getResource("/images/ok.png")));
+                UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));
                 UIManager.put("OptionPane.yesIcon", UIManager.get("OptionPane.okIcon"));
-                UIManager.put("OptionPane.cancelIcon", new ImageIcon(Main.class.getResource("/images/cancel.png")));
+                UIManager.put("OptionPane.cancelIcon", ImageProvider.get("cancel"));
                 UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
         }