libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


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

4 files changed, 231 insertions, 0 deletions

diff --git a/libjava/gnu/java/awt/font/GNUGlyphVector.h b/libjava/gnu/java/awt/font/GNUGlyphVector.h
index 99086f13f2a..a3f54bf8edd 100644
--- a/libjava/gnu/java/awt/font/GNUGlyphVector.h
+++ b/libjava/gnu/java/awt/font/GNUGlyphVector.h
@@ -93,6 +93,7 @@ private:
   JArray< jfloat > * pos;
   JArray< ::java::awt::geom::AffineTransform * > * transforms;
   jint layoutFlags;
+  ::java::awt::Shape * cleanOutline;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
new file mode 100644
index 00000000000..3f0b4d28c14
--- /dev/null
+++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
+#define __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
+
+#pragma interface
+
+#include <java/awt/FontMetrics.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+            class OpenTypeFontPeer;
+            class OpenTypeFontPeer$XFontMetrics;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Font;
+      namespace geom
+      {
+          class Point2D;
+      }
+    }
+  }
+}
+
+class gnu::java::awt::font::OpenTypeFontPeer$XFontMetrics : public ::java::awt::FontMetrics
+{
+
+public: // actually package-private
+  OpenTypeFontPeer$XFontMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *);
+public:
+  virtual jint getAscent();
+  virtual jint getDescent();
+  virtual jint getHeight();
+  virtual jint charWidth(jchar);
+  virtual jint charsWidth(JArray< jchar > *, jint, jint);
+  virtual jint stringWidth(::java::lang::String *);
+private:
+  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) cachedPoint;
+public: // actually package-private
+  ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
new file mode 100644
index 00000000000..1fec3c237e2
--- /dev/null
+++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
+#define __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
+
+#pragma interface
+
+#include <java/awt/font/LineMetrics.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+            class OpenTypeFontPeer;
+            class OpenTypeFontPeer$XLineMetrics;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Font;
+      namespace font
+      {
+          class FontRenderContext;
+          class GlyphVector;
+      }
+    }
+    namespace text
+    {
+        class CharacterIterator;
+    }
+  }
+}
+
+class gnu::java::awt::font::OpenTypeFontPeer$XLineMetrics : public ::java::awt::font::LineMetrics
+{
+
+public: // actually package-private
+  OpenTypeFontPeer$XLineMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
+public:
+  virtual jfloat getAscent();
+  virtual jint getBaselineIndex();
+  virtual JArray< jfloat > * getBaselineOffsets();
+  virtual jfloat getDescent();
+  virtual jfloat getHeight();
+  virtual jfloat getLeading();
+  virtual jint getNumChars();
+  virtual jfloat getStrikethroughOffset();
+  virtual jfloat getStrikethroughThickness();
+  virtual jfloat getUnderlineOffset();
+  virtual jfloat getUnderlineThickness();
+private:
+  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) font;
+  ::java::awt::font::GlyphVector * glyphVector;
+  ::java::awt::font::FontRenderContext * fontRenderContext;
+public: // actually package-private
+  ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
new file mode 100644
index 00000000000..6129982b4c4
--- /dev/null
+++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_OpenTypeFontPeer__
+#define __gnu_java_awt_font_OpenTypeFontPeer__
+
+#pragma interface
+
+#include <gnu/java/awt/peer/ClasspathFontPeer.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace font
+        {
+            class FontDelegate;
+            class OpenTypeFontPeer;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Font;
+        class FontMetrics;
+      namespace font
+      {
+          class FontRenderContext;
+          class GlyphVector;
+          class LineMetrics;
+      }
+      namespace geom
+      {
+          class AffineTransform;
+          class Rectangle2D;
+      }
+    }
+    namespace text
+    {
+        class CharacterIterator;
+    }
+  }
+}
+
+class gnu::java::awt::font::OpenTypeFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
+{
+
+public:
+  OpenTypeFontPeer(::java::lang::String *, jint, jint);
+  OpenTypeFontPeer(::java::lang::String *, ::java::util::Map *);
+  virtual jboolean canDisplay(::java::awt::Font *, jint);
+  virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
+  virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
+  virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
+  virtual jint getNumGlyphs(::java::awt::Font *);
+  virtual jint getMissingGlyphCode(::java::awt::Font *);
+  virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
+  virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
+  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
+  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
+  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
+  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
+  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
+  static ::java::lang::String * encodeFont(::java::lang::String *, ::java::util::Map *);
+public: // actually package-private
+  static ::java::lang::String * encodeFont(::java::lang::String *, jint);
+  static ::java::lang::String * validName(::java::lang::String *);
+public:
+  static JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
+private:
+  static ::java::util::Set * getFontNames();
+  ::java::lang::String * mapFontToFilename(::java::lang::String *);
+public: // actually package-private
+  static ::gnu::java::awt::font::FontDelegate * access$0(::gnu::java::awt::font::OpenTypeFontPeer *);
+  static ::java::awt::geom::AffineTransform * access$1();
+private:
+  static ::java::util::Properties * fontProperties;
+  static ::java::util::Set * availableFontNames;
+  static ::java::util::Map * fontToFileMap;
+  static ::java::awt::geom::AffineTransform * IDENDITY;
+  ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) fontDelegate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_OpenTypeFontPeer__