more renaming fixes

darcs-hash:20040414070859-5007d-5bf8148c927dc864dbe87501741839c8ec8898a0.gz

diff --git a/src/org/ibex/core/Main.java b/src/org/ibex/core/Main.java
index 2f68bf0..b7be374 100644 (file)
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.java
@@ -68,7 +68,7 @@ public class Main {
             startargs++;
         }
 
             startargs++;
         }
 

-        Platform.forceLoad();
+        org.ibex.plat.Platform.forceLoad();

         if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
 
         initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
         if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
 
         initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";

diff --git a/src/org/ibex/plat/Darwin.java b/src/org/ibex/plat/Darwin.java
index 10a73af..289ce51 100644 (file)
--- a/src/org/ibex/plat/Darwin.java
+++ b/src/org/ibex/plat/Darwin.java
@@ -95,7 +95,7 @@ public class Darwin extends POSIX {
     
     protected Scheduler _getScheduler() { return new DarwinScheduler(); }
     protected native void runApplicationEventLoop();
     
     protected Scheduler _getScheduler() { return new DarwinScheduler(); }
     protected native void runApplicationEventLoop();

-    private class DarwinScheduler extends org.ibex.Scheduler {
+    private class DarwinScheduler extends org.ibex.util.Scheduler {

         public void run() {
             new Thread() { public void run() { defaultRun(); } }.start();
             runApplicationEventLoop();
         public void run() {
             new Thread() { public void run() { defaultRun(); } }.start();
             runApplicationEventLoop();

@@ -332,7 +332,7 @@ public class Darwin extends POSIX {
         else
             return /*new QZCarbonPicture(data,w,h);*/ null;
     }
         else
             return /*new QZCarbonPicture(data,w,h);*/ null;
     }

-    protected org.ibex.Font.Glyph  _createGlyph(org.ibex.Font f, char c) {
+    protected org.ibex.graphics.Font.Glyph  _createGlyph(org.ibex.graphics.Font f, char c) {

         if(openGL != null)
             return openGL._createGlyph(f, c);
         else
         if(openGL != null)
             return openGL._createGlyph(f, c);
         else

diff --git a/src/org/ibex/plat/OpenGL.java b/src/org/ibex/plat/OpenGL.java
index 83ad065..c5be9bf 100644 (file)
--- a/src/org/ibex/plat/OpenGL.java
+++ b/src/org/ibex/plat/OpenGL.java
@@ -83,8 +83,8 @@ abstract class OpenGL {
             //System.out.println("drawString(): " + text);
         }
 
             //System.out.println("drawString(): " + text);
         }
 

-        public void drawGlyph(org.ibex.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
-            drawPicture_(((org.ibex.Platform.DefaultGlyph)source).getPicture(), dx, dy, cx1, cy1, cx2, cy2, rgb);
+        public void drawGlyph(org.ibex.graphics.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+            drawPicture_(((org.ibex.plat.Platform.DefaultGlyph)source).getPicture(), dx, dy, cx1, cy1, cx2, cy2, rgb);

         }
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
             drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, 0xffffffff);
         }
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
             drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, 0xffffffff);

@@ -129,7 +129,7 @@ abstract class OpenGL {
         GLPicture realPicture = null;
     }
 
         GLPicture realPicture = null;
     }
 

-    public Font.Glyph _createGlyph(org.ibex.Font f, char c) { return new org.ibex.Platform.DefaultGlyph(f, c); }
+    public Font.Glyph _createGlyph(org.ibex.graphics.Font f, char c) { return new org.ibex.plat.Platform.DefaultGlyph(f, c); }

     
     private native void natDeleteTexture(int tex);
     public void deleteTexture(final int tex) {
     
     private native void natDeleteTexture(int tex);
     public void deleteTexture(final int tex) {