diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2008-10-21 17:55:01 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2008-10-21 17:55:01 +0000 |
| commit | cd6d4007aa4f72b51756e4a571abf876fa3e3133 (patch) | |
| tree | 6de8da5758622565799768e49cd0de6698ca3cb8 /libjava/classpath/gnu/xml/xpath | |
| parent | d9cc481a359c713f473a136730e4019124368d6b (diff) | |
| download | gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.zip gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.tar.gz gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.tar.bz2 | |
re PR libgcj/37636 (java tools are unable to find resource files)
libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
Diffstat (limited to 'libjava/classpath/gnu/xml/xpath')
39 files changed, 379 insertions, 264 deletions
diff --git a/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java b/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java index cbc1ee0..61098d6 100644 --- a/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java +++ b/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import javax.xml.namespace.QName; import org.w3c.dom.Node; @@ -139,7 +141,7 @@ final class ArithmeticExpr public String toString() { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); buf.append(lhs); buf.append(' '); switch (op) diff --git a/libjava/classpath/gnu/xml/xpath/BooleanFunction.java b/libjava/classpath/gnu/xml/xpath/BooleanFunction.java index 256de03..f661b2a 100644 --- a/libjava/classpath/gnu/xml/xpath/BooleanFunction.java +++ b/libjava/classpath/gnu/xml/xpath/BooleanFunction.java @@ -61,9 +61,9 @@ final class BooleanFunction final Expr arg; - BooleanFunction(List args) + BooleanFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } BooleanFunction(Expr arg) diff --git a/libjava/classpath/gnu/xml/xpath/CeilingFunction.java b/libjava/classpath/gnu/xml/xpath/CeilingFunction.java index 7db08fc..1539884 100644 --- a/libjava/classpath/gnu/xml/xpath/CeilingFunction.java +++ b/libjava/classpath/gnu/xml/xpath/CeilingFunction.java @@ -54,9 +54,9 @@ final class CeilingFunction final Expr arg; - CeilingFunction(List args) + CeilingFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } CeilingFunction(Expr arg) diff --git a/libjava/classpath/gnu/xml/xpath/ConcatFunction.java b/libjava/classpath/gnu/xml/xpath/ConcatFunction.java index fddd7ae..a61a454 100644 --- a/libjava/classpath/gnu/xml/xpath/ConcatFunction.java +++ b/libjava/classpath/gnu/xml/xpath/ConcatFunction.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -52,19 +54,19 @@ final class ConcatFunction extends Expr { - final List args; + final List<Expr> args; - ConcatFunction(List args) + ConcatFunction(List<Expr> args) { this.args = args; } + @Override public Object evaluate(Node context, int pos, int len) { - StringBuffer buf = new StringBuffer(); - for (Iterator i = args.iterator(); i.hasNext(); ) + CPStringBuilder buf = new CPStringBuilder(); + for (Expr arg : args) { - Expr arg = (Expr) i.next(); Object val = arg.evaluate(context, pos, len); buf.append(_string(context, val)); } @@ -74,19 +76,19 @@ final class ConcatFunction public Expr clone(Object context) { int len = args.size(); - List args2 = new ArrayList(len); + List<Expr> args2 = new ArrayList<Expr>(len); for (int i = 0; i < len; i++) { - args2.add(((Expr) args.get(i)).clone(context)); + args2.add(args.get(i).clone(context)); } return new ConcatFunction(args2); } public boolean references(QName var) { - for (Iterator i = args.iterator(); i.hasNext(); ) + for (Iterator<Expr> i = args.iterator(); i.hasNext(); ) { - if (((Expr) i.next()).references(var)) + if (i.next().references(var)) { return true; } @@ -96,7 +98,7 @@ final class ConcatFunction public String toString() { - StringBuffer buf = new StringBuffer("concat("); + CPStringBuilder buf = new CPStringBuilder("concat("); int len = args.size(); for (int i = 0; i < len; i++) { diff --git a/libjava/classpath/gnu/xml/xpath/ContainsFunction.java b/libjava/classpath/gnu/xml/xpath/ContainsFunction.java index fc2f33f..620606b 100644 --- a/libjava/classpath/gnu/xml/xpath/ContainsFunction.java +++ b/libjava/classpath/gnu/xml/xpath/ContainsFunction.java @@ -54,9 +54,9 @@ final class ContainsFunction final Expr arg1; final Expr arg2; - ContainsFunction(List args) + ContainsFunction(List<Expr> args) { - this((Expr) args.get(0), (Expr) args.get(1)); + this(args.get(0), args.get(1)); } ContainsFunction(Expr arg1, Expr arg2) @@ -65,6 +65,7 @@ final class ContainsFunction this.arg2 = arg2; } + @Override public Object evaluate(Node context, int pos, int len) { Object val1 = arg1.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/CountFunction.java b/libjava/classpath/gnu/xml/xpath/CountFunction.java index cb534bf..f29d833 100644 --- a/libjava/classpath/gnu/xml/xpath/CountFunction.java +++ b/libjava/classpath/gnu/xml/xpath/CountFunction.java @@ -54,9 +54,9 @@ final class CountFunction final Expr arg; - CountFunction(List args) + CountFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } CountFunction(Expr arg) @@ -64,10 +64,11 @@ final class CountFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); - return new Double((double) ((Collection) val).size()); + return new Double((double) ((Collection<?>) val).size()); } public Expr clone(Object context) diff --git a/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java b/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java index c7d7de9..605749d 100644 --- a/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java +++ b/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java @@ -46,18 +46,12 @@ import org.w3c.dom.Node; * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DocumentOrderComparator - implements Comparator + implements Comparator<Node> { - public int compare(Object o1, Object o2) + public int compare(Node n1, Node n2) { - if (o1 instanceof Node && o2 instanceof Node) - { - Node n1 = (Node)o1; - Node n2 = (Node)o2; - return (int) n1.compareDocumentPosition(n2); - } - return 0; + return (int) n1.compareDocumentPosition(n2); } } diff --git a/libjava/classpath/gnu/xml/xpath/EqualityExpr.java b/libjava/classpath/gnu/xml/xpath/EqualityExpr.java index 6d00cee..3b6fd56 100644 --- a/libjava/classpath/gnu/xml/xpath/EqualityExpr.java +++ b/libjava/classpath/gnu/xml/xpath/EqualityExpr.java @@ -62,6 +62,7 @@ final class EqualityExpr this.invert = invert; } + @Override public Object evaluate(Node context, int pos, int len) { boolean val = evaluateImpl(context, pos, len); @@ -90,19 +91,20 @@ final class EqualityExpr boolean frns = right instanceof Collection; if (flns && frns) { - Collection lns = (Collection) left; - Collection rns = (Collection) right; + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> lns = (Collection<Node>) left; + @SuppressWarnings("unchecked") + Collection<Node> rns = (Collection<Node>) right; if (lns.isEmpty()) { return false; } boolean all = true; - for (Iterator i = lns.iterator(); i.hasNext(); ) - { - Node ltest = (Node) i.next(); - for (Iterator j = rns.iterator(); j.hasNext(); ) - { - Node rtest = (Node) j.next(); + for (Node ltest : lns) + { + for (Node rtest : rns) + { if (ltest == rtest || ltest.equals(rtest)) { // much shorter @@ -138,13 +140,14 @@ final class EqualityExpr boolean frn = right instanceof Double; if ((flns && frn) || (frns && fln)) { - Collection ns = flns ? (Collection) left : (Collection) right; + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> ns = flns ? (Collection<Node>) left : (Collection<Node>) right; double n = fln ? ((Double) left).doubleValue() : ((Double) right).doubleValue(); boolean all = true; - for (Iterator i = ns.iterator(); i.hasNext(); ) + for (Node test : ns) { - Node test = (Node) i.next(); double nn = _number(context, stringValue(test)); if (nn == n) { @@ -171,12 +174,13 @@ final class EqualityExpr boolean frs = right instanceof String; if ((flns && frs) || (frns && fls)) { - Collection ns = flns ? (Collection) left : (Collection) right; + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> ns = flns ? (Collection<Node>) left : (Collection<Node>) right; String s = fls ? (String) left : (String) right; boolean all = true; - for (Iterator i = ns.iterator(); i.hasNext(); ) + for (Node test : ns) { - Node test = (Node) i.next(); if (stringValue(test).equals(s)) { if (!invert) @@ -202,7 +206,9 @@ final class EqualityExpr boolean frb = right instanceof Boolean; if ((flns && frb) || (frns && flb)) { - Collection ns = flns ? (Collection) left : (Collection) right; + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> ns = flns ? (Collection<Node>) left : (Collection<Node>) right; boolean b = flb ? ((Boolean) left).booleanValue() : ((Boolean) right).booleanValue(); return _boolean(context, ns) == b; diff --git a/libjava/classpath/gnu/xml/xpath/Expr.java b/libjava/classpath/gnu/xml/xpath/Expr.java index cafc83b..87ce3df 100644 --- a/libjava/classpath/gnu/xml/xpath/Expr.java +++ b/libjava/classpath/gnu/xml/xpath/Expr.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.io.IOException; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -73,7 +75,7 @@ public abstract class Expr implements XPathExpression { - protected static final Comparator documentOrderComparator = + protected static final Comparator<Node> documentOrderComparator = new DocumentOrderComparator(); protected static final DecimalFormat decimalFormat = @@ -84,14 +86,14 @@ public abstract class Expr static class ExprNodeSet implements NodeList { - private ArrayList list; + private ArrayList<Node> list; - ExprNodeSet(Collection collection) + ExprNodeSet(Collection<Node> collection) { if (collection instanceof ArrayList) - list = (ArrayList) collection; + list = (ArrayList<Node>) collection; else - list = new ArrayList(collection); + list = new ArrayList<Node>(collection); } public int getLength() @@ -103,7 +105,7 @@ public abstract class Expr { try { - return (Node) list.get(index); + return list.get(index); } catch (ArrayIndexOutOfBoundsException e) { @@ -141,14 +143,17 @@ public abstract class Expr { if (ret instanceof Collection) { - Collection ns = (Collection) ret; + /* Suppression is safe, as we know context + produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> ns = (Collection<Node>) ret; switch (ns.size()) { case 0: ret = null; break; case 1: - ret = (Node) ns.iterator().next(); + ret = ns.iterator().next(); break; default: throw new XPathExpressionException("multiple nodes in node-set"); @@ -166,7 +171,12 @@ public abstract class Expr throw new XPathExpressionException("return value is not a node-set"); } if (ret != null) - ret = new ExprNodeSet((Collection) ret); + { + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> nodes = (Collection<Node>) ret; + ret = new ExprNodeSet(nodes); + } } } return ret; @@ -229,15 +239,17 @@ public abstract class Expr * same document as the context node that have a unique ID equal to any of * the tokens in the list. */ - public static Collection _id(Node context, Object object) + public static Collection<Node> _id(Node context, Object object) { - Set ret = new HashSet(); + Set<Node> ret = new HashSet<Node>(); if (object instanceof Collection) { - Collection nodeSet = (Collection) object; - for (Iterator i = nodeSet.iterator(); i.hasNext(); ) + /* Suppression is safe, as the iteration will check each value is a Node */ + @SuppressWarnings("unchecked") + Collection<Node> nodeSet = (Collection<Node>) object; + for (Iterator<Node> i = nodeSet.iterator(); i.hasNext(); ) { - String string = stringValue((Node) i.next()); + String string = stringValue(i.next()); ret.addAll(_id (context, string)); } } @@ -266,7 +278,7 @@ public abstract class Expr * an empty string is returned. If the argument is omitted, it defaults to * a node-set with the context node as its only member. */ - public static String _local_name(Node context, Collection nodeSet) + public static String _local_name(Node context, Collection<Node> nodeSet) { if (nodeSet == null || nodeSet.isEmpty()) return ""; @@ -283,7 +295,7 @@ public abstract class Expr * empty string is returned. If the argument is omitted, it defaults to a * node-set with the context node as its only member. */ - public static String _namespace_uri(Node context, Collection nodeSet) + public static String _namespace_uri(Node context, Collection<Node> nodeSet) { if (nodeSet == null || nodeSet.isEmpty()) return ""; @@ -308,7 +320,7 @@ public abstract class Expr * string is returned. If the argument it omitted, it defaults to a * node-set with the context node as its only member. */ - public static String _name(Node context, Collection nodeSet) + public static String _name(Node context, Collection<Node> nodeSet) { if (nodeSet == null || nodeSet.isEmpty()) return ""; @@ -327,11 +339,11 @@ public abstract class Expr /** * Returns the first node in the set in document order. */ - static Node firstNode(Collection nodeSet) + static Node firstNode(Collection<Node> nodeSet) { - List list = new ArrayList(nodeSet); + List<Node> list = new ArrayList<Node>(nodeSet); Collections.sort(list, documentOrderComparator); - return (Node) list.get(0); + return list.get(0); } /* -- 4.2 String Functions -- */ @@ -387,7 +399,10 @@ public abstract class Expr } if (object instanceof Collection) { - Collection nodeSet = (Collection) object; + /* Suppression is safe, as we fail immediately if the + * first element is not a Node and don't use the rest */ + @SuppressWarnings("unchecked") + Collection<Node> nodeSet = (Collection<Node>) object; if (nodeSet.isEmpty()) { return ""; @@ -422,7 +437,7 @@ public abstract class Expr } if (object instanceof Collection) { - return ((Collection) object).size() != 0; + return ((Collection<?>) object).size() != 0; } return false; // TODO user defined types } @@ -448,8 +463,12 @@ public abstract class Expr } if (object instanceof Collection) { + /* Suppression is safe, as we fail immediately if one + * of the elements is not a Node */ + @SuppressWarnings("unchecked") + Collection<Node> nodeSet = (Collection<Node>) object; // Convert node-set to string - object = stringValue((Collection) object); + object = stringValue(nodeSet); } if (object instanceof String) { @@ -469,12 +488,12 @@ public abstract class Expr /** * Computes the XPath string-value of the specified node-set. */ - public static String stringValue(Collection nodeSet) + public static String stringValue(Collection<Node> nodeSet) { - StringBuffer buf = new StringBuffer(); - for (Iterator i = nodeSet.iterator(); i.hasNext(); ) + CPStringBuilder buf = new CPStringBuilder(); + for (Iterator<Node> i = nodeSet.iterator(); i.hasNext(); ) { - buf.append(stringValue((Node) i.next())); + buf.append(stringValue(i.next())); } return buf.toString(); } @@ -494,7 +513,7 @@ public abstract class Expr case Node.DOCUMENT_NODE: // 5.1 Root Node case Node.DOCUMENT_FRAGMENT_NODE: case Node.ELEMENT_NODE: // 5.2 Element Nodes - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); for (Node ctx = node.getFirstChild(); ctx != null; ctx = ctx.getNextSibling()) { diff --git a/libjava/classpath/gnu/xml/xpath/FloorFunction.java b/libjava/classpath/gnu/xml/xpath/FloorFunction.java index c03c0e7..bbf56c9 100644 --- a/libjava/classpath/gnu/xml/xpath/FloorFunction.java +++ b/libjava/classpath/gnu/xml/xpath/FloorFunction.java @@ -54,9 +54,9 @@ final class FloorFunction final Expr arg; - FloorFunction(List args) + FloorFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } FloorFunction(Expr arg) @@ -64,6 +64,7 @@ final class FloorFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/Function.java b/libjava/classpath/gnu/xml/xpath/Function.java index aecd49d..12e2e11 100644 --- a/libjava/classpath/gnu/xml/xpath/Function.java +++ b/libjava/classpath/gnu/xml/xpath/Function.java @@ -51,7 +51,7 @@ public interface Function /** * Sets the list of expressions to evaluate as parameter values. */ - void setArguments(List args); + void setArguments(List<Expr> args); } diff --git a/libjava/classpath/gnu/xml/xpath/FunctionCall.java b/libjava/classpath/gnu/xml/xpath/FunctionCall.java index 669efbf..e811f53 100644 --- a/libjava/classpath/gnu/xml/xpath/FunctionCall.java +++ b/libjava/classpath/gnu/xml/xpath/FunctionCall.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -58,20 +60,24 @@ public final class FunctionCall final XPathFunctionResolver resolver; final String name; - final List args; + final List<Expr> args; public FunctionCall(XPathFunctionResolver resolver, String name) { - this(resolver, name, Collections.EMPTY_LIST); + this(resolver, name, null); } - public FunctionCall(XPathFunctionResolver resolver, String name, List args) + public FunctionCall(XPathFunctionResolver resolver, String name, List<Expr> args) { this.resolver = resolver; this.name = name; - this.args = args; + if (args == null) + this.args = Collections.emptyList(); + else + this.args = args; } + @Override public Object evaluate(Node context, int pos, int len) { if (resolver != null) @@ -92,7 +98,7 @@ public final class FunctionCall } else { - List values = new ArrayList(arity); + List<Object> values = new ArrayList<Object>(arity); for (int i = 0; i < arity; i++) { Expr arg = (Expr) args.get(i); @@ -117,10 +123,10 @@ public final class FunctionCall public Expr clone(Object context) { int len = args.size(); - List args2 = new ArrayList(len); + List<Expr> args2 = new ArrayList<Expr>(len); for (int i = 0; i < len; i++) { - args2.add(((Expr) args.get(i)).clone(context)); + args2.add(args.get(i).clone(context)); } XPathFunctionResolver r = resolver; if (context instanceof XPathFunctionResolver) @@ -132,9 +138,9 @@ public final class FunctionCall public boolean references(QName var) { - for (Iterator i = args.iterator(); i.hasNext(); ) + for (Iterator<Expr> i = args.iterator(); i.hasNext(); ) { - if (((Expr) i.next()).references(var)) + if (i.next().references(var)) { return true; } @@ -144,7 +150,7 @@ public final class FunctionCall public String toString() { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); buf.append(name); buf.append('('); int len = args.size(); diff --git a/libjava/classpath/gnu/xml/xpath/IdFunction.java b/libjava/classpath/gnu/xml/xpath/IdFunction.java index 7497954..b3d2208 100644 --- a/libjava/classpath/gnu/xml/xpath/IdFunction.java +++ b/libjava/classpath/gnu/xml/xpath/IdFunction.java @@ -62,9 +62,9 @@ public final class IdFunction final Expr arg; - IdFunction(List args) + IdFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } public IdFunction(Expr arg) @@ -75,9 +75,10 @@ public final class IdFunction public boolean matches(Node context) { Object ret = evaluate(context, 1, 1); - return !((Collection) ret).isEmpty(); + return !((Collection<?>) ret).isEmpty(); } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/LangFunction.java b/libjava/classpath/gnu/xml/xpath/LangFunction.java index 584787e..33cf8b0 100644 --- a/libjava/classpath/gnu/xml/xpath/LangFunction.java +++ b/libjava/classpath/gnu/xml/xpath/LangFunction.java @@ -64,9 +64,9 @@ final class LangFunction final Expr arg; - LangFunction(List args) + LangFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } LangFunction(Expr arg) @@ -74,6 +74,7 @@ final class LangFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java b/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java index 84fb6d4..dbad9d3 100644 --- a/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java +++ b/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java @@ -59,9 +59,9 @@ final class LocalNameFunction final Expr arg; - LocalNameFunction(List args) + LocalNameFunction(List<Expr> args) { - this(args.size() > 0 ? (Expr) args.get(0) : null); + this(args.size() > 0 ? args.get(0) : null); } LocalNameFunction(Expr arg) @@ -69,11 +69,14 @@ final class LocalNameFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { - Object val = (arg == null) ? Collections.singleton(context) : - arg.evaluate(context, pos, len); - return _local_name(context, (Collection) val); + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> val = (arg == null) ? Collections.singleton(context) : + (Collection<Node>) arg.evaluate(context, pos, len); + return _local_name(context, val); } public Expr clone(Object context) diff --git a/libjava/classpath/gnu/xml/xpath/NameFunction.java b/libjava/classpath/gnu/xml/xpath/NameFunction.java index ea49741..239a534 100644 --- a/libjava/classpath/gnu/xml/xpath/NameFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NameFunction.java @@ -67,9 +67,9 @@ final class NameFunction final Expr arg; - NameFunction(List args) + NameFunction(List<Expr> args) { - this(args.size() > 0 ? (Expr) args.get(0) : null); + this(args.size() > 0 ? args.get(0) : null); } NameFunction(Expr arg) @@ -77,24 +77,30 @@ final class NameFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { - Object val = (arg == null) ? Collections.singleton(context) : - arg.evaluate(context, pos, len); - return _name(context, (Collection) val); + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> val = (arg == null) ? Collections.singleton(context) : + (Collection<Node>) arg.evaluate(context, pos, len); + return _name(context, val); } + @Override public Expr clone(Object context) { return new NameFunction((arg == null) ? null : arg.clone(context)); } - + + @Override public boolean references(QName var) { return (arg == null) ? false : arg.references(var); } + @Override public String toString() { return (arg == null) ? "name()" : "name(" + arg + ")"; diff --git a/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java b/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java index 3ae46f7..56da90f 100644 --- a/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java @@ -59,9 +59,9 @@ final class NamespaceUriFunction final Expr arg; - NamespaceUriFunction(List args) + NamespaceUriFunction(List<Expr> args) { - this(args.size() > 0 ? (Expr) args.get(0) : null); + this(args.size() > 0 ? args.get(0) : null); } NamespaceUriFunction(Expr arg) @@ -69,11 +69,14 @@ final class NamespaceUriFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { - Object val = (arg == null) ? Collections.singleton(context) : - arg.evaluate(context, pos, len); - return _namespace_uri(context, (Collection) val); + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> val = (arg == null) ? Collections.singleton(context) : + (Collection<Node>) arg.evaluate(context, pos, len); + return _namespace_uri(context, val); } public Expr clone(Object context) diff --git a/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java b/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java index b7358e8..30069ac 100644 --- a/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.util.List; import java.util.StringTokenizer; import javax.xml.namespace.QName; @@ -59,9 +61,9 @@ final class NormalizeSpaceFunction final Expr arg; - NormalizeSpaceFunction(List args) + NormalizeSpaceFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } NormalizeSpaceFunction(Expr arg) @@ -69,12 +71,13 @@ final class NormalizeSpaceFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = (arg == null) ? null : arg.evaluate(context, pos, len); String s = _string(context, val); StringTokenizer st = new StringTokenizer(s, " \t\r\n"); - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); if (st.hasMoreTokens()) { buf.append(st.nextToken()); diff --git a/libjava/classpath/gnu/xml/xpath/NotFunction.java b/libjava/classpath/gnu/xml/xpath/NotFunction.java index bbed66a..188b3db 100644 --- a/libjava/classpath/gnu/xml/xpath/NotFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NotFunction.java @@ -53,9 +53,9 @@ final class NotFunction final Expr arg; - NotFunction(List args) + NotFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } NotFunction(Expr arg) @@ -63,6 +63,7 @@ final class NotFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/NumberFunction.java b/libjava/classpath/gnu/xml/xpath/NumberFunction.java index 79553ce..8804a78 100644 --- a/libjava/classpath/gnu/xml/xpath/NumberFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NumberFunction.java @@ -68,9 +68,9 @@ final class NumberFunction final Expr arg; - NumberFunction(List args) + NumberFunction(List<Expr> args) { - this(args.size() > 0 ? (Expr) args.get(0) : null); + this(args.size() > 0 ? args.get(0) : null); } NumberFunction(Expr arg) @@ -78,6 +78,7 @@ final class NumberFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = (arg == null) ? null : arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java b/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java index f343857..adadd67 100644 --- a/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java +++ b/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java @@ -60,12 +60,17 @@ final class ParenthesizedExpr this.expr = expr; } + @Override public Object evaluate(Node context, int pos, int len) { Object ret = expr.evaluate(context, pos, len); if (ret instanceof Collection) { - List list = new ArrayList((Collection) ret); + /* Suppression is safe, as we know context produces + Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> nodes = (Collection<Node>) ret; + List<Node> list = new ArrayList<Node>(nodes); Collections.sort(list, documentOrderComparator); ret = list; } diff --git a/libjava/classpath/gnu/xml/xpath/Path.java b/libjava/classpath/gnu/xml/xpath/Path.java index 4b01f09..809f965 100644 --- a/libjava/classpath/gnu/xml/xpath/Path.java +++ b/libjava/classpath/gnu/xml/xpath/Path.java @@ -49,6 +49,6 @@ abstract class Path extends Pattern { - abstract Collection evaluate(Node context, Collection nodeSet); + abstract Collection<Node> evaluate(Node context, Collection<Node> nodeSet); } diff --git a/libjava/classpath/gnu/xml/xpath/Root.java b/libjava/classpath/gnu/xml/xpath/Root.java index 1f79b39..cbcb249 100644 --- a/libjava/classpath/gnu/xml/xpath/Root.java +++ b/libjava/classpath/gnu/xml/xpath/Root.java @@ -39,6 +39,8 @@ package gnu.xml.xpath; import java.util.Collection; import java.util.Collections; +import java.util.Set; + import javax.xml.namespace.QName; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -59,12 +61,14 @@ public final class Root public Object evaluate(Node context, int pos, int len) { - return evaluate(context, Collections.EMPTY_SET); + Set<Node> emptySet = Collections.emptySet(); + return evaluate(context, emptySet); } - Collection evaluate(Node context, Collection ns) + @Override + Collection<Node> evaluate(Node context, Collection<Node> ns) { - Document doc = (context instanceof Document) ? (Document) context : + Node doc = (context instanceof Document) ? context : context.getOwnerDocument(); return Collections.singleton(doc); } diff --git a/libjava/classpath/gnu/xml/xpath/RoundFunction.java b/libjava/classpath/gnu/xml/xpath/RoundFunction.java index bfbfd35..2d1bd54 100644 --- a/libjava/classpath/gnu/xml/xpath/RoundFunction.java +++ b/libjava/classpath/gnu/xml/xpath/RoundFunction.java @@ -60,9 +60,9 @@ final class RoundFunction final Expr arg; - RoundFunction(List args) + RoundFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } RoundFunction(Expr arg) @@ -70,6 +70,7 @@ final class RoundFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/Selector.java b/libjava/classpath/gnu/xml/xpath/Selector.java index c7abb33..429b3f7 100644 --- a/libjava/classpath/gnu/xml/xpath/Selector.java +++ b/libjava/classpath/gnu/xml/xpath/Selector.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -82,7 +84,7 @@ public final class Selector */ final Test[] tests; - public Selector(int axis, List tests) + public Selector(int axis, List<? extends Test> tests) { this.axis = axis; int len = tests.size(); @@ -177,29 +179,31 @@ public final class Selector return count; } + + @Override public Object evaluate(Node context, int pos, int len) { - Set acc = new LinkedHashSet(); + Set<Node> acc = new LinkedHashSet<Node>(); addCandidates(context, acc); - List candidates = new ArrayList(acc); - List ret = filterCandidates(candidates, false); + List<Node> candidates = new ArrayList<Node>(acc); + List<Node> ret = filterCandidates(candidates, false); return ret; } - Collection evaluate(Node context, Collection ns) + Collection<Node> evaluate(Node context, Collection<Node> ns) { - Set acc = new LinkedHashSet(); - for (Iterator i = ns.iterator(); i.hasNext(); ) - addCandidates((Node) i.next(), acc); - List candidates = new ArrayList(acc); - List ret = filterCandidates(candidates, true); + Set<Node> acc = new LinkedHashSet<Node>(); + for (Iterator<Node> i = ns.iterator(); i.hasNext(); ) + addCandidates(i.next(), acc); + List<Node> candidates = new ArrayList<Node>(acc); + List<Node> ret = filterCandidates(candidates, true); return ret; } /** * Filter the given list of candidates according to the node tests. */ - List filterCandidates(List candidates, boolean cascade) + List<Node> filterCandidates(List<Node> candidates, boolean cascade) { int len = candidates.size(); int tlen = tests.length; @@ -209,10 +213,10 @@ public final class Selector for (int j = 0; j < tlen && len > 0; j++) { Test test = tests[j]; - List successful = new ArrayList(len); + List<Node> successful = new ArrayList<Node>(len); for (int i = 0; i < len; i++) { - Node node = (Node) candidates.get(i); + Node node = candidates.get(i); if (cascade) { // Documents and DocumentFragments should be considered @@ -242,7 +246,7 @@ public final class Selector return candidates; } - void addCandidates(Node context, Collection candidates) + void addCandidates(Node context, Collection<Node> candidates) { // Build list of candidates switch (axis) @@ -291,7 +295,7 @@ public final class Selector } } - void addChildNodes(Node context, Collection acc, boolean recurse) + void addChildNodes(Node context, Collection<Node> acc, boolean recurse) { Node child = context.getFirstChild(); while (child != null) @@ -303,7 +307,7 @@ public final class Selector } } - void addParentNode(Node context, Collection acc, boolean recurse) + void addParentNode(Node context, Collection<Node> acc, boolean recurse) { Node parent = (context.getNodeType() == Node.ATTRIBUTE_NODE) ? ((Attr) context).getOwnerElement() : context.getParentNode(); @@ -315,7 +319,7 @@ public final class Selector } } - void addFollowingNodes(Node context, Collection acc, boolean recurse) + void addFollowingNodes(Node context, Collection<Node> acc, boolean recurse) { if (context != null && recurse) addChildNodes(context, acc, true); @@ -349,7 +353,7 @@ public final class Selector } } - void addPrecedingNodes(Node context, Collection acc, boolean recurse) + void addPrecedingNodes(Node context, Collection<Node> acc, boolean recurse) { Node cur = (context.getNodeType() == Node.ATTRIBUTE_NODE) ? null : context.getPreviousSibling(); @@ -370,7 +374,7 @@ public final class Selector } } - void addAttributes(Node context, Collection acc) + void addAttributes(Node context, Collection<Node> acc) { NamedNodeMap attrs = context.getAttributes(); if (attrs != null) @@ -387,7 +391,7 @@ public final class Selector } } - void addNamespaceAttributes(Node context, Collection acc) + void addNamespaceAttributes(Node context, Collection<Node> acc) { NamedNodeMap attrs = context.getAttributes(); if (attrs != null) @@ -413,7 +417,7 @@ public final class Selector public Expr clone(Object context) { int len = tests.length; - List tests2 = new ArrayList(len); + List<Test> tests2 = new ArrayList<Test>(len); for (int i = 0; i < len; i++) tests2.add(tests[i].clone(context)); return new Selector(axis, tests2); @@ -431,7 +435,7 @@ public final class Selector public String toString() { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); switch (axis) { case ANCESTOR: diff --git a/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java b/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java index ec02155..2dc2c40 100644 --- a/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java +++ b/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java @@ -54,9 +54,9 @@ final class StartsWithFunction final Expr arg1; final Expr arg2; - StartsWithFunction(List args) + StartsWithFunction(List<Expr> args) { - this((Expr) args.get(0), (Expr) args.get(1)); + this(args.get(0), args.get(1)); } StartsWithFunction(Expr arg1, Expr arg2) diff --git a/libjava/classpath/gnu/xml/xpath/Steps.java b/libjava/classpath/gnu/xml/xpath/Steps.java index 9ef6cd3..427fbe2 100644 --- a/libjava/classpath/gnu/xml/xpath/Steps.java +++ b/libjava/classpath/gnu/xml/xpath/Steps.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -56,14 +58,14 @@ public final class Steps extends Path { - final LinkedList path; + final LinkedList<Expr> path; public Steps() { - this(new LinkedList()); + this(new LinkedList<Expr>()); } - Steps(LinkedList path) + Steps(LinkedList<Expr> path) { this.path = path; } @@ -84,10 +86,8 @@ public final class Steps if (pos > 0) { Pattern left = (Pattern) path.get(pos - 1); - Iterator j = possibleContexts(right, context).iterator(); - while (j.hasNext()) + for (Node candidate : possibleContexts(right, context)) { - Node candidate = (Node) j.next(); if (left.matches(candidate) && matches(candidate, pos - 1)) { @@ -104,12 +104,12 @@ public final class Steps * Essentially the reverse of Selector.addCandidates. * The idea is to determine possible context nodes for a match. */ - Collection possibleContexts(Pattern pattern, Node context) + Collection<Node> possibleContexts(Pattern pattern, Node context) { if (pattern instanceof Selector) { Selector s = (Selector) pattern; - Collection candidates = new LinkedHashSet(); + Collection<Node> candidates = new LinkedHashSet<Node>(); switch (s.axis) { case Selector.PARENT: @@ -157,46 +157,53 @@ public final class Steps } return candidates; } - return Collections.EMPTY_SET; + return Collections.emptySet(); } + @Override public Object evaluate(Node context, int pos, int len) { //System.err.println(toString()+" evaluate"); // Left to right - Iterator i = path.iterator(); - Expr lhs = (Expr) i.next(); + Iterator<Expr> i = path.iterator(); + Expr lhs = i.next(); Object val = lhs.evaluate(context, pos, len); //System.err.println("\tevaluate "+lhs+" = "+val); while (val instanceof Collection && i.hasNext()) { Path rhs = (Path) i.next(); - val = rhs.evaluate(context, (Collection) val); + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> nodes = (Collection<Node>) val; + val = rhs.evaluate(context, nodes); //System.err.println("\tevaluate "+rhs+" = "+val); } return val; } - Collection evaluate(Node context, Collection ns) + @Override + Collection<Node> evaluate(Node context, Collection<Node> ns) { // Left to right - Iterator i = path.iterator(); - Expr lhs = (Expr) i.next(); + Iterator<Expr> i = path.iterator(); + Expr lhs = i.next(); if (lhs instanceof Path) { ns = ((Path) lhs).evaluate(context, ns); } else { - Set acc = new LinkedHashSet(); + Set<Node> acc = new LinkedHashSet<Node>(); int pos = 1, len = ns.size(); - for (Iterator j = ns.iterator(); j.hasNext(); ) + for (Node node : ns) { - Node node = (Node) j.next(); Object ret = lhs.evaluate(node, pos++, len); if (ret instanceof Collection) { - acc.addAll((Collection) ret); + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> nodes = (Collection<Node>) ret; + acc.addAll(nodes); } } ns = acc; @@ -212,19 +219,19 @@ public final class Steps public Expr clone(Object context) { int len = path.size(); - LinkedList path2 = new LinkedList(); + LinkedList<Expr> path2 = new LinkedList<Expr>(); for (int i = 0; i < len; i++) { - path2.add(((Expr) path.get(i)).clone(context)); + path2.add(path.get(i).clone(context)); } return new Steps(path2); } public boolean references(QName var) { - for (Iterator i = path.iterator(); i.hasNext(); ) + for (Iterator<Expr> i = path.iterator(); i.hasNext(); ) { - if (((Expr) i.next()).references(var)) + if (i.next().references(var)) { return true; } @@ -234,16 +241,16 @@ public final class Steps public String toString() { - StringBuffer buf = new StringBuffer(); - Iterator i = path.iterator(); - Expr expr = (Expr) i.next(); + CPStringBuilder buf = new CPStringBuilder(); + Iterator<Expr> i = path.iterator(); + Expr expr = i.next(); if (!(expr instanceof Root)) { buf.append(expr); } while (i.hasNext()) { - expr = (Expr) i.next(); + expr = i.next(); buf.append('/'); buf.append(expr); } diff --git a/libjava/classpath/gnu/xml/xpath/StringFunction.java b/libjava/classpath/gnu/xml/xpath/StringFunction.java index 0a4c681..b8cba37 100644 --- a/libjava/classpath/gnu/xml/xpath/StringFunction.java +++ b/libjava/classpath/gnu/xml/xpath/StringFunction.java @@ -84,9 +84,9 @@ final class StringFunction final Expr arg; - StringFunction(List args) + StringFunction(List<Expr> args) { - this(args.size() > 0 ? (Expr) args.get(0) : null); + this(args.size() > 0 ? args.get(0) : null); } StringFunction(Expr arg) diff --git a/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java b/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java index 7f5ceaf..561537e 100644 --- a/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java +++ b/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java @@ -55,7 +55,7 @@ final class StringLengthFunction final Expr arg; - StringLengthFunction(List args) + StringLengthFunction(List<Expr> args) { this(args.isEmpty() ? null : (Expr) args.get(0)); } @@ -65,6 +65,7 @@ final class StringLengthFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = (arg == null) ? null : arg.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java b/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java index 8144cf8..ad75f2e 100644 --- a/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java @@ -58,9 +58,9 @@ final class SubstringAfterFunction final Expr arg1; final Expr arg2; - SubstringAfterFunction(List args) + SubstringAfterFunction(List<Expr> args) { - this((Expr) args.get(0), (Expr) args.get(1)); + this(args.get(0), args.get(1)); } SubstringAfterFunction(Expr arg1, Expr arg2) diff --git a/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java b/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java index 2d92a3e..1bf1657 100644 --- a/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java @@ -57,9 +57,9 @@ final class SubstringBeforeFunction final Expr arg1; final Expr arg2; - SubstringBeforeFunction(List args) + SubstringBeforeFunction(List<Expr> args) { - this((Expr) args.get(0), (Expr) args.get(1)); + this(args.get(0), args.get(1)); } SubstringBeforeFunction(Expr arg1, Expr arg2) diff --git a/libjava/classpath/gnu/xml/xpath/SubstringFunction.java b/libjava/classpath/gnu/xml/xpath/SubstringFunction.java index e926f6c..33bcade 100644 --- a/libjava/classpath/gnu/xml/xpath/SubstringFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SubstringFunction.java @@ -60,10 +60,10 @@ final class SubstringFunction final Expr arg2; final Expr arg3; - SubstringFunction(List args) + SubstringFunction(List<Expr> args) { - this((Expr) args.get(0), (Expr) args.get(1), - (args.size() > 2) ? (Expr) args.get(2) : null); + this(args.get(0), args.get(1), + (args.size() > 2) ? args.get(2) : null); } SubstringFunction(Expr arg1, Expr arg2, Expr arg3) @@ -73,6 +73,7 @@ final class SubstringFunction this.arg3 = arg3; } + @Override public Object evaluate(Node context, int pos, int len) { Object val1 = arg1.evaluate(context, pos, len); diff --git a/libjava/classpath/gnu/xml/xpath/SumFunction.java b/libjava/classpath/gnu/xml/xpath/SumFunction.java index 93c2e80..73db2a9 100644 --- a/libjava/classpath/gnu/xml/xpath/SumFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SumFunction.java @@ -56,9 +56,9 @@ final class SumFunction final Expr arg; - SumFunction(List args) + SumFunction(List<Expr> args) { - this((Expr) args.get(0)); + this(args.get(0)); } SumFunction(Expr arg) @@ -66,15 +66,19 @@ final class SumFunction this.arg = arg; } + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); double sum = 0.0d; if (val instanceof Collection) { - for (Iterator i = ((Collection) val).iterator(); i.hasNext(); ) + /* Suppression is safe, as we know context produces + Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> nodes = (Collection<Node>) val; + for (Node node : nodes) { - Node node = (Node) i.next(); String s = stringValue(node); sum += _number(context, s); } diff --git a/libjava/classpath/gnu/xml/xpath/TranslateFunction.java b/libjava/classpath/gnu/xml/xpath/TranslateFunction.java index 54e8b9c..8b4b8b2 100644 --- a/libjava/classpath/gnu/xml/xpath/TranslateFunction.java +++ b/libjava/classpath/gnu/xml/xpath/TranslateFunction.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.util.List; import javax.xml.namespace.QName; import org.w3c.dom.Node; @@ -66,9 +68,9 @@ final class TranslateFunction final Expr arg2; final Expr arg3; - TranslateFunction(List args) + TranslateFunction(List<Expr> args) { - this((Expr) args.get(0), (Expr) args.get(1), (Expr) args.get(2)); + this(args.get(0), args.get(1), args.get(2)); } TranslateFunction(Expr arg1, Expr arg2, Expr arg3) @@ -86,7 +88,7 @@ final class TranslateFunction String string = _string(context, val1); String search = _string(context, val2); String replace = _string(context, val3); - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); int l1 = string.length(); int l2 = search.length(); int l3 = replace.length(); @@ -110,7 +112,7 @@ final class TranslateFunction buf.append(c); } } - return new String(buf); + return buf.toString(); } public Expr clone(Object context) diff --git a/libjava/classpath/gnu/xml/xpath/UnionExpr.java b/libjava/classpath/gnu/xml/xpath/UnionExpr.java index 5078713..03ae5c0 100644 --- a/libjava/classpath/gnu/xml/xpath/UnionExpr.java +++ b/libjava/classpath/gnu/xml/xpath/UnionExpr.java @@ -74,20 +74,29 @@ public final class UnionExpr return false; } + @Override public Object evaluate(Node context, int pos, int len) { Object left = lhs.evaluate(context, pos, len); Object right = rhs.evaluate(context, pos, len); + List<Node> list; if (left instanceof Collection && right instanceof Collection) { - Set set = new HashSet(); - set.addAll ((Collection) left); - set.addAll ((Collection) right); - List list = new ArrayList(set); + Set<Node> set = new HashSet<Node>(); + /* Suppression is safe as addAll will check the types + of the elements and throw a ClassCastException as necessary */ + @SuppressWarnings("unchecked") + Collection<Node> l = (Collection<Node>) left; + @SuppressWarnings("unchecked") + Collection<Node> r = (Collection<Node>) right; + set.addAll (l); + set.addAll (r); + list = new ArrayList<Node>(set); Collections.sort(list, documentOrderComparator); - return list; } - return Collections.EMPTY_SET; + else + list = Collections.emptyList(); + return list; } public Expr clone(Object context) diff --git a/libjava/classpath/gnu/xml/xpath/VariableReference.java b/libjava/classpath/gnu/xml/xpath/VariableReference.java index 813a37f..9ef6f16 100644 --- a/libjava/classpath/gnu/xml/xpath/VariableReference.java +++ b/libjava/classpath/gnu/xml/xpath/VariableReference.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import javax.xml.namespace.QName; import javax.xml.xpath.XPathVariableResolver; import org.w3c.dom.Node; @@ -86,7 +88,7 @@ public class VariableReference public String toString() { - StringBuffer buf = new StringBuffer("$"); + CPStringBuilder buf = new CPStringBuilder("$"); String prefix = name.getPrefix(); if (prefix != null && !"".equals(prefix)) { diff --git a/libjava/classpath/gnu/xml/xpath/XPathParser.java b/libjava/classpath/gnu/xml/xpath/XPathParser.java index 9b7540a..e8c8e94 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathParser.java +++ b/libjava/classpath/gnu/xml/xpath/XPathParser.java @@ -79,7 +79,7 @@ public class XPathParser return qName; } - Expr lookupFunction(String name, List args) + Expr lookupFunction(String name, List<Expr> args) { int arity = args.size(); if ("position".equals(name) && arity == 0) @@ -491,7 +491,7 @@ case 5: else { steps = new Steps(); - steps.path.addFirst(yyVals[0+yyTop]); + steps.path.addFirst((Expr) yyVals[0+yyTop]); } steps.path.addFirst(new Root()); yyVal = steps; @@ -512,7 +512,7 @@ case 6: else { steps = new Steps(); - steps.path.addFirst(yyVals[0+yyTop]); + steps.path.addFirst((Expr) yyVals[0+yyTop]); } steps.path.addFirst(s); steps.path.addFirst(new Root()); @@ -532,9 +532,9 @@ case 8: else { steps = new Steps(); - steps.path.addFirst(yyVals[-2+yyTop]); + steps.path.addFirst((Expr) yyVals[-2+yyTop]); } - steps.path.addLast(yyVals[0+yyTop]); + steps.path.addLast((Expr) yyVals[0+yyTop]); yyVal = steps; /*$$ = new Step((Expr) $1, (Path) $3);*/ } @@ -553,10 +553,10 @@ case 9: else { steps = new Steps(); - steps.path.addFirst(yyVals[-2+yyTop]); + steps.path.addFirst((Expr) yyVals[-2+yyTop]); } steps.path.addLast(s); - steps.path.addLast(yyVals[0+yyTop]); + steps.path.addLast((Expr) yyVals[0+yyTop]); yyVal = steps; /*Step step = new Step(s, (Path) $3);*/ /*$$ = new Step((Expr) $1, step);*/ @@ -565,48 +565,56 @@ case 9: case 10: // line 362 "XPathParser.y" { - yyVal = new Selector (Selector.CHILD, (List) yyVals[0+yyTop]); - } + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>) yyVals[0+yyTop]; + yyVal = new Selector (Selector.CHILD, tests); + } break; case 11: // line 366 "XPathParser.y" { - yyVal = new Selector (Selector.ATTRIBUTE, (List) yyVals[0+yyTop]); - } + /* This is safe as we create this in one of the other cases */ + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>) yyVals[0+yyTop]; + yyVal = new Selector (Selector.ATTRIBUTE, tests); + } break; case 12: // line 370 "XPathParser.y" { - yyVal = new Selector (((Integer) yyVals[-2+yyTop]).intValue (), (List) yyVals[0+yyTop]); - } + /* This is safe as we create this in one of the other cases */ + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>) yyVals[0+yyTop]; + yyVal = new Selector (((Integer) yyVals[-2+yyTop]).intValue (), tests); + } break; case 13: // line 374 "XPathParser.y" { - yyVal = new Selector (Selector.SELF, Collections.EMPTY_LIST); - } + List<Test> emptyList = Collections.emptyList(); + yyVal = new Selector (Selector.SELF, emptyList); + } break; case 14: // line 378 "XPathParser.y" { - yyVal = new Selector (Selector.PARENT, Collections.EMPTY_LIST); - } + List<Test> emptyList = Collections.emptyList(); + yyVal = new Selector (Selector.PARENT, emptyList); + } break; case 15: // line 385 "XPathParser.y" { - List list = new ArrayList(); - list.add(yyVals[0+yyTop]); + List<Test> list = new ArrayList<Test>(); + list.add((Test) yyVals[0+yyTop]); yyVal = list; } break; case 16: // line 391 "XPathParser.y" { - List list = (List)yyVals[-1+yyTop]; - list.add(yyVals[0+yyTop]); - yyVal = list; - } + /* This is safe as we create this in one of the other cases */ + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>)yyVals[-1+yyTop]; + tests.add((Test) yyVals[0+yyTop]); + yyVal = tests; + } break; case 17: // line 415 "XPathParser.y" @@ -725,30 +733,34 @@ case 37: case 39: // line 508 "XPathParser.y" { - yyVal = lookupFunction((String) yyVals[-2+yyTop], Collections.EMPTY_LIST); - } + List<Expr> emptyList = Collections.emptyList(); + yyVal = lookupFunction((String) yyVals[-2+yyTop], emptyList); + } break; case 40: // line 512 "XPathParser.y" { - yyVal = lookupFunction((String) yyVals[-3+yyTop], (List) yyVals[-1+yyTop]); - } + /* This is safe as we create this below */ + @SuppressWarnings("unchecked") List<Expr> exprs = (List<Expr>) yyVals[-1+yyTop]; + yyVal = lookupFunction((String) yyVals[-3+yyTop], exprs); + } break; case 41: // line 519 "XPathParser.y" { - List list = new ArrayList(); - list.add(yyVals[0+yyTop]); + List<Expr> list = new ArrayList<Expr>(); + list.add((Expr) yyVals[0+yyTop]); yyVal = list; } break; case 42: // line 525 "XPathParser.y" { - List list = (List) yyVals[0+yyTop]; - list.add(0, yyVals[-2+yyTop]); - yyVal = list; - } + /* This is safe as we create this above */ + @SuppressWarnings("unchecked") List<Expr> list = (List<Expr>) yyVals[0+yyTop]; + list.add(0, (Expr) yyVals[-2+yyTop]); + yyVal = list; + } break; case 44: // line 535 "XPathParser.y" @@ -767,9 +779,9 @@ case 47: else { steps = new Steps(); - steps.path.addFirst(yyVals[0+yyTop]); + steps.path.addFirst((Expr) yyVals[0+yyTop]); } - steps.path.addFirst(yyVals[-2+yyTop]); + steps.path.addFirst((Expr) yyVals[-2+yyTop]); yyVal = steps; /*$$ = new Step ((Expr) $1, (Path) $3);*/ } @@ -788,10 +800,10 @@ case 48: else { steps = new Steps(); - steps.path.addFirst(yyVals[0+yyTop]); + steps.path.addFirst((Expr) yyVals[0+yyTop]); } steps.path.addFirst(s); - steps.path.addFirst(yyVals[-2+yyTop]); + steps.path.addFirst((Expr) yyVals[-2+yyTop]); yyVal = steps; /*Step step = new Step (s, (Path) $3);*/ /*$$ = new Step ((Expr) $1, step);*/ @@ -811,7 +823,7 @@ case 50: else { steps = new Steps(); - steps.path.addFirst(yyVals[-1+yyTop]); + steps.path.addFirst((Expr) yyVals[-1+yyTop]); } steps.path.addLast(s); yyVal = steps; diff --git a/libjava/classpath/gnu/xml/xpath/XPathParser.y b/libjava/classpath/gnu/xml/xpath/XPathParser.y index 5501513..a6d3fd1 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathParser.y +++ b/libjava/classpath/gnu/xml/xpath/XPathParser.y @@ -78,7 +78,7 @@ public class XPathParser return qName; } - Expr lookupFunction(String name, List args) + Expr lookupFunction(String name, List<Expr> args) { int arity = args.size(); if ("position".equals(name) && arity == 0) @@ -287,7 +287,7 @@ absolute_location_path: else { steps = new Steps(); - steps.path.addFirst($2); + steps.path.addFirst((Expr) $2); } steps.path.addFirst(new Root()); $$ = steps; @@ -306,7 +306,7 @@ absolute_location_path: else { steps = new Steps(); - steps.path.addFirst($2); + steps.path.addFirst((Expr) $2); } steps.path.addFirst(s); steps.path.addFirst(new Root()); @@ -328,9 +328,9 @@ relative_location_path: else { steps = new Steps(); - steps.path.addFirst($1); + steps.path.addFirst((Expr) $1); } - steps.path.addLast($3); + steps.path.addLast((Expr) $3); $$ = steps; //$$ = new Step((Expr) $1, (Path) $3); } @@ -347,10 +347,10 @@ relative_location_path: else { steps = new Steps(); - steps.path.addFirst($1); + steps.path.addFirst((Expr) $1); } steps.path.addLast(s); - steps.path.addLast($3); + steps.path.addLast((Expr) $3); $$ = steps; //Step step = new Step(s, (Path) $3); //$$ = new Step((Expr) $1, step); @@ -360,37 +360,43 @@ relative_location_path: step: step_node_test { - $$ = new Selector (Selector.CHILD, (List) $1); + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>) $1; + $$ = new Selector (Selector.CHILD, tests); } | AT step_node_test { - $$ = new Selector (Selector.ATTRIBUTE, (List) $2); + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>) $2; + $$ = new Selector (Selector.ATTRIBUTE, tests); } | axis_name DOUBLE_COLON step_node_test { - $$ = new Selector (((Integer) $1).intValue (), (List) $3); + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>) $3; + $$ = new Selector (((Integer) $1).intValue (), tests); } | DOT { - $$ = new Selector (Selector.SELF, Collections.EMPTY_LIST); + List<Test> emptyList = Collections.emptyList(); + $$ = new Selector (Selector.SELF, emptyList); } | DOUBLE_DOT { - $$ = new Selector (Selector.PARENT, Collections.EMPTY_LIST); + List<Test> emptyList = Collections.emptyList(); + $$ = new Selector (Selector.PARENT, emptyList); } ; step_node_test: node_test { - List list = new ArrayList(); - list.add($1); + List<Test> list = new ArrayList<Test>(); + list.add((Test) $1); $$ = list; } | step_node_test predicate { - List list = (List)$1; - list.add($2); + /* This is safe as we create this in one of the other cases */ + @SuppressWarnings("unchecked") List<Test> tests = (List<Test>)$1; + tests.add((Test) $2); $$ = list; } ; @@ -506,25 +512,29 @@ primary_expr: function_call: function_name LP RP { - $$ = lookupFunction((String) $1, Collections.EMPTY_LIST); + List<Expr> emptyList = Collections.emptyList(); + $$ = lookupFunction((String) $1, emptyList); } | function_name LP argument_list RP { - $$ = lookupFunction((String) $1, (List) $3); + /* This is safe as we create this below */ + @SuppressWarnings("unchecked") List<Expr> exprs = (List<Expr>) $3; + $$ = lookupFunction((String) $1, (List) exprs); } ; argument_list: expr { - List list = new ArrayList(); - list.add($1); + List<Expr> list = new ArrayList<Expr>(); + list.add((Expr) $1); $$ = list; } | expr COMMA argument_list { - List list = (List) $3; - list.add(0, $1); + /* This is safe as we create this above */ + @SuppressWarnings("unchecked") List<Expr> list = (List<Expr>) $3; + list.add(0, (Expr) $1); $$ = list; } ; @@ -550,9 +560,9 @@ path_expr: else { steps = new Steps(); - steps.path.addFirst($3); + steps.path.addFirst((Expr) $3); } - steps.path.addFirst($1); + steps.path.addFirst((Expr) $1); $$ = steps; //$$ = new Step ((Expr) $1, (Path) $3); } @@ -572,7 +582,7 @@ path_expr: steps.path.addFirst($3); } steps.path.addFirst(s); - steps.path.addFirst($1); + steps.path.addFirst((Expr) $1); $$ = steps; //Step step = new Step (s, (Path) $3); //$$ = new Step ((Expr) $1, step); @@ -594,7 +604,7 @@ filter_expr: else { steps = new Steps(); - steps.path.addFirst($1); + steps.path.addFirst((Expr) $1); } steps.path.addLast(s); $$ = steps; diff --git a/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java b/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java index a287137..bf4516a 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java +++ b/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.xpath; +import gnu.java.lang.CPStringBuilder; + import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; @@ -90,7 +92,7 @@ implements XPathParser.yyInput } - static final Map keywords = new TreeMap (); + static final Map<String,Integer> keywords = new TreeMap<String,Integer> (); static { keywords.put ("ancestor", new Integer (XPathParser.ANCESTOR)); @@ -314,7 +316,7 @@ implements XPathParser.yyInput XPathToken consume_literal (int delimiter) throws IOException { - StringBuffer buf = new StringBuffer (); + CPStringBuilder buf = new CPStringBuilder (); while (true) { int c = in.read (); @@ -336,7 +338,7 @@ implements XPathParser.yyInput XPathToken consume_digits (int c) throws IOException { - StringBuffer buf = new StringBuffer (); + CPStringBuilder buf = new CPStringBuilder (); buf.append ((char) c); while (true) { @@ -357,7 +359,7 @@ implements XPathParser.yyInput XPathToken consume_name (int c) throws IOException { - StringBuffer buf = new StringBuffer (); + CPStringBuilder buf = new CPStringBuilder (); buf.append ((char) c); while (true) { |