diff options
Diffstat (limited to 'libjava/gnu')
125 files changed, 1678 insertions, 3221 deletions
diff --git a/libjava/gnu/classpath/Configuration.java b/libjava/gnu/classpath/Configuration.java index 6899b77..73e3c2f 100644 --- a/libjava/gnu/classpath/Configuration.java +++ b/libjava/gnu/classpath/Configuration.java @@ -1,5 +1,6 @@ /* Configuration.java -- - Copyright (C) 1998, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2003, 2005, 2006, 2007 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +66,7 @@ public final class Configuration * It is set according to the value of 'version' in the configure[.in] file * and used to set the System property gnu.classpath.version. */ - public static final String CLASSPATH_VERSION = "0.93"; + public static final String CLASSPATH_VERSION = "0.95"; /** * The value of DEBUG is substituted according to whether the diff --git a/libjava/gnu/classpath/Pair.h b/libjava/gnu/classpath/Pair.h new file mode 100644 index 0000000..98b3e23 --- /dev/null +++ b/libjava/gnu/classpath/Pair.h @@ -0,0 +1,37 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_classpath_Pair__ +#define __gnu_classpath_Pair__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace classpath + { + class Pair; + } + } +} + +class gnu::classpath::Pair : public ::java::lang::Object +{ + +public: + Pair(::java::lang::Object *, ::java::lang::Object *); + virtual ::java::lang::Object * getLeft(); + virtual ::java::lang::Object * getRight(); + virtual jboolean equals(::java::lang::Object *); + virtual jint hashCode(); +private: + ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) left; + ::java::lang::Object * right; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_classpath_Pair__ diff --git a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h index a64ca4f..2d532ad 100644 --- a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h +++ b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h @@ -33,7 +33,7 @@ class gnu::classpath::ServiceFactory$ServiceIterator : public ::java::lang::Obje { public: // actually package-private - ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, ::java::security::AccessControlContext *); + ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, jboolean, ::java::security::AccessControlContext *); public: ::java::lang::Object * next(); jboolean hasNext(); @@ -48,6 +48,7 @@ private: ::java::io::BufferedReader * reader; ::java::net::URL * currentURL; ::java::lang::Object * nextProvider; + jboolean error; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/classpath/ServiceFactory.h b/libjava/gnu/classpath/ServiceFactory.h index fddad85..d335427 100644 --- a/libjava/gnu/classpath/ServiceFactory.h +++ b/libjava/gnu/classpath/ServiceFactory.h @@ -24,6 +24,7 @@ class gnu::classpath::ServiceFactory : public ::java::lang::Object ServiceFactory(); public: static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *); + static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *, jboolean); static ::java::util::Iterator * lookupProviders(::java::lang::Class *); public: // actually package-private static void log(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Throwable *); diff --git a/libjava/gnu/classpath/jdwp/util/Value.h b/libjava/gnu/classpath/jdwp/util/Value.h deleted file mode 100644 index 01dda3f..0000000 --- a/libjava/gnu/classpath/jdwp/util/Value.h +++ /dev/null @@ -1,50 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_classpath_jdwp_util_Value__ -#define __gnu_classpath_jdwp_util_Value__ - -#pragma interface - -#include <java/lang/Object.h> -extern "Java" -{ - namespace gnu - { - namespace classpath - { - namespace jdwp - { - namespace util - { - class Value; - } - } - } - } - namespace java - { - namespace nio - { - class ByteBuffer; - } - } -} - -class gnu::classpath::jdwp::util::Value : public ::java::lang::Object -{ - -public: - Value(); - static void writeUntaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *); - static void writeTaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *); -private: - static void writeValue(::java::io::DataOutputStream *, ::java::lang::Object *, jboolean); -public: - static ::java::lang::Object * getObj(::java::nio::ByteBuffer *); - static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, ::java::lang::Class *); - static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, jbyte); - static ::java::lang::Class class$; -}; - -#endif // __gnu_classpath_jdwp_util_Value__ diff --git a/libjava/gnu/java/awt/AWTUtilities.h b/libjava/gnu/java/awt/AWTUtilities.h index 36db985..70b5111 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 0000000..4f3c2ab --- /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 f3acd66..565b924 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 202529b..a84c93e 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 4d47e2a..99086f1 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 0000000..e11a394 --- /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 29dad47..0d8b7ea 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 ae10368..60932a9 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 0000000..f456c36 --- /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 6a878d5..27ce963 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 ffebc5a..b494fe4 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 af4c300..7afa24c 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 631cd79..8c56e5a 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 0000000..b8a6a39 --- /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 a7a12fd..18a21db 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 5a72289..6455af5 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 79ab128..c58575b 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 4b2adef..d3c1d72 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 0000000..12fb2f5 --- /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 23d21fe..d107e50 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 0000000..29992b7 --- /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 149337c..7d07889 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 a911828..6d229d7 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 e93546a..9427f13 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 2b0dd07..f0582d3 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 0000000..a993ca0 --- /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 77ae20f..fadc996 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 b3ff4f0..e564789 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 fe61003..5e64ba8 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 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__ diff --git a/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h b/libjava/gnu/java/awt/peer/ClasspathDesktopPeer.h new file mode 100644 index 0000000..5433933 --- /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 0000000..7445662 --- /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 80a09c1..2752664 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 0000000..7621bd1 --- /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 0000000..1d6448b --- /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 ef29b9b..032eb27 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 1be46fb..5d5ee49 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 3373a83..0000000 --- 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 bc33bdb..7e34ee9 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 ce5a558..9379c5e 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 312e69c..47b452e 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 c788e82..0000000 --- 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 803f173..0000000 --- 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 65ca7a2..0000000 --- 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 903210a..d7168b27 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 8249a1e..49586fc 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 94bac6c..0000000 --- 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 e02c3b6..66b3fcb 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 56b8a05..be48395 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 0be0fe8..0000000 --- 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 41385fe..af79980 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 3a8fd5f..6127548 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 0000000..183f4ba --- /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 0000000..20b3f9e --- /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 77577f76..4c8ab8c 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 c5bcb63..1c061aa 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 0000000..daea76b --- /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 df05300..5d48957 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 7a83893..c96dc33 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 0000000..92c1c55 --- /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 77616ba..0000000 --- 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 7c82e46..f0d0880 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 16a2705..4a362e9 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 d7c485c..cad6e68 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 e8259a8..fc0b0bf 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 bc43e23..04b6244 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 1674815..0000000 --- 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 8a501b5..0000000 --- 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 4752110..03da80e 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 89cf7f1..7fbd289 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 e75b6b5..0000000 --- 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 024e403..68e9443 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 3e6724e..5de6184 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 0000000..db98200 --- /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 0000000..018bd36 --- /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 8765d18..e55113b 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 0000000..dae50e2 --- /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 0000000..f7bc778 --- /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/javax/net/ssl/Base64.h b/libjava/gnu/java/util/Base64.h index 658e137..69c2a4f 100644 --- a/libjava/gnu/javax/net/ssl/Base64.h +++ b/libjava/gnu/java/util/Base64.h @@ -1,8 +1,8 @@ // DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- -#ifndef __gnu_javax_net_ssl_Base64__ -#define __gnu_javax_net_ssl_Base64__ +#ifndef __gnu_java_util_Base64__ +#define __gnu_java_util_Base64__ #pragma interface @@ -13,25 +13,24 @@ extern "Java" { namespace gnu { - namespace javax + namespace java { - namespace net + namespace util { - namespace ssl - { - class Base64; - } + class Base64; } } } } -class gnu::javax::net::ssl::Base64 : public ::java::lang::Object +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; @@ -40,4 +39,4 @@ public: static ::java::lang::Class class$; }; -#endif // __gnu_javax_net_ssl_Base64__ +#endif // __gnu_java_util_Base64__ diff --git a/libjava/gnu/javax/management/Translator.h b/libjava/gnu/javax/management/Translator.h new file mode 100644 index 0000000..dce0165 --- /dev/null +++ b/libjava/gnu/javax/management/Translator.h @@ -0,0 +1,56 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_management_Translator__ +#define __gnu_javax_management_Translator__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace management + { + class Translator; + } + } + } + namespace javax + { + namespace management + { + namespace openmbean + { + class OpenMBeanParameterInfo; + class OpenType; + } + } + } +} + +class gnu::javax::management::Translator : public ::java::lang::Object +{ + +public: + Translator(); + static JArray< ::java::lang::Object * > * fromJava(JArray< ::java::lang::Object * > *, ::java::lang::reflect::Method *); + static ::java::lang::Object * fromJava(::java::lang::Object *, ::java::lang::reflect::Type *); + static ::java::lang::Object * toJava(::java::lang::Object *, ::java::lang::reflect::Method *); +private: + static JArray< ::java::lang::Object * > * makeArraySpecific(JArray< ::java::lang::Object * > *); +public: + static ::javax::management::openmbean::OpenMBeanParameterInfo * translate(::java::lang::String *); +private: + static ::javax::management::openmbean::OpenType * getTypeFromClass(::java::lang::Class *); + static ::java::lang::String * getTypeName(::java::lang::reflect::Type *); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_management_Translator__ diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientType.h b/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientType.h deleted file mode 100644 index 54ace32..0000000 --- a/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientType.h +++ /dev/null @@ -1,53 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_CertificateRequest$ClientType__ -#define __gnu_javax_net_ssl_provider_CertificateRequest$ClientType__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class CertificateRequest$ClientType; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::CertificateRequest$ClientType : public ::java::lang::Object -{ - - CertificateRequest$ClientType(jint); -public: // actually package-private - static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * read(::java::io::InputStream *); -public: - JArray< jbyte > * getEncoded(); - jint getValue(); - ::java::lang::String * toString(); -public: // actually package-private - static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * RSA_SIGN; - static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * DSS_SIGN; - static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * RSA_FIXED_DH; - static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * DSS_FIXED_DH; -private: - jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_CertificateRequest$ClientType__ diff --git a/libjava/gnu/javax/net/ssl/provider/Context.h b/libjava/gnu/javax/net/ssl/provider/Context.h deleted file mode 100644 index b6a838d..0000000 --- a/libjava/gnu/javax/net/ssl/provider/Context.h +++ /dev/null @@ -1,82 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_Context__ -#define __gnu_javax_net_ssl_provider_Context__ - -#pragma interface - -#include <javax/net/ssl/SSLContextSpi.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - class SRPTrustManager; - namespace provider - { - class Context; - class SessionContext; - } - } - } - } - } - namespace java - { - namespace security - { - class SecureRandom; - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class KeyManager; - class SSLServerSocketFactory; - class SSLSessionContext; - class SSLSocketFactory; - class TrustManager; - class X509KeyManager; - class X509TrustManager; - } - } - } -} - -class gnu::javax::net::ssl::provider::Context : public ::javax::net::ssl::SSLContextSpi -{ - -public: - Context(); -public: // actually protected - ::javax::net::ssl::SSLSessionContext * engineGetClientSessionContext(); - ::javax::net::ssl::SSLSessionContext * engineGetServerSessionContext(); - ::javax::net::ssl::SSLServerSocketFactory * engineGetServerSocketFactory(); - ::javax::net::ssl::SSLSocketFactory * engineGetSocketFactory(); - void engineInit(JArray< ::javax::net::ssl::KeyManager * > *, JArray< ::javax::net::ssl::TrustManager * > *, ::java::security::SecureRandom *); -private: - ::javax::net::ssl::X509KeyManager * defaultKeyManager(); - ::javax::net::ssl::X509TrustManager * defaultTrustManager(); - ::java::security::SecureRandom * defaultRandom(); - ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLContextSpi)))) clientSessions; - ::gnu::javax::net::ssl::provider::SessionContext * serverSessions; - ::javax::net::ssl::X509KeyManager * keyManager; - ::javax::net::ssl::X509TrustManager * trustManager; - ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager; - ::java::security::SecureRandom * random; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_Context__ diff --git a/libjava/gnu/javax/net/ssl/provider/DigestInputStream.h b/libjava/gnu/javax/net/ssl/provider/DigestInputStream.h deleted file mode 100644 index 15436a6..0000000 --- a/libjava/gnu/javax/net/ssl/provider/DigestInputStream.h +++ /dev/null @@ -1,60 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_DigestInputStream__ -#define __gnu_javax_net_ssl_provider_DigestInputStream__ - -#pragma interface - -#include <java/io/FilterInputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace hash - { - class IMessageDigest; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class DigestInputStream; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::DigestInputStream : public ::java::io::FilterInputStream -{ - -public: // actually package-private - DigestInputStream(::java::io::InputStream *, ::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *); - void setDigesting(jboolean); -public: - jint read(); - jint read(JArray< jbyte > *); - jint read(JArray< jbyte > *, jint, jint); -private: - ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) md5; - ::gnu::java::security::hash::IMessageDigest * sha; - jboolean digesting; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_DigestInputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/DigestOutputStream.h b/libjava/gnu/javax/net/ssl/provider/DigestOutputStream.h deleted file mode 100644 index 0b70104..0000000 --- a/libjava/gnu/javax/net/ssl/provider/DigestOutputStream.h +++ /dev/null @@ -1,60 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_DigestOutputStream__ -#define __gnu_javax_net_ssl_provider_DigestOutputStream__ - -#pragma interface - -#include <java/io/FilterOutputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace hash - { - class IMessageDigest; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class DigestOutputStream; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::DigestOutputStream : public ::java::io::FilterOutputStream -{ - -public: // actually package-private - DigestOutputStream(::java::io::OutputStream *, ::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *); - void setDigesting(jboolean); -public: - void write(jint); - void write(JArray< jbyte > *); - void write(JArray< jbyte > *, jint, jint); -private: - ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) md5; - ::gnu::java::security::hash::IMessageDigest * sha; - jboolean digesting; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_DigestOutputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/Enumerated.h b/libjava/gnu/javax/net/ssl/provider/Enumerated.h deleted file mode 100644 index db50831..0000000 --- a/libjava/gnu/javax/net/ssl/provider/Enumerated.h +++ /dev/null @@ -1,42 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_Enumerated__ -#define __gnu_javax_net_ssl_provider_Enumerated__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class Enumerated; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::Enumerated : public ::java::lang::Object -{ - -public: - virtual JArray< jbyte > * getEncoded() = 0; - virtual jint getValue() = 0; - virtual ::java::lang::String * toString() = 0; - static ::java::lang::Class class$; -} __attribute__ ((java_interface)); - -#endif // __gnu_javax_net_ssl_provider_Enumerated__ diff --git a/libjava/gnu/javax/net/ssl/provider/Extensions.h b/libjava/gnu/javax/net/ssl/provider/Extensions.h deleted file mode 100644 index ac8a0f1..0000000 --- a/libjava/gnu/javax/net/ssl/provider/Extensions.h +++ /dev/null @@ -1,54 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_Extensions__ -#define __gnu_javax_net_ssl_provider_Extensions__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class CertificateType; - class Extension; - class Extensions; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::Extensions : public ::java::lang::Object -{ - - Extensions(); -public: // actually package-private - static ::java::util::List * getServerName(::gnu::javax::net::ssl::provider::Extension *); - static ::java::util::List * getClientCertTypes(::gnu::javax::net::ssl::provider::Extension *); - static ::gnu::javax::net::ssl::provider::CertificateType * getServerCertType(::gnu::javax::net::ssl::provider::Extension *); - static ::java::lang::Integer * getMaxFragmentLength(::gnu::javax::net::ssl::provider::Extension *); - static JArray< ::java::lang::Object * > * getTrustedCA(::gnu::javax::net::ssl::provider::Extension *); - static ::java::lang::String * getSRPUsername(::gnu::javax::net::ssl::provider::Extension *); -private: - static ::java::lang::Integer * _512; - static ::java::lang::Integer * _1024; - static ::java::lang::Integer * _2048; - static ::java::lang::Integer * _4096; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_Extensions__ diff --git a/libjava/gnu/javax/net/ssl/provider/GNUSecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/GNUSecurityParameters.h deleted file mode 100644 index b5b2bc7..0000000 --- a/libjava/gnu/javax/net/ssl/provider/GNUSecurityParameters.h +++ /dev/null @@ -1,98 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_GNUSecurityParameters__ -#define __gnu_javax_net_ssl_provider_GNUSecurityParameters__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace prng - { - class IRandom; - } - } - } - namespace javax - { - namespace crypto - { - namespace mac - { - class IMac; - } - namespace mode - { - class IMode; - } - } - namespace net - { - namespace ssl - { - namespace provider - { - class ContentType; - class GNUSecurityParameters; - class ProtocolVersion; - class Session; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::GNUSecurityParameters : public ::java::lang::Object -{ - -public: // actually package-private - GNUSecurityParameters(::gnu::javax::net::ssl::provider::Session *); -public: - virtual void reset(); - virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * getVersion(); - virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *); - virtual void setInCipher(::java::lang::Object *); - virtual void setOutCipher(::java::lang::Object *); - virtual void setInMac(::java::lang::Object *); - virtual void setOutMac(::java::lang::Object *); - virtual void setDeflating(jboolean); - virtual void setInflating(jboolean); - virtual jint getFragmentLength(); - virtual void setFragmentLength(jint); - virtual JArray< jbyte > * decrypt(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::javax::net::ssl::provider::ContentType *); - virtual JArray< jbyte > * encrypt(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *); -private: - static void transformRC4(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint, ::gnu::java::security::prng::IRandom *); - static const jboolean DEBUG_RECORD_LAYER = 0; - static ::java::io::PrintWriter * debug; -public: // actually package-private - ::gnu::javax::crypto::mode::IMode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCipher; - ::gnu::javax::crypto::mode::IMode * outCipher; - ::gnu::java::security::prng::IRandom * inRandom; - ::gnu::java::security::prng::IRandom * outRandom; - ::gnu::javax::crypto::mac::IMac * inMac; - ::gnu::javax::crypto::mac::IMac * outMac; - jlong inSequence; - jlong outSequence; - ::gnu::javax::net::ssl::provider::Session * session; - ::gnu::javax::net::ssl::provider::ProtocolVersion * version; - jint fragmentLength; -private: - ::java::util::zip::Inflater * inflater; - ::java::util::zip::Deflater * deflater; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_GNUSecurityParameters__ diff --git a/libjava/gnu/javax/net/ssl/provider/Handshake$buffer.h b/libjava/gnu/javax/net/ssl/provider/Handshake$buffer.h deleted file mode 100644 index 5ddb06e..0000000 --- a/libjava/gnu/javax/net/ssl/provider/Handshake$buffer.h +++ /dev/null @@ -1,44 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_Handshake$buffer__ -#define __gnu_javax_net_ssl_provider_Handshake$buffer__ - -#pragma interface - -#include <java/lang/ThreadLocal.h> -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class Handshake$buffer; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::Handshake$buffer : public ::java::lang::ThreadLocal -{ - - Handshake$buffer(); -public: // actually protected - virtual ::java::lang::Object * initialValue(); -public: // actually package-private - virtual ::java::io::ByteArrayOutputStream * getBuffer(); - Handshake$buffer(::gnu::javax::net::ssl::provider::Handshake$buffer *); - static const jint SIZE = 2048; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_Handshake$buffer__ diff --git a/libjava/gnu/javax/net/ssl/provider/JCESecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/JCESecurityParameters.h deleted file mode 100644 index cc12a36..0000000 --- a/libjava/gnu/javax/net/ssl/provider/JCESecurityParameters.h +++ /dev/null @@ -1,76 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_JCESecurityParameters__ -#define __gnu_javax_net_ssl_provider_JCESecurityParameters__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class ContentType; - class JCESecurityParameters; - class ProtocolVersion; - } - } - } - } - } - namespace javax - { - namespace crypto - { - class Cipher; - class Mac; - } - } -} - -class gnu::javax::net::ssl::provider::JCESecurityParameters : public ::java::lang::Object -{ - -public: // actually package-private - JCESecurityParameters(); -public: - virtual void reset(); - virtual void setInCipher(::java::lang::Object *); - virtual void setOutCipher(::java::lang::Object *); - virtual void setInMac(::java::lang::Object *); - virtual void setOutMac(::java::lang::Object *); - virtual void setDeflating(jboolean); - virtual void setInflating(jboolean); - virtual jint getFragmentLength(); - virtual void setFragmentLength(jint); - virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * getVersion(); - virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *); - virtual JArray< jbyte > * decrypt(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::javax::net::ssl::provider::ContentType *); - virtual JArray< jbyte > * encrypt(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *); -private: - ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCipher; - ::javax::crypto::Cipher * outCipher; - ::javax::crypto::Mac * inMac; - ::javax::crypto::Mac * outMac; - ::java::util::zip::Inflater * inflater; - ::java::util::zip::Deflater * deflater; - jint fragmentLength; - jlong inSequence; - jlong outSequence; - ::gnu::javax::net::ssl::provider::ProtocolVersion * version; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_JCESecurityParameters__ diff --git a/libjava/gnu/javax/net/ssl/provider/JDBCSessionContext.h b/libjava/gnu/javax/net/ssl/provider/JDBCSessionContext.h deleted file mode 100644 index 3c838cf..0000000 --- a/libjava/gnu/javax/net/ssl/provider/JDBCSessionContext.h +++ /dev/null @@ -1,87 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_JDBCSessionContext__ -#define __gnu_javax_net_ssl_provider_JDBCSessionContext__ - -#pragma interface - -#include <gnu/javax/net/ssl/provider/SessionContext.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class JDBCSessionContext; - class Session; - class Session$ID; - } - } - } - } - } - namespace java - { - namespace security - { - namespace cert - { - class Certificate; - } - } - namespace sql - { - class Connection; - class PreparedStatement; - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class SSLSession; - } - } - } -} - -class gnu::javax::net::ssl::provider::JDBCSessionContext : public ::gnu::javax::net::ssl::provider::SessionContext -{ - -public: // actually package-private - JDBCSessionContext(); -public: - virtual ::java::util::Enumeration * getIds(); - virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *); -public: // actually package-private - virtual jboolean addSession(::gnu::javax::net::ssl::provider::Session$ID *, ::gnu::javax::net::ssl::provider::Session *); - virtual jboolean containsSessionID(::gnu::javax::net::ssl::provider::Session$ID *); -public: // actually protected - virtual jboolean removeSession(::gnu::javax::net::ssl::provider::Session$ID *); -public: // actually package-private - virtual void notifyAccess(::gnu::javax::net::ssl::provider::Session *); -private: - JArray< jbyte > * certs(JArray< ::java::security::cert::Certificate * > *); -public: // actually protected - ::java::sql::Connection * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::SessionContext)))) connection; - ::java::sql::PreparedStatement * selectById; - ::java::sql::PreparedStatement * insert; - ::java::sql::PreparedStatement * selectTimestamp; - ::java::sql::PreparedStatement * updateTimestamp; - ::java::sql::PreparedStatement * deleteSession; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_JDBCSessionContext__ diff --git a/libjava/gnu/javax/net/ssl/provider/JessieDHPrivateKey.h b/libjava/gnu/javax/net/ssl/provider/JessieDHPrivateKey.h deleted file mode 100644 index 3f6f8f1..0000000 --- a/libjava/gnu/javax/net/ssl/provider/JessieDHPrivateKey.h +++ /dev/null @@ -1,68 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_JessieDHPrivateKey__ -#define __gnu_javax_net_ssl_provider_JessieDHPrivateKey__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class JessieDHPrivateKey; - } - } - } - } - } - namespace java - { - namespace math - { - class BigInteger; - } - } - namespace javax - { - namespace crypto - { - namespace spec - { - class DHParameterSpec; - } - } - } -} - -class gnu::javax::net::ssl::provider::JessieDHPrivateKey : public ::java::lang::Object -{ - -public: // actually package-private - JessieDHPrivateKey(::javax::crypto::spec::DHParameterSpec *, ::java::math::BigInteger *); -public: - virtual ::java::lang::String * getAlgorithm(); - virtual ::java::lang::String * getFormat(); - virtual JArray< jbyte > * getEncoded(); - virtual ::javax::crypto::spec::DHParameterSpec * getParams(); - virtual ::java::math::BigInteger * getX(); - virtual ::java::lang::String * toString(); -private: - ::javax::crypto::spec::DHParameterSpec * __attribute__((aligned(__alignof__( ::java::lang::Object)))) params; - ::java::math::BigInteger * x; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_JessieDHPrivateKey__ diff --git a/libjava/gnu/javax/net/ssl/provider/JessieDHPublicKey.h b/libjava/gnu/javax/net/ssl/provider/JessieDHPublicKey.h deleted file mode 100644 index 80f504a..0000000 --- a/libjava/gnu/javax/net/ssl/provider/JessieDHPublicKey.h +++ /dev/null @@ -1,68 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_JessieDHPublicKey__ -#define __gnu_javax_net_ssl_provider_JessieDHPublicKey__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class JessieDHPublicKey; - } - } - } - } - } - namespace java - { - namespace math - { - class BigInteger; - } - } - namespace javax - { - namespace crypto - { - namespace spec - { - class DHParameterSpec; - } - } - } -} - -class gnu::javax::net::ssl::provider::JessieDHPublicKey : public ::java::lang::Object -{ - -public: // actually package-private - JessieDHPublicKey(::javax::crypto::spec::DHParameterSpec *, ::java::math::BigInteger *); -public: - virtual ::java::lang::String * getAlgorithm(); - virtual ::java::lang::String * getFormat(); - virtual JArray< jbyte > * getEncoded(); - virtual ::javax::crypto::spec::DHParameterSpec * getParams(); - virtual ::java::math::BigInteger * getY(); - virtual ::java::lang::String * toString(); -private: - ::javax::crypto::spec::DHParameterSpec * __attribute__((aligned(__alignof__( ::java::lang::Object)))) params; - ::java::math::BigInteger * y; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_JessieDHPublicKey__ diff --git a/libjava/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.h b/libjava/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.h deleted file mode 100644 index 0c26446..0000000 --- a/libjava/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.h +++ /dev/null @@ -1,58 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_JessieRSAPrivateKey__ -#define __gnu_javax_net_ssl_provider_JessieRSAPrivateKey__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class JessieRSAPrivateKey; - } - } - } - } - } - namespace java - { - namespace math - { - class BigInteger; - } - } -} - -class gnu::javax::net::ssl::provider::JessieRSAPrivateKey : public ::java::lang::Object -{ - -public: // actually package-private - JessieRSAPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *); -public: - virtual ::java::lang::String * getAlgorithm(); - virtual ::java::lang::String * getFormat(); - virtual JArray< jbyte > * getEncoded(); - virtual ::java::math::BigInteger * getModulus(); - virtual ::java::math::BigInteger * getPrivateExponent(); - virtual ::java::lang::String * toString(); -private: - ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus; - ::java::math::BigInteger * exponent; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_JessieRSAPrivateKey__ diff --git a/libjava/gnu/javax/net/ssl/provider/JessieRSAPublicKey.h b/libjava/gnu/javax/net/ssl/provider/JessieRSAPublicKey.h deleted file mode 100644 index 14dfea7b..0000000 --- a/libjava/gnu/javax/net/ssl/provider/JessieRSAPublicKey.h +++ /dev/null @@ -1,58 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_JessieRSAPublicKey__ -#define __gnu_javax_net_ssl_provider_JessieRSAPublicKey__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class JessieRSAPublicKey; - } - } - } - } - } - namespace java - { - namespace math - { - class BigInteger; - } - } -} - -class gnu::javax::net::ssl::provider::JessieRSAPublicKey : public ::java::lang::Object -{ - -public: // actually package-private - JessieRSAPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *); -public: - virtual ::java::lang::String * getAlgorithm(); - virtual ::java::lang::String * getFormat(); - virtual JArray< jbyte > * getEncoded(); - virtual ::java::math::BigInteger * getModulus(); - virtual ::java::math::BigInteger * getPublicExponent(); - virtual ::java::lang::String * toString(); -private: - ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus; - ::java::math::BigInteger * exponent; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_JessieRSAPublicKey__ diff --git a/libjava/gnu/javax/net/ssl/provider/KeyPool.h b/libjava/gnu/javax/net/ssl/provider/KeyPool.h deleted file mode 100644 index 0eb8f3c..0000000 --- a/libjava/gnu/javax/net/ssl/provider/KeyPool.h +++ /dev/null @@ -1,60 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_KeyPool__ -#define __gnu_javax_net_ssl_provider_KeyPool__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class KeyPool; - } - } - } - } - } - namespace java - { - namespace math - { - class BigInteger; - } - namespace security - { - class KeyPair; - class SecureRandom; - } - } -} - -class gnu::javax::net::ssl::provider::KeyPool : public ::java::lang::Object -{ - - KeyPool(); -public: // actually package-private - static ::java::security::KeyPair * generateRSAKeyPair(); -private: - static void nextBytes(JArray< jbyte > *); - static ::java::math::BigInteger * ONE; - static ::java::math::BigInteger * TWO; - static ::java::math::BigInteger * E; - static ::java::security::SecureRandom * RANDOM; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_KeyPool__ diff --git a/libjava/gnu/javax/net/ssl/provider/OverflowException.h b/libjava/gnu/javax/net/ssl/provider/OverflowException.h deleted file mode 100644 index 0fb5735..0000000 --- a/libjava/gnu/javax/net/ssl/provider/OverflowException.h +++ /dev/null @@ -1,40 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_OverflowException__ -#define __gnu_javax_net_ssl_provider_OverflowException__ - -#pragma interface - -#include <java/io/IOException.h> -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class OverflowException; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::OverflowException : public ::java::io::IOException -{ - -public: // actually package-private - OverflowException(); - OverflowException(::java::lang::String *); -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_OverflowException__ diff --git a/libjava/gnu/javax/net/ssl/provider/RecordInput.h b/libjava/gnu/javax/net/ssl/provider/RecordInput.h deleted file mode 100644 index 964c965..0000000 --- a/libjava/gnu/javax/net/ssl/provider/RecordInput.h +++ /dev/null @@ -1,56 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_RecordInput__ -#define __gnu_javax_net_ssl_provider_RecordInput__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class ContentType; - class RecordInput; - class Session; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::RecordInput : public ::java::lang::Object -{ - -public: // actually package-private - RecordInput(::java::io::InputStream *, ::gnu::javax::net::ssl::provider::Session *); - virtual jint available(::gnu::javax::net::ssl::provider::ContentType *); - virtual void setSession(::gnu::javax::net::ssl::provider::Session *); - virtual jint read(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *); - virtual jboolean pollClose(); -private: - void readRecord(); - static const jboolean DEBUG_RECORD_LAYER = 1; - static ::java::util::logging::Logger * logger; - JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fragment; - jint index; - ::gnu::javax::net::ssl::provider::ContentType * type; - ::java::io::DataInputStream * in; - ::gnu::javax::net::ssl::provider::Session * session; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_RecordInput__ diff --git a/libjava/gnu/javax/net/ssl/provider/RecordInputStream.h b/libjava/gnu/javax/net/ssl/provider/RecordInputStream.h deleted file mode 100644 index b78f2eb..0000000 --- a/libjava/gnu/javax/net/ssl/provider/RecordInputStream.h +++ /dev/null @@ -1,52 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_RecordInputStream__ -#define __gnu_javax_net_ssl_provider_RecordInputStream__ - -#pragma interface - -#include <java/io/InputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class ContentType; - class RecordInput; - class RecordInputStream; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::RecordInputStream : public ::java::io::InputStream -{ - -public: // actually package-private - RecordInputStream(::gnu::javax::net::ssl::provider::RecordInput *, ::gnu::javax::net::ssl::provider::ContentType *); -public: - virtual jint available(); - virtual jint read(); - virtual jint read(JArray< jbyte > *); - virtual jint read(JArray< jbyte > *, jint, jint); - virtual ::java::lang::String * toString(); -private: - ::gnu::javax::net::ssl::provider::RecordInput * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in; - ::gnu::javax::net::ssl::provider::ContentType * type; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_RecordInputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/RecordOutputStream.h b/libjava/gnu/javax/net/ssl/provider/RecordOutputStream.h deleted file mode 100644 index 427edbf..0000000 --- a/libjava/gnu/javax/net/ssl/provider/RecordOutputStream.h +++ /dev/null @@ -1,54 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_RecordOutputStream__ -#define __gnu_javax_net_ssl_provider_RecordOutputStream__ - -#pragma interface - -#include <java/io/FilterOutputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class ContentType; - class RecordOutputStream; - class SecurityParameters; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::RecordOutputStream : public ::java::io::FilterOutputStream -{ - -public: // actually package-private - RecordOutputStream(::java::io::OutputStream *, ::gnu::javax::net::ssl::provider::ContentType *, ::gnu::javax::net::ssl::provider::SecurityParameters *); -public: - virtual void write(jint); - virtual void write(JArray< jbyte > *); - virtual void write(JArray< jbyte > *, jint, jint); -private: - static const jboolean DEBUG_RECORD_LAYER = 1; - static ::java::util::logging::Logger * logger; - ::gnu::javax::net::ssl::provider::ContentType * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) type; - ::gnu::javax::net::ssl::provider::SecurityParameters * params; - jboolean emitEmpty; - static JArray< jbyte > * ZERO; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_RecordOutputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/RecordingInputStream.h b/libjava/gnu/javax/net/ssl/provider/RecordingInputStream.h deleted file mode 100644 index a6d912c..0000000 --- a/libjava/gnu/javax/net/ssl/provider/RecordingInputStream.h +++ /dev/null @@ -1,52 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_RecordingInputStream__ -#define __gnu_javax_net_ssl_provider_RecordingInputStream__ - -#pragma interface - -#include <java/io/FilterInputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class RecordingInputStream; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::RecordingInputStream : public ::java::io::FilterInputStream -{ - -public: // actually package-private - RecordingInputStream(::java::io::InputStream *); - RecordingInputStream(::java::io::InputStream *, ::java::io::ByteArrayOutputStream *); -public: - virtual jint read(); - virtual jint read(JArray< jbyte > *, jint, jint); - virtual jint read(JArray< jbyte > *); - virtual jlong skip(jlong); -public: // actually package-private - virtual JArray< jbyte > * getBytes(); - virtual void resetSink(); -public: // actually protected - ::java::io::ByteArrayOutputStream * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) sink; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_RecordingInputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLRSASignature.h b/libjava/gnu/javax/net/ssl/provider/SSLRSASignature.h deleted file mode 100644 index cef51da..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLRSASignature.h +++ /dev/null @@ -1,79 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLRSASignature__ -#define __gnu_javax_net_ssl_provider_SSLRSASignature__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace hash - { - class IMessageDigest; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class SSLRSASignature; - } - } - } - } - } - namespace java - { - namespace security - { - namespace interfaces - { - class RSAPrivateKey; - class RSAPublicKey; - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLRSASignature : public ::java::lang::Object -{ - -public: // actually package-private - SSLRSASignature(); - SSLRSASignature(::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *); -public: - ::java::lang::String * name(); - void setupVerify(::java::util::Map *); - void setupSign(::java::util::Map *); - void update(jbyte); - void update(JArray< jbyte > *, jint, jint); - ::java::lang::Object * sign(); - jboolean verify(::java::lang::Object *); - ::java::lang::Object * clone(); -private: - ::java::security::interfaces::RSAPublicKey * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pubkey; - ::java::security::interfaces::RSAPrivateKey * privkey; - ::gnu::java::security::hash::IMessageDigest * md5; - ::gnu::java::security::hash::IMessageDigest * sha; - jboolean initVerify; - jboolean initSign; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLRSASignature__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocket.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocket.h deleted file mode 100644 index 8877d82..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocket.h +++ /dev/null @@ -1,104 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLServerSocket__ -#define __gnu_javax_net_ssl_provider_SSLServerSocket__ - -#pragma interface - -#include <javax/net/ssl/SSLServerSocket.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - class SRPTrustManager; - namespace provider - { - class SSLServerSocket; - class SessionContext; - } - } - } - } - } - namespace java - { - namespace net - { - class InetAddress; - class Socket; - } - namespace security - { - class SecureRandom; - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class X509KeyManager; - class X509TrustManager; - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLServerSocket : public ::javax::net::ssl::SSLServerSocket -{ - -public: // actually package-private - SSLServerSocket(); - SSLServerSocket(jint); - SSLServerSocket(jint, jint); - SSLServerSocket(jint, jint, ::java::net::InetAddress *); -public: - virtual JArray< ::java::lang::String * > * getSupportedCipherSuites(); - virtual JArray< ::java::lang::String * > * getEnabledCipherSuites(); - virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *); - virtual JArray< ::java::lang::String * > * getSupportedProtocols(); - virtual JArray< ::java::lang::String * > * getEnabledProtocols(); - virtual void setEnabledProtocols(JArray< ::java::lang::String * > *); - virtual void setUseClientMode(jboolean); - virtual jboolean getUseClientMode(); - virtual void setNeedClientAuth(jboolean); - virtual jboolean getNeedClientAuth(); - virtual void setWantClientAuth(jboolean); - virtual jboolean getWantClientAuth(); - virtual void setEnabledSessionCreation(jboolean); - virtual void setEnableSessionCreation(jboolean); - virtual jboolean getEnableSessionCreation(); - virtual ::java::net::Socket * accept(); -public: // actually package-private - virtual void setSessionContext(::gnu::javax::net::ssl::provider::SessionContext *); - virtual void setKeyManager(::javax::net::ssl::X509KeyManager *); - virtual void setTrustManager(::javax::net::ssl::X509TrustManager *); - virtual void setSRPTrustManager(::gnu::javax::net::ssl::SRPTrustManager *); - virtual void setRandom(::java::security::SecureRandom *); -private: - ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocket)))) sessions; - ::java::util::SortedSet * enabledProtocols; - ::java::util::List * enabledSuites; - jboolean clientMode; - jboolean needClientAuth; - jboolean wantClientAuth; - jboolean createSessions; - ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager; - ::javax::net::ssl::X509TrustManager * trustManager; - ::javax::net::ssl::X509KeyManager * keyManager; - ::java::security::SecureRandom * random; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLServerSocket__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactory.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactory.h deleted file mode 100644 index 308a38d..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactory.h +++ /dev/null @@ -1,81 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLServerSocketFactory__ -#define __gnu_javax_net_ssl_provider_SSLServerSocketFactory__ - -#pragma interface - -#include <javax/net/ssl/SSLServerSocketFactory.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - class SRPTrustManager; - namespace provider - { - class SSLServerSocket; - class SSLServerSocketFactory; - class SessionContext; - } - } - } - } - } - namespace java - { - namespace net - { - class InetAddress; - class ServerSocket; - } - namespace security - { - class SecureRandom; - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class X509KeyManager; - class X509TrustManager; - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLServerSocketFactory : public ::javax::net::ssl::SSLServerSocketFactory -{ - -public: // actually package-private - SSLServerSocketFactory(::javax::net::ssl::X509TrustManager *, ::gnu::javax::net::ssl::SRPTrustManager *, ::javax::net::ssl::X509KeyManager *, ::java::security::SecureRandom *, ::gnu::javax::net::ssl::provider::SessionContext *); -public: - virtual JArray< ::java::lang::String * > * getDefaultCipherSuites(); - virtual JArray< ::java::lang::String * > * getSupportedCipherSuites(); - virtual ::java::net::ServerSocket * createServerSocket(); - virtual ::java::net::ServerSocket * createServerSocket(jint); - virtual ::java::net::ServerSocket * createServerSocket(jint, jint); - virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *); -private: - void setup(::gnu::javax::net::ssl::provider::SSLServerSocket *); - ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocketFactory)))) sessions; - ::javax::net::ssl::X509KeyManager * keyManager; - ::javax::net::ssl::X509TrustManager * trustManager; - ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager; - ::java::security::SecureRandom * random; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLServerSocketFactory__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocket.h b/libjava/gnu/javax/net/ssl/provider/SSLSocket.h deleted file mode 100644 index ee2ecbb..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLSocket.h +++ /dev/null @@ -1,240 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLSocket__ -#define __gnu_javax_net_ssl_provider_SSLSocket__ - -#pragma interface - -#include <javax/net/ssl/SSLSocket.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace hash - { - class IMessageDigest; - } - namespace sig - { - class ISignature; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class SRPTrustManager; - namespace provider - { - class Alert; - class CipherSuite; - class Finished; - class ProtocolVersion; - class RecordInput; - class SSLSocket; - class Session; - class SessionContext; - } - } - } - } - } - namespace java - { - namespace math - { - class BigInteger; - } - namespace net - { - class InetAddress; - class Socket; - class SocketAddress; - } - namespace nio - { - namespace channels - { - class SocketChannel; - } - } - namespace security - { - class SecureRandom; - namespace cert - { - class X509Certificate; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class HandshakeCompletedListener; - class SSLSession; - class X509KeyManager; - class X509TrustManager; - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLSocket : public ::javax::net::ssl::SSLSocket -{ - -public: // actually package-private - SSLSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean); - SSLSocket(::java::net::Socket *, ::java::nio::channels::SocketChannel *); - SSLSocket(); - SSLSocket(::java::net::InetAddress *, jint); - SSLSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint); - SSLSocket(::java::lang::String *, jint); - SSLSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint); -private: - void initialize(); -public: - void addHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *); - void removeHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *); - JArray< ::java::lang::String * > * getEnabledProtocols(); - void setEnabledProtocols(JArray< ::java::lang::String * > *); - JArray< ::java::lang::String * > * getSupportedProtocols(); - JArray< ::java::lang::String * > * getEnabledCipherSuites(); - void setEnabledCipherSuites(JArray< ::java::lang::String * > *); - JArray< ::java::lang::String * > * getSupportedCipherSuites(); - ::javax::net::ssl::SSLSession * getSession(); - jboolean getEnableSessionCreation(); - void setEnableSessionCreation(jboolean); - jboolean getNeedClientAuth(); - void setNeedClientAuth(jboolean); - jboolean getWantClientAuth(); - void setWantClientAuth(jboolean); - jboolean getUseClientMode(); - void setUseClientMode(jboolean); - void startHandshake(); - ::java::net::InetAddress * getInetAddress(); - ::java::net::InetAddress * getLocalAddress(); - jint getPort(); - jint getLocalPort(); - ::java::io::InputStream * getInputStream(); - ::java::io::OutputStream * getOutputStream(); - void setTcpNoDelay(jboolean); - jboolean getTcpNoDelay(); - void setSoLinger(jboolean, jint); - jint getSoLinger(); - void sendUrgentData(jint); - void setSoTimeout(jint); - jint getSoTimeout(); - void setSendBufferSize(jint); - jint getSendBufferSize(); - void setReceiveBufferSize(jint); - jint getReceiveBufferSize(); - void close(); - ::java::lang::String * toString(); - void connect(::java::net::SocketAddress *); - void connect(::java::net::SocketAddress *, jint); - void bind(::java::net::SocketAddress *); - ::java::net::SocketAddress * getLocalSocketAddress(); - ::java::nio::channels::SocketChannel * getChannel(); - jboolean isBound(); - jboolean isClosed(); - void setOOBInline(jboolean); - jboolean getOOBInline(); - void setKeepAlive(jboolean); - jboolean getKeepAlive(); - void setTrafficClass(jint); - jint getTrafficClass(); - void setReuseAddress(jboolean); - jboolean getReuseAddress(); - void shutdownInput(); - void shutdownOutput(); - jboolean isConnected(); - jboolean isInputShutdown(); - jboolean isOutputShutdown(); -public: // actually protected - void finalize(); -public: // actually package-private - void setSessionContext(::gnu::javax::net::ssl::provider::SessionContext *); - void setEnabledCipherSuites(::java::util::List *); - void setEnabledProtocols(::java::util::SortedSet *); - void setSRPTrustManager(::gnu::javax::net::ssl::SRPTrustManager *); - void setTrustManager(::javax::net::ssl::X509TrustManager *); - void setKeyManager(::javax::net::ssl::X509KeyManager *); - void setRandom(::java::security::SecureRandom *); - void sendAlert(::gnu::javax::net::ssl::provider::Alert *); - ::gnu::javax::net::ssl::provider::Alert * checkAlert(); - void checkHandshakeDone(); -private: - void changeCipherSpec(); - void readChangeCipherSpec(); - void setupIO(); - void handshakeCompleted(); - void doClientHandshake(); - void doServerHandshake(); - JArray< JArray< jbyte > * > * generateKeys(JArray< jbyte > *, JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *); - ::gnu::javax::net::ssl::provider::Finished * generateFinished(::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *, jboolean); - ::gnu::javax::net::ssl::provider::Alert * unexpectedMessage(); - void throwUnexpectedMessage(); - ::gnu::javax::net::ssl::provider::Alert * handshakeFailure(); - void throwHandshakeFailure(); - ::gnu::javax::net::ssl::provider::Alert * internalError(); - void throwInternalError(); - ::gnu::javax::net::ssl::provider::Alert * peerUnverified(JArray< ::java::security::cert::X509Certificate * > *); - void throwPeerUnverified(JArray< ::java::security::cert::X509Certificate * > *); - ::gnu::javax::net::ssl::provider::CipherSuite * selectSuite(::java::util::List *, ::gnu::javax::net::ssl::provider::ProtocolVersion *); - ::java::lang::String * askUserName(::java::lang::String *); - ::java::lang::String * askPassword(::java::lang::String *); - jboolean checkCertificates(JArray< ::java::security::cert::X509Certificate * > *); - void updateSig(::gnu::java::security::sig::ISignature *, ::java::math::BigInteger *); - void fatal(); - static const jboolean DEBUG_HANDSHAKE_LAYER = 1; - static const jboolean DEBUG_KEY_EXCHANGE = 0; - static ::java::util::logging::Logger * logger; - ::java::net::Socket * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocket)))) underlyingSocket; - jint underlyingPort; - jboolean autoClose; -public: // actually package-private - ::gnu::javax::net::ssl::provider::SessionContext * sessionContext; - ::gnu::javax::net::ssl::provider::Session * session; - ::java::util::LinkedList * handshakeListeners; -private: - jboolean clientMode; - jboolean wantClientAuth; - jboolean needClientAuth; - jboolean createSessions; - jboolean handshakeDone; - ::java::lang::String * remoteHost; - ::java::io::InputStream * socketIn; - ::java::io::OutputStream * socketOut; - ::java::io::InputStream * applicationIn; - ::java::io::OutputStream * applicationOut; - ::java::io::InputStream * handshakeIn; - ::java::io::OutputStream * handshakeOut; -public: // actually package-private - ::gnu::javax::net::ssl::provider::RecordInput * recordInput; -private: - jlong handshakeTime; - ::java::nio::channels::SocketChannel * channel; -public: // actually package-private - static ::java::util::SortedSet * supportedProtocols; - static ::java::util::List * supportedSuites; -private: - static JArray< jbyte > * SENDER_CLIENT; - static JArray< jbyte > * SENDER_SERVER; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLSocket__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactory.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactory.h deleted file mode 100644 index ce96e04..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactory.h +++ /dev/null @@ -1,81 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLSocketFactory__ -#define __gnu_javax_net_ssl_provider_SSLSocketFactory__ - -#pragma interface - -#include <javax/net/ssl/SSLSocketFactory.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class SSLSocket; - class SSLSocketFactory; - class SessionContext; - } - } - } - } - } - namespace java - { - namespace net - { - class InetAddress; - class Socket; - } - namespace security - { - class SecureRandom; - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class X509KeyManager; - class X509TrustManager; - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLSocketFactory : public ::javax::net::ssl::SSLSocketFactory -{ - -public: // actually package-private - SSLSocketFactory(::javax::net::ssl::X509TrustManager *, ::javax::net::ssl::X509KeyManager *, ::java::security::SecureRandom *, ::gnu::javax::net::ssl::provider::SessionContext *); -public: - virtual JArray< ::java::lang::String * > * getDefaultCipherSuites(); - virtual JArray< ::java::lang::String * > * getSupportedCipherSuites(); - virtual ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean); - virtual ::java::net::Socket * createSocket(); - virtual ::java::net::Socket * createSocket(::java::lang::String *, jint); - virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint); - virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint); - virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint); -private: - ::gnu::javax::net::ssl::provider::SSLSocket * setup(::gnu::javax::net::ssl::provider::SSLSocket *); - ::javax::net::ssl::X509TrustManager * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocketFactory)))) trustManager; - ::javax::net::ssl::X509KeyManager * keyManager; - ::java::security::SecureRandom * random; - ::gnu::javax::net::ssl::provider::SessionContext * sessionContext; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLSocketFactory__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketInputStream.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketInputStream.h deleted file mode 100644 index 22b8e5f..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLSocketInputStream.h +++ /dev/null @@ -1,52 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLSocketInputStream__ -#define __gnu_javax_net_ssl_provider_SSLSocketInputStream__ - -#pragma interface - -#include <java/io/FilterInputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class SSLSocket; - class SSLSocketInputStream; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLSocketInputStream : public ::java::io::FilterInputStream -{ - -public: // actually package-private - SSLSocketInputStream(::java::io::InputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *); - SSLSocketInputStream(::java::io::InputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *, jboolean); -public: - virtual jint available(); - virtual jint read(); - virtual jint read(JArray< jbyte > *); - virtual jint read(JArray< jbyte > *, jint, jint); -private: - jboolean checkAlert(); - ::gnu::javax::net::ssl::provider::SSLSocket * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) socket; - jboolean checkHandshake; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLSocketInputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketOutputStream.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketOutputStream.h deleted file mode 100644 index e62ee5d..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SSLSocketOutputStream.h +++ /dev/null @@ -1,51 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SSLSocketOutputStream__ -#define __gnu_javax_net_ssl_provider_SSLSocketOutputStream__ - -#pragma interface - -#include <java/io/FilterOutputStream.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class SSLSocket; - class SSLSocketOutputStream; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::SSLSocketOutputStream : public ::java::io::FilterOutputStream -{ - -public: // actually package-private - SSLSocketOutputStream(::java::io::OutputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *); - SSLSocketOutputStream(::java::io::OutputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *, jboolean); -public: - virtual void write(jint); - virtual void write(JArray< jbyte > *); - virtual void write(JArray< jbyte > *, jint, jint); -private: - void checkAlert(); - ::gnu::javax::net::ssl::provider::SSLSocket * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) socket; - jboolean checkHandshake; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SSLSocketOutputStream__ diff --git a/libjava/gnu/javax/net/ssl/provider/SecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/SecurityParameters.h deleted file mode 100644 index e96e7da..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SecurityParameters.h +++ /dev/null @@ -1,54 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SecurityParameters__ -#define __gnu_javax_net_ssl_provider_SecurityParameters__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class ContentType; - class ProtocolVersion; - class SecurityParameters; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::SecurityParameters : public ::java::lang::Object -{ - -public: - virtual JArray< jbyte > * decrypt(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::javax::net::ssl::provider::ContentType *) = 0; - virtual JArray< jbyte > * encrypt(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *) = 0; - virtual void reset() = 0; - virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * getVersion() = 0; - virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *) = 0; - virtual void setDeflating(jboolean) = 0; - virtual void setInflating(jboolean) = 0; - virtual jint getFragmentLength() = 0; - virtual void setFragmentLength(jint) = 0; - virtual void setInCipher(::java::lang::Object *) = 0; - virtual void setOutCipher(::java::lang::Object *) = 0; - virtual void setInMac(::java::lang::Object *) = 0; - virtual void setOutMac(::java::lang::Object *) = 0; - static ::java::lang::Class class$; -} __attribute__ ((java_interface)); - -#endif // __gnu_javax_net_ssl_provider_SecurityParameters__ diff --git a/libjava/gnu/javax/net/ssl/provider/Session$ID.h b/libjava/gnu/javax/net/ssl/provider/Session$ID.h deleted file mode 100644 index 849f941..0000000 --- a/libjava/gnu/javax/net/ssl/provider/Session$ID.h +++ /dev/null @@ -1,49 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_Session$ID__ -#define __gnu_javax_net_ssl_provider_Session$ID__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class Session$ID; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::Session$ID : public ::java::lang::Object -{ - -public: // actually package-private - Session$ID(JArray< jbyte > *); -public: - JArray< jbyte > * getId(); - jboolean equals(::java::lang::Object *); - jint hashCode(); - jint compareTo(::java::lang::Object *); - ::java::lang::String * toString(); -private: - JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_Session$ID__ diff --git a/libjava/gnu/javax/net/ssl/provider/Session.h b/libjava/gnu/javax/net/ssl/provider/Session.h deleted file mode 100644 index d1f241c..0000000 --- a/libjava/gnu/javax/net/ssl/provider/Session.h +++ /dev/null @@ -1,134 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_Session__ -#define __gnu_javax_net_ssl_provider_Session__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - class SRPTrustManager; - namespace provider - { - class Alert; - class CipherSuite; - class ProtocolVersion; - class SecurityParameters; - class Session; - class Session$ID; - class SessionContext; - } - } - } - } - } - namespace java - { - namespace security - { - class Principal; - class SecureRandom; - namespace cert - { - class Certificate; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class SSLPermission; - class SSLSessionContext; - class X509KeyManager; - class X509TrustManager; - } - } - namespace security - { - namespace cert - { - class X509Certificate; - } - } - } -} - -class gnu::javax::net::ssl::provider::Session : public ::java::lang::Object -{ - -public: // actually package-private - Session(); - Session(jlong); -public: // actually protected - ::java::lang::Object * clone(); -public: - ::java::lang::String * getCipherSuite(); - jlong getCreationTime(); - JArray< jbyte > * getId(); - jlong getLastAccessedTime(); - JArray< ::java::security::cert::Certificate * > * getLocalCertificates(); - JArray< ::java::security::cert::Certificate * > * getPeerCertificates(); - JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain(); - ::java::lang::String * getPeerHost(); - ::java::lang::String * getProtocol(); - ::javax::net::ssl::SSLSessionContext * getSessionContext(); - JArray< ::java::lang::String * > * getValueNames(); - ::java::lang::Object * getValue(::java::lang::String *); - void putValue(::java::lang::String *, ::java::lang::Object *); - void removeValue(::java::lang::String *); - void invalidate(); -public: // actually package-private - void access(); - void setLastAccessedTime(jlong); -public: - jint getApplicationBufferSize() = 0; - ::java::security::Principal * getLocalPrincipal() = 0; - jint getPacketBufferSize() = 0; - jint getPeerPort() = 0; - ::java::security::Principal * getPeerPrincipal() = 0; - jboolean isValid() = 0; -private: - static ::javax::net::ssl::SSLPermission * GET_SESSION_CONTEXT_PERMISSION; - jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) creationTime; - ::java::util::Date * lastAccessedTime; -public: // actually package-private - ::gnu::javax::net::ssl::provider::Session$ID * sessionId; - JArray< ::java::security::cert::Certificate * > * localCerts; - JArray< ::java::security::cert::Certificate * > * peerCerts; - JArray< ::javax::security::cert::X509Certificate * > * peerCertChain; - ::java::lang::String * peerHost; - jboolean peerVerified; - ::gnu::javax::net::ssl::provider::SessionContext * context; - ::java::util::HashMap * values; - jboolean valid; - ::java::util::List * enabledSuites; - ::gnu::javax::net::ssl::provider::CipherSuite * cipherSuite; - ::java::util::SortedSet * enabledProtocols; - ::gnu::javax::net::ssl::provider::ProtocolVersion * protocol; - JArray< jbyte > * masterSecret; - ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager; - ::javax::net::ssl::X509TrustManager * trustManager; - ::javax::net::ssl::X509KeyManager * keyManager; - ::java::security::SecureRandom * random; - ::gnu::javax::net::ssl::provider::SecurityParameters * params; - ::gnu::javax::net::ssl::provider::Alert * currentAlert; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_Session__ diff --git a/libjava/gnu/javax/net/ssl/provider/SessionContext.h b/libjava/gnu/javax/net/ssl/provider/SessionContext.h deleted file mode 100644 index 3dab41c..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SessionContext.h +++ /dev/null @@ -1,70 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SessionContext__ -#define __gnu_javax_net_ssl_provider_SessionContext__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class Session; - class Session$ID; - class SessionContext; - } - } - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - class SSLSession; - } - } - } -} - -class gnu::javax::net::ssl::provider::SessionContext : public ::java::lang::Object -{ - -public: // actually package-private - SessionContext(); -public: - virtual ::java::util::Enumeration * getIds(); - virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *); - virtual jint getSessionCacheSize(); - virtual void setSessionCacheSize(jint); - virtual jint getSessionTimeout(); - virtual void setSessionTimeout(jint); - virtual ::java::lang::String * toString(); -public: // actually package-private - virtual jboolean addSession(::gnu::javax::net::ssl::provider::Session$ID *, ::gnu::javax::net::ssl::provider::Session *); - virtual jboolean containsSessionID(::gnu::javax::net::ssl::provider::Session$ID *); - virtual jboolean removeSession(::gnu::javax::net::ssl::provider::Session$ID *); - virtual void notifyAccess(::gnu::javax::net::ssl::provider::Session *); -public: // actually protected - ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sessions; - jint cacheSize; - jint timeout; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SessionContext__ diff --git a/libjava/gnu/javax/net/ssl/provider/SynchronizedRandom.h b/libjava/gnu/javax/net/ssl/provider/SynchronizedRandom.h deleted file mode 100644 index a045e53..0000000 --- a/libjava/gnu/javax/net/ssl/provider/SynchronizedRandom.h +++ /dev/null @@ -1,62 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_SynchronizedRandom__ -#define __gnu_javax_net_ssl_provider_SynchronizedRandom__ - -#pragma interface - -#include <java/lang/Object.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace prng - { - class IRandom; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class SynchronizedRandom; - } - } - } - } - } -} - -class gnu::javax::net::ssl::provider::SynchronizedRandom : public ::java::lang::Object -{ - -public: // actually package-private - SynchronizedRandom(::gnu::java::security::prng::IRandom *); -public: - virtual ::java::lang::String * name(); - virtual void init(::java::util::Map *); - virtual jbyte nextByte(); - virtual void nextBytes(JArray< jbyte > *, jint, jint); - virtual ::java::lang::Object * clone(); - virtual void addRandomByte(jbyte); - virtual void addRandomBytes(JArray< jbyte > *); - virtual void addRandomBytes(JArray< jbyte > *, jint, jint); -private: - ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) random; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_SynchronizedRandom__ diff --git a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext$SAXHandler.h b/libjava/gnu/javax/net/ssl/provider/XMLSessionContext$SAXHandler.h deleted file mode 100644 index 0ced1c2..0000000 --- a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext$SAXHandler.h +++ /dev/null @@ -1,102 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_XMLSessionContext$SAXHandler__ -#define __gnu_javax_net_ssl_provider_XMLSessionContext$SAXHandler__ - -#pragma interface - -#include <org/xml/sax/helpers/DefaultHandler.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace prng - { - class IRandom; - } - } - } - namespace javax - { - namespace crypto - { - namespace mac - { - class IMac; - } - namespace mode - { - class IMode; - } - } - namespace net - { - namespace ssl - { - namespace provider - { - class Session; - class SessionContext; - class XMLSessionContext; - class XMLSessionContext$SAXHandler; - } - } - } - } - } - namespace org - { - namespace xml - { - namespace sax - { - class Attributes; - } - } - } -} - -class gnu::javax::net::ssl::provider::XMLSessionContext$SAXHandler : public ::org::xml::sax::helpers::DefaultHandler -{ - -public: // actually package-private - XMLSessionContext$SAXHandler(::gnu::javax::net::ssl::provider::XMLSessionContext *, ::gnu::javax::net::ssl::provider::SessionContext *, ::gnu::java::security::prng::IRandom *); -public: - virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *); - virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); - virtual void characters(JArray< jchar > *, jint, jint); -private: - ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::org::xml::sax::helpers::DefaultHandler)))) context; - ::gnu::javax::net::ssl::provider::Session * current; - ::gnu::java::security::prng::IRandom * pbekdf; - ::java::lang::StringBuffer * buf; - ::java::lang::String * certType; - jint state; - ::gnu::javax::crypto::mode::IMode * cipher; - ::java::util::HashMap * cipherAttr; - ::gnu::javax::crypto::mac::IMac * mac; - ::java::util::HashMap * macAttr; - JArray< jbyte > * key; - JArray< jbyte > * iv; - JArray< jbyte > * mackey; - static const jint START = 0; - static const jint SESSIONS = 1; - static const jint SESSION = 2; - static const jint PEER = 3; - static const jint PEER_CERTS = 4; - static const jint CERTS = 5; - static const jint SECRET = 6; -public: // actually package-private - ::gnu::javax::net::ssl::provider::XMLSessionContext * this$0; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_XMLSessionContext$SAXHandler__ diff --git a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext.h b/libjava/gnu/javax/net/ssl/provider/XMLSessionContext.h deleted file mode 100644 index dfc4224..0000000 --- a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext.h +++ /dev/null @@ -1,69 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_net_ssl_provider_XMLSessionContext__ -#define __gnu_javax_net_ssl_provider_XMLSessionContext__ - -#pragma interface - -#include <gnu/javax/net/ssl/provider/SessionContext.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace security - { - namespace prng - { - class IRandom; - } - } - } - namespace javax - { - namespace net - { - namespace ssl - { - namespace provider - { - class Session; - class Session$ID; - class XMLSessionContext; - } - } - } - } - } - namespace java - { - namespace security - { - class SecureRandom; - } - } -} - -class gnu::javax::net::ssl::provider::XMLSessionContext : public ::gnu::javax::net::ssl::provider::SessionContext -{ - -public: // actually package-private - XMLSessionContext(); - virtual jboolean addSession(::gnu::javax::net::ssl::provider::Session$ID *, ::gnu::javax::net::ssl::provider::Session *); - virtual void notifyAccess(::gnu::javax::net::ssl::provider::Session *); - virtual jboolean removeSession(::gnu::javax::net::ssl::provider::Session$ID *); -private: - void decode(); - void encode(); - ::java::io::File * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::SessionContext)))) file; - ::gnu::java::security::prng::IRandom * pbekdf; - jboolean compress; - ::java::security::SecureRandom * random; - jboolean encoding; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_net_ssl_provider_XMLSessionContext__ diff --git a/libjava/gnu/javax/swing/text/html/parser/HTML_401Swing.h b/libjava/gnu/javax/swing/text/html/parser/HTML_401Swing.h deleted file mode 100644 index 621eed5..0000000 --- a/libjava/gnu/javax/swing/text/html/parser/HTML_401Swing.h +++ /dev/null @@ -1,65 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_swing_text_html_parser_HTML_401Swing__ -#define __gnu_javax_swing_text_html_parser_HTML_401Swing__ - -#pragma interface - -#include <gnu/javax/swing/text/html/parser/HTML_401F.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace swing - { - namespace text - { - namespace html - { - namespace parser - { - class HTML_401Swing; - } - } - } - } - } - } - namespace javax - { - namespace swing - { - namespace text - { - namespace html - { - namespace parser - { - class DTD; - } - } - } - } - } -} - -class gnu::javax::swing::text::html::parser::HTML_401Swing : public ::gnu::javax::swing::text::html::parser::HTML_401F -{ - -public: - HTML_401Swing(); - static ::javax::swing::text::html::parser::DTD * getInstance(); -public: // actually protected - virtual JArray< ::java::lang::String * > * getBodyElements(); -public: // actually package-private - static ::gnu::javax::swing::text::html::parser::HTML_401Swing * singleton; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_swing_text_html_parser_HTML_401Swing__ diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h index d2b2ff0..430aca2 100644 --- a/libjava/gnu/xml/stream/XMLParser.h +++ b/libjava/gnu/xml/stream/XMLParser.h @@ -128,6 +128,8 @@ private: void pushInput(::java::lang::String *, ::java::lang::String *, jboolean, jboolean); void pushInput(::java::lang::String *, ::gnu::xml::stream::XMLParser$ExternalIds *, jboolean, jboolean); void pushInput(::gnu::xml::stream::XMLParser$Input *); +public: // actually package-private + static ::java::lang::String * canonicalize(::java::lang::String *); public: static ::java::lang::String * absolutize(::java::lang::String *, ::java::lang::String *); private: |