libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4

83 files changed, 1610 insertions, 643 deletions

diff --git a/libjava/gnu/java/awt/AWTUtilities.h b/libjava/gnu/java/awt/AWTUtilities.h
index 36db9855831..70b5111cd38 100644
--- a/libjava/gnu/java/awt/AWTUtilities.h
+++ b/libjava/gnu/java/awt/AWTUtilities.h
@@ -62,6 +62,7 @@ public:
   static void invokeLater(::java::lang::Runnable *);
   static void invokeAndWait(::java::lang::Runnable *);
   static jboolean isEventDispatchThread();
+  static jboolean isValidKey(jint);
 public: // actually package-private
   static ::java::util::WeakHashMap * visibleChildrenCache;
 public:
diff --git a/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h b/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h
new file mode 100644
index 00000000000..4f3c2abf426
--- /dev/null
+++ b/libjava/gnu/java/awt/ClasspathGraphicsEnvironment.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_ClasspathGraphicsEnvironment__
+#define __gnu_java_awt_ClasspathGraphicsEnvironment__
+
+#pragma interface
+
+#include <java/awt/GraphicsEnvironment.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+          class ClasspathGraphicsEnvironment;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class ColorModel;
+          class SampleModel;
+          class WritableRaster;
+      }
+    }
+  }
+}
+
+class gnu::java::awt::ClasspathGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
+{
+
+public:
+  ClasspathGraphicsEnvironment();
+  virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_ClasspathGraphicsEnvironment__
diff --git a/libjava/gnu/java/awt/ClasspathToolkit.h b/libjava/gnu/java/awt/ClasspathToolkit.h
index f3acd663871..565b9246305 100644
--- a/libjava/gnu/java/awt/ClasspathToolkit.h
+++ b/libjava/gnu/java/awt/ClasspathToolkit.h
@@ -29,11 +29,13 @@ extern "Java"
   {
     namespace awt
     {
+        class Desktop;
         class Font;
         class GraphicsDevice;
         class GraphicsEnvironment;
       namespace peer
       {
+          class DesktopPeer;
           class RobotPeer;
       }
     }
@@ -63,6 +65,9 @@ public:
   virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *) = 0;
   virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *);
   virtual jint getMouseNumberOfButtons();
+public: // actually protected
+  virtual ::java::awt::peer::DesktopPeer * createDesktopPeer(::java::awt::Desktop *);
+public:
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/gnu/java/awt/font/FontDelegate.h b/libjava/gnu/java/awt/font/FontDelegate.h
index 202529b547a..a84c93e1c75 100644
--- a/libjava/gnu/java/awt/font/FontDelegate.h
+++ b/libjava/gnu/java/awt/font/FontDelegate.h
@@ -58,10 +58,16 @@ public:
   virtual jint getMissingGlyphCode() = 0;
   virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *) = 0;
   virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean) = 0;
+  virtual ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint) = 0;
   virtual ::java::lang::String * getGlyphName(jint) = 0;
   virtual jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
   virtual jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
+  static const jint FLAG_FITTED = 1;
+  static const jint FLAG_NO_HINT_HORIZONTAL = 2;
+  static const jint FLAG_NO_HINT_VERTICAL = 4;
+  static const jint FLAG_NO_HINT_EDGE_POINTS = 8;
+  static const jint FLAG_NO_HINT_STRONG_POINTS = 16;
+  static const jint FLAG_NO_HINT_WEAK_POINTS = 32;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/gnu/java/awt/font/GNUGlyphVector.h b/libjava/gnu/java/awt/font/GNUGlyphVector.h
index 4d47e2addc2..99086f13f2a 100644
--- a/libjava/gnu/java/awt/font/GNUGlyphVector.h
+++ b/libjava/gnu/java/awt/font/GNUGlyphVector.h
@@ -63,7 +63,9 @@ public:
   virtual ::java::awt::geom::Rectangle2D * getVisualBounds();
   virtual ::java::awt::Shape * getOutline();
   virtual ::java::awt::Shape * getOutline(jfloat, jfloat);
+  virtual ::java::awt::Shape * getOutline(jfloat, jfloat, jint);
   virtual ::java::awt::Shape * getGlyphOutline(jint);
+  virtual ::java::awt::Shape * getGlyphOutline(jint, jint);
   virtual ::java::awt::geom::Point2D * getGlyphPosition(jint);
   virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *);
   virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint);
diff --git a/libjava/gnu/java/awt/font/autofit/AutoHinter.h b/libjava/gnu/java/awt/font/autofit/AutoHinter.h
new file mode 100644
index 00000000000..e11a394aaba
--- /dev/null
+++ b/libjava/gnu/java/awt/font/autofit/AutoHinter.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_autofit_AutoHinter__
+#define __gnu_java_awt_font_autofit_AutoHinter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+          namespace autofit
+          {
+              class AutoHinter;
+              class GlyphHints;
+              class HintScaler;
+              class Latin;
+              class LatinMetrics;
+          }
+          namespace opentype
+          {
+              class OpenTypeFont;
+            namespace truetype
+            {
+                class Zone;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::autofit::AutoHinter : public ::java::lang::Object
+{
+
+public:
+  AutoHinter();
+  virtual void init(::gnu::java::awt::font::opentype::OpenTypeFont *);
+  virtual void applyHints(::gnu::java::awt::font::opentype::truetype::Zone *);
+  virtual void setFlags(jint);
+public: // actually package-private
+  ::gnu::java::awt::font::autofit::Latin * __attribute__((aligned(__alignof__( ::java::lang::Object)))) latinScript;
+  ::gnu::java::awt::font::autofit::LatinMetrics * metrics;
+  ::gnu::java::awt::font::autofit::GlyphHints * hints;
+  ::gnu::java::awt::font::autofit::HintScaler * scaler;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_autofit_AutoHinter__
diff --git a/libjava/gnu/java/awt/font/autofit/AxisHints.h b/libjava/gnu/java/awt/font/autofit/AxisHints.h
index 29dad47f239..0d8b7eac121 100644
--- a/libjava/gnu/java/awt/font/autofit/AxisHints.h
+++ b/libjava/gnu/java/awt/font/autofit/AxisHints.h
@@ -22,6 +22,7 @@ extern "Java"
           namespace autofit
           {
               class AxisHints;
+              class Edge;
               class Segment;
           }
         }
@@ -35,7 +36,16 @@ class gnu::java::awt::font::autofit::AxisHints : public ::java::lang::Object
 
 public: // actually package-private
   AxisHints();
+  virtual ::gnu::java::awt::font::autofit::Segment * newSegment();
+public:
+  virtual ::gnu::java::awt::font::autofit::Edge * newEdge(jint);
+public: // actually package-private
+  virtual jint getEdgeIndex(::gnu::java::awt::font::autofit::Edge *);
   JArray< ::gnu::java::awt::font::autofit::Segment * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
+  jint majorDir;
+  jint numSegments;
+  jint numEdges;
+  JArray< ::gnu::java::awt::font::autofit::Edge * > * edges;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/font/autofit/Constants.h b/libjava/gnu/java/awt/font/autofit/Constants.h
index ae103683e0d..60932a91dc7 100644
--- a/libjava/gnu/java/awt/font/autofit/Constants.h
+++ b/libjava/gnu/java/awt/font/autofit/Constants.h
@@ -34,6 +34,11 @@ public:
   static const jint DIMENSION_HORZ = 0;
   static const jint DIMENSION_VERT = 1;
   static const jint DIMENSION_MAX = 2;
+  static const jint DIR_NONE = 0;
+  static const jint DIR_RIGHT = 1;
+  static const jint DIR_LEFT = -1;
+  static const jint DIR_UP = 2;
+  static const jint DIR_DOWN = -2;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/gnu/java/awt/font/autofit/Edge.h b/libjava/gnu/java/awt/font/autofit/Edge.h
new file mode 100644
index 00000000000..f456c3618b1
--- /dev/null
+++ b/libjava/gnu/java/awt/font/autofit/Edge.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_autofit_Edge__
+#define __gnu_java_awt_font_autofit_Edge__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+          namespace autofit
+          {
+              class Edge;
+              class Segment;
+              class Width;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::autofit::Edge : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Edge();
+public:
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) fpos;
+  ::gnu::java::awt::font::autofit::Segment * first;
+  ::gnu::java::awt::font::autofit::Segment * last;
+  jint opos;
+  ::gnu::java::awt::font::autofit::Edge * link;
+  ::gnu::java::awt::font::autofit::Edge * serif;
+  jint flags;
+  jint dir;
+  ::gnu::java::awt::font::autofit::Width * blueEdge;
+  jint pos;
+  jint scale;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_autofit_Edge__
diff --git a/libjava/gnu/java/awt/font/autofit/GlyphHints.h b/libjava/gnu/java/awt/font/autofit/GlyphHints.h
index 6a878d56c81..27ce96390ed 100644
--- a/libjava/gnu/java/awt/font/autofit/GlyphHints.h
+++ b/libjava/gnu/java/awt/font/autofit/GlyphHints.h
@@ -29,6 +29,7 @@ extern "Java"
           {
             namespace truetype
             {
+                class Point;
                 class Zone;
             }
           }
@@ -45,13 +46,42 @@ public: // actually package-private
   GlyphHints();
   virtual void rescale(::gnu::java::awt::font::autofit::ScriptMetrics *);
   virtual void reload(::gnu::java::awt::font::opentype::truetype::Zone *);
-  virtual void computeSegments(jint);
-  virtual void linkSegments(jint);
+private:
+  void setWeakPoint(::gnu::java::awt::font::opentype::truetype::Point *);
+  void computeInflectionPoints();
+public: // actually package-private
+  virtual jboolean doHorizontal();
+  virtual jboolean doVertical();
+  virtual void alignWeakPoints(jint);
+private:
+  void iupShift(jint, jint, jint);
+  void iupInterp(jint, jint, jint, jint);
+public: // actually package-private
+  virtual void alignStrongPoints(jint);
+private:
+  void storePoint(::gnu::java::awt::font::opentype::truetype::Point *, jint, jint, jshort);
+public: // actually package-private
+  virtual void alignEdgePoints(jint);
+private:
+  jint getPointIndex(::gnu::java::awt::font::opentype::truetype::Point *);
+public:
+  virtual jboolean doAlignEdgePoints();
+  virtual jboolean doAlignStrongPoints();
+  virtual jboolean doAlignWeakPoints();
+public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
   jint xDelta;
   jint yScale;
   jint yDelta;
   JArray< ::gnu::java::awt::font::autofit::AxisHints * > * axis;
+  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * points;
+  jint numPoints;
+  jint maxPoints;
+  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * contours;
+  jint numContours;
+  jint maxContours;
+  ::gnu::java::awt::font::autofit::ScriptMetrics * metrics;
+  jint flags;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/font/autofit/Scaler.h b/libjava/gnu/java/awt/font/autofit/HintScaler.h
index ffebc5a30dd..b494fe4516b 100644
--- a/libjava/gnu/java/awt/font/autofit/Scaler.h
+++ b/libjava/gnu/java/awt/font/autofit/HintScaler.h
@@ -1,8 +1,8 @@
 
 // DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
 
-#ifndef __gnu_java_awt_font_autofit_Scaler__
-#define __gnu_java_awt_font_autofit_Scaler__
+#ifndef __gnu_java_awt_font_autofit_HintScaler__
+#define __gnu_java_awt_font_autofit_HintScaler__
 
 #pragma interface
 
@@ -19,7 +19,7 @@ extern "Java"
         {
           namespace autofit
           {
-              class Scaler;
+              class HintScaler;
           }
           namespace opentype
           {
@@ -31,18 +31,19 @@ extern "Java"
   }
 }
 
-class gnu::java::awt::font::autofit::Scaler : public ::java::lang::Object
+class gnu::java::awt::font::autofit::HintScaler : public ::java::lang::Object
 {
 
 public: // actually package-private
-  Scaler();
+  HintScaler();
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
   jint xDelta;
   jint yScale;
   jint yDelta;
   ::gnu::java::awt::font::opentype::OpenTypeFont * face;
+  jint renderMode;
 public:
   static ::java::lang::Class class$;
 };
 
-#endif // __gnu_java_awt_font_autofit_Scaler__
+#endif // __gnu_java_awt_font_autofit_HintScaler__
diff --git a/libjava/gnu/java/awt/font/autofit/Latin.h b/libjava/gnu/java/awt/font/autofit/Latin.h
index af4c300d943..7afa24ca8bb 100644
--- a/libjava/gnu/java/awt/font/autofit/Latin.h
+++ b/libjava/gnu/java/awt/font/autofit/Latin.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/lang/Object.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -19,19 +21,36 @@ extern "Java"
         {
           namespace autofit
           {
+              class Edge;
               class GlyphHints;
+              class HintScaler;
               class Latin;
               class LatinMetrics;
               class ScriptMetrics;
+              class Width;
           }
           namespace opentype
           {
               class OpenTypeFont;
+            namespace truetype
+            {
+                class Zone;
+            }
           }
         }
       }
     }
   }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+      }
+    }
+  }
 }
 
 class gnu::java::awt::font::autofit::Latin : public ::java::lang::Object
@@ -40,16 +59,51 @@ class gnu::java::awt::font::autofit::Latin : public ::java::lang::Object
 public: // actually package-private
   Latin();
 public:
-  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
+  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
+private:
+  void hintEdges(::gnu::java::awt::font::autofit::GlyphHints *, jint);
+  void alignSerifEdge(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::Edge *, ::gnu::java::awt::font::autofit::Edge *);
+  jint computeStemWidth(::gnu::java::awt::font::autofit::GlyphHints *, jint, jint, jint, jint);
+  jboolean doMono(::gnu::java::awt::font::autofit::GlyphHints *);
+  jint snapWidth(JArray< ::gnu::java::awt::font::autofit::Width * > *, jint, jint);
+  jint doneWidth(jint, jint);
+  jboolean doVertSnap(::gnu::java::awt::font::autofit::GlyphHints *);
+  jboolean doHorzSnap(::gnu::java::awt::font::autofit::GlyphHints *);
+  jboolean doStemAdjust(::gnu::java::awt::font::autofit::GlyphHints *);
+  void alignLinkedEdge(::gnu::java::awt::font::autofit::GlyphHints *, jint, ::gnu::java::awt::font::autofit::Edge *, ::gnu::java::awt::font::autofit::Edge *);
+public:
   virtual void doneMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *);
   virtual void initHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *);
   virtual void initMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
-  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *);
+  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::autofit::HintScaler *);
 private:
+  void scaleMetricsDim(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::autofit::HintScaler *, jint);
   void initWidths(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *, jchar);
+public: // actually package-private
+  virtual void linkSegments(::gnu::java::awt::font::autofit::GlyphHints *, jint);
+private:
   void initBlues(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
   jint constant(::gnu::java::awt::font::autofit::LatinMetrics *, jint);
+  void computeSegments(::gnu::java::awt::font::autofit::GlyphHints *, jint);
+  jboolean isTopBlue(jint);
+  void detectFeatures(::gnu::java::awt::font::autofit::GlyphHints *, jint);
+  void computeEdges(::gnu::java::awt::font::autofit::GlyphHints *, jint);
+  void computeBlueEdges(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::LatinMetrics *);
+public: // actually package-private
   static const jint MAX_WIDTHS = 16;
+private:
+  static const jint MAX_TEST_CHARS = 12;
+  static const jint CAPITAL_TOP = 0;
+  static const jint CAPITAL_BOTTOM = 1;
+  static const jint SMALL_F_TOP = 2;
+  static const jint SMALL_TOP = 3;
+  static const jint SMALL_BOTTOM = 4;
+  static const jint SMALL_MINOR = 5;
+public: // actually package-private
+  static const jint BLUE_MAX = 6;
+private:
+  static JArray< ::java::lang::String * > * TEST_CHARS;
+  static ::java::awt::geom::AffineTransform * IDENTITY;
 public: // actually package-private
   static jboolean $assertionsDisabled;
 public:
diff --git a/libjava/gnu/java/awt/font/autofit/LatinAxis.h b/libjava/gnu/java/awt/font/autofit/LatinAxis.h
index 631cd794a57..8c56e5a1075 100644
--- a/libjava/gnu/java/awt/font/autofit/LatinAxis.h
+++ b/libjava/gnu/java/awt/font/autofit/LatinAxis.h
@@ -22,6 +22,7 @@ extern "Java"
           namespace autofit
           {
               class LatinAxis;
+              class LatinBlue;
               class Width;
           }
         }
@@ -39,7 +40,11 @@ public: // actually package-private
   jint delta;
   jint widthCount;
   JArray< ::gnu::java::awt::font::autofit::Width * > * widths;
-  jfloat edgeDistanceTreshold;
+  jint edgeDistanceTreshold;
+  JArray< ::gnu::java::awt::font::autofit::LatinBlue * > * blues;
+  jint blueCount;
+  jint orgDelta;
+  jint orgScale;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/font/autofit/LatinBlue.h b/libjava/gnu/java/awt/font/autofit/LatinBlue.h
new file mode 100644
index 00000000000..b8a6a39a78b
--- /dev/null
+++ b/libjava/gnu/java/awt/font/autofit/LatinBlue.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_autofit_LatinBlue__
+#define __gnu_java_awt_font_autofit_LatinBlue__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+          namespace autofit
+          {
+              class LatinBlue;
+              class Width;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::autofit::LatinBlue : public ::java::lang::Object
+{
+
+public:
+  LatinBlue();
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  static const jint FLAG_BLUE_ACTIVE = 1;
+  static const jint FLAG_TOP = 2;
+  static const jint FLAG_ADJUSTMENT = 4;
+  ::gnu::java::awt::font::autofit::Width * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ref;
+  ::gnu::java::awt::font::autofit::Width * shoot;
+  jint flags;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_autofit_LatinBlue__
diff --git a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h b/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
index a7a12fd4c7e..18a21db4bc3 100644
--- a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
+++ b/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
@@ -24,6 +24,10 @@ extern "Java"
               class LatinAxis;
               class LatinMetrics;
           }
+          namespace opentype
+          {
+              class OpenTypeFont;
+          }
         }
       }
     }
@@ -35,6 +39,7 @@ class gnu::java::awt::font::autofit::LatinMetrics : public ::gnu::java::awt::fon
 
 public: // actually package-private
   LatinMetrics();
+  LatinMetrics(::gnu::java::awt::font::opentype::OpenTypeFont *);
   JArray< ::gnu::java::awt::font::autofit::LatinAxis * > * __attribute__((aligned(__alignof__( ::gnu::java::awt::font::autofit::ScriptMetrics)))) axis;
   jint unitsPerEm;
 public:
diff --git a/libjava/gnu/java/awt/font/autofit/Script.h b/libjava/gnu/java/awt/font/autofit/Script.h
index 5a722896a80..6455af524cc 100644
--- a/libjava/gnu/java/awt/font/autofit/Script.h
+++ b/libjava/gnu/java/awt/font/autofit/Script.h
@@ -20,12 +20,17 @@ extern "Java"
           namespace autofit
           {
               class GlyphHints;
+              class HintScaler;
               class Script;
               class ScriptMetrics;
           }
           namespace opentype
           {
               class OpenTypeFont;
+            namespace truetype
+            {
+                class Zone;
+            }
           }
         }
       }
@@ -38,10 +43,10 @@ class gnu::java::awt::font::autofit::Script : public ::java::lang::Object
 
 public:
   virtual void initMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *) = 0;
-  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
+  virtual void scaleMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *, ::gnu::java::awt::font::autofit::HintScaler *) = 0;
   virtual void doneMetrics(::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
   virtual void initHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
-  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
+  virtual void applyHints(::gnu::java::awt::font::autofit::GlyphHints *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::autofit::ScriptMetrics *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h b/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
index 79ab128b5a5..c58575b354e 100644
--- a/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
+++ b/libjava/gnu/java/awt/font/autofit/ScriptMetrics.h
@@ -19,7 +19,7 @@ extern "Java"
         {
           namespace autofit
           {
-              class Scaler;
+              class HintScaler;
               class Script;
               class ScriptMetrics;
           }
@@ -35,7 +35,7 @@ class gnu::java::awt::font::autofit::ScriptMetrics : public ::java::lang::Object
 public: // actually package-private
   ScriptMetrics();
   ::gnu::java::awt::font::autofit::Script * __attribute__((aligned(__alignof__( ::java::lang::Object)))) script;
-  ::gnu::java::awt::font::autofit::Scaler * scaler;
+  ::gnu::java::awt::font::autofit::HintScaler * scaler;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/font/autofit/Segment.h b/libjava/gnu/java/awt/font/autofit/Segment.h
index 4b2adef67b0..d3c1d72d740 100644
--- a/libjava/gnu/java/awt/font/autofit/Segment.h
+++ b/libjava/gnu/java/awt/font/autofit/Segment.h
@@ -19,8 +19,16 @@ extern "Java"
         {
           namespace autofit
           {
+              class Edge;
               class Segment;
           }
+          namespace opentype
+          {
+            namespace truetype
+            {
+                class Point;
+            }
+          }
         }
       }
     }
@@ -32,9 +40,28 @@ class gnu::java::awt::font::autofit::Segment : public ::java::lang::Object
 
 public: // actually package-private
   Segment();
-  ::gnu::java::awt::font::autofit::Segment * __attribute__((aligned(__alignof__( ::java::lang::Object)))) link;
-  jint index;
+public:
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  static const jint FLAG_EDGE_NORMAL = 0;
+  static const jint FLAG_EDGE_ROUND = 1;
+  static const jint FLAG_EDGE_SERIF = 2;
+  static const jint FLAG_EDGE_DONE = 4;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) dir;
+  jint flags;
+  ::gnu::java::awt::font::autofit::Segment * link;
+  ::gnu::java::awt::font::autofit::Segment * serif;
+  jint numLinked;
   jint pos;
+  ::gnu::java::awt::font::opentype::truetype::Point * first;
+  ::gnu::java::awt::font::opentype::truetype::Point * last;
+  ::gnu::java::awt::font::opentype::truetype::Point * contour;
+  jint minPos;
+  jint maxPos;
+  jint score;
+  jint len;
+  ::gnu::java::awt::font::autofit::Segment * edgeNext;
+  ::gnu::java::awt::font::autofit::Edge * edge;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/font/autofit/Utils.h b/libjava/gnu/java/awt/font/autofit/Utils.h
new file mode 100644
index 00000000000..12fb2f542a5
--- /dev/null
+++ b/libjava/gnu/java/awt/font/autofit/Utils.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_autofit_Utils__
+#define __gnu_java_awt_font_autofit_Utils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+          namespace autofit
+          {
+              class Utils;
+              class Width;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::autofit::Utils : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Utils();
+  static jint computeDirection(jint, jint);
+public:
+  static jint atan(jint, jint);
+  static jint angleDiff(jint, jint);
+public: // actually package-private
+  static void sort(jint, JArray< jint > *);
+  static void sort(jint, JArray< ::gnu::java::awt::font::autofit::Width * > *);
+  static jint pixRound(jint);
+  static jint pixFloor(jint);
+public:
+  static jint mulDiv(jint, jint, jint);
+private:
+  static const jint ATAN_BITS = 8;
+  static JArray< jbyte > * ATAN;
+  static const jint ANGLE_PI = 256;
+  static const jint ANGLE_PI2 = 128;
+  static const jint ANGLE_PI4 = 64;
+  static const jint ANGLE_2PI = 512;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_autofit_Utils__
diff --git a/libjava/gnu/java/awt/font/autofit/Width.h b/libjava/gnu/java/awt/font/autofit/Width.h
index 23d21fe07c5..d107e50b281 100644
--- a/libjava/gnu/java/awt/font/autofit/Width.h
+++ b/libjava/gnu/java/awt/font/autofit/Width.h
@@ -30,8 +30,10 @@ extern "Java"
 class gnu::java::awt::font::autofit::Width : public ::java::lang::Object
 {
 
+public: // actually package-private
+  Width(jint);
 public:
-  Width();
+  virtual ::java::lang::String * toString();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) org;
   jint cur;
diff --git a/libjava/gnu/java/awt/font/opentype/Hinter.h b/libjava/gnu/java/awt/font/opentype/Hinter.h
new file mode 100644
index 00000000000..29992b70a10
--- /dev/null
+++ b/libjava/gnu/java/awt/font/opentype/Hinter.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_opentype_Hinter__
+#define __gnu_java_awt_font_opentype_Hinter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+          namespace opentype
+          {
+              class Hinter;
+              class OpenTypeFont;
+            namespace truetype
+            {
+                class Zone;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::opentype::Hinter : public ::java::lang::Object
+{
+
+public:
+  virtual void init(::gnu::java::awt::font::opentype::OpenTypeFont *) = 0;
+  virtual void applyHints(::gnu::java::awt::font::opentype::truetype::Zone *) = 0;
+  virtual void setFlags(jint) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_java_awt_font_opentype_Hinter__
diff --git a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h b/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
index 149337c4c8a..7d07889c7d6 100644
--- a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
+++ b/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
@@ -23,6 +23,7 @@ extern "Java"
           {
               class CharGlyphMap;
               class GlyphNamer;
+              class Hinter;
               class OpenTypeFont;
               class Scaler;
             namespace truetype
@@ -88,13 +89,16 @@ public:
   jint getGlyph(jint);
   ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
   void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *);
-  ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean);
+  ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint);
   ::gnu::java::awt::font::opentype::truetype::Zone * getRawGlyphOutline(jint, ::java::awt::geom::AffineTransform *);
   ::java::lang::String * getGlyphName(jint);
   jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
   jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean);
 public: // actually package-private
   static ::java::lang::String * tagToString(jint);
+private:
+  void checkHinter(jint);
+public: // actually package-private
   static const jint TAG_OTTO = 1330926671;
   static const jint TAG_SFNT = 1936092788;
   static const jint TAG_TRUE = 1953658213;
@@ -114,6 +118,7 @@ private:
   ::gnu::java::awt::font::opentype::Scaler * scaler;
   ::gnu::java::awt::font::opentype::CharGlyphMap * cmap;
   ::gnu::java::awt::font::opentype::GlyphNamer * glyphNamer;
+  ::gnu::java::awt::font::opentype::Hinter * hinter;
   ::java::nio::ByteBuffer * nameTable;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/java/awt/font/opentype/Scaler.h b/libjava/gnu/java/awt/font/opentype/Scaler.h
index a9118288ba2..6d229d70981 100644
--- a/libjava/gnu/java/awt/font/opentype/Scaler.h
+++ b/libjava/gnu/java/awt/font/opentype/Scaler.h
@@ -19,6 +19,7 @@ extern "Java"
         {
           namespace opentype
           {
+              class Hinter;
               class Scaler;
             namespace truetype
             {
@@ -48,7 +49,7 @@ class gnu::java::awt::font::opentype::Scaler : public ::java::lang::Object
 
 public:
   Scaler();
-  virtual ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean) = 0;
+  virtual ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, ::gnu::java::awt::font::opentype::Hinter *, jint) = 0;
   virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0;
   virtual jfloat getAscent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
   virtual jfloat getDescent(jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean) = 0;
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h b/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
index e93546aca72..9427f135a06 100644
--- a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
+++ b/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
@@ -36,15 +36,19 @@ class gnu::java::awt::font::opentype::truetype::Fixed : public ::java::lang::Obj
   Fixed();
 public:
   static jint mul(jint, jint);
+  static jint mul16(jint, jint);
   static jint div(jint, jint);
+  static jint div16(jint, jint);
   static jint ceil(jint);
   static jint floor(jint);
   static jint vectorLength(jint, jint);
   static jint intValue(jint);
   static jfloat floatValue(jint);
+  static jfloat floatValue16(jint);
   static jdouble doubleValue(jint);
   static jint valueOf(jfloat);
   static jint valueOf(jdouble);
+  static jint valueOf16(jdouble);
   static ::java::lang::String * toString(jint);
   static ::java::lang::String * toString(jint, jint);
   static const jint ONE = 64;
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
index 2b0dd072428..f0582d347a5 100644
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
+++ b/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
@@ -21,6 +21,7 @@ extern "Java"
         {
           namespace opentype
           {
+              class Hinter;
             namespace truetype
             {
                 class GlyphLoader;
@@ -56,12 +57,12 @@ class gnu::java::awt::font::opentype::truetype::GlyphLoader : public ::java::lan
 public: // actually package-private
   GlyphLoader(::gnu::java::awt::font::opentype::truetype::GlyphLocator *, ::gnu::java::awt::font::opentype::truetype::VirtualMachine *, jint, jint, jint, ::gnu::java::awt::font::opentype::truetype::GlyphMeasurer *);
 public:
-  void loadGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *);
-  void loadGlyph(jint, ::java::awt::geom::AffineTransform *, ::gnu::java::awt::font::opentype::truetype::Zone *);
+  void loadGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::opentype::Hinter *);
+  void loadGlyph(jint, ::java::awt::geom::AffineTransform *, ::gnu::java::awt::font::opentype::truetype::Zone *, ::gnu::java::awt::font::opentype::Hinter *);
 private:
-  void loadSubGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  void loadSimpleGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  void loadCompoundGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
+  void loadSubGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
+  void loadSimpleGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
+  void loadCompoundGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint, ::gnu::java::awt::font::opentype::Hinter *);
   jdouble getDouble214(::java::nio::ByteBuffer *);
   void loadFlags(jint, ::java::nio::ByteBuffer *);
   void loadCoordinates(jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *);
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Point.h b/libjava/gnu/java/awt/font/opentype/truetype/Point.h
new file mode 100644
index 00000000000..a993ca0234c
--- /dev/null
+++ b/libjava/gnu/java/awt/font/opentype/truetype/Point.h
@@ -0,0 +1,99 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_opentype_truetype_Point__
+#define __gnu_java_awt_font_opentype_truetype_Point__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+          namespace opentype
+          {
+            namespace truetype
+            {
+                class Point;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::opentype::truetype::Point : public ::java::lang::Object
+{
+
+public:
+  Point();
+  virtual ::gnu::java::awt::font::opentype::truetype::Point * getNext();
+  virtual void setNext(::gnu::java::awt::font::opentype::truetype::Point *);
+  virtual ::gnu::java::awt::font::opentype::truetype::Point * getPrev();
+  virtual void setPrev(::gnu::java::awt::font::opentype::truetype::Point *);
+  virtual jint getOrigX();
+  virtual void setOrigX(jint);
+  virtual jint getOrigY();
+  virtual void setOrigY(jint);
+  virtual jint getInDir();
+  virtual void setInDir(jint);
+  virtual jint getOutDir();
+  virtual void setOutDir(jint);
+  virtual jshort getFlags();
+  virtual void setFlags(jshort);
+  virtual void addFlags(jshort);
+  virtual jboolean isControlPoint();
+  virtual jint getU();
+  virtual void setU(jint);
+  virtual jint getV();
+  virtual void setV(jint);
+  virtual ::java::lang::String * toString();
+  virtual jint getX();
+  virtual void setX(jint);
+  virtual jint getY();
+  virtual void setY(jint);
+  virtual jint getScaledX();
+  virtual void setScaledX(jint);
+  virtual jint getScaledY();
+  virtual void setScaledY(jint);
+  static const jshort FLAG_TOUCHED_X = 1;
+  static const jshort FLAG_TOUCHED_Y = 2;
+  static const jshort FLAG_ON_CURVE = 4;
+  static const jshort FLAG_CONTOUR_END = 8;
+  static const jshort FLAG_WEAK_INTERPOLATION = 16;
+  static const jshort FLAG_INFLECTION = 32;
+  static const jshort FLAG_DONE_X = 64;
+  static const jshort FLAG_DONE_Y = 128;
+  static const jint DIR_RIGHT = 1;
+  static const jint DIR_LEFT = -1;
+  static const jint DIR_UP = 2;
+  static const jint DIR_DOWN = -2;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) origX;
+  jint origY;
+  jint scaledX;
+  jint scaledY;
+  jint x;
+  jint y;
+  jint u;
+  jint v;
+  jshort flags;
+private:
+  ::gnu::java::awt::font::opentype::truetype::Point * prev;
+  ::gnu::java::awt::font::opentype::truetype::Point * next;
+public: // actually package-private
+  jint inDir;
+  jint outDir;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_opentype_truetype_Point__
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h b/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
index 77ae20fb3ad..fadc996ccf0 100644
--- a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
+++ b/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
@@ -19,6 +19,7 @@ extern "Java"
         {
           namespace opentype
           {
+              class Hinter;
             namespace truetype
             {
                 class GlyphLoader;
@@ -54,7 +55,7 @@ class gnu::java::awt::font::opentype::truetype::TrueTypeScaler : public ::gnu::j
 
 public:
   TrueTypeScaler(jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, jint, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean);
+  ::java::awt::geom::GeneralPath * getOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, ::gnu::java::awt::font::opentype::Hinter *, jint);
   ::gnu::java::awt::font::opentype::truetype::Zone * getRawOutline(jint, ::java::awt::geom::AffineTransform *);
   void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *);
 private:
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h b/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
index b3ff4f05959..e5647898e48 100644
--- a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
+++ b/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
@@ -23,6 +23,7 @@ extern "Java"
           {
             namespace truetype
             {
+                class Point;
                 class Zone;
             }
           }
@@ -52,9 +53,11 @@ public:
   jint getCapacity();
   jint getSize();
   jint getX(jint);
+  jint getX(jint, jint);
   void setX(jint, jint, jboolean);
   void setY(jint, jint, jboolean);
   jint getY(jint);
+  jint getY(jint, jint);
   jint getOriginalX(jint);
   jint getOriginalY(jint);
   void setOriginalX(jint, jint);
@@ -70,18 +73,19 @@ public: // actually package-private
 private:
   void dump();
 public:
-  ::java::awt::geom::PathIterator * getPathIterator();
-  ::java::awt::geom::GeneralPath * getPath();
+  ::java::awt::geom::PathIterator * getPathIterator(jint);
+  ::java::awt::geom::GeneralPath * getPath(jint);
+  jint getNumContours();
+  jint getContourEnd(jint);
+  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * getPoints();
 private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
-  JArray< jint > * origPos;
-  JArray< jbyte > * flags;
+  JArray< ::gnu::java::awt::font::opentype::truetype::Point * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) points;
   jint numPoints;
-  static const jint FLAG_TOUCHED_X = 1;
-  static const jint FLAG_TOUCHED_Y = 2;
-  static const jint FLAG_ON_CURVE = 4;
-  static const jint FLAG_CONTOUR_END = 8;
 public:
+  jdouble scaleX;
+  jdouble scaleY;
+  jdouble shearX;
+  jdouble shearY;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h b/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
index fe610037981..5e64ba8753d 100644
--- a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
+++ b/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
@@ -37,7 +37,7 @@ class gnu::java::awt::font::opentype::truetype::ZonePathIterator : public ::java
 {
 
 public: // actually package-private
-  ZonePathIterator(::gnu::java::awt::font::opentype::truetype::Zone *);
+  ZonePathIterator(::gnu::java::awt::font::opentype::truetype::Zone *, jint);
 public:
   jint getWindingRule();
   jboolean isDone();
@@ -58,6 +58,7 @@ private:
   jint numPoints;
   jint curPoint;
   jint contourStart;
+  jint type;
 public: // actually package-private
   JArray< jfloat > * floats;
 public:
diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
index b8933b32db9..48d474bf2a6 100644
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
@@ -20,6 +20,7 @@ extern "Java"
         namespace java2d
         {
             class AbstractGraphics2D;
+            class ScanlineConverter;
             class ShapeCache;
         }
       }
@@ -29,6 +30,7 @@ extern "Java"
   {
     namespace awt
     {
+        class BasicStroke;
         class Color;
         class Composite;
         class Font;
@@ -50,7 +52,6 @@ extern "Java"
       namespace geom
       {
           class AffineTransform;
-          class Rectangle2D;
       }
       namespace image
       {
@@ -175,11 +176,9 @@ public: // actually protected
   virtual void rawCopyArea(jint, jint, jint, jint, jint, jint);
 private:
   void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  void fillShapeImpl(::java::util::ArrayList *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
 public: // actually protected
-  virtual void fillScanline(::java::awt::PaintContext *, jint, jint, jint);
+  virtual void fillScanline(jint, jint, jint);
 private:
-  void fillShapeAntialias(::java::util::ArrayList *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
   void fillScanlineAA(JArray< jint > *, jint, jint, jint, ::java::awt::PaintContext *, jint);
 public: // actually protected
   virtual void init();
@@ -189,14 +188,17 @@ private:
   void updateOptimization();
   static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
   void updateClip(::java::awt::geom::AffineTransform *);
-  ::java::util::ArrayList * getSegments(::java::awt::Shape *, ::java::awt::geom::AffineTransform *, ::java::awt::geom::Rectangle2D *, jboolean);
   ::gnu::java::awt::java2d::ShapeCache * getShapeCache();
+  ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter();
+  static ::java::awt::Font * FONT;
   static const jint AA_SAMPLING = 8;
   static ::java::lang::ThreadLocal * shapeCache;
+  static ::java::lang::ThreadLocal * scanlineConverters;
 public: // actually protected
   ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__;
 private:
   ::java::awt::Paint * paint;
+  ::java::awt::PaintContext * paintContext;
   ::java::awt::Color * background;
   ::java::awt::Font * font;
   ::java::awt::Composite * composite;
@@ -207,6 +209,8 @@ private:
   JArray< jint > * alpha;
   JArray< ::java::util::ArrayList * > * edgeTable;
   jboolean isOptimized;
+  static ::java::awt::BasicStroke * STANDARD_STROKE;
+  static ::java::util::HashMap * STANDARD_HINTS;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/java2d/ActiveEdges.h b/libjava/gnu/java/awt/java2d/ActiveEdges.h
new file mode 100644
index 00000000000..9310460b9d6
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/ActiveEdges.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ActiveEdges__
+#define __gnu_java_awt_java2d_ActiveEdges__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class ActiveEdges;
+            class PolyEdge;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::ActiveEdges : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ActiveEdges();
+  void clear();
+  void add(::gnu::java::awt::java2d::PolyEdge *);
+  void intersectSortAndPack(jint, jint);
+  jint getNumActiveEdges();
+  ::gnu::java::awt::java2d::PolyEdge * getActiveEdge(jint);
+  void remove(jint);
+public:
+  ::java::lang::String * toString();
+private:
+  JArray< ::gnu::java::awt::java2d::PolyEdge * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) activeEdges;
+  jint numActiveEdges;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ActiveEdges__
diff --git a/libjava/gnu/java/awt/java2d/PolyEdge.h b/libjava/gnu/java/awt/java2d/PolyEdge.h
index 6698599d6ac..e51a868ca47 100644
--- a/libjava/gnu/java/awt/java2d/PolyEdge.h
+++ b/libjava/gnu/java/awt/java2d/PolyEdge.h
@@ -28,18 +28,26 @@ class gnu::java::awt::java2d::PolyEdge : public ::java::lang::Object
 {
 
 public: // actually package-private
-  PolyEdge(jdouble, jdouble, jdouble, jdouble, jboolean);
+  PolyEdge();
+  PolyEdge(jint, jint, jint, jint, jint, jboolean);
+  void init(jint, jint, jint, jint, jint, jboolean);
 public:
-  virtual jint compareTo(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) x0;
-  jdouble y0;
-  jdouble x1;
-  jdouble y1;
+  jint compareTo(::java::lang::Object *);
 public: // actually package-private
-  jdouble slope;
-  jdouble xIntersection;
+  void intersect(jint, jint);
+public:
+  ::java::lang::String * toString();
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x0;
+  jint y0;
+  jint x1;
+  jint y1;
+private:
+  jint slope;
+public: // actually package-private
+  jint xIntersection;
   jboolean isClip;
+  ::gnu::java::awt::java2d::PolyEdge * poolNext;
+  ::gnu::java::awt::java2d::PolyEdge * scanlineNext;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/java2d/Scanline.h b/libjava/gnu/java/awt/java2d/Scanline.h
new file mode 100644
index 00000000000..ce2be0e97a3
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/Scanline.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_Scanline__
+#define __gnu_java_awt_java2d_Scanline__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class PolyEdge;
+            class Scanline;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::Scanline : public ::java::lang::Object
+{
+
+public: // actually package-private
+  virtual void clear();
+  Scanline();
+  virtual void addEdge(::gnu::java::awt::java2d::PolyEdge *);
+  virtual ::gnu::java::awt::java2d::PolyEdge * getEdges();
+private:
+  ::gnu::java::awt::java2d::PolyEdge * __attribute__((aligned(__alignof__( ::java::lang::Object)))) edges;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_Scanline__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineConverter.h b/libjava/gnu/java/awt/java2d/ScanlineConverter.h
new file mode 100644
index 00000000000..febf495e451
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/ScanlineConverter.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ScanlineConverter__
+#define __gnu_java_awt_java2d_ScanlineConverter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class AbstractGraphics2D;
+            class ActiveEdges;
+            class PolyEdge;
+            class Scanline;
+            class ScanlineConverter;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+      namespace geom
+      {
+          class AffineTransform;
+          class PathIterator;
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::ScanlineConverter : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ScanlineConverter();
+  void renderShape(::gnu::java::awt::java2d::AbstractGraphics2D *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint);
+private:
+  void clear();
+  void doScanline(::gnu::java::awt::java2d::AbstractGraphics2D *, jint, jboolean, jboolean);
+  void setResolution(jint);
+  void setUpperBounds(jint);
+  void addShape(::java::awt::geom::PathIterator *, jboolean);
+  void addEdge(::gnu::java::awt::java2d::PolyEdge *);
+  jint fit(jint);
+  jint scanlineIndex(jint);
+  void edgePoolAdd(jint, jint, jint, jint, jboolean);
+  static jint FIXED_DIGITS;
+  static jint ONE;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines;
+  JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines;
+  jint upperBounds;
+  jint resolution;
+  jint halfStep;
+  JArray< jfloat > * coords;
+  ::gnu::java::awt::java2d::ActiveEdges * activeEdges;
+  ::gnu::java::awt::java2d::PolyEdge * edgePool;
+  ::gnu::java::awt::java2d::PolyEdge * edgePoolLast;
+  jint minY;
+  jint maxY;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ScanlineConverter__
diff --git a/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h b/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h
new file mode 100644
index 00000000000..5433933293d
--- /dev/null
+++ b/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h
@@ -0,0 +1,86 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_peer_ClasspathDesktopPeer__
+#define __gnu_java_awt_peer_ClasspathDesktopPeer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace peer
+        {
+            class ClasspathDesktopPeer;
+            class GnomeDesktopPeer;
+            class KDEDesktopPeer;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Desktop$Action;
+      namespace peer
+      {
+          class DesktopPeer;
+      }
+    }
+    namespace net
+    {
+        class URI;
+    }
+  }
+}
+
+class gnu::java::awt::peer::ClasspathDesktopPeer : public ::java::lang::Object
+{
+
+public: // actually protected
+  ClasspathDesktopPeer();
+public:
+  virtual jboolean isSupported(::java::awt::Desktop$Action *);
+  virtual void browse(::java::net::URI *);
+  virtual void edit(::java::io::File *);
+  virtual void mail(::java::net::URI *);
+  virtual void mail();
+  virtual void open(::java::io::File *);
+  virtual void print(::java::io::File *);
+public: // actually protected
+  virtual ::java::lang::String * getCommand(::java::lang::String *);
+  virtual void checkPermissions();
+  virtual void checkPermissions(::java::io::File *, jboolean);
+  virtual void checkPrintPermissions(::java::io::File *);
+  virtual jboolean supportCommand(::java::lang::String *);
+public:
+  static ::java::awt::peer::DesktopPeer * getDesktop();
+public: // actually package-private
+  static JArray< jint > * $SWITCH_TABLE$java$awt$Desktop$Action();
+public: // actually protected
+  static ::java::lang::String * _DEFAULT_BROWSER;
+  static ::java::lang::String * _BROWSE;
+  static ::java::lang::String * _MAIL;
+  static ::java::lang::String * _EDIT;
+  static ::java::lang::String * _PRINT;
+  static ::java::lang::String * _OPEN;
+  static ::gnu::java::awt::peer::KDEDesktopPeer * kde;
+  static ::gnu::java::awt::peer::GnomeDesktopPeer * gnome;
+  static ::gnu::java::awt::peer::ClasspathDesktopPeer * classpath;
+  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
+private:
+  static JArray< jint > * $SWITCH_TABLE$java$awt$Desktop$Action__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_peer_ClasspathDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h
new file mode 100644
index 00000000000..744566261c3
--- /dev/null
+++ b/libjava/gnu/java/awt/peer/ClasspathFontPeer$LRUCache.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
+#define __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
+
+#pragma interface
+
+#include <java/util/LinkedHashMap.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace peer
+        {
+            class ClasspathFontPeer$LRUCache;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::peer::ClasspathFontPeer$LRUCache : public ::java::util::LinkedHashMap
+{
+
+public:
+  ClasspathFontPeer$LRUCache(jint);
+public: // actually protected
+  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) max_entries;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_peer_ClasspathFontPeer$LRUCache__
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
index 80a09c17b90..2752664c8fc 100644
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
+++ b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
@@ -21,6 +21,7 @@ extern "Java"
         namespace peer
         {
             class ClasspathFontPeer;
+            class ClasspathFontPeer$LRUCache;
         }
       }
     }
@@ -116,6 +117,8 @@ public: // actually protected
   jint style;
   jfloat size;
   ::java::awt::geom::AffineTransform * transform;
+private:
+  static ::gnu::java::awt::peer::ClasspathFontPeer$LRUCache * transCache;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h b/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h
new file mode 100644
index 00000000000..7621bd1501e
--- /dev/null
+++ b/libjava/gnu/java/awt/peer/GnomeDesktopPeer.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_peer_GnomeDesktopPeer__
+#define __gnu_java_awt_peer_GnomeDesktopPeer__
+
+#pragma interface
+
+#include <gnu/java/awt/peer/ClasspathDesktopPeer.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace peer
+        {
+            class GnomeDesktopPeer;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace net
+    {
+        class URI;
+    }
+  }
+}
+
+class gnu::java::awt::peer::GnomeDesktopPeer : public ::gnu::java::awt::peer::ClasspathDesktopPeer
+{
+
+public:
+  GnomeDesktopPeer();
+public: // actually protected
+  virtual ::java::lang::String * getCommand(::java::lang::String *);
+public:
+  virtual void browse(::java::net::URI *);
+public: // actually protected
+  virtual jboolean supportCommand(::java::lang::String *);
+public:
+  virtual void mail();
+public: // actually protected
+  virtual ::java::lang::String * execQuery(::java::lang::String *);
+private:
+  static ::java::lang::String * BROWSER_QUERY_GNOME;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_peer_GnomeDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/KDEDesktopPeer.h b/libjava/gnu/java/awt/peer/KDEDesktopPeer.h
new file mode 100644
index 00000000000..1d6448b6c7e
--- /dev/null
+++ b/libjava/gnu/java/awt/peer/KDEDesktopPeer.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_peer_KDEDesktopPeer__
+#define __gnu_java_awt_peer_KDEDesktopPeer__
+
+#pragma interface
+
+#include <gnu/java/awt/peer/ClasspathDesktopPeer.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace peer
+        {
+            class KDEDesktopPeer;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::peer::KDEDesktopPeer : public ::gnu::java::awt::peer::ClasspathDesktopPeer
+{
+
+public:
+  KDEDesktopPeer();
+public: // actually protected
+  virtual ::java::lang::String * getCommand(::java::lang::String *);
+  virtual jboolean supportCommand(::java::lang::String *);
+public:
+  virtual void mail();
+public: // actually protected
+  virtual ::java::lang::String * execQuery(::java::lang::String *);
+private:
+  static ::java::lang::String * BROWSER_QUERY_GNOME;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_peer_KDEDesktopPeer__
diff --git a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h b/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
index ef29b9b8060..032eb270cc1 100644
--- a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
+++ b/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
@@ -87,7 +87,6 @@ public: // actually protected
 private:
   ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) image;
   ::java::awt::image::BufferedImage * buffer;
-  jboolean locked;
   jint imageWidth;
   jint imageHeight;
 public: // actually package-private
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
index 1be46fbaf7b..5d5ee497dd8 100644
--- a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
+++ b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h
@@ -22,6 +22,7 @@ extern "Java"
           namespace gtk
           {
               class CairoGraphics2D;
+              class CairoSurface;
               class GdkFontPeer;
           }
         }
@@ -109,9 +110,7 @@ public: // actually protected
   virtual void cairoSetFillRule(jlong, jint);
   virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble);
   virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble);
-public: // actually package-private
-  virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *);
-public: // actually protected
+  virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *, JArray< jlong > *);
   virtual void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *);
   virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble);
   virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
@@ -126,6 +125,7 @@ public: // actually protected
   virtual void cairoFill(jlong, jdouble);
   virtual void cairoClip(jlong);
   virtual void cairoResetClip(jlong);
+  virtual void cairoSetAntialias(jlong, jboolean);
 public:
   virtual void setTransform(::java::awt::geom::AffineTransform *);
 private:
@@ -200,6 +200,7 @@ public:
   virtual ::java::awt::RenderingHints * getRenderingHints();
 private:
   jint getInterpolation();
+  void setAntialias(jboolean);
 public: // actually protected
   virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
 public:
@@ -213,6 +214,9 @@ public:
   virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
   virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
   virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
+public: // actually protected
+  virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint);
+public:
   virtual void drawString(::java::lang::String *, jfloat, jfloat);
   virtual void drawString(::java::lang::String *, jint, jint);
   virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
@@ -237,6 +241,7 @@ private:
   void updateClip(::java::awt::geom::AffineTransform *);
   static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
 public: // actually package-private
+  static ::java::awt::geom::Rectangle2D * getTransformedBounds(::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *);
   jlong __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) nativePointer;
   ::java::awt::Paint * paint;
   jboolean customPaint;
@@ -250,6 +255,8 @@ public: // actually package-private
   ::java::awt::CompositeContext * compCtx;
 private:
   ::java::awt::RenderingHints * hints;
+  jboolean antialias;
+  jboolean ignoreAA;
 public: // actually protected
   jboolean shiftDrawCalls;
 private:
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h
deleted file mode 100644
index 3373a83bdbd..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__
-#define __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class CairoSurface$CairoDataBuffer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurface$CairoDataBuffer : public ::java::awt::image::DataBuffer
-{
-
-public:
-  CairoSurface$CairoDataBuffer(::gnu::java::awt::peer::gtk::CairoSurface *);
-  virtual jint getElem(jint, jint);
-  virtual void setElem(jint, jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::CairoSurface * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__
diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
index bc33bdb6391..7e34ee923b4 100644
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
+++ b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
@@ -33,11 +33,15 @@ extern "Java"
     namespace awt
     {
         class Graphics2D;
+        class Point;
+        class Rectangle;
       namespace image
       {
           class BufferedImage;
           class ColorModel;
+          class Raster;
           class SampleModel;
+          class WritableRaster;
       }
     }
   }
@@ -46,25 +50,18 @@ extern "Java"
 class gnu::java::awt::peer::gtk::CairoSurface : public ::java::awt::image::WritableRaster
 {
 
-  void create(jint, jint, jint);
-  void destroy(jlong, jlong);
-  jint nativeGetElem(jlong, jint);
-  void nativeSetElem(jlong, jint, jint);
+  void create(jint, jint, jint, JArray< jint > *);
+  void destroy(jlong, JArray< jint > *);
 public:
   virtual void nativeDrawSurface(jlong, jlong, JArray< jdouble > *, jdouble, jint);
-  virtual void drawSurface(jlong, JArray< jdouble > *, jdouble, jint);
 public: // actually package-private
-  virtual JArray< jint > * nativeGetPixels(jlong, jint);
-public:
-  virtual JArray< jint > * getPixels(jint);
-public: // actually package-private
-  virtual void nativeSetPixels(jlong, JArray< jint > *);
-public:
-  virtual void setPixels(JArray< jint > *);
-public: // actually package-private
-  virtual jlong getFlippedBuffer(jlong, jint);
+  virtual void syncNativeToJava(jlong, JArray< jint > *);
+  virtual void syncJavaToNative(jlong, JArray< jint > *);
+  virtual jlong getFlippedBuffer(jlong);
 public:
   CairoSurface(jint, jint);
+  CairoSurface(jint, jint, jint, jint);
+  CairoSurface(::java::awt::image::SampleModel *, ::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::Rectangle *, ::java::awt::Point *);
 public: // actually package-private
   CairoSurface(::gnu::java::awt::peer::gtk::GtkImage *);
 public:
@@ -73,6 +70,7 @@ public: // actually protected
   virtual void finalize();
 public:
   virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage();
+  virtual JArray< jint > * getData();
   static ::java::awt::image::BufferedImage * getBufferedImage(jint, jint);
   static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::GtkImage *);
   static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::CairoSurface *);
@@ -81,19 +79,25 @@ public: // actually package-private
   virtual jlong nativeNewCairoContext(jlong);
 public:
   virtual jlong newCairoContext();
+  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
 public: // actually package-private
   virtual void copyAreaNative2(jlong, jint, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
 public: // actually protected
   static ::java::awt::image::SampleModel * createCairoSampleModel(jint, jint);
+public:
+  static jboolean isCompatibleColorModel(::java::awt::image::ColorModel *);
+  static jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
+  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
+  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
+  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
+  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
+  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
+  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
 public: // actually package-private
-  static jint access$0(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint);
-  static void access$1(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint, jint);
   jint __attribute__((aligned(__alignof__( ::java::awt::image::WritableRaster)))) width;
   jint height;
   jlong surfacePointer;
-  jlong bufferPointer;
+  jboolean sharedBuffer;
   static ::java::awt::image::ColorModel * cairoColorModel;
   static ::java::awt::image::ColorModel * cairoCM_pre;
   static ::java::awt::image::ColorModel * cairoCM_opaque;
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
index ce5a55849a7..9379c5ea611 100644
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
+++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
@@ -25,6 +25,7 @@ extern "Java"
         {
           namespace gtk
           {
+              class CairoSurface;
               class ComponentGraphics;
               class GtkComponentPeer;
               class GtkImage;
@@ -132,6 +133,8 @@ public: // actually protected
   virtual void cairoFill(jlong, jdouble);
   virtual void cairoClip(jlong);
   virtual void cairoResetClip(jlong);
+  virtual void cairoSetAntialias(jlong, jboolean);
+  virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint);
 private:
   static jboolean hasXRenderExtension;
   ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) component;
diff --git a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
index 312e69c0076..47b452ee712 100644
--- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
+++ b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
@@ -55,19 +55,24 @@ extern "Java"
 class gnu::java::awt::peer::gtk::FreetypeGlyphVector : public ::java::awt::font::GlyphVector
 {
 
+  void dispose(JArray< jlong > *);
+  jlong getNativeFontPointer(jint);
 public:
   FreetypeGlyphVector(::java::awt::Font *, ::java::lang::String *, ::java::awt::font::FontRenderContext *);
   FreetypeGlyphVector(::java::awt::Font *, JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *, jint);
   FreetypeGlyphVector(::java::awt::Font *, JArray< jint > *, ::java::awt::font::FontRenderContext *);
 private:
   FreetypeGlyphVector(::gnu::java::awt::peer::gtk::FreetypeGlyphVector *);
+public:
+  virtual void finalize();
+private:
   void getGlyphs();
 public:
-  virtual JArray< jint > * getGlyphs(JArray< jint > *);
+  virtual void getGlyphs(JArray< jint > *, JArray< jint > *, JArray< jlong > *);
 private:
-  ::java::awt::geom::Point2D * getKerning(jint, jint);
-  JArray< jdouble > * getMetricsNative(jint);
-  ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint);
+  ::java::awt::geom::Point2D * getKerning(jint, jint, jlong);
+  JArray< jdouble > * getMetricsNative(jint, jlong);
+  ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint, jlong);
 public:
   virtual ::java::lang::Object * clone();
   virtual jboolean equals(::java::awt::font::GlyphVector *);
@@ -76,6 +81,9 @@ public:
   virtual void performDefaultLayout();
   virtual jint getGlyphCode(jint);
   virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *);
+public: // actually protected
+  virtual JArray< jlong > * getGlyphFonts(jint, jint, JArray< jlong > *);
+public:
   virtual ::java::awt::Shape * getGlyphLogicalBounds(jint);
   virtual void setupGlyphMetrics();
   virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
@@ -101,6 +109,7 @@ private:
   ::java::awt::font::FontRenderContext * frc;
   jint nGlyphs;
   JArray< jint > * glyphCodes;
+  JArray< jlong > * fontSet;
   JArray< ::java::awt::geom::AffineTransform * > * glyphTransforms;
   JArray< ::java::awt::font::GlyphMetrics * > * metricsCache;
 public:
diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
deleted file mode 100644
index c788e827531..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GThreadMutex__
-#define __gnu_java_awt_peer_gtk_GThreadMutex__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GThreadMutex;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GThreadMutex : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GThreadMutex();
-  jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers;
-  ::java::lang::Object * lockForPotentialLockers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GThreadMutex__
diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h b/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h
deleted file mode 100644
index 803f173cf77..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
-#define __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GThreadNativeMethodRunner;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GThreadNativeMethodRunner : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  GThreadNativeMethodRunner(jlong, jlong, jboolean);
-public:
-  virtual void run();
-private:
-  void nativeRun(jlong, jlong);
-  static jint registerThread(::java::lang::Thread *);
-public: // actually package-private
-  static jint threadToThreadID(::java::lang::Thread *);
-  static ::java::lang::Thread * threadIDToThread(jint);
-private:
-  void registerSelfJoinable();
-public: // actually package-private
-  static void deRegisterJoinable(::java::lang::Thread *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Thread)))) funcPtr;
-  jlong funcArg;
-  static JArray< ::java::lang::ref::WeakReference * > * threads;
-  static ::java::util::Set * joinable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h
deleted file mode 100644
index 65ca7a2dea3..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontMetrics__
-#define __gnu_java_awt_peer_gtk_GdkFontMetrics__
-
-#pragma interface
-
-#include <java/awt/FontMetrics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkFontMetrics;
-              class GdkFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontMetrics : public ::java::awt::FontMetrics
-{
-
-  static ::java::awt::Font * initFont(::java::awt::Font *);
-public:
-  GdkFontMetrics(::java::awt::Font *);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint getLeading();
-  virtual jint getAscent();
-  virtual jint getMaxAscent();
-  virtual jint getDescent();
-  virtual jint getMaxDescent();
-  virtual jint getMaxAdvance();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) font_metrics;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * peer;
-  static const jint FONT_METRICS_ASCENT = 0;
-  static const jint FONT_METRICS_MAX_ASCENT = 1;
-  static const jint FONT_METRICS_DESCENT = 2;
-  static const jint FONT_METRICS_MAX_DESCENT = 3;
-  static const jint FONT_METRICS_MAX_ADVANCE = 4;
-  static const jint TEXT_METRICS_X_BEARING = 0;
-  static const jint TEXT_METRICS_Y_BEARING = 1;
-  static const jint TEXT_METRICS_WIDTH = 2;
-  static const jint TEXT_METRICS_HEIGHT = 3;
-  static const jint TEXT_METRICS_X_ADVANCE = 4;
-  static const jint TEXT_METRICS_Y_ADVANCE = 5;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontMetrics__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
index 903210aca3a..d7168b27bcf 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
@@ -109,7 +109,7 @@ public:
   virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
 public: // actually package-private
   virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint);
-  virtual void putGlyphMetrics(jint, ::java::lang::Object *);
+  virtual void putGlyphMetrics(jint, ::java::awt::font::GlyphMetrics *);
   static ::java::awt::font::FontRenderContext * DEFAULT_CTX;
   ::java::util::HashMap * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) textLayoutCache;
 private:
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
index 8249a1e9a3e..49586fc08b1 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
@@ -6,7 +6,7 @@
 
 #pragma interface
 
-#include <java/awt/GraphicsEnvironment.h>
+#include <gnu/java/awt/ClasspathGraphicsEnvironment.h>
 #include <gcj/array.h>
 
 extern "Java"
@@ -38,12 +38,15 @@ extern "Java"
       namespace image
       {
           class BufferedImage;
+          class ColorModel;
+          class SampleModel;
+          class WritableRaster;
       }
     }
   }
 }
 
-class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
+class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::gnu::java::awt::ClasspathGraphicsEnvironment
 {
 
 public: // actually package-private
@@ -71,8 +74,10 @@ public:
   virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
 public: // actually package-private
   virtual JArray< jint > * getMouseCoordinates();
+public:
+  virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
 private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::GraphicsEnvironment)))) native_state;
+  jint __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathGraphicsEnvironment)))) native_state;
   ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * defaultDevice;
   JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * devices;
 public:
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h
deleted file mode 100644
index 94bac6c75cc..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkToolkit$1__
-#define __gnu_java_awt_peer_gtk_GtkToolkit$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkToolkit$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkToolkit$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  GtkToolkit$1(::java::lang::String *);
-public:
-  void run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkToolkit$1__
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
index e02c3b6a9ed..66b3fcbaad4 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
@@ -141,7 +141,7 @@ class gnu::java::awt::peer::gtk::GtkToolkit : public ::gnu::java::awt::Classpath
 {
 
 public: // actually package-private
-  static void gtkInit(jint);
+  static void gtkInit(jint, ::java::lang::Object *);
   static void gtkMain();
   static void gtkQuit();
 public:
@@ -215,6 +215,10 @@ public:
   virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
   virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
   virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
+  virtual jboolean getLockingKeyState(jint);
+public: // actually protected
+  virtual jint getLockState(jint);
+public:
   virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *);
 public: // actually protected
   virtual ::java::awt::peer::MouseInfoPeer * getMouseInfoPeer();
@@ -224,6 +228,8 @@ private:
   void checkHeadless();
 public:
   virtual jint getMouseNumberOfButtons();
+public: // actually package-private
+  static ::java::lang::Object * GTK_LOCK;
 private:
   static ::java::awt::EventQueue * q;
   ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) fontCache;
diff --git a/libjava/gnu/java/lang/management/BeanImpl.h b/libjava/gnu/java/lang/management/BeanImpl.h
index 56b8a050cb3..be483954424 100644
--- a/libjava/gnu/java/lang/management/BeanImpl.h
+++ b/libjava/gnu/java/lang/management/BeanImpl.h
@@ -34,7 +34,6 @@ extern "Java"
       {
           class OpenMBeanInfo;
           class OpenMBeanParameterInfo;
-          class OpenType;
       }
     }
   }
@@ -55,9 +54,7 @@ public: // actually protected
 public:
   virtual ::javax::management::MBeanInfo * getMBeanInfo();
 private:
-  ::javax::management::openmbean::OpenType * getTypeFromClass(::java::lang::Class *);
   JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > * translateSignature(JArray< ::javax::management::MBeanParameterInfo * > *);
-  ::javax::management::openmbean::OpenMBeanParameterInfo * translate(::java::lang::String *);
   ::javax::management::openmbean::OpenMBeanInfo * __attribute__((aligned(__alignof__( ::javax::management::StandardMBean)))) openInfo;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/java/lang/management/MemoryMXBeanImpl$ListenerData.h b/libjava/gnu/java/lang/management/MemoryMXBeanImpl$ListenerData.h
deleted file mode 100644
index 0be0fe815ae..00000000000
--- a/libjava/gnu/java/lang/management/MemoryMXBeanImpl$ListenerData.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_MemoryMXBeanImpl$ListenerData__
-#define __gnu_java_lang_management_MemoryMXBeanImpl$ListenerData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class MemoryMXBeanImpl;
-            class MemoryMXBeanImpl$ListenerData;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class gnu::java::lang::management::MemoryMXBeanImpl$ListenerData : public ::java::lang::Object
-{
-
-public:
-  MemoryMXBeanImpl$ListenerData(::gnu::java::lang::management::MemoryMXBeanImpl *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual ::javax::management::NotificationListener * getListener();
-  virtual ::javax::management::NotificationFilter * getFilter();
-  virtual ::java::lang::Object * getPassback();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::javax::management::NotificationListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listener;
-  ::javax::management::NotificationFilter * filter;
-  ::java::lang::Object * passback;
-public: // actually package-private
-  ::gnu::java::lang::management::MemoryMXBeanImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_MemoryMXBeanImpl$ListenerData__
diff --git a/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h b/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h
index 41385fe2542..af79980b2ae 100644
--- a/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h
+++ b/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h
@@ -32,6 +32,7 @@ public:
   ::java::lang::String * getArch();
   jint getAvailableProcessors();
   ::java::lang::String * getName();
+  jdouble getSystemLoadAverage();
   ::java::lang::String * getVersion();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h b/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h
index 3a8fd5f3033..6127548f510 100644
--- a/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h
+++ b/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h
@@ -31,6 +31,8 @@ class gnu::java::lang::management::ThreadMXBeanImpl : public ::gnu::java::lang::
 
 public:
   ThreadMXBeanImpl();
+  JArray< ::java::lang::management::ThreadInfo * > * dumpAllThreads(jboolean, jboolean);
+  JArray< jlong > * findDeadlockedThreads();
   JArray< jlong > * findMonitorDeadlockedThreads();
   JArray< jlong > * getAllThreadIds();
   jlong getCurrentThreadCpuTime();
@@ -43,9 +45,12 @@ public:
   JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *);
   ::java::lang::management::ThreadInfo * getThreadInfo(jlong, jint);
   JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *, jint);
+  JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *, jboolean, jboolean);
   jlong getThreadUserTime(jlong);
   jlong getTotalStartedThreadCount();
   jboolean isCurrentThreadCpuTimeSupported();
+  jboolean isObjectMonitorUsageSupported();
+  jboolean isSynchronizerUsageSupported();
   jboolean isThreadContentionMonitoringEnabled();
   jboolean isThreadContentionMonitoringSupported();
   jboolean isThreadCpuTimeEnabled();
@@ -58,6 +63,8 @@ private:
   static ::java::lang::String * THREAD_TIME_SUPPORT;
   static ::java::lang::String * CONTENTION_SUPPORT;
   static ::java::lang::String * TIME_ENABLED;
+  static ::java::lang::String * MONITOR_SUPPORT;
+  static ::java::lang::String * SYNCHRONIZER_SUPPORT;
   jboolean __attribute__((aligned(__alignof__( ::gnu::java::lang::management::BeanImpl)))) timeEnabled;
   jboolean contentionEnabled;
 public:
diff --git a/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h b/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h
new file mode 100644
index 00000000000..183f4ba2ea5
--- /dev/null
+++ b/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_lang_management_VMOperatingSystemMXBeanImpl__
+#define __gnu_java_lang_management_VMOperatingSystemMXBeanImpl__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace lang
+      {
+        namespace management
+        {
+            class VMOperatingSystemMXBeanImpl;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::lang::management::VMOperatingSystemMXBeanImpl : public ::java::lang::Object
+{
+
+public: // actually package-private
+  VMOperatingSystemMXBeanImpl();
+  static jdouble getSystemLoadAverage();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_lang_management_VMOperatingSystemMXBeanImpl__
diff --git a/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java b/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
new file mode 100644
index 00000000000..20b3f9ed271
--- /dev/null
+++ b/libjava/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
@@ -0,0 +1,68 @@
+/* VMOperatingSystemMXBeanImpl.java - VM implementation of an OS bean
+   Copyright (C) 2006 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.lang.management;
+
+import gnu.classpath.Configuration;
+
+/**
+ * Provides access to information about the operating system.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.6
+ */
+final class VMOperatingSystemMXBeanImpl
+{
+
+  static
+  {
+    if (Configuration.INIT_LOAD_LIBRARY)
+      {
+        System.loadLibrary("javalangmanagement");
+      }
+  }
+
+  /**
+   * Returns the system load average from the last
+   * minute.
+   *
+   * @return the system load average from the last
+   *         minute.
+   */
+  static native double getSystemLoadAverage();
+
+}
diff --git a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
index 77577f7668e..4c8ab8c459c 100644
--- a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
+++ b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
@@ -31,12 +31,15 @@ class gnu::java::lang::management::VMThreadMXBeanImpl : public ::java::lang::Obj
 
 public: // actually package-private
   VMThreadMXBeanImpl();
+  static JArray< jlong > * findDeadlockedThreads();
   static JArray< jlong > * findMonitorDeadlockedThreads();
   static JArray< ::java::lang::Thread * > * getAllThreads();
   static JArray< jlong > * getAllThreadIds();
   static jlong getCurrentThreadCpuTime();
   static jlong getCurrentThreadUserTime();
   static jint getDaemonThreadCount();
+  static void getLockInfo(::java::lang::management::ThreadInfo *);
+  static void getMonitorInfo(::java::lang::management::ThreadInfo *);
   static jint getPeakThreadCount();
   static jint getThreadCount();
   static jlong getThreadCpuTime(jlong);
diff --git a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java
index c5bcb631055..1c061aa9356 100644
--- a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java
+++ b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.java
@@ -60,6 +60,16 @@ final class VMThreadMXBeanImpl
 
   /**
    * Returns the ids of cycles of deadlocked threads, occurring
+   * due to monitor ownership or ownable synchronizer ownership.
+   * This will only be called if ownable synchronizer monitoring
+   * is supported.
+   *
+   * @return the ids of the deadlocked threads.
+   */
+  static native long[] findDeadlockedThreads();
+
+  /**
+   * Returns the ids of cycles of deadlocked threads, occurring
    * due to monitor ownership.
    *
    * @return the ids of the deadlocked threads.
@@ -138,6 +148,25 @@ final class VMThreadMXBeanImpl
   }
 
   /**
+   * Fill out the given {@link ThreadInfo} object
+   * with ownable synchronizer usage information.
+   * This is only called if ownable synchronizer
+   * usage monitoring is supported.
+   *
+   * @param info the {@link ThreadInfo} object to modify.
+   */
+  static native void getLockInfo(ThreadInfo info);
+
+  /**
+   * Fill out the given {@link ThreadInfo} object
+   * with monitor usage information.  This is only
+   * called if monitor usage monitoring is supported.
+   *
+   * @param info the {@link ThreadInfo} object to modify.
+   */
+  static native void getMonitorInfo(ThreadInfo info);
+
+  /**
    * Returns the current peak number of live threads.
    *
    * @return the peak number of live threads.
diff --git a/libjava/gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc
new file mode 100644
index 00000000000..daea76bbf7a
--- /dev/null
+++ b/libjava/gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc
@@ -0,0 +1,18 @@
+#include <config.h>
+
+#include <gnu/java/lang/management/VMOperatingSystemMXBeanImpl.h>
+#include <gcj/cni.h>
+#include <java/lang/UnsupportedOperationException.h>
+
+jdouble
+gnu::java::lang::management::VMOperatingSystemMXBeanImpl::getSystemLoadAverage ()
+{
+#ifdef HAVE_GETLOADAVG
+  double avg[1];
+  int nos = getloadavg(avg, 1);
+  if (nos == 1)
+    return avg[0];
+  else
+#endif
+    return -1;
+}
diff --git a/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc
index df05300ca2f..5d48957bac0 100644
--- a/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc
+++ b/libjava/gnu/java/lang/management/natVMThreadMXBeanImpl.cc
@@ -5,12 +5,17 @@
 #include <java/lang/UnsupportedOperationException.h>
 
 jlongArray
+gnu::java::lang::management::VMThreadMXBeanImpl::findDeadlockedThreads ()
+{
+  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::findDeadlockedThreads () not implemented"));
+}
+
+jlongArray
 gnu::java::lang::management::VMThreadMXBeanImpl::findMonitorDeadlockedThreads ()
 {
   throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::findMonitorDeadlockedThreads () not implemented"));
 }
 
-
 jlong
 gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadCpuTime ()
 {
@@ -24,6 +29,17 @@ gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadUserTime ()
   throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getCurrentThreadUserTime () not implemented"));
 }
 
+void
+gnu::java::lang::management::VMThreadMXBeanImpl::getLockInfo (::java::lang::management::ThreadInfo *)
+{
+  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getLockInfo () not implemented"));
+}
+
+void
+gnu::java::lang::management::VMThreadMXBeanImpl::getMonitorInfo (::java::lang::management::ThreadInfo *)
+{
+  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMThreadMXBeanImpl::getMonitorInfo () not implemented"));
+}
 
 jint
 gnu::java::lang::management::VMThreadMXBeanImpl::getPeakThreadCount ()
diff --git a/libjava/gnu/java/locale/LocaleHelper.h b/libjava/gnu/java/locale/LocaleHelper.h
index 7a8389334ad..c96dc33f9a0 100644
--- a/libjava/gnu/java/locale/LocaleHelper.h
+++ b/libjava/gnu/java/locale/LocaleHelper.h
@@ -28,7 +28,7 @@ class gnu::java::locale::LocaleHelper : public ::java::lang::Object
 
 public:
   LocaleHelper();
-  static ::java::lang::String * getLocalizedString(::java::util::Locale *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
+  static ::java::util::Locale * getFallbackLocale(::java::util::Locale *);
   static JArray< ::java::util::Locale * > * getCollatorLocales();
   static jint getLocaleCount();
   static ::java::lang::String * getLocaleName(jint);
diff --git a/libjava/gnu/java/math/Fixed.h b/libjava/gnu/java/math/Fixed.h
new file mode 100644
index 00000000000..92c1c55585f
--- /dev/null
+++ b/libjava/gnu/java/math/Fixed.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_math_Fixed__
+#define __gnu_java_math_Fixed__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace math
+      {
+          class Fixed;
+      }
+    }
+  }
+}
+
+class gnu::java::math::Fixed : public ::java::lang::Object
+{
+
+  Fixed();
+public:
+  static jint div(jint, jint, jint);
+  static jint mul(jint, jint, jint);
+  static jint ceil(jint, jint);
+  static jint floor(jint, jint);
+  static jint round(jint, jint);
+  static jfloat floatValue(jint, jint);
+  static jdouble doubleValue(jint, jint);
+  static jint fixedValue(jint, jfloat);
+  static jint fixedValue(jint, jdouble);
+  static jint intValue(jint, jint);
+  static jint roundIntValue(jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_math_Fixed__
diff --git a/libjava/gnu/java/net/BASE64.h b/libjava/gnu/java/net/BASE64.h
deleted file mode 100644
index 77616ba5136..00000000000
--- a/libjava/gnu/java/net/BASE64.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_BASE64__
-#define __gnu_java_net_BASE64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class BASE64;
-      }
-    }
-  }
-}
-
-class gnu::java::net::BASE64 : public ::java::lang::Object
-{
-
-  BASE64();
-public:
-  static JArray< jbyte > * encode(JArray< jbyte > *);
-  static JArray< jbyte > * decode(JArray< jbyte > *);
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  static JArray< jbyte > * src;
-  static JArray< jbyte > * dst;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_BASE64__
diff --git a/libjava/gnu/java/net/GetLocalHostAction.h b/libjava/gnu/java/net/GetLocalHostAction.h
index 7c82e46fa71..f0d088064e8 100644
--- a/libjava/gnu/java/net/GetLocalHostAction.h
+++ b/libjava/gnu/java/net/GetLocalHostAction.h
@@ -19,6 +19,13 @@ extern "Java"
       }
     }
   }
+  namespace java
+  {
+    namespace net
+    {
+        class InetAddress;
+    }
+  }
 }
 
 class gnu::java::net::GetLocalHostAction : public ::java::lang::Object
@@ -26,6 +33,7 @@ class gnu::java::net::GetLocalHostAction : public ::java::lang::Object
 
 public:
   GetLocalHostAction();
+  virtual ::java::net::InetAddress * GetLocalHostAction$run();
   virtual ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h
index 16a27056bcb..4a362e96b72 100644
--- a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h
+++ b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h
@@ -39,9 +39,6 @@ public:
   virtual jint read(JArray< jbyte > *, jint, jint);
   virtual jint available();
   virtual void close();
-private:
-  static const jbyte CR = 13;
-  static const jbyte LF = 10;
 public: // actually package-private
   ::gnu::java::net::protocol::http::Headers * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) headers;
 private:
diff --git a/libjava/gnu/java/net/protocol/http/Headers.h b/libjava/gnu/java/net/protocol/http/Headers.h
index d7c485c2511..cad6e68a7f5 100644
--- a/libjava/gnu/java/net/protocol/http/Headers.h
+++ b/libjava/gnu/java/net/protocol/http/Headers.h
@@ -39,9 +39,7 @@ class gnu::java::net::protocol::http::Headers : public ::java::lang::Object
 
 public:
   Headers();
-public: // actually package-private
   virtual ::java::util::Iterator * iterator();
-public:
   virtual ::java::lang::String * getValue(::java::lang::String *);
   virtual jint getIntValue(::java::lang::String *);
   virtual jlong getLongValue(::java::lang::String *);
diff --git a/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h b/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h
index e8259a8a2cb..fc0b0bf3268 100644
--- a/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h
+++ b/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h
@@ -38,7 +38,7 @@ public:
   virtual void setCookie(::gnu::java::net::protocol::http::Cookie *);
   virtual JArray< ::gnu::java::net::protocol::http::Cookie * > * getCookies(::java::lang::String *, jboolean, ::java::lang::String *);
 private:
-  void addCookies(::java::util::List *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::util::Date *);
+  void addCookies(::java::util::ArrayList *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::util::Date *);
 public: // actually protected
   ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cookies;
 public:
diff --git a/libjava/gnu/java/nio/ChannelInputStream.h b/libjava/gnu/java/nio/ChannelInputStream.h
index bc43e23da5a..04b624440f7 100644
--- a/libjava/gnu/java/nio/ChannelInputStream.h
+++ b/libjava/gnu/java/nio/ChannelInputStream.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/io/InputStream.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -36,6 +38,7 @@ class gnu::java::nio::ChannelInputStream : public ::java::io::InputStream
 
 public:
   ChannelInputStream(::java::nio::channels::ReadableByteChannel *);
+  jint read(JArray< jbyte > *, jint, jint);
   jint read();
 private:
   ::java::nio::channels::ReadableByteChannel * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) ch;
diff --git a/libjava/gnu/java/nio/EpollSelectionKeyImpl.h b/libjava/gnu/java/nio/EpollSelectionKeyImpl.h
deleted file mode 100644
index 1674815153c..00000000000
--- a/libjava/gnu/java/nio/EpollSelectionKeyImpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_EpollSelectionKeyImpl__
-#define __gnu_java_nio_EpollSelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class EpollSelectionKeyImpl;
-          class EpollSelectorImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::EpollSelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public: // actually package-private
-  EpollSelectionKeyImpl(::gnu::java::nio::EpollSelectorImpl *, ::java::nio::channels::SelectableChannel *, jint);
-public:
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual jint readyOps();
-  virtual ::java::nio::channels::Selector * selector();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) fd;
-private:
-  ::gnu::java::nio::EpollSelectorImpl * selector__;
-  ::java::nio::channels::SelectableChannel * channel__;
-public: // actually package-private
-  jint interestOps__;
-  jint selectedOps;
-  jint key;
-  jboolean valid;
-  jboolean cancelled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_EpollSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h b/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h
deleted file mode 100644
index 8a501b545cd..00000000000
--- a/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_KqueueSelectionKeyImpl__
-#define __gnu_java_nio_KqueueSelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class KqueueSelectionKeyImpl;
-          class KqueueSelectorImpl;
-          class VMChannelOwner;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::KqueueSelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public:
-  KqueueSelectionKeyImpl(::gnu::java::nio::KqueueSelectorImpl *, ::java::nio::channels::SelectableChannel *);
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual jint readyOps();
-  virtual ::java::nio::channels::Selector * selector();
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  virtual jboolean isReadActive();
-  virtual jboolean isReadInterested();
-  virtual jboolean isWriteActive();
-  virtual jboolean isWriteInterested();
-  virtual jboolean needCommitRead();
-  virtual jboolean needCommitWrite();
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) interestOps__;
-  jint readyOps__;
-  jint activeOps;
-  jint key;
-  jint fd;
-private:
-  ::gnu::java::nio::KqueueSelectorImpl * selector__;
-  ::java::nio::channels::SelectableChannel * channel__;
-  ::gnu::java::nio::VMChannelOwner * natChannel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_KqueueSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/SelectorProviderImpl.java b/libjava/gnu/java/nio/SelectorProviderImpl.java
index 47521107e90..03da80e6949 100644
--- a/libjava/gnu/java/nio/SelectorProviderImpl.java
+++ b/libjava/gnu/java/nio/SelectorProviderImpl.java
@@ -80,4 +80,5 @@ public class SelectorProviderImpl extends SelectorProvider
   {
     return new SocketChannelImpl (this);
   }
+
 }
diff --git a/libjava/gnu/java/nio/charset/EncodingHelper.h b/libjava/gnu/java/nio/charset/EncodingHelper.h
index 89cf7f1fe4c..7fbd289683e 100644
--- a/libjava/gnu/java/nio/charset/EncodingHelper.h
+++ b/libjava/gnu/java/nio/charset/EncodingHelper.h
@@ -43,6 +43,7 @@ public:
   static ::java::lang::String * getOldCanonical(::java::lang::String *);
   static jboolean isISOLatin1(::java::lang::String *);
   static ::java::nio::charset::Charset * getCharset(::java::lang::String *);
+  static ::java::nio::charset::Charset * getDefaultCharset();
 private:
   static ::java::util::HashMap * canonicalNames;
 public:
diff --git a/libjava/gnu/java/security/util/Base64.h b/libjava/gnu/java/security/util/Base64.h
deleted file mode 100644
index e75b6b57b06..00000000000
--- a/libjava/gnu/java/security/util/Base64.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_Base64__
-#define __gnu_java_security_util_Base64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class Base64;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::Base64 : public ::java::lang::Object
-{
-
-  Base64();
-public:
-  static ::java::lang::String * encode(JArray< jbyte > *);
-  static ::java::lang::String * encode(JArray< jbyte > *, jint, jint, jboolean);
-  static JArray< jbyte > * decode(::java::lang::String *);
-  static JArray< jbyte > * decode(JArray< jbyte > *, jint, jint);
-private:
-  static JArray< jbyte > * encode3to4(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  static jint decode4to3(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  static ::java::util::logging::Logger * log;
-  static const jint MAX_LINE_LENGTH = 76;
-  static const jbyte NEW_LINE = 10;
-  static const jbyte EQUALS_SIGN = 61;
-  static const jbyte WHITE_SPACE_ENC = -5;
-  static const jbyte EQUALS_SIGN_ENC = -1;
-  static JArray< jbyte > * ALPHABET;
-  static JArray< jbyte > * DECODABET;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_Base64__
diff --git a/libjava/gnu/java/security/x509/X509Certificate.h b/libjava/gnu/java/security/x509/X509Certificate.h
index 024e4031255..68e944360b6 100644
--- a/libjava/gnu/java/security/x509/X509Certificate.h
+++ b/libjava/gnu/java/security/x509/X509Certificate.h
@@ -107,6 +107,7 @@ public:
 private:
   void doVerify(::java::security::Signature *, ::java::security::PublicKey *);
   void parse(::java::io::InputStream *);
+  static const jlong serialVersionUID = -2491127588187038216LL;
   static ::java::util::logging::Logger * logger;
 public: // actually protected
   static ::gnu::java::security::OID * ID_DSA;
diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h b/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
index 3e6724e6c46..5de618446c3 100644
--- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
+++ b/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
@@ -37,6 +37,7 @@ public:
   CertificatePolicies(JArray< jbyte > *);
   CertificatePolicies(::java::util::List *, ::java::util::Map *);
   virtual ::java::util::List * getPolicies();
+  virtual ::java::util::List * getPolicyStrings();
   virtual ::java::util::List * getPolicyQualifierInfos(::gnu::java::security::OID *);
   virtual JArray< jbyte > * getEncoded();
   virtual ::java::lang::String * toString();
diff --git a/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h b/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h
new file mode 100644
index 00000000000..db98200eb3f
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_GeneralName$Kind__
+#define __gnu_java_security_x509_ext_GeneralName$Kind__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName$Kind;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::GeneralName$Kind : public ::java::lang::Enum
+{
+
+  GeneralName$Kind(::java::lang::String *, jint, jint);
+public:
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * forTag(jint);
+  jint tag();
+  static JArray< ::gnu::java::security::x509::ext::GeneralName$Kind * > * values();
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * valueOf(::java::lang::String *);
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * otherName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * rfc822Name;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * dNSName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * x400Address;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * directoryName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * ediPartyName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * uniformResourceIdentifier;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * iPAddress;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * registeredId;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) tag__;
+  static JArray< ::gnu::java::security::x509::ext::GeneralName$Kind * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_GeneralName$Kind__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralName.h b/libjava/gnu/java/security/x509/ext/GeneralName.h
new file mode 100644
index 00000000000..018bd3637cb
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/GeneralName.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_GeneralName__
+#define __gnu_java_security_x509_ext_GeneralName__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName;
+              class GeneralName$Kind;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::GeneralName : public ::java::lang::Object
+{
+
+public:
+  GeneralName(JArray< jbyte > *);
+  GeneralName(::gnu::java::security::x509::ext::GeneralName$Kind *, JArray< jbyte > *);
+  virtual ::gnu::java::security::x509::ext::GeneralName$Kind * kind();
+  virtual JArray< jbyte > * name();
+  virtual JArray< jbyte > * encoded();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind();
+private:
+  ::gnu::java::security::x509::ext::GeneralName$Kind * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kind__;
+  JArray< jbyte > * name__;
+  JArray< jbyte > * encoded__;
+  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_GeneralName__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralNames.h b/libjava/gnu/java/security/x509/ext/GeneralNames.h
index 8765d18e71a..e55113b1400 100644
--- a/libjava/gnu/java/security/x509/ext/GeneralNames.h
+++ b/libjava/gnu/java/security/x509/ext/GeneralNames.h
@@ -36,15 +36,6 @@ public:
   GeneralNames(JArray< jbyte > *);
   virtual ::java::util::List * getNames();
   virtual ::java::lang::String * toString();
-  static const jint OTHER_NAME = 0;
-  static const jint RFC822_NAME = 1;
-  static const jint DNS_NAME = 2;
-  static const jint X400_ADDRESS = 3;
-  static const jint DIRECTORY_NAME = 4;
-  static const jint EDI_PARTY_NAME = 5;
-  static const jint URI = 6;
-  static const jint IP_ADDRESS = 7;
-  static const jint REGISTERED_ID = 8;
 private:
   ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) names;
 public:
diff --git a/libjava/gnu/java/security/x509/ext/GeneralSubtree.h b/libjava/gnu/java/security/x509/ext/GeneralSubtree.h
new file mode 100644
index 00000000000..dae50e21215
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/GeneralSubtree.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_GeneralSubtree__
+#define __gnu_java_security_x509_ext_GeneralSubtree__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName;
+              class GeneralSubtree;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::GeneralSubtree : public ::java::lang::Object
+{
+
+public:
+  GeneralSubtree(JArray< jbyte > *);
+  virtual ::gnu::java::security::x509::ext::GeneralName * base();
+  virtual jint minimum();
+  virtual jint maximum();
+  virtual ::java::lang::String * toString();
+private:
+  ::gnu::java::security::x509::ext::GeneralName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) base__;
+  jint minimum__;
+  jint maximum__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_GeneralSubtree__
diff --git a/libjava/gnu/java/security/x509/ext/NameConstraints.h b/libjava/gnu/java/security/x509/ext/NameConstraints.h
new file mode 100644
index 00000000000..f7bc7788034
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/NameConstraints.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_NameConstraints__
+#define __gnu_java_security_x509_ext_NameConstraints__
+
+#pragma interface
+
+#include <gnu/java/security/x509/ext/Extension$Value.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+          class OID;
+        namespace x509
+        {
+          namespace ext
+          {
+              class NameConstraints;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::NameConstraints : public ::gnu::java::security::x509::ext::Extension$Value
+{
+
+public:
+  NameConstraints(JArray< jbyte > *);
+  virtual ::java::util::List * permittedSubtrees();
+  virtual ::java::util::List * excludedSubtrees();
+  virtual ::java::lang::String * toString();
+  static ::gnu::java::security::OID * ID;
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) permittedSubtrees__;
+  ::java::util::List * excludedSubtrees__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_NameConstraints__
diff --git a/libjava/gnu/java/util/Base64.h b/libjava/gnu/java/util/Base64.h
new file mode 100644
index 00000000000..69c2a4fddc1
--- /dev/null
+++ b/libjava/gnu/java/util/Base64.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_util_Base64__
+#define __gnu_java_util_Base64__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace util
+      {
+          class Base64;
+      }
+    }
+  }
+}
+
+class gnu::java::util::Base64 : public ::java::lang::Object
+{
+
+  Base64();
+public:
+  static ::java::lang::String * encode(JArray< jbyte > *);
+  static ::java::lang::String * encode(JArray< jbyte > *, jint);
+  static ::java::lang::String * encode(JArray< jbyte > *, jint, jint, jint);
+  static JArray< jbyte > * decode(::java::lang::String *);
+private:
+  static ::java::lang::String * BASE_64;
+  static const jchar BASE_64_PAD = 61;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_util_Base64__