Changeset 1849 in josm

Timestamp:

2009-07-26T10:58:59+02:00 (16 years ago)

Author:

stoecker

Message:

fix #3084 - patch by Pieren

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/projection/Lambert.java (modified) (6 diffs)
• gui/MainApplet.java (modified) (1 diff)

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

@@ -447 +447 @@
     }
 
-    protected static void determinePlatformHook() {
+    public static void determinePlatformHook() {
         String os = System.getProperty("os.name");
         if (os == null) {

trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.ProjectionBounds;
 
 public class Lambert implements Projection {
@@ -69 +68 @@
 
     private static int currentZone = 0;
-
-    private static boolean dontDisplayErrors = false;
 
     /**
@@ -110 +107 @@
             if (layoutZone == -1) {
                 layoutZone = currentZone;
-                dontDisplayErrors = false;
             } else if (layoutZone != currentZone) {
                 if ((currentZone < layoutZone && Math.abs(zoneLimits[currentZone] - lt) > cMaxOverlappingZones)
@@ -121 +117 @@
                     + "and start a new layer on the new zone."));
                     layoutZone = -1;
-                    dontDisplayErrors = true;
                 } else {
                     System.out.println("temporarily extend Lambert zone " + layoutZone + " projection at lat,lon:"
@@ -128 +123 @@
             }
         }
-        if (layoutZone == -1) {
+        if (layoutZone == -1)
             return ConicProjection(lt, lg, Xs[currentZone], Ys[currentZone], c[currentZone], n[currentZone]);
-        } // else
         return ConicProjection(lt, lg, Xs[layoutZone], Ys[layoutZone], c[layoutZone], n[layoutZone]);
     }
@@ -280 +274 @@
     {
         return new Bounds(
-        new LatLon(-90.0, -180.0),
-        new LatLon(90.0, 180.0));
+                new LatLon(45.0, -4.9074074074074059),
+                new LatLon(57.0, 10.2));
     }
 }

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

@@ -101 +101 @@
         Main.preConstructorInit(args);
         Main.parent = this;
+
+        // initialize the plaform hook, and
+        Main.determinePlatformHook();
+        // call the really early hook before we anything else
+        Main.platform.preStartupHook();
+
         new MainCaller().postConstructorProcessCmdLine(args);