Import GNU Classpath (libgcj-import-20070727).

libjava/ 2007-08-04 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20070727). * Regenerate class and header files. * Regenerate auto* files. * include/jvm.h: * jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type. * jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise. * jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA, _Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA, _Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA, _Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify jvalue parameter. * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise. * java/lang/VMFloat.java (toString, parseFloat): New. * gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported, isModalExclusionTypeSupported): New (stub only). * gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise. * gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages, updateFocusableWindowState, setModalBlocked, getBoundsPrivate, setAlwaysOnTop): Likewise. * gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature. * scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer, ignore javax.sound.sampled.spi.MixerProvider, ignore .in files. * HACKING: Mention --enable-gstreamer-peer, removal of generated files. libjava/classpath/ 2007-08-04 Matthias Klose <doko@ubuntu.com> * java/util/EnumMap.java (clone): Add cast. From-SVN: r127204
2007-08-04 10:53:49 +00:00
parent 2c3de459b6
commit f06a83c0b2
522 changed files with 13385 additions and 4867 deletions
@@ -21,6 +21,7 @@ extern "Java"
        {
            class AbstractGraphics2D;
            class ScanlineConverter;
+            class ScanlineCoverage;
            class ShapeCache;
        }
      }
@@ -176,10 +177,8 @@ public: // actually protected
  virtual void rawCopyArea(jint, jint, jint, jint, jint, jint);
 private:
  void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-public: // actually protected
-  virtual void fillScanline(jint, jint, jint);
-private:
-  void fillScanlineAA(JArray< jint > *, jint, jint, jint, ::java::awt::PaintContext *, jint);
+public:
+  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *);
 public: // actually protected
  virtual void init();
  virtual ::java::awt::image::WritableRaster * getDestinationRaster();
@@ -191,7 +190,6 @@ private:
  ::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
@@ -206,8 +204,6 @@ private:
  ::java::awt::Shape * clip__;
  ::java::awt::RenderingHints * renderingHints;
  ::java::awt::image::WritableRaster * destinationRaster;
-  JArray< jint > * alpha;
-  JArray< ::java::util::ArrayList * > * edgeTable;
  jboolean isOptimized;
  static ::java::awt::BasicStroke * STANDARD_STROKE;
  static ::java::util::HashMap * STANDARD_HINTS;
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_Pixelizer__
+#define __gnu_java_awt_java2d_Pixelizer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class Pixelizer;
+            class ScanlineCoverage;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::Pixelizer : public ::java::lang::Object
+{
+
+public:
+  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_java_awt_java2d_Pixelizer__
@@ -19,11 +19,12 @@ extern "Java"
      {
        namespace java2d
        {
-            class AbstractGraphics2D;
            class ActiveEdges;
+            class Pixelizer;
            class PolyEdge;
            class Scanline;
            class ScanlineConverter;
+            class ScanlineCoverage;
        }
      }
    }
@@ -32,6 +33,7 @@ extern "Java"
  {
    namespace awt
    {
+        class RenderingHints;
        class Shape;
      namespace geom
      {
@@ -47,10 +49,11 @@ 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);
+public:
+  void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, ::java::awt::RenderingHints *);
 private:
  void clear();
-  void doScanline(::gnu::java::awt::java2d::AbstractGraphics2D *, jint, jboolean, jboolean);
+  void doScanline(::gnu::java::awt::java2d::Pixelizer *, jint, jboolean, jboolean);
  void setResolution(jint);
  void setUpperBounds(jint);
  void addShape(::java::awt::geom::PathIterator *, jboolean);
@@ -60,6 +63,7 @@ private:
  void edgePoolAdd(jint, jint, jint, jint, jboolean);
  static jint FIXED_DIGITS;
  static jint ONE;
+  static jint Y_RESOLUTION;
  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines;
  JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines;
  jint upperBounds;
@@ -71,6 +75,9 @@ private:
  ::gnu::java::awt::java2d::PolyEdge * edgePoolLast;
  jint minY;
  jint maxY;
+  jint minX;
+  jint maxX;
+  ::gnu::java::awt::java2d::ScanlineCoverage * scanlineCoverage;
 public: // actually package-private
  static jboolean $assertionsDisabled;
 public:
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
+#define __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class ScanlineCoverage$Coverage;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::ScanlineCoverage$Coverage : public ::java::lang::Object
+{
+
+  ScanlineCoverage$Coverage();
+public:
+  jint getXPos();
+  jint getCoverageDelta();
+  ::java::lang::String * toString();
+  ::java::lang::String * list();
+public: // actually package-private
+  ScanlineCoverage$Coverage(::gnu::java::awt::java2d::ScanlineCoverage$Coverage *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
+  jint covDelta;
+  jint pixelCoverage;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * next;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ScanlineCoverage$Coverage__
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
+#define __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class ScanlineCoverage;
+            class ScanlineCoverage$Coverage;
+            class ScanlineCoverage$Iterator;
+            class ScanlineCoverage$Range;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::ScanlineCoverage$Iterator : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ScanlineCoverage$Iterator(::gnu::java::awt::java2d::ScanlineCoverage *);
+public:
+  ::gnu::java::awt::java2d::ScanlineCoverage$Range * next();
+  jboolean hasNext();
+public: // actually package-private
+  void reset();
+private:
+  ::gnu::java::awt::java2d::ScanlineCoverage$Range * __attribute__((aligned(__alignof__( ::java::lang::Object)))) range;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentItem;
+  jint currentCoverage;
+  jboolean handledPixelCoverage;
+public: // actually package-private
+  ::gnu::java::awt::java2d::ScanlineCoverage * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ScanlineCoverage$Iterator__
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Range__
+#define __gnu_java_awt_java2d_ScanlineCoverage$Range__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class ScanlineCoverage$Range;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::ScanlineCoverage$Range : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ScanlineCoverage$Range();
+  void setXPos(jint);
+public:
+  jint getXPos();
+public: // actually package-private
+  void setLength(jint);
+public:
+  jint getLength();
+  jint getXPosEnd();
+public: // actually package-private
+  void setCoverage(jint);
+public:
+  jint getCoverage();
+  ::java::lang::String * toString();
+public: // actually package-private
+  static jint access$0(::gnu::java::awt::java2d::ScanlineCoverage$Range *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
+  jint length;
+  jint coverage;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ScanlineCoverage$Range__
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ScanlineCoverage__
+#define __gnu_java_awt_java2d_ScanlineCoverage__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace awt
+      {
+        namespace java2d
+        {
+            class ScanlineCoverage;
+            class ScanlineCoverage$Coverage;
+            class ScanlineCoverage$Iterator;
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::awt::java2d::ScanlineCoverage : public ::java::lang::Object
+{
+
+public:
+  ScanlineCoverage();
+  void rewind();
+  void clear();
+  void add(jint, jint, jint);
+  jint getMaxCoverage();
+public: // actually package-private
+  void setMaxCoverage(jint);
+public:
+  jint getMaxX();
+  jint getMinX();
+private:
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * findOrInsert(jint);
+public:
+  ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterate();
+  jboolean isEmpty();
+public: // actually package-private
+  static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$0(::gnu::java::awt::java2d::ScanlineCoverage *);
+  static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$1(::gnu::java::awt::java2d::ScanlineCoverage *);
+private:
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * current;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentPrev;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * last;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * lastPrev;
+  jint minX;
+  jint maxX;
+  jint maxCoverage;
+  ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterator;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ScanlineCoverage__
@@ -32,6 +32,7 @@ extern "Java"
      {
          class Arc2D;
          class Ellipse2D;
+          class GeneralPath;
          class Line2D;
          class RoundRectangle2D;
      }
@@ -50,6 +51,7 @@ public:
  ::java::awt::geom::Ellipse2D * ellipse;
  ::java::awt::geom::Arc2D * arc;
  ::java::awt::Polygon * polygon;
+  ::java::awt::geom::GeneralPath * polyline;
  static ::java::lang::Class class$;
 };