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.

From-SVN: r125302

5 files changed, 200 insertions, 14 deletions

diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
index b8933b3..48d474b 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 0000000..9310460
--- /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 6698599..e51a868 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 0000000..ce2be0e
--- /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 0000000..febf495
--- /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__