2003/12/29 03:25:44

darcs-hash:20040130074331-2ba56-a4025c142b5191e6b78d2d76f28663475ef07283.gz

diff --git a/src/org/xwt/plat/Darwin.java b/src/org/xwt/plat/Darwin.java
index 8061723..a4f533e 100644 (file)
--- a/src/org/xwt/plat/Darwin.java
+++ b/src/org/xwt/plat/Darwin.java
@@ -83,7 +83,7 @@ public class Darwin extends POSIX {
             openGL = new CarbonOpenGL();
             openGL.init();
         } catch(OpenGL.NotSupportedException e) {
-            Log.log(this,"WARNING: OpenGL support not available: " + e);
+            Log.info(this,"WARNING: OpenGL support not available: " + e);
             // FEATURE: fall back to quartz 2d
             throw new Error("No OpenGL support");
         }
@@ -121,7 +121,7 @@ public class Darwin extends POSIX {
             maxAglSurfaceTexSize = rectangularTextures ? maxRectTexSize : maxTexSize;
             if(renderer.startsWith("ATI Radeon 7500")) {
                 maxAglSurfaceTexSize = Math.min(rectangularTextures ? 1600 : 1024,maxAglSurfaceTexSize);
-                Log.log(this,"Working around Radeon 7500 bug: maxAglSurfaceTexSize: " + maxAglSurfaceTexSize);
+                Log.info(this,"Working around Radeon 7500 bug: maxAglSurfaceTexSize: " + maxAglSurfaceTexSize);
             }
             maxSurfaceWidth = maxSurfaceHeight = maxAglSurfaceTexSize;
         }

diff --git a/src/org/xwt/plat/Java2.java b/src/org/xwt/plat/Java2.java
index 8a6ed7c..dc105a7 100644 (file)
--- a/src/org/xwt/plat/Java2.java
+++ b/src/org/xwt/plat/Java2.java
@@ -31,8 +31,8 @@ public class Java2 extends AWT {
                 Method m = java.awt.Toolkit.class.getMethod("setDynamicLayout", new Class[] { Boolean.class });
                 m.invoke(t, new Object[] { Boolean.TRUE });
             } catch (Exception e) {
-                Log.log(this, "Exception while trying to enable AWT Dynamic Layout");
-                Log.log(this, e);
+                Log.info(this, "Exception while trying to enable AWT Dynamic Layout");
+                Log.info(this, e);
             }
         }
         javax.swing.FocusManager.setCurrentManager(new javax.swing.FocusManager() {
@@ -77,7 +77,7 @@ public class Java2 extends AWT {
                         else return null;
 
                     } catch (Throwable e) {
-                        if (Log.on) Log.log(this, "No proxy information found in Java Plugin classes");
+                        if (Log.on) Log.info(this, "No proxy information found in Java Plugin classes");
                         return null;
                     }
                 }});
@@ -94,7 +94,7 @@ public class Java2 extends AWT {
                              Constructor ctor = java14SurfaceClass.getConstructor(new Class[] { Box.class, Boolean.TYPE });
                              return (Surface)ctor.newInstance(new Object[] { root, new Boolean(framed) });
                         } catch (Exception e) {
-                            Log.log(this, e);
+                            Log.info(this, e);
                             throw new LinkageError("error: " + e);
                         }
                     } else {
@@ -115,7 +115,7 @@ public class Java2 extends AWT {
         public Java2Surface(Box root, boolean framed) { super(root, framed); }
 
         protected void _setMinimized(boolean b) {
-            if (frame == null) Log.log(this, "JDK 1.2 can only minimize frames, not windows");
+            if (frame == null) Log.info(this, "JDK 1.2 can only minimize frames, not windows");
             else if (b) frame.setState(java.awt.Frame.ICONIFIED);
             else frame.setState(java.awt.Frame.NORMAL);
         }
@@ -140,14 +140,14 @@ public class Java2 extends AWT {
         
         protected void _setMaximized(boolean m) {
             if (frame == null) {
-                if (Log.on) Log.log(this, "JDK 1.4 can only maximize frames, not windows");
+                if (Log.on) Log.info(this, "JDK 1.4 can only maximize frames, not windows");
                 return;
             }
             frame.setExtendedState(m ? Frame.MAXIMIZED_BOTH : (minimized ? Frame.ICONIFIED : Frame.NORMAL));
         }
         protected void _setMinimized(boolean m) {
             if (frame == null) {
-                if (Log.on) Log.log(this, "JDK 1.4 can only minimize frames, not windows");
+                if (Log.on) Log.info(this, "JDK 1.4 can only minimize frames, not windows");
                 return;
             }
             frame.setExtendedState(m ? Frame.ICONIFIED : (maximized ? Frame.MAXIMIZED_BOTH : Frame.NORMAL));

diff --git a/src/org/xwt/plat/OpenGL.java b/src/org/xwt/plat/OpenGL.java
index 6268ad5..b403bdf 100644 (file)
--- a/src/org/xwt/plat/OpenGL.java
+++ b/src/org/xwt/plat/OpenGL.java
@@ -38,12 +38,12 @@ abstract class OpenGL {
             maxRectTexSize = 0;
             rectangularTextures = false;
         }
-        Log.log(this,"Renderer: " + renderer);
-        Log.log(this,"Version: " + version);
-        Log.log(this,"Vendor: " + vendor);
-        Log.log(this,"Rectangular textures: " + (rectangularTextures ? "supported" : "unsupported"));
-        Log.log(this,"Max texture size: " + maxTexSize);
-        Log.log(this,"Max rectangular texture size: " + maxRectTexSize);
+        Log.info(this,"Renderer: " + renderer);
+        Log.info(this,"Version: " + version);
+        Log.info(this,"Vendor: " + vendor);
+        Log.info(this,"Rectangular textures: " + (rectangularTextures ? "supported" : "unsupported"));
+        Log.info(this,"Max texture size: " + maxTexSize);
+        Log.info(this,"Max rectangular texture size: " + maxRectTexSize);
     }
     
     protected abstract void activateSharedInterpreter();
@@ -244,7 +244,7 @@ abstract class OpenGL {
             super(w,h);
             psize = gl.maxTexSize;
             while(wastedSpace(w,h,psize) > 0.40) psize/=2;
-            Log.log(this,"Using psize: " + psize + " for " + w + "x" + h + " image (wasted space: " + wastedSpace(w,h,psize));
+            Log.info(this,"Using psize: " + psize + " for " + w + "x" + h + " image (wasted space: " + wastedSpace(w,h,psize));
             
             int rows = (h+psize-1)/psize;
             int cols = (w+psize-1)/psize;

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index ddad001..938b6c2 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -79,16 +79,16 @@ public class Win32 extends GCJ {
     protected synchronized HTTP.Proxy _detectProxy() {
 
         String[] container = new String[] { null, null, null };
-        if (Log.on) Log.log(this, "accessing Win32 registry");
+        if (Log.on) Log.info(this, "accessing Win32 registry");
         __detectProxy(container);
         if (container[2] == null && container[0] == null) {
-            if (Log.on) Log.log(this, "no proxy settings in the Win32 registry");
+            if (Log.on) Log.info(this, "no proxy settings in the Win32 registry");
             return null;
         }
         
-        if (Log.on) Log.log(this, "PAC Script URL: " + container[2]);
-        if (Log.on) Log.log(this, "Proxy Server String: " + container[0]);
-        if (Log.on) Log.log(this, "Proxy Override String: " + container[1]);
+        if (Log.on) Log.info(this, "PAC Script URL: " + container[2]);
+        if (Log.on) Log.info(this, "Proxy Server String: " + container[0]);
+        if (Log.on) Log.info(this, "Proxy Override String: " + container[1]);
 
         HTTP.Proxy ret = new HTTP.Proxy();
         if (container[2] != null) {
@@ -138,7 +138,7 @@ public class Win32 extends GCJ {
     protected native boolean _newBrowserWindow_(String url);
     protected void _newBrowserWindow(String url) {
         if (!_newBrowserWindow_(url))
-            if (Log.on) Log.log(this, "ShellExecuteEx() failed trying to open url " + url);
+            if (Log.on) Log.info(this, "ShellExecuteEx() failed trying to open url " + url);
     }
 
     // Win32Surface ////////////////////////////////////////////////////////////////////////////

diff --git a/src/org/xwt/plat/X11.java b/src/org/xwt/plat/X11.java
index 6a4d769..746b1b8 100644 (file)
--- a/src/org/xwt/plat/X11.java
+++ b/src/org/xwt/plat/X11.java
@@ -62,7 +62,7 @@ public class X11 extends POSIX {
         Semaphore waitForCreation = new Semaphore();
         
         public native void setInvisible(boolean i);
-        public void _setMaximized(boolean m) { if (Log.on) Log.log(this, "X11 can't maximize windows"); }
+        public void _setMaximized(boolean m) { if (Log.on) Log.info(this, "X11 can't maximize windows"); }
         public native void setIcon(Picture p);
         public native void _setMinimized(boolean b);
         public native void setTitleBarText(String s);