[cp-patches] FYI: Remove ClasspathTextLayoutPeer

[Sven de Marothy]

2006-06-30  Sven de Marothy  <[EMAIL PROTECTED]>

        * gnu/java/awt/ClasspathToolkit.java,
        * gnu/java/awt/peer/x/XToolkit.java,
        * gnu/java/awt/peer/qt/QtToolkit.java,
        * gnu/java/awt/peer/gtk/GtkToolkit.java,
        Remove ClasspathTextLayoutPeer.
        * gnu/java/awt/peer/gtk/GdkTextLayout.java,
        * gnu/java/awt/peer/ClasspathTextLayoutPeer,
        Files removed.
        


Index: gnu/java/awt/ClasspathToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/ClasspathToolkit.java,v
retrieving revision 1.19
diff -U3 -r1.19 ClasspathToolkit.java
--- gnu/java/awt/ClasspathToolkit.java	2 Sep 2005 09:15:22 -0000	1.19
+++ gnu/java/awt/ClasspathToolkit.java	30 Jun 2006 18:14:36 -0000
@@ -41,7 +41,6 @@
 import gnu.java.awt.EmbeddedWindow;
 import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.java.awt.peer.EmbeddedWindowPeer;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 import gnu.java.security.action.SetAccessibleAction;
 
 import java.awt.AWTException;
@@ -120,10 +119,6 @@
    */
   public abstract ClasspathFontPeer getClasspathFontPeer (String name, Map attrs); 
 
-  public abstract ClasspathTextLayoutPeer 
-  getClasspathTextLayoutPeer (AttributedString str, FontRenderContext frc); 
-
-
   /** 
    * Creates a [EMAIL PROTECTED] Font}, in a platform-specific manner.
    * 
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.88
diff -U3 -r1.88 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java	20 Jun 2006 11:36:23 -0000	1.88
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	30 Jun 2006 18:14:36 -0000
@@ -42,7 +42,6 @@
 import gnu.classpath.Configuration;
 import gnu.java.awt.EmbeddedWindow;
 import gnu.java.awt.peer.ClasspathFontPeer;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 import gnu.java.awt.peer.EmbeddedWindowPeer;
 
 import java.awt.*;
@@ -533,12 +532,6 @@
       }
   }
 
-  public ClasspathTextLayoutPeer getClasspathTextLayoutPeer (AttributedString str, 
-                                                             FontRenderContext frc)
-  {
-    return new GdkTextLayout(str, frc);
-  }
-
   protected EventQueue getSystemEventQueueImpl() 
   {
     synchronized (GtkToolkit.class)
Index: gnu/java/awt/peer/qt/QtToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/qt/QtToolkit.java,v
retrieving revision 1.7
diff -U3 -r1.7 QtToolkit.java
--- gnu/java/awt/peer/qt/QtToolkit.java	20 Jun 2006 11:36:23 -0000	1.7
+++ gnu/java/awt/peer/qt/QtToolkit.java	30 Jun 2006 18:14:36 -0000
@@ -41,7 +41,6 @@
 import gnu.java.awt.EmbeddedWindow;
 import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.java.awt.peer.EmbeddedWindowPeer;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 import java.awt.AWTEvent;
 import java.awt.AWTException;
 import java.awt.Button;
@@ -450,12 +449,6 @@
     return new QtFontPeer (name, attrs);
   }
 
-  public ClasspathTextLayoutPeer getClasspathTextLayoutPeer(AttributedString str, 
-							    FontRenderContext frc)
-  {
-    return null;
-  }
-
   // FIXME
   public Font createFont(int format, InputStream stream)
   {
Index: gnu/java/awt/peer/x/XToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/x/XToolkit.java,v
retrieving revision 1.1
diff -U3 -r1.1 XToolkit.java
--- gnu/java/awt/peer/x/XToolkit.java	29 Jun 2006 15:15:56 -0000	1.1
+++ gnu/java/awt/peer/x/XToolkit.java	30 Jun 2006 18:14:36 -0000
@@ -117,7 +117,6 @@
 import gnu.java.awt.ClasspathToolkit;
 import gnu.java.awt.EmbeddedWindow;
 import gnu.java.awt.peer.ClasspathFontPeer;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 import gnu.java.awt.peer.EmbeddedWindowPeer;
 import gnu.java.awt.peer.swing.SwingCanvasPeer;
 import gnu.java.awt.peer.swing.SwingLabelPeer;
@@ -190,12 +189,6 @@
     return font;
   }
 
-  public ClasspathTextLayoutPeer getClasspathTextLayoutPeer(AttributedString str, FontRenderContext frc)
-  {
-    // TODO: Implement this.
-    throw new UnsupportedOperationException("Not yet implemented.");
-  }
-
   public Font createFont(int format, InputStream stream)
   {
     return null;