2003/02/12 06:31:52

darcs-hash:20040130065120-2ba56-70f2257da6b101638c5a714b80da8efe46dca0d8.gz

diff --git a/CHANGES b/CHANGES
index 6610033..b2e2aff 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -457,3 +457,7 @@
 11-Feb megacz Log.java: refactored printing code in prep for inline logging
 
 11-Feb megacz X11.java: bugfix for stupid typos
+
+11-Feb megacz Picture.java, DoubleBuffer.java, Win32.java, AWT.java:
+              made Picture and DoubleBuffer abstract classes rather
+              than interfaces

diff --git a/src/org/xwt/DoubleBuffer.java b/src/org/xwt/DoubleBuffer.java
index eebd830..816434b 100644 (file)
--- a/src/org/xwt/DoubleBuffer.java
+++ b/src/org/xwt/DoubleBuffer.java
@@ -21,7 +21,7 @@ package org.xwt;
  *  represents regions internally as x,y,w,h.
  *  </p>
  */
-public interface DoubleBuffer {
+public abstract class DoubleBuffer {
 
     /** Draw the region of source within (sx1, sy1, sx2, sy2) onto the region of this DoubleBuffer within (dx1, dy1, dx2, dy2), scaling as needed. */
     public void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2);

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 3f60854..94d265e 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -14,7 +14,7 @@ package org.xwt;
  *    example, using a Pixmap on X11).
  *    </p>
  */
-public interface Picture {
+public abstract class Picture {
     public int getHeight();
     public int getWidth();
 }

diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java
index 46bb5f6..7005f1e 100644 (file)
--- a/src/org/xwt/plat/AWT.java
+++ b/src/org/xwt/plat/AWT.java
@@ -120,7 +120,7 @@ public class AWT extends Platform {
 
     // Inner Classes /////////////////////////////////////////////////////////////////////////////////////
 
-    protected static class AWTPicture implements Picture {
+    protected static class AWTPicture extends Picture {
         public int getHeight() { return i.getHeight(null); }
         public int getWidth() { return i.getWidth(null); } 
         public int[] getData() { return data; }
@@ -140,7 +140,7 @@ public class AWT extends Platform {
         }
     }
     
-    protected static class AWTDoubleBuffer implements DoubleBuffer {
+    protected static class AWTDoubleBuffer extends DoubleBuffer {
         
         protected Image i = null;
         protected Graphics g = null;

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 3e647ac..a6551df 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -251,7 +251,7 @@ public class Win32 extends GCJ {
 
     // Win32Picture ////////////////////////////////////////////////////////////////////////////
 
-    public static class Win32Picture implements Picture {
+    public static class Win32Picture extends Picture {
         int w = 0, h = 0;
         int[] data = null;
 
@@ -283,7 +283,7 @@ public class Win32 extends GCJ {
 
     // Win32DoubleBuffer //////////////////////////////////////////////////////////////////////////
 
-    public static class Win32DoubleBuffer implements DoubleBuffer {
+    public static class Win32DoubleBuffer extends DoubleBuffer {
 
         int w = 0;
         int h = 0;