Changeset 98 in josm for src/org/openstreetmap/josm/tools

Timestamp:

2006-04-25T00:11:38+02:00 (19 years ago)

Author:

imi

Message:

• added Applet version of JOSM (unfinished)
• fixed display bug if --no-fullscreen and --geometry was specified

Location:

src/org/openstreetmap/josm/tools

Files:

• BugReportExceptionHandler.java (modified) (2 diffs)
• TileCache.java (modified) (3 diffs)

src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -28 +28 @@
         public void uncaughtException(Thread t, Throwable e) {
                 e.printStackTrace();
-                if (Main.main != null) {
+                if (Main.parent != null) {
                         Object[] options = new String[]{"Do nothing", "Report Bug"};
-                        int answer = JOptionPane.showOptionDialog(Main.main, "An unexpected exception occoured.\n\n" +
+                        int answer = JOptionPane.showOptionDialog(Main.parent, "An unexpected exception occoured.\n\n" +
                                         "This is always a coding error. If you are running the latest\n" +
                                         "version of JOSM, please consider be kind and file a bug report.",
@@ -69 +69 @@
                                         p.add(new JScrollPane(info), GBC.eop());
 
-                                        JOptionPane.showMessageDialog(Main.main, p);
+                                        JOptionPane.showMessageDialog(Main.parent, p);
                                 } catch (Exception e1) {
                                         e1.printStackTrace();

src/org/openstreetmap/josm/tools/TileCache.java

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -153 +152 @@
      */
     public synchronized Image get(final int tileId, final int zoom) {
-        final File cacheDir = new File(Main.pref.get("cache.directory", Preferences.getPreferencesDir()+"cache")+"/"+Main.proj.getCacheDirectoryName()+"/"+zoom);
+        final File cacheDir = new File(Main.pref.get("cache.directory", Main.pref.getPreferencesDir()+"cache")+"/"+Main.proj.getCacheDirectoryName()+"/"+zoom);
         if (!cache.containsKey(zoom)) {
             HashMap<Integer, Image> map = new HashMap<Integer, Image>();
@@ -189 +188 @@
                             map.put(tileId, loading);
                             currentlyLoading.remove(tileId*256+zoom);
-                            Main.main.repaint();
+                            Main.map.repaint();
                         } catch (Exception e) {
                             e.printStackTrace();