diff options
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/ArrayList.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/Arrays.h | 15 | ||||
| -rw-r--r-- | libjava/java/util/Calendar.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/Formatter.h | 16 | ||||
| -rw-r--r-- | libjava/java/util/Properties.h | 16 | ||||
| -rw-r--r-- | libjava/java/util/PropertyResourceBundle.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/ResourceBundle$BundleKey.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/ResourceBundle.h | 4 | ||||
| -rw-r--r-- | libjava/java/util/Scanner.h | 178 | ||||
| -rw-r--r-- | libjava/java/util/Vector.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/logging/XMLFormatter.h | 14 | ||||
| -rw-r--r-- | libjava/java/util/prefs/AbstractPreferences$1.h | 2 | ||||
| -rw-r--r-- | libjava/java/util/prefs/AbstractPreferences$2.h | 2 | ||||
| -rw-r--r-- | libjava/java/util/regex/Matcher.h | 14 | ||||
| -rw-r--r-- | libjava/java/util/zip/ZipEntry.h | 22 |
15 files changed, 267 insertions, 21 deletions
diff --git a/libjava/java/util/ArrayList.h b/libjava/java/util/ArrayList.h index 755e7c5a98d..4bbdb1ae074 100644 --- a/libjava/java/util/ArrayList.h +++ b/libjava/java/util/ArrayList.h @@ -40,6 +40,7 @@ public: // actually protected private: void checkBoundInclusive(jint); void checkBoundExclusive(jint); + void raiseBoundsError(jint); public: // actually package-private virtual jboolean removeAllInternal(::java::util::Collection *); virtual jboolean retainAllInternal(::java::util::Collection *); diff --git a/libjava/java/util/Arrays.h b/libjava/java/util/Arrays.h index 4010f602cd1..8860ee35a69 100644 --- a/libjava/java/util/Arrays.h +++ b/libjava/java/util/Arrays.h @@ -9,6 +9,19 @@ #include <java/lang/Object.h> #include <gcj/array.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } +} class java::util::Arrays : public ::java::lang::Object { @@ -144,7 +157,7 @@ public: static ::java::lang::String * toString(JArray< jdouble > *); static ::java::lang::String * toString(JArray< ::java::lang::Object * > *); private: - static void deepToString(JArray< ::java::lang::Object * > *, ::java::lang::StringBuilder *, ::java::util::HashSet *); + static void deepToString(JArray< ::java::lang::Object * > *, ::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *); public: static ::java::lang::String * deepToString(JArray< ::java::lang::Object * > *); static JArray< jboolean > * copyOf(JArray< jboolean > *, jint); diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h index b3878714807..9abfba539ad 100644 --- a/libjava/java/util/Calendar.h +++ b/libjava/java/util/Calendar.h @@ -138,6 +138,7 @@ public: // actually package-private static const jlong serialVersionUID = -1807547505821590642LL; private: static ::java::lang::String * bundleName; + static ::java::util::Properties * properties; static ::java::util::HashMap * cache; static JArray< ::java::lang::Class * > * ctorArgTypes; static JArray< ::java::lang::String * > * fieldNames; diff --git a/libjava/java/util/Formatter.h b/libjava/java/util/Formatter.h index 5d513ed786d..71a659f6632 100644 --- a/libjava/java/util/Formatter.h +++ b/libjava/java/util/Formatter.h @@ -11,6 +11,16 @@ extern "Java" { + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } namespace java { namespace text @@ -44,7 +54,7 @@ private: ::java::lang::String * getName(jint); void checkFlags(jint, jint, jchar); void noPrecision(jint); - void applyLocalization(::java::lang::StringBuilder *, jint, jint, jboolean); + void applyLocalization(::gnu::java::lang::CPStringBuilder *, jint, jint, jboolean); void genericFormat(::java::lang::String *, jint, jint, jint); void booleanFormat(::java::lang::Object *, jint, jint, jint, jchar); void hashCodeFormat(::java::lang::Object *, jint, jint, jint, jchar); @@ -52,10 +62,10 @@ private: void characterFormat(::java::lang::Object *, jint, jint, jint, jchar); void percentFormat(jint, jint, jint); void newLineFormat(jint, jint, jint); - ::java::lang::StringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); + ::gnu::java::lang::CPStringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); void hexOrOctalConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); void decimalConversion(::java::lang::Object *, jint, jint, jint, jchar); - void singleDateTimeConversion(::java::lang::StringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *); + void singleDateTimeConversion(::gnu::java::lang::CPStringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *); void dateTimeConversion(::java::lang::Object *, jint, jint, jint, jchar, jchar); void advance(); jint parseInt(); diff --git a/libjava/java/util/Properties.h b/libjava/java/util/Properties.h index 5075e347c80..ccb76b5a20b 100644 --- a/libjava/java/util/Properties.h +++ b/libjava/java/util/Properties.h @@ -7,6 +7,19 @@ #pragma interface #include <java/util/Hashtable.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } +} class java::util::Properties : public ::java::util::Hashtable { @@ -15,6 +28,7 @@ public: Properties(); Properties(::java::util::Properties *); virtual ::java::lang::Object * setProperty(::java::lang::String *, ::java::lang::String *); + virtual void load(::java::io::Reader *); virtual void load(::java::io::InputStream *); virtual void save(::java::io::OutputStream *, ::java::lang::String *); virtual void store(::java::io::OutputStream *, ::java::lang::String *); @@ -24,7 +38,7 @@ public: virtual void list(::java::io::PrintStream *); virtual void list(::java::io::PrintWriter *); private: - void formatForOutput(::java::lang::String *, ::java::lang::StringBuilder *, jboolean); + void formatForOutput(::java::lang::String *, ::gnu::java::lang::CPStringBuilder *, jboolean); public: virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *); virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *, ::java::lang::String *); diff --git a/libjava/java/util/PropertyResourceBundle.h b/libjava/java/util/PropertyResourceBundle.h index a0f0726be78..fa6528511a1 100644 --- a/libjava/java/util/PropertyResourceBundle.h +++ b/libjava/java/util/PropertyResourceBundle.h @@ -13,6 +13,7 @@ class java::util::PropertyResourceBundle : public ::java::util::ResourceBundle public: PropertyResourceBundle(::java::io::InputStream *); + PropertyResourceBundle(::java::io::Reader *); virtual ::java::lang::Object * handleGetObject(::java::lang::String *); virtual ::java::util::Enumeration * getKeys(); private: diff --git a/libjava/java/util/ResourceBundle$BundleKey.h b/libjava/java/util/ResourceBundle$BundleKey.h index 62c08b38f3c..49c051cfbd3 100644 --- a/libjava/java/util/ResourceBundle$BundleKey.h +++ b/libjava/java/util/ResourceBundle$BundleKey.h @@ -18,6 +18,7 @@ public: // actually package-private public: virtual jint hashCode(); virtual jboolean equals(::java::lang::Object *); + virtual ::java::lang::String * toString(); public: // actually package-private ::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultLocale; ::java::lang::String * baseName; diff --git a/libjava/java/util/ResourceBundle.h b/libjava/java/util/ResourceBundle.h index 98a87e679fd..e14e4539fb0 100644 --- a/libjava/java/util/ResourceBundle.h +++ b/libjava/java/util/ResourceBundle.h @@ -32,6 +32,10 @@ public: private: static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::lang::ClassLoader *); static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *, jboolean); +public: + static void clearCache(); + static void clearCache(::java::lang::ClassLoader *); +private: static const jint CACHE_SIZE = 100; public: // actually protected ::java::util::ResourceBundle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent; diff --git a/libjava/java/util/Scanner.h b/libjava/java/util/Scanner.h new file mode 100644 index 00000000000..bca1ab77eff --- /dev/null +++ b/libjava/java/util/Scanner.h @@ -0,0 +1,178 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __java_util_Scanner__ +#define __java_util_Scanner__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace java + { + namespace math + { + class BigDecimal; + class BigInteger; + } + namespace nio + { + namespace channels + { + class ReadableByteChannel; + } + } + namespace text + { + class DecimalFormat; + class DecimalFormatSymbols; + class NumberFormat; + } + } +} + +class java::util::Scanner : public ::java::lang::Object +{ + +public: + Scanner(::java::io::File *); + Scanner(::java::io::File *, ::java::lang::String *); + Scanner(::java::io::InputStream *); + Scanner(::java::io::InputStream *, ::java::lang::String *); + Scanner(::java::lang::Readable *); + Scanner(::java::nio::channels::ReadableByteChannel *); + Scanner(::java::nio::channels::ReadableByteChannel *, ::java::lang::String *); + Scanner(::java::lang::String *); + virtual void close(); + virtual ::java::util::regex::Pattern * delimiter(); + virtual ::java::lang::String * findInLine(::java::util::regex::Pattern *); + virtual ::java::lang::String * findInLine(::java::lang::String *); + virtual ::java::lang::String * findWithinHorizon(::java::util::regex::Pattern *, jint); + virtual ::java::lang::String * findWithinHorizon(::java::lang::String *, jint); + virtual jboolean hasNext(); + virtual jboolean hasNext(::java::util::regex::Pattern *); + virtual jboolean hasNext(::java::lang::String *); + virtual jboolean hasNextBigDecimal(); + virtual jboolean hasNextBigInteger(); + virtual jboolean hasNextBigInteger(jint); + virtual jboolean hasNextBoolean(); + virtual jboolean hasNextByte(); + virtual jboolean hasNextByte(jint); + virtual jboolean hasNextDouble(); + virtual jboolean hasNextFloat(); + virtual jboolean hasNextInt(); + virtual jboolean hasNextInt(jint); + virtual jboolean hasNextLine(); + virtual jboolean hasNextLong(); + virtual jboolean hasNextLong(jint); + virtual jboolean hasNextShort(); + virtual jboolean hasNextShort(jint); + virtual ::java::io::IOException * ioException(); + virtual jboolean isUseLocale(); + virtual ::java::util::Locale * locale(); + virtual ::java::util::regex::MatchResult * match(); + virtual ::java::lang::String * Scanner$next(); + virtual ::java::lang::String * next(::java::util::regex::Pattern *); + virtual ::java::lang::String * next(::java::lang::String *); + virtual ::java::math::BigDecimal * nextBigDecimal(); + virtual ::java::math::BigInteger * nextBigInteger(); + virtual ::java::math::BigInteger * nextBigInteger(jint); + virtual jboolean nextBoolean(); + virtual jbyte nextByte(); + virtual jbyte nextByte(jint); + virtual jdouble nextDouble(); + virtual jfloat nextFloat(); + virtual jint nextInt(); + virtual jint nextInt(jint); + virtual ::java::lang::String * nextLine(); + virtual jlong nextLong(); + virtual jlong nextLong(jint); + virtual jshort nextShort(); + virtual jshort nextShort(jint); + virtual jint radix(); + virtual void remove(); + virtual void setUseLocale(jboolean); + virtual ::java::util::Scanner * skip(::java::util::regex::Pattern *); + virtual ::java::util::Scanner * skip(::java::lang::String *); + virtual ::java::lang::String * toString(); + virtual ::java::util::Scanner * useDelimiter(::java::util::regex::Pattern *); + virtual ::java::util::Scanner * useDelimiter(::java::lang::String *); + virtual ::java::util::Scanner * useLocale(::java::util::Locale *); + virtual ::java::util::Scanner * useRadix(jint); +private: + ::java::lang::String * myApplyLocale(::java::lang::String *, jint); + ::java::lang::String * myApplyLocaleBD(::java::lang::String *); + ::java::math::BigDecimal * myBigDecimal(jboolean); + ::java::lang::String * myConvert(::java::lang::String *); + ::java::lang::String * myCoreNext(jboolean, ::java::util::regex::Pattern *); + void myFillBuffer(); + jboolean myFillBuffer_loop(::java::util::regex::Matcher *, jint, jboolean); + ::java::lang::String * myFindPInStr(::java::util::regex::Pattern *, ::java::lang::String *, jint); + ::java::lang::String * myNext(::java::util::regex::Pattern *, jboolean); + ::java::math::BigInteger * myNextBigInteger(jint, jboolean, ::java::lang::String *); + jboolean myNextBoolean(jboolean); + jbyte myNextByte(jint, jboolean); + jdouble myNextDouble(jboolean); + jint myNextInt(jint, jboolean); + ::java::lang::String * myNextLine(jboolean); + jlong myNextLong(jint, jboolean); + jshort myNextShort(jint, jboolean); + ::java::lang::String * myPrepareForNext(::java::util::regex::Pattern *, jboolean); + jboolean shallUseLastFound(::java::util::regex::Pattern *); +public: + virtual ::java::lang::Object * next(); +private: + static ::java::lang::String * NOT_LONG; + static ::java::lang::String * ERR_PREFIX; + static ::java::lang::String * NOT_INT; + static ::java::lang::String * NOT_DOUBLE; + static ::java::lang::String * NOT_BYTE; + static ::java::lang::String * NOT_BOOLEAN; + static ::java::lang::String * IS_NOT; + static ::java::lang::String * DEFAULT_PATTERN_S; + static ::java::util::regex::Pattern * DEFAULT_PATTERN; + static ::java::lang::String * BIG_INTEGER; + static ::java::lang::String * NEW_LINE; + ::java::io::IOException * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastIOException; + ::java::io::InputStream * bIS; + const jint MaxBufferLen; + const jint MIN_BUF_LEN; + const jint MAX_PREFIX; + ::java::lang::String * actBuffer; + jint currentRadix; + ::java::util::Locale * actLocale; + ::java::util::regex::Pattern * p; + jint actPos; + JArray< jbyte > * tmpBuffer; + ::java::lang::String * charsetName; + ::java::util::regex::Matcher * myMatcher; + ::java::util::regex::MatchResult * actResult; + ::java::lang::Readable * readableSource; + ::java::nio::channels::ReadableByteChannel * rbcSource; + jboolean isClosed; + ::java::lang::String * lastFound; + jboolean lastFoundPresent; + jint lastNextPos; + jint lastPatternHash; + jint last_RegionStart; + jint last_RegionEnd; + jboolean last_anchor; + jboolean last_transparent; + ::java::util::regex::MatchResult * lastResult; + jint procesedChars; + jboolean needInput; + jboolean skipped; + jboolean doSkipp; + jboolean matchValid; + ::java::text::NumberFormat * actFormat; + ::java::text::DecimalFormat * df; + jboolean useLocale__; + ::java::text::DecimalFormatSymbols * dfs; +public: + static ::java::lang::Class class$; +}; + +#endif // __java_util_Scanner__ diff --git a/libjava/java/util/Vector.h b/libjava/java/util/Vector.h index 8330b2a18ff..c903819c4b9 100644 --- a/libjava/java/util/Vector.h +++ b/libjava/java/util/Vector.h @@ -64,6 +64,7 @@ public: // actually protected private: void checkBoundInclusive(jint); void checkBoundExclusive(jint); + void raiseBoundsError(jint, ::java::lang::String *); void writeObject(::java::io::ObjectOutputStream *); static const jlong serialVersionUID = -2767605614048989439LL; public: // actually protected diff --git a/libjava/java/util/logging/XMLFormatter.h b/libjava/java/util/logging/XMLFormatter.h index 48a585de097..a5de3543541 100644 --- a/libjava/java/util/logging/XMLFormatter.h +++ b/libjava/java/util/logging/XMLFormatter.h @@ -9,6 +9,16 @@ #include <java/util/logging/Formatter.h> extern "Java" { + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } namespace java { namespace text @@ -24,8 +34,8 @@ class java::util::logging::XMLFormatter : public ::java::util::logging::Formatte public: XMLFormatter(); private: - static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, ::java::lang::String *); - static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, jlong); + static void appendTag(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *, ::java::lang::String *); + static void appendTag(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *, jlong); public: virtual ::java::lang::String * format(::java::util::logging::LogRecord *); virtual ::java::lang::String * getHead(::java::util::logging::Handler *); diff --git a/libjava/java/util/prefs/AbstractPreferences$1.h b/libjava/java/util/prefs/AbstractPreferences$1.h index 97c3f53c752..6e41aa3102e 100644 --- a/libjava/java/util/prefs/AbstractPreferences$1.h +++ b/libjava/java/util/prefs/AbstractPreferences$1.h @@ -18,7 +18,7 @@ public: public: // actually package-private ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0; private: - ::java::util::prefs::PreferenceChangeListener * val$l; + ::java::util::prefs::PreferenceChangeListener * val$listener; ::java::util::prefs::PreferenceChangeEvent * val$event; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/prefs/AbstractPreferences$2.h b/libjava/java/util/prefs/AbstractPreferences$2.h index 45378c56ad5..a96ebf139cb 100644 --- a/libjava/java/util/prefs/AbstractPreferences$2.h +++ b/libjava/java/util/prefs/AbstractPreferences$2.h @@ -19,7 +19,7 @@ public: // actually package-private ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0; private: jboolean val$added; - ::java::util::prefs::NodeChangeListener * val$l; + ::java::util::prefs::NodeChangeListener * val$listener; ::java::util::prefs::NodeChangeEvent * val$event; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/regex/Matcher.h b/libjava/java/util/regex/Matcher.h index 35cd1c1cab4..74230ef51b7 100644 --- a/libjava/java/util/regex/Matcher.h +++ b/libjava/java/util/regex/Matcher.h @@ -53,12 +53,26 @@ public: ::java::lang::String * toString(); private: void assertMatchOp(); +public: + ::java::util::regex::Matcher * region(jint, jint); + jint regionStart(); + jint regionEnd(); + jboolean hasTransparentBounds(); + ::java::util::regex::Matcher * useTransparentBounds(jboolean); + jboolean hasAnchoringBounds(); + ::java::util::regex::Matcher * useAnchoringBounds(jboolean); + ::java::util::regex::MatchResult * toMatchResult(); +private: ::java::util::regex::Pattern * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pattern__; ::java::lang::CharSequence * input; ::gnu::java::util::regex::CharIndexed * inputCharIndexed; jint position; jint appendPosition; ::gnu::java::util::regex::REMatch * match; + jint regionStart__; + jint regionEnd__; + jboolean transparentBounds; + jint anchoringBounds; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/zip/ZipEntry.h b/libjava/java/util/zip/ZipEntry.h index 7e1cc8f518f..47cb903a8d6 100644 --- a/libjava/java/util/zip/ZipEntry.h +++ b/libjava/java/util/zip/ZipEntry.h @@ -25,9 +25,6 @@ public: virtual ::java::lang::String * getName(); virtual void setTime(jlong); virtual jlong getTime(); -private: - static ::java::util::Calendar * getCalendar(); -public: virtual void setSize(jlong); virtual jlong getSize(); virtual void setCompressedSize(jlong); @@ -47,21 +44,22 @@ public: virtual ::java::lang::String * toString(); virtual jint hashCode(); private: - static const jint KNOWN_SIZE = 1; - static const jint KNOWN_CSIZE = 2; - static const jint KNOWN_CRC = 4; - static const jint KNOWN_TIME = 8; - static const jint KNOWN_EXTRA = 16; - static ::java::util::Calendar * cal; + static const jbyte KNOWN_SIZE = 1; + static const jbyte KNOWN_CSIZE = 2; + static const jbyte KNOWN_CRC = 4; + static const jbyte KNOWN_TIME = 8; + static const jbyte KNOWN_DOSTIME = 16; + static const jbyte KNOWN_EXTRA = 32; ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; jint size; jlong compressedSize; jint crc; + ::java::lang::String * comment; + jbyte method; + jbyte known; jint dostime; - jshort known; - jshort method; + jlong time; JArray< jbyte > * extra; - ::java::lang::String * comment; public: // actually package-private jint flags; jint offset; |