diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
| commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/gnu | |
| parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
| download | gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz | |
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
51 files changed, 1398 insertions, 77 deletions
diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java index 4431e0f6a47..acd0996ad57 100644 --- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java +++ b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java @@ -48,7 +48,6 @@ import gnu.classpath.jdwp.util.MethodResult; import gnu.classpath.jdwp.util.MonitorInfo; import gnu.classpath.jdwp.value.Value; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.Hashtable; diff --git a/libjava/gnu/classpath/toolkit/DefaultDaemonThreadFactory.h b/libjava/gnu/classpath/toolkit/DefaultDaemonThreadFactory.h new file mode 100644 index 00000000000..ae86fa10763 --- /dev/null +++ b/libjava/gnu/classpath/toolkit/DefaultDaemonThreadFactory.h @@ -0,0 +1,33 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_classpath_toolkit_DefaultDaemonThreadFactory__ +#define __gnu_classpath_toolkit_DefaultDaemonThreadFactory__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace classpath + { + namespace toolkit + { + class DefaultDaemonThreadFactory; + } + } + } +} + +class gnu::classpath::toolkit::DefaultDaemonThreadFactory : public ::java::lang::Object +{ + +public: + DefaultDaemonThreadFactory(); + virtual ::java::lang::Thread * newThread(::java::lang::Runnable *); + static ::java::lang::Class class$; +}; + +#endif // __gnu_classpath_toolkit_DefaultDaemonThreadFactory__ diff --git a/libjava/gnu/java/awt/font/GNUGlyphVector.h b/libjava/gnu/java/awt/font/GNUGlyphVector.h index 99086f13f2a..a3f54bf8edd 100644 --- a/libjava/gnu/java/awt/font/GNUGlyphVector.h +++ b/libjava/gnu/java/awt/font/GNUGlyphVector.h @@ -93,6 +93,7 @@ private: JArray< jfloat > * pos; JArray< ::java::awt::geom::AffineTransform * > * transforms; jint layoutFlags; + ::java::awt::Shape * cleanOutline; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h new file mode 100644 index 00000000000..3f0b4d28c14 --- /dev/null +++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h @@ -0,0 +1,61 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__ +#define __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__ + +#pragma interface + +#include <java/awt/FontMetrics.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace font + { + class OpenTypeFontPeer; + class OpenTypeFontPeer$XFontMetrics; + } + } + } + } + namespace java + { + namespace awt + { + class Font; + namespace geom + { + class Point2D; + } + } + } +} + +class gnu::java::awt::font::OpenTypeFontPeer$XFontMetrics : public ::java::awt::FontMetrics +{ + +public: // actually package-private + OpenTypeFontPeer$XFontMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *); +public: + virtual jint getAscent(); + virtual jint getDescent(); + virtual jint getHeight(); + virtual jint charWidth(jchar); + virtual jint charsWidth(JArray< jchar > *, jint, jint); + virtual jint stringWidth(::java::lang::String *); +private: + ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) cachedPoint; +public: // actually package-private + ::gnu::java::awt::font::OpenTypeFontPeer * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__ diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h new file mode 100644 index 00000000000..1fec3c237e2 --- /dev/null +++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h @@ -0,0 +1,73 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__ +#define __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__ + +#pragma interface + +#include <java/awt/font/LineMetrics.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace font + { + class OpenTypeFontPeer; + class OpenTypeFontPeer$XLineMetrics; + } + } + } + } + namespace java + { + namespace awt + { + class Font; + namespace font + { + class FontRenderContext; + class GlyphVector; + } + } + namespace text + { + class CharacterIterator; + } + } +} + +class gnu::java::awt::font::OpenTypeFontPeer$XLineMetrics : public ::java::awt::font::LineMetrics +{ + +public: // actually package-private + OpenTypeFontPeer$XLineMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *); +public: + virtual jfloat getAscent(); + virtual jint getBaselineIndex(); + virtual JArray< jfloat > * getBaselineOffsets(); + virtual jfloat getDescent(); + virtual jfloat getHeight(); + virtual jfloat getLeading(); + virtual jint getNumChars(); + virtual jfloat getStrikethroughOffset(); + virtual jfloat getStrikethroughThickness(); + virtual jfloat getUnderlineOffset(); + virtual jfloat getUnderlineThickness(); +private: + ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) font; + ::java::awt::font::GlyphVector * glyphVector; + ::java::awt::font::FontRenderContext * fontRenderContext; +public: // actually package-private + ::gnu::java::awt::font::OpenTypeFontPeer * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__ diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h new file mode 100644 index 00000000000..6129982b4c4 --- /dev/null +++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h @@ -0,0 +1,96 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_font_OpenTypeFontPeer__ +#define __gnu_java_awt_font_OpenTypeFontPeer__ + +#pragma interface + +#include <gnu/java/awt/peer/ClasspathFontPeer.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace font + { + class FontDelegate; + class OpenTypeFontPeer; + } + } + } + } + namespace java + { + namespace awt + { + class Font; + class FontMetrics; + namespace font + { + class FontRenderContext; + class GlyphVector; + class LineMetrics; + } + namespace geom + { + class AffineTransform; + class Rectangle2D; + } + } + namespace text + { + class CharacterIterator; + } + } +} + +class gnu::java::awt::font::OpenTypeFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer +{ + +public: + OpenTypeFontPeer(::java::lang::String *, jint, jint); + OpenTypeFontPeer(::java::lang::String *, ::java::util::Map *); + virtual jboolean canDisplay(::java::awt::Font *, jint); + virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint); + virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *); + virtual ::java::lang::String * getPostScriptName(::java::awt::Font *); + virtual jint getNumGlyphs(::java::awt::Font *); + virtual jint getMissingGlyphCode(::java::awt::Font *); + virtual jbyte getBaselineFor(::java::awt::Font *, jchar); + virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint); + virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *); + virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *); + virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint); + virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *); + virtual jboolean hasUniformLineMetrics(::java::awt::Font *); + virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *); + virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *); + static ::java::lang::String * encodeFont(::java::lang::String *, ::java::util::Map *); +public: // actually package-private + static ::java::lang::String * encodeFont(::java::lang::String *, jint); + static ::java::lang::String * validName(::java::lang::String *); +public: + static JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *); +private: + static ::java::util::Set * getFontNames(); + ::java::lang::String * mapFontToFilename(::java::lang::String *); +public: // actually package-private + static ::gnu::java::awt::font::FontDelegate * access$0(::gnu::java::awt::font::OpenTypeFontPeer *); + static ::java::awt::geom::AffineTransform * access$1(); +private: + static ::java::util::Properties * fontProperties; + static ::java::util::Set * availableFontNames; + static ::java::util::Map * fontToFileMap; + static ::java::awt::geom::AffineTransform * IDENDITY; + ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) fontDelegate; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_font_OpenTypeFontPeer__ diff --git a/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h b/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h new file mode 100644 index 00000000000..ecd73a56be5 --- /dev/null +++ b/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h @@ -0,0 +1,61 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_image_AsyncImage$AsyncImageSource__ +#define __gnu_java_awt_image_AsyncImage$AsyncImageSource__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace image + { + class AsyncImage; + class AsyncImage$AsyncImageSource; + } + } + } + } + namespace java + { + namespace awt + { + namespace image + { + class ImageConsumer; + class ImageProducer; + } + } + } +} + +class gnu::java::awt::image::AsyncImage$AsyncImageSource : public ::java::lang::Object +{ + + AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *); +public: + virtual void addConsumer(::java::awt::image::ImageConsumer *); + virtual jboolean isConsumer(::java::awt::image::ImageConsumer *); + virtual void removeConsumer(::java::awt::image::ImageConsumer *); + virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *); + virtual void startProduction(::java::awt::image::ImageConsumer *); +private: + ::java::awt::image::ImageProducer * getRealSource(); +public: // actually package-private + AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *, ::gnu::java::awt::image::AsyncImage$AsyncImageSource *); +private: + ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) realSource; +public: // actually package-private + ::gnu::java::awt::image::AsyncImage * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_image_AsyncImage$AsyncImageSource__ diff --git a/libjava/gnu/java/awt/image/AsyncImage.h b/libjava/gnu/java/awt/image/AsyncImage.h new file mode 100644 index 00000000000..7c1a731799e --- /dev/null +++ b/libjava/gnu/java/awt/image/AsyncImage.h @@ -0,0 +1,72 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_image_AsyncImage__ +#define __gnu_java_awt_image_AsyncImage__ + +#pragma interface + +#include <java/awt/Image.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace image + { + class AsyncImage; + } + } + } + } + namespace java + { + namespace awt + { + class Graphics; + class Image; + namespace image + { + class ImageObserver; + class ImageProducer; + } + } + } +} + +class gnu::java::awt::image::AsyncImage : public ::java::awt::Image +{ + +public: // actually package-private + AsyncImage(); +public: + virtual void flush(); + virtual ::java::awt::Graphics * getGraphics(); + virtual jboolean isComplete(); + virtual jint getHeight(::java::awt::image::ImageObserver *); + virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *); + virtual ::java::awt::image::ImageProducer * getSource(); + virtual jint getWidth(::java::awt::image::ImageObserver *); + virtual void addObserver(::java::awt::image::ImageObserver *); + virtual jboolean prepareImage(jint, jint, ::java::awt::image::ImageObserver *); + virtual jint checkImage(jint, jint, ::java::awt::image::ImageObserver *); + virtual ::java::awt::Image * getRealImage(); + virtual void setRealImage(::java::awt::Image *); + virtual void notifyObservers(jint, jint, jint, jint, jint); + virtual void waitForImage(::java::awt::image::ImageObserver *); +public: // actually package-private + static ::java::awt::Image * access$0(::gnu::java::awt::image::AsyncImage *); +private: + ::java::awt::Image * volatile __attribute__((aligned(__alignof__( ::java::awt::Image)))) realImage; +public: // actually package-private + ::java::util::HashSet * observers; +private: + jboolean volatile complete; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_image_AsyncImage__ diff --git a/libjava/gnu/java/awt/image/ImageConverter.h b/libjava/gnu/java/awt/image/ImageConverter.h new file mode 100644 index 00000000000..8df255f6910 --- /dev/null +++ b/libjava/gnu/java/awt/image/ImageConverter.h @@ -0,0 +1,82 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_image_ImageConverter__ +#define __gnu_java_awt_image_ImageConverter__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace image + { + class AsyncImage; + class ImageConverter; + } + } + } + } + namespace java + { + namespace awt + { + class Image; + namespace image + { + class BufferedImage; + class ColorModel; + class IndexColorModel; + } + } + } +} + +class gnu::java::awt::image::ImageConverter : public ::java::lang::Object +{ + +public: + ImageConverter(); + virtual void setDimensions(jint, jint); + virtual void setProperties(::java::util::Hashtable *); + virtual void setColorModel(::java::awt::image::ColorModel *); + virtual void setHints(jint); + virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint); + virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint); +private: + ::java::awt::image::ColorModel * setupColorModel(::java::awt::image::ColorModel *); + void createImage(); + jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint); + jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint); + jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint); + jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint); + jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jbyte > *, jint, jint, jint); + jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jint > *, jint, jint, jint); + jint updateTransparency(jint, jint); +public: + virtual void imageComplete(jint); + virtual void setTargetColorModel(::java::awt::image::ColorModel *); + virtual ::java::awt::Image * getImage(); + static ::java::lang::String * IMAGE_TRANSPARENCY_PROPERTY; + static ::java::lang::String * IMAGE_PROPERTIES_PROPERTY; +private: + ::gnu::java::awt::image::AsyncImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image; + ::java::awt::image::BufferedImage * bImage; + ::java::util::Hashtable * imageProperties; + jint width; + jint height; + ::java::awt::image::ColorModel * colorModel; + ::java::awt::image::ColorModel * targetColorModel; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_image_ImageConverter__ diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h index 03567167734..92f78733b29 100644 --- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h +++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h @@ -23,6 +23,7 @@ extern "Java" class ScanlineConverter; class ScanlineCoverage; class ShapeCache; + class TextCacheKey; } } } @@ -170,7 +171,6 @@ public: // actually protected virtual ::java::awt::Rectangle * getDeviceBounds(); virtual void rawDrawLine(jint, jint, jint, jint); virtual void rawDrawRect(jint, jint, jint, jint); - virtual void rawDrawString(::java::lang::String *, jint, jint); virtual void rawClearRect(jint, jint, jint, jint); virtual void rawFillRect(jint, jint, jint, jint); virtual jboolean rawDrawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *); @@ -187,11 +187,15 @@ private: void updateOptimization(); static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *); void updateClip(::java::awt::geom::AffineTransform *); - ::gnu::java::awt::java2d::ShapeCache * getShapeCache(); ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter(); + void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *); + static jboolean DEFAULT_TEXT_AA; static ::java::awt::Font * FONT; - static ::java::lang::ThreadLocal * shapeCache; - static ::java::lang::ThreadLocal * scanlineConverters; + static const jint GV_CACHE_SIZE = 50; + static ::gnu::java::awt::java2d::ShapeCache * shapeCache; + static ::java::util::LinkedList * scanlineConverters; + static ::java::util::Map * gvCache; + static ::gnu::java::awt::java2d::TextCacheKey * searchTextKey; public: // actually protected ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__; private: diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h b/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h new file mode 100644 index 00000000000..07b6ac072c1 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h @@ -0,0 +1,42 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_PixelCoverage$Bucket__ +#define __gnu_java_awt_java2d_PixelCoverage$Bucket__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class PixelCoverage$Bucket; + } + } + } + } +} + +class gnu::java::awt::java2d::PixelCoverage$Bucket : public ::java::lang::Object +{ + + PixelCoverage$Bucket(); +public: // actually package-private + PixelCoverage$Bucket(::gnu::java::awt::java2d::PixelCoverage$Bucket *); + jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos; + jint xCov; + jint yCov; + ::gnu::java::awt::java2d::PixelCoverage$Bucket * next; + ::gnu::java::awt::java2d::PixelCoverage$Bucket * prev; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_PixelCoverage$Bucket__ diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage.h b/libjava/gnu/java/awt/java2d/PixelCoverage.h new file mode 100644 index 00000000000..75a505760e0 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/PixelCoverage.h @@ -0,0 +1,45 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_PixelCoverage__ +#define __gnu_java_awt_java2d_PixelCoverage__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class PixelCoverage; + class PixelCoverage$Bucket; + } + } + } + } +} + +class gnu::java::awt::java2d::PixelCoverage : public ::java::lang::Object +{ + +public: // actually package-private + PixelCoverage(); + void rewind(); + void clear(); + void add(jint, jint, jint); +private: + ::gnu::java::awt::java2d::PixelCoverage$Bucket * findOrInsert(jint); + ::gnu::java::awt::java2d::PixelCoverage$Bucket * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head; + ::gnu::java::awt::java2d::PixelCoverage$Bucket * current; + ::gnu::java::awt::java2d::PixelCoverage$Bucket * last; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_PixelCoverage__ diff --git a/libjava/gnu/java/awt/java2d/ScanlineConverter.h b/libjava/gnu/java/awt/java2d/ScanlineConverter.h index 8ef5369096d..b2da8ffdcd8 100644 --- a/libjava/gnu/java/awt/java2d/ScanlineConverter.h +++ b/libjava/gnu/java/awt/java2d/ScanlineConverter.h @@ -50,11 +50,11 @@ class gnu::java::awt::java2d::ScanlineConverter : public ::java::lang::Object public: // actually package-private ScanlineConverter(); public: - void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, ::java::awt::RenderingHints *); + void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, jint, ::java::awt::RenderingHints *); private: void clear(); void doScanline(::gnu::java::awt::java2d::Pixelizer *, jint, jboolean, jboolean); - void setResolution(jint); + void setResolution(jint, jint); void setUpperBounds(jint); void addShape(::java::awt::geom::PathIterator *, jboolean); void addEdge(::gnu::java::awt::java2d::PolyEdge *); @@ -63,11 +63,11 @@ private: void edgePoolAdd(jint, jint, jint, jint, jboolean); static jint FIXED_DIGITS; static jint ONE; - static jint Y_RESOLUTION; jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines; JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines; jint upperBounds; jint resolution; + jint yResolution; jint halfStep; JArray< jfloat > * coords; ::gnu::java::awt::java2d::ActiveEdges * activeEdges; diff --git a/libjava/gnu/java/awt/java2d/ShapeWrapper.h b/libjava/gnu/java/awt/java2d/ShapeWrapper.h new file mode 100644 index 00000000000..62c9b357e40 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/ShapeWrapper.h @@ -0,0 +1,63 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_ShapeWrapper__ +#define __gnu_java_awt_java2d_ShapeWrapper__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class ShapeWrapper; + } + } + } + } + namespace java + { + namespace awt + { + class Rectangle; + class Shape; + namespace geom + { + class AffineTransform; + class PathIterator; + class Point2D; + class Rectangle2D; + } + } + } +} + +class gnu::java::awt::java2d::ShapeWrapper : public ::java::lang::Object +{ + +public: + ShapeWrapper(::java::awt::Shape *); + virtual jboolean contains(jdouble, jdouble); + virtual jboolean contains(::java::awt::geom::Point2D *); + virtual jboolean contains(jdouble, jdouble, jdouble, jdouble); + virtual jboolean contains(::java::awt::geom::Rectangle2D *); + virtual ::java::awt::Rectangle * getBounds(); + virtual ::java::awt::geom::Rectangle2D * getBounds2D(); + virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *); + virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble); + virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble); + virtual jboolean intersects(::java::awt::geom::Rectangle2D *); +private: + ::java::awt::Shape * __attribute__((aligned(__alignof__( ::java::lang::Object)))) shape; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_ShapeWrapper__ diff --git a/libjava/gnu/java/awt/java2d/TextCacheKey.h b/libjava/gnu/java/awt/java2d/TextCacheKey.h new file mode 100644 index 00000000000..9904a6a3ee2 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/TextCacheKey.h @@ -0,0 +1,57 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_TextCacheKey__ +#define __gnu_java_awt_java2d_TextCacheKey__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class TextCacheKey; + } + } + } + } + namespace java + { + namespace awt + { + class Font; + namespace font + { + class FontRenderContext; + } + } + } +} + +class gnu::java::awt::java2d::TextCacheKey : public ::java::lang::Object +{ + +public: + TextCacheKey(); + TextCacheKey(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *); + virtual void setString(::java::lang::String *); + virtual void setFontRenderContext(::java::awt::font::FontRenderContext *); + virtual void setFont(::java::awt::Font *); + virtual jboolean equals(::java::lang::Object *); + virtual jint hashCode(); +private: + ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) string; + ::java::awt::font::FontRenderContext * fontRenderContext; + ::java::awt::Font * font; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_TextCacheKey__ diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h index 9379c5ea611..a9b70e73bcb 100644 --- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h +++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h @@ -76,7 +76,7 @@ private: void lock(); void unlock(); public: // actually protected - virtual jlong initFromVolatile(jlong, jint, jint); + virtual jlong initFromVolatile(jlong); private: void start_gdk_drawing(); void end_gdk_drawing(); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h index fa35e2ad70b..78c7127c85d 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h @@ -87,7 +87,9 @@ public: // actually package-private virtual void gtkWidgetGetDimensions(JArray< jint > *); virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *); virtual void gtkWindowGetLocationOnScreen(JArray< jint > *); + virtual void gtkWindowGetLocationOnScreenUnlocked(JArray< jint > *); virtual void gtkWidgetGetLocationOnScreen(JArray< jint > *); + virtual void gtkWidgetGetLocationOnScreenUnlocked(JArray< jint > *); virtual void gtkWidgetSetCursor(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint); virtual void gtkWidgetSetCursorUnlocked(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint); virtual void gtkWidgetSetBackground(jint, jint, jint); diff --git a/libjava/gnu/java/lang/management/BeanImpl.h b/libjava/gnu/java/lang/management/BeanImpl.h index be483954424..463d617f348 100644 --- a/libjava/gnu/java/lang/management/BeanImpl.h +++ b/libjava/gnu/java/lang/management/BeanImpl.h @@ -28,7 +28,9 @@ extern "Java" { namespace management { + class MBeanConstructorInfo; class MBeanInfo; + class MBeanOperationInfo; class MBeanParameterInfo; namespace openmbean { @@ -51,6 +53,10 @@ public: virtual ::java::lang::Object * getAttribute(::java::lang::String *); public: // actually protected virtual ::javax::management::MBeanInfo * getCachedMBeanInfo(); + virtual ::java::lang::String * getDescription(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint); + virtual ::java::lang::String * getDescription(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint); + virtual ::java::lang::String * getParameterName(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint); + virtual ::java::lang::String * getParameterName(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint); public: virtual ::javax::management::MBeanInfo * getMBeanInfo(); private: diff --git a/libjava/gnu/java/nio/charset/ByteCharset$1.h b/libjava/gnu/java/nio/charset/ByteCharset$1.h new file mode 100644 index 00000000000..cc36fe86a06 --- /dev/null +++ b/libjava/gnu/java/nio/charset/ByteCharset$1.h @@ -0,0 +1,42 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_ByteCharset$1__ +#define __gnu_java_nio_charset_ByteCharset$1__ + +#pragma interface + +#include <gnu/java/nio/charset/ByteDecodeLoopHelper.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class ByteCharset$1; + class ByteCharset$Decoder; + } + } + } + } +} + +class gnu::java::nio::charset::ByteCharset$1 : public ::gnu::java::nio::charset::ByteDecodeLoopHelper +{ + +public: // actually package-private + ByteCharset$1(::gnu::java::nio::charset::ByteCharset$Decoder *); +public: // actually protected + jboolean isMappable(jbyte); + jchar mapToChar(jbyte); +public: // actually package-private + ::gnu::java::nio::charset::ByteCharset$Decoder * __attribute__((aligned(__alignof__( ::gnu::java::nio::charset::ByteDecodeLoopHelper)))) this$1; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_ByteCharset$1__ diff --git a/libjava/gnu/java/nio/charset/ByteCharset$2.h b/libjava/gnu/java/nio/charset/ByteCharset$2.h new file mode 100644 index 00000000000..924e44c5ca5 --- /dev/null +++ b/libjava/gnu/java/nio/charset/ByteCharset$2.h @@ -0,0 +1,42 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_ByteCharset$2__ +#define __gnu_java_nio_charset_ByteCharset$2__ + +#pragma interface + +#include <gnu/java/nio/charset/ByteEncodeLoopHelper.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class ByteCharset$2; + class ByteCharset$Encoder; + } + } + } + } +} + +class gnu::java::nio::charset::ByteCharset$2 : public ::gnu::java::nio::charset::ByteEncodeLoopHelper +{ + +public: // actually package-private + ByteCharset$2(::gnu::java::nio::charset::ByteCharset$Encoder *); +public: // actually protected + jboolean isMappable(jchar); + jbyte mapToByte(jchar); +public: // actually package-private + ::gnu::java::nio::charset::ByteCharset$Encoder * __attribute__((aligned(__alignof__( ::gnu::java::nio::charset::ByteEncodeLoopHelper)))) this$1; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_ByteCharset$2__ diff --git a/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h b/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h index 584b15fe5ba..0f5dd6c65a7 100644 --- a/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h +++ b/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h @@ -21,6 +21,7 @@ extern "Java" { class ByteCharset; class ByteCharset$Decoder; + class ByteDecodeLoopHelper; } } } @@ -46,8 +47,11 @@ public: // actually package-private ByteCharset$Decoder(::gnu::java::nio::charset::ByteCharset *); public: // actually protected ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *); +public: // actually package-private + static JArray< jchar > * access$0(::gnu::java::nio::charset::ByteCharset$Decoder *); private: JArray< jchar > * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetDecoder)))) lookup; + ::gnu::java::nio::charset::ByteDecodeLoopHelper * helper; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h b/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h index cc31ae43eec..019bb4b5d6e 100644 --- a/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h +++ b/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h @@ -21,6 +21,7 @@ extern "Java" { class ByteCharset; class ByteCharset$Encoder; + class ByteEncodeLoopHelper; } } } @@ -49,8 +50,11 @@ public: jboolean canEncode(::java::lang::CharSequence *); public: // actually protected ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *); +public: // actually package-private + static JArray< jbyte > * access$0(::gnu::java::nio::charset::ByteCharset$Encoder *); private: JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetEncoder)))) lookup; + ::gnu::java::nio::charset::ByteEncodeLoopHelper * helper; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/nio/charset/ByteCharset.h b/libjava/gnu/java/nio/charset/ByteCharset.h index 045e03fde28..aa0890cb16d 100644 --- a/libjava/gnu/java/nio/charset/ByteCharset.h +++ b/libjava/gnu/java/nio/charset/ByteCharset.h @@ -42,7 +42,7 @@ class gnu::java::nio::charset::ByteCharset : public ::java::nio::charset::Charse { public: // actually package-private - ByteCharset(::java::lang::String *, JArray< ::java::lang::String * > *); + ByteCharset(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< jchar > *); public: virtual jboolean contains(::java::nio::charset::Charset *); public: // actually package-private diff --git a/libjava/gnu/java/nio/charset/ByteDecodeLoopHelper.h b/libjava/gnu/java/nio/charset/ByteDecodeLoopHelper.h new file mode 100644 index 00000000000..1a373a1bf5c --- /dev/null +++ b/libjava/gnu/java/nio/charset/ByteDecodeLoopHelper.h @@ -0,0 +1,56 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_ByteDecodeLoopHelper__ +#define __gnu_java_nio_charset_ByteDecodeLoopHelper__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class ByteDecodeLoopHelper; + } + } + } + } + namespace java + { + namespace nio + { + class ByteBuffer; + class CharBuffer; + namespace charset + { + class CoderResult; + } + } + } +} + +class gnu::java::nio::charset::ByteDecodeLoopHelper : public ::java::lang::Object +{ + +public: + ByteDecodeLoopHelper(); +public: // actually protected + virtual jboolean isMappable(jbyte) = 0; + virtual jchar mapToChar(jbyte) = 0; +public: // actually package-private + virtual ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *); +private: + ::java::nio::charset::CoderResult * normalDecodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *); + ::java::nio::charset::CoderResult * arrayDecodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_ByteDecodeLoopHelper__ diff --git a/libjava/gnu/java/nio/charset/ByteEncodeLoopHelper.h b/libjava/gnu/java/nio/charset/ByteEncodeLoopHelper.h new file mode 100644 index 00000000000..0b67645e7f8 --- /dev/null +++ b/libjava/gnu/java/nio/charset/ByteEncodeLoopHelper.h @@ -0,0 +1,56 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_ByteEncodeLoopHelper__ +#define __gnu_java_nio_charset_ByteEncodeLoopHelper__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class ByteEncodeLoopHelper; + } + } + } + } + namespace java + { + namespace nio + { + class ByteBuffer; + class CharBuffer; + namespace charset + { + class CoderResult; + } + } + } +} + +class gnu::java::nio::charset::ByteEncodeLoopHelper : public ::java::lang::Object +{ + +public: + ByteEncodeLoopHelper(); +public: // actually protected + virtual jboolean isMappable(jchar) = 0; + virtual jbyte mapToByte(jchar) = 0; +public: // actually package-private + virtual ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *); +private: + ::java::nio::charset::CoderResult * normalEncodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *); + ::java::nio::charset::CoderResult * arrayEncodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_ByteEncodeLoopHelper__ diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$1.h b/libjava/gnu/java/nio/charset/ISO_8859_1$1.h new file mode 100644 index 00000000000..ceaa655aace --- /dev/null +++ b/libjava/gnu/java/nio/charset/ISO_8859_1$1.h @@ -0,0 +1,39 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_ISO_8859_1$1__ +#define __gnu_java_nio_charset_ISO_8859_1$1__ + +#pragma interface + +#include <gnu/java/nio/charset/ByteDecodeLoopHelper.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class ISO_8859_1$1; + } + } + } + } +} + +class gnu::java::nio::charset::ISO_8859_1$1 : public ::gnu::java::nio::charset::ByteDecodeLoopHelper +{ + +public: // actually package-private + ISO_8859_1$1(); +public: // actually protected + jboolean isMappable(jbyte); + jchar mapToChar(jbyte); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_ISO_8859_1$1__ diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$2.h b/libjava/gnu/java/nio/charset/ISO_8859_1$2.h new file mode 100644 index 00000000000..849ebe637bc --- /dev/null +++ b/libjava/gnu/java/nio/charset/ISO_8859_1$2.h @@ -0,0 +1,39 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_ISO_8859_1$2__ +#define __gnu_java_nio_charset_ISO_8859_1$2__ + +#pragma interface + +#include <gnu/java/nio/charset/ByteEncodeLoopHelper.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class ISO_8859_1$2; + } + } + } + } +} + +class gnu::java::nio::charset::ISO_8859_1$2 : public ::gnu::java::nio::charset::ByteEncodeLoopHelper +{ + +public: // actually package-private + ISO_8859_1$2(); +public: // actually protected + jboolean isMappable(jchar); + jbyte mapToByte(jchar); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_ISO_8859_1$2__ diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h b/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h index 8adb8b83bcd..25e97ee0d88 100644 --- a/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h +++ b/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h @@ -17,6 +17,7 @@ extern "Java" { namespace charset { + class ByteDecodeLoopHelper; class ISO_8859_1$Decoder; } } @@ -44,6 +45,8 @@ public: // actually package-private ISO_8859_1$Decoder(::java::nio::charset::Charset *); public: // actually protected ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *); +private: + static ::gnu::java::nio::charset::ByteDecodeLoopHelper * helper; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h b/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h index 47d2280cbb5..e4da289cc1b 100644 --- a/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h +++ b/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.h @@ -17,6 +17,7 @@ extern "Java" { namespace charset { + class ByteEncodeLoopHelper; class ISO_8859_1$Encoder; } } @@ -47,6 +48,8 @@ public: jboolean canEncode(::java::lang::CharSequence *); public: // actually protected ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *); +private: + static ::gnu::java::nio::charset::ByteEncodeLoopHelper * helper; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/nio/charset/Provider$1.h b/libjava/gnu/java/nio/charset/Provider$1.h index 880faccf5c6..651b6d06ca8 100644 --- a/libjava/gnu/java/nio/charset/Provider$1.h +++ b/libjava/gnu/java/nio/charset/Provider$1.h @@ -17,6 +17,7 @@ extern "Java" { namespace charset { + class Provider; class Provider$1; } } @@ -30,6 +31,7 @@ class gnu::java::nio::charset::Provider$1 : public ::java::lang::Object public: // actually package-private Provider$1(); public: + ::gnu::java::nio::charset::Provider * Provider$1$run(); ::java::lang::Object * run(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/nio/charset/US_ASCII$1.h b/libjava/gnu/java/nio/charset/US_ASCII$1.h new file mode 100644 index 00000000000..63d4af15b45 --- /dev/null +++ b/libjava/gnu/java/nio/charset/US_ASCII$1.h @@ -0,0 +1,39 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_US_ASCII$1__ +#define __gnu_java_nio_charset_US_ASCII$1__ + +#pragma interface + +#include <gnu/java/nio/charset/ByteDecodeLoopHelper.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class US_ASCII$1; + } + } + } + } +} + +class gnu::java::nio::charset::US_ASCII$1 : public ::gnu::java::nio::charset::ByteDecodeLoopHelper +{ + +public: // actually package-private + US_ASCII$1(); +public: // actually protected + jboolean isMappable(jbyte); + jchar mapToChar(jbyte); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_US_ASCII$1__ diff --git a/libjava/gnu/java/nio/charset/US_ASCII$2.h b/libjava/gnu/java/nio/charset/US_ASCII$2.h new file mode 100644 index 00000000000..41c450a55fc --- /dev/null +++ b/libjava/gnu/java/nio/charset/US_ASCII$2.h @@ -0,0 +1,39 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_nio_charset_US_ASCII$2__ +#define __gnu_java_nio_charset_US_ASCII$2__ + +#pragma interface + +#include <gnu/java/nio/charset/ByteEncodeLoopHelper.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace nio + { + namespace charset + { + class US_ASCII$2; + } + } + } + } +} + +class gnu::java::nio::charset::US_ASCII$2 : public ::gnu::java::nio::charset::ByteEncodeLoopHelper +{ + +public: // actually package-private + US_ASCII$2(); +public: // actually protected + jboolean isMappable(jchar); + jbyte mapToByte(jchar); +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_nio_charset_US_ASCII$2__ diff --git a/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h b/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h index c0c09bc32f7..9659ac2e7ba 100644 --- a/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h +++ b/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h @@ -17,6 +17,7 @@ extern "Java" { namespace charset { + class ByteDecodeLoopHelper; class US_ASCII$Decoder; } } @@ -44,6 +45,8 @@ public: // actually package-private US_ASCII$Decoder(::java::nio::charset::Charset *); public: // actually protected ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *); +private: + static ::gnu::java::nio::charset::ByteDecodeLoopHelper * helper; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h b/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h index 7a30c343c6e..467f6b77036 100644 --- a/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h +++ b/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h @@ -17,6 +17,7 @@ extern "Java" { namespace charset { + class ByteEncodeLoopHelper; class US_ASCII$Encoder; } } @@ -47,6 +48,8 @@ public: jboolean canEncode(::java::lang::CharSequence *); public: // actually protected ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *); +private: + static ::gnu::java::nio::charset::ByteEncodeLoopHelper * helper; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h b/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h index b1078ffb464..ed9b9364b44 100644 --- a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h +++ b/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h @@ -38,8 +38,6 @@ class gnu::java::rmi::server::RMIClassLoaderImpl$MyClassLoader : public ::java:: public: // actually package-private RMIClassLoaderImpl$MyClassLoader(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *, ::java::lang::String *); -private: - RMIClassLoaderImpl$MyClassLoader(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *); public: static ::java::lang::String * urlToAnnotation(JArray< ::java::net::URL * > *); virtual ::java::lang::String * getClassAnnotation(); diff --git a/libjava/gnu/java/util/LRUCache.h b/libjava/gnu/java/util/LRUCache.h new file mode 100644 index 00000000000..fc524d0f66b --- /dev/null +++ b/libjava/gnu/java/util/LRUCache.h @@ -0,0 +1,37 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_util_LRUCache__ +#define __gnu_java_util_LRUCache__ + +#pragma interface + +#include <java/util/LinkedHashMap.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace util + { + class LRUCache; + } + } + } +} + +class gnu::java::util::LRUCache : public ::java::util::LinkedHashMap +{ + +public: + LRUCache(jint); +public: // actually protected + virtual jboolean removeEldestEntry(::java::util::Map$Entry *); +private: + jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) capacity; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_util_LRUCache__ diff --git a/libjava/gnu/java/util/regex/REException.h b/libjava/gnu/java/util/regex/REException.h index da4560b2fe8..dc91d47cd75 100644 --- a/libjava/gnu/java/util/regex/REException.h +++ b/libjava/gnu/java/util/regex/REException.h @@ -29,6 +29,7 @@ class gnu::java::util::regex::REException : public ::java::lang::Exception public: // actually package-private REException(::java::lang::String *, jint, jint); + REException(::java::lang::String *, ::java::lang::Throwable *, jint, jint); public: virtual jint getType(); virtual jint getPosition(); diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h new file mode 100644 index 00000000000..8c9e229b055 --- /dev/null +++ b/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h @@ -0,0 +1,39 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__ +#define __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__ + +#pragma interface + +#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace util + { + namespace regex + { + class RETokenNamedProperty$JavaCategoryHandler; + } + } + } + } +} + +class gnu::java::util::regex::RETokenNamedProperty$JavaCategoryHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler +{ + +public: + RETokenNamedProperty$JavaCategoryHandler(::java::lang::reflect::Method *); + virtual jboolean includes(jchar); +private: + ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) method; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__ diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h index dccd81e8a58..f716854bcb7 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.h @@ -33,7 +33,6 @@ extern "Java" { namespace sampled { - class AudioFormat; class Control; class Control$Type; class Line; @@ -74,8 +73,9 @@ public: virtual void removeLineListener(::javax::sound::sampled::LineListener *); static ::java::lang::String * GST_BACKEND; static ::java::lang::String * GST_DECODER; + static ::java::lang::String * GST_TYPE_NAME; + static ::java::lang::String * GST_FILE_EXTENSION; private: - static JArray< ::javax::sound::sampled::AudioFormat * > * BASIC_FORMATS; static ::javax::sound::sampled::Mixer$Info * INFO; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h index dbe3a676622..a6dc8fa7fae 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.h @@ -55,6 +55,9 @@ public: GstAudioFileReader(); virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *); virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *); +private: + ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *, ::java::lang::String *); +public: virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *); virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *); virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *); diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h index 0c9253c9d63..82878f19622 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.h @@ -11,6 +11,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace javax { namespace sound @@ -59,12 +63,14 @@ public: static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::InputStream *); static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::net::URL *); private: + static ::javax::sound::sampled::AudioFormat * getAudioFormat(::java::io::InputStream *, ::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *); static ::javax::sound::sampled::AudioFormat$Encoding * getEncoding(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *); static ::javax::sound::sampled::AudioFormat * getAudioFormat(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *); public: // actually protected - static jboolean gstreamer_get_audio_format_stream(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *, ::java::io::BufferedInputStream *); + static jboolean gstreamer_get_audio_format_stream(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *, ::gnu::classpath::Pointer *); static jboolean gstreamer_get_audio_format_file(::gnu::javax::sound::sampled::gstreamer::io::GstAudioFileReaderNativePeer$GstHeader *); private: + static void init_id_cache(); static ::java::lang::String * GST_ENCODING; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h new file mode 100644 index 00000000000..8ffb113e5ed --- /dev/null +++ b/libjava/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.h @@ -0,0 +1,56 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__ +#define __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace classpath + { + class Pointer; + } + namespace javax + { + namespace sound + { + namespace sampled + { + namespace gstreamer + { + namespace io + { + class GstInputStream; + } + } + } + } + } + } +} + +class gnu::javax::sound::sampled::gstreamer::io::GstInputStream : public ::java::lang::Object +{ + +public: + GstInputStream(::java::io::InputStream *); + virtual jint read(JArray< jbyte > *, jint, jint); + virtual jint available(); + virtual ::gnu::classpath::Pointer * getNativeClass(); +private: + void init_instance(); + static void init_id_cache(); + ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) istream; + ::gnu::classpath::Pointer * gstInputStream; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_sound_sampled_gstreamer_io_GstInputStream__ diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine$State.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine$State.h deleted file mode 100644 index ed6df66aaf0..00000000000 --- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine$State.h +++ /dev/null @@ -1,51 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine$State__ -#define __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine$State__ - -#pragma interface - -#include <java/lang/Enum.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace javax - { - namespace sound - { - namespace sampled - { - namespace gstreamer - { - namespace lines - { - class GstDataLine$State; - } - } - } - } - } - } -} - -class gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State : public ::java::lang::Enum -{ - - GstDataLine$State(::java::lang::String *, jint); -public: - static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * > * values(); - static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * valueOf(::java::lang::String *); - static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * PLAY; - static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * PAUSE; - static ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * STOP; -private: - static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * > * ENUM$VALUES; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstDataLine$State__ diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h index 7939abb3459..20ef7deb826 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.h @@ -24,7 +24,6 @@ extern "Java" namespace lines { class GstDataLine; - class GstDataLine$State; } } } @@ -56,15 +55,18 @@ public: virtual jint getBufferSize(); virtual ::javax::sound::sampled::AudioFormat * getFormat(); virtual jfloat getLevel(); - virtual jboolean isRunning(); virtual void addLineListener(::javax::sound::sampled::LineListener *); virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *); virtual JArray< ::javax::sound::sampled::Control * > * getControls(); virtual ::javax::sound::sampled::Line$Info * getLineInfo(); virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *); virtual jboolean isOpen(); - virtual void open(); virtual void removeLineListener(::javax::sound::sampled::LineListener *); +public: // actually protected + virtual void setOpen(::java::lang::Boolean *); + virtual void setBufferSize(jint); + virtual void setFormat(::javax::sound::sampled::AudioFormat *); +public: virtual jint available() = 0; virtual void drain() = 0; virtual void flush() = 0; @@ -72,13 +74,14 @@ public: virtual jlong getLongFramePosition() = 0; virtual jlong getMicrosecondPosition() = 0; virtual jboolean isActive() = 0; + virtual jboolean isRunning() = 0; virtual void start() = 0; virtual void stop() = 0; virtual void close() = 0; + virtual void open() = 0; static const jint DEFAULT_BUFFER_SIZE = 1024; public: // actually protected - ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine$State * __attribute__((aligned(__alignof__( ::java::lang::Object)))) state; - ::java::lang::Boolean * open__; + ::java::lang::Boolean * __attribute__((aligned(__alignof__( ::java::lang::Object)))) open; private: ::javax::sound::sampled::AudioFormat * format; jint bufferSize; diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h index 5452434e1c7..e382f3ea47d 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.h @@ -11,6 +11,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace javax { namespace sound @@ -22,6 +26,7 @@ extern "Java" namespace lines { class GstNativeDataLine; + class GstPipeline; } } } @@ -35,6 +40,11 @@ class gnu::javax::sound::sampled::gstreamer::lines::GstNativeDataLine : public : public: GstNativeDataLine(); + static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * createSourcePipeline(jint); +private: + static void init_id_cache(); + static jboolean setup_sink_pipeline(::gnu::classpath::Pointer *); +public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h new file mode 100644 index 00000000000..a0de53f38d6 --- /dev/null +++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$CleanPipeline.h @@ -0,0 +1,47 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__ +#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__ + +#pragma interface + +#include <java/lang/Thread.h> +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace sound + { + namespace sampled + { + namespace gstreamer + { + namespace lines + { + class GstPipeline; + class GstPipeline$CleanPipeline; + } + } + } + } + } + } +} + +class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$CleanPipeline : public ::java::lang::Thread +{ + + GstPipeline$CleanPipeline(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *); +public: + virtual void run(); +public: // actually package-private + GstPipeline$CleanPipeline(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *, ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$CleanPipeline *); + ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$CleanPipeline__ diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h new file mode 100644 index 00000000000..5966084287a --- /dev/null +++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline$State.h @@ -0,0 +1,52 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__ +#define __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__ + +#pragma interface + +#include <java/lang/Enum.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace sound + { + namespace sampled + { + namespace gstreamer + { + namespace lines + { + class GstPipeline$State; + } + } + } + } + } + } +} + +class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State : public ::java::lang::Enum +{ + + GstPipeline$State(::java::lang::String *, jint); +public: + static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * > * values(); + static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * valueOf(::java::lang::String *); + static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * PLAY; + static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * PAUSE; + static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * STOP; + static ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * CLOSE; +private: + static JArray< ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * > * ENUM$VALUES; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_sound_sampled_gstreamer_lines_GstPipeline$State__ diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h index a32150f9fe7..56afb46bae3 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.h @@ -7,6 +7,8 @@ #pragma interface #include <java/lang/Object.h> +#include <gcj/array.h> + extern "Java" { namespace gnu @@ -26,6 +28,7 @@ extern "Java" namespace lines { class GstPipeline; + class GstPipeline$State; } } } @@ -39,9 +42,49 @@ class gnu::javax::sound::sampled::gstreamer::lines::GstPipeline : public ::java: public: GstPipeline(); + GstPipeline(jint); + virtual void createForWrite(); + virtual ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * getState(); + virtual void close(); + virtual void setState(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State *); + virtual ::gnu::classpath::Pointer * getNativeClass(); + virtual jint write(JArray< jbyte > *, jint, jint); + virtual jint read(JArray< jbyte > *, jint, jint); + virtual jint available(); + virtual void drain(); + virtual void flush(); +private: + void closePipe(); + void prepareWrite(); + static void init_id_cache(); + static jboolean set_state(::gnu::classpath::Pointer *, jint); + static jint available(::gnu::classpath::Pointer *, jint); + static void open_native_pipe(::gnu::classpath::Pointer *, jint); + static void close_native_pipe(::gnu::classpath::Pointer *); + void init_instance(); + jboolean create_named_pipe(::gnu::classpath::Pointer *); + jlong detect_pipe_size(); +public: // actually package-private + static ::gnu::classpath::Pointer * access$0(::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline *); + static void access$1(::gnu::classpath::Pointer *); + static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$sampled$gstreamer$lines$GstPipeline$State(); +private: + static const jint READ = 0; + static const jint WRITE = 1; + static const jint QUEUED = 1; + static ::java::lang::String * CAPACITY_KEY; + static JArray< ::java::lang::Object * > * lock; +public: // actually protected + ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs; private: - void setState(); - ::gnu::classpath::Pointer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pipeline; + jlong capacity; + ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline$State * state; + ::java::lang::String * name; + ::java::io::FileOutputStream * output; + jboolean source; + jboolean ready; + ::gnu::classpath::Pointer * pipeline; + static JArray< jint > * $SWITCH_TABLE$gnu$javax$sound$sampled$gstreamer$lines$GstPipeline$State__; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h index 02b4b83ec9e..4120a2b2d07 100644 --- a/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h +++ b/libjava/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.h @@ -23,6 +23,7 @@ extern "Java" { namespace lines { + class GstPipeline; class GstSourceDataLine; } } @@ -47,6 +48,7 @@ class gnu::javax::sound::sampled::gstreamer::lines::GstSourceDataLine : public : public: GstSourceDataLine(::javax::sound::sampled::AudioFormat *); + virtual void open(); virtual void open(::javax::sound::sampled::AudioFormat *); virtual void open(::javax::sound::sampled::AudioFormat *, jint); virtual jint write(JArray< jbyte > *, jint, jint); @@ -60,6 +62,11 @@ public: virtual void start(); virtual void stop(); virtual void close(); + virtual jboolean isRunning(); +private: + ::gnu::javax::sound::sampled::gstreamer::lines::GstPipeline * __attribute__((aligned(__alignof__( ::gnu::javax::sound::sampled::gstreamer::lines::GstDataLine)))) pipeline; + jboolean open__; +public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/stream/AttributeImpl.h b/libjava/gnu/xml/stream/AttributeImpl.h index d78c6a53efc..8fc37c01d3b 100644 --- a/libjava/gnu/xml/stream/AttributeImpl.h +++ b/libjava/gnu/xml/stream/AttributeImpl.h @@ -39,18 +39,18 @@ class gnu::xml::stream::AttributeImpl : public ::gnu::xml::stream::XMLEventImpl { public: // actually protected - AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::lang::String *, ::javax::xml::namespace::QName *, jboolean); + AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::lang::String *, ::java::lang::String *, jboolean); public: virtual jint getEventType(); virtual ::javax::xml::namespace::QName * getName(); virtual ::java::lang::String * getValue(); - virtual ::javax::xml::namespace::QName * getDTDType(); + virtual ::java::lang::String * getDTDType(); virtual jboolean isSpecified(); virtual void writeAsEncodedUnicode(::java::io::Writer *); public: // actually protected ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; ::java::lang::String * value; - ::javax::xml::namespace::QName * type; + ::java::lang::String * type; jboolean specified; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h index 430aca24a26..3136a60e591 100644 --- a/libjava/gnu/xml/stream/XMLParser.h +++ b/libjava/gnu/xml/stream/XMLParser.h @@ -239,7 +239,6 @@ private: ::java::util::LinkedList * endEntityStack; jint state; jint event; - jboolean lookahead; ::java::util::LinkedList * stack; ::java::util::LinkedList * namespaces; ::java::util::LinkedList * bases; |