
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
502 lines
15 KiB
Java
502 lines
15 KiB
Java
/* JobAttributes.java --
|
|
Copyright (C) 2002, 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.awt;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
/**
|
|
* Needs documentation...
|
|
*
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @since 1.3
|
|
* @status updated to 1.4, lacks documentation
|
|
*/
|
|
public final class JobAttributes implements Cloneable
|
|
{
|
|
public static final class DefaultSelectionType extends AttributeValue
|
|
{
|
|
private static final String[] NAMES = { "all", "range", "selection" };
|
|
public static final DefaultSelectionType ALL
|
|
= new DefaultSelectionType(0);
|
|
public static final DefaultSelectionType RANGE
|
|
= new DefaultSelectionType(1);
|
|
public static final DefaultSelectionType SELECTION
|
|
= new DefaultSelectionType(2);
|
|
private DefaultSelectionType(int value)
|
|
{
|
|
super(value, NAMES);
|
|
}
|
|
} // class DefaultSelectionType
|
|
|
|
public static final class DestinationType extends AttributeValue
|
|
{
|
|
private static final String[] NAMES = { "file", "printer" };
|
|
public static final DestinationType FILE = new DestinationType(0);
|
|
public static final DestinationType PRINTER = new DestinationType(1);
|
|
private DestinationType(int value)
|
|
{
|
|
super(value, NAMES);
|
|
}
|
|
} // class DestinationType
|
|
|
|
public static final class DialogType extends AttributeValue
|
|
{
|
|
private static final String[] NAMES = { "common", "native", "none" };
|
|
public static final DialogType COMMON = new DialogType(0);
|
|
public static final DialogType NATIVE = new DialogType(1);
|
|
public static final DialogType NONE = new DialogType(2);
|
|
private DialogType(int value)
|
|
{
|
|
super(value, NAMES);
|
|
}
|
|
} // class DialogType
|
|
|
|
public static final class MultipleDocumentHandlingType
|
|
extends AttributeValue
|
|
{
|
|
private static final String[] NAMES = {
|
|
"separate-documents-collated-copies",
|
|
"separate-documents-uncollated-copies"
|
|
};
|
|
public static final MultipleDocumentHandlingType
|
|
SEPARATE_DOCUMENTS_COLLATED_COPIES
|
|
= new MultipleDocumentHandlingType(0);
|
|
public static final MultipleDocumentHandlingType
|
|
SEPARATE_DOCUMENTS_UNCOLLATED_COPIES
|
|
= new MultipleDocumentHandlingType(1);
|
|
private MultipleDocumentHandlingType(int value)
|
|
{
|
|
super(value, NAMES);
|
|
}
|
|
} // class MultipleDocumentHandlingType
|
|
|
|
public static final class SidesType extends AttributeValue
|
|
{
|
|
private static final String[] NAMES
|
|
= { "one-sided", "two-sided-long-edge", "two-sided-short-edge" };
|
|
public static final SidesType ONE_SIDED = new SidesType(0);
|
|
public static final SidesType TWO_SIDED_LONG_EDGE = new SidesType(1);
|
|
public static final SidesType TWO_SIDED_SHORT_EDGE = new SidesType(2);
|
|
private SidesType(int value)
|
|
{
|
|
super(value, NAMES);
|
|
}
|
|
} // class SidesType
|
|
|
|
private int copies;
|
|
private DefaultSelectionType selection;
|
|
private DestinationType destination;
|
|
private DialogType dialog;
|
|
private String filename;
|
|
private int maxPage;
|
|
private int minPage;
|
|
private MultipleDocumentHandlingType multiple;
|
|
private int[][] pageRanges; // null for default value
|
|
private int fromPage; // 0 for default value
|
|
private int toPage; // 0 for default value
|
|
private String printer;
|
|
private SidesType sides;
|
|
|
|
public JobAttributes()
|
|
{
|
|
copies = 1;
|
|
selection = DefaultSelectionType.ALL;
|
|
destination = DestinationType.PRINTER;
|
|
dialog = DialogType.NATIVE;
|
|
maxPage = Integer.MAX_VALUE;
|
|
minPage = 1;
|
|
multiple
|
|
= MultipleDocumentHandlingType.SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
|
|
sides = SidesType.ONE_SIDED;
|
|
}
|
|
|
|
public JobAttributes(JobAttributes attr)
|
|
{
|
|
set(attr);
|
|
}
|
|
|
|
public JobAttributes(int copies, DefaultSelectionType selection,
|
|
DestinationType destination, DialogType dialog,
|
|
String filename, int max, int min,
|
|
MultipleDocumentHandlingType multiple,
|
|
int[][] pageRanges, String printer, SidesType sides)
|
|
{
|
|
if (copies <= 0 || selection == null || destination == null
|
|
|| dialog == null || max < min || min <= 0 || multiple == null
|
|
|| sides == null)
|
|
throw new IllegalArgumentException();
|
|
this.copies = copies;
|
|
this.selection = selection;
|
|
this.destination = destination;
|
|
this.dialog = dialog;
|
|
this.filename = filename;
|
|
maxPage = max;
|
|
minPage = min;
|
|
this.multiple = multiple;
|
|
setPageRanges(pageRanges);
|
|
this.printer = printer;
|
|
this.sides = sides;
|
|
}
|
|
|
|
public Object clone()
|
|
{
|
|
return new JobAttributes(this);
|
|
}
|
|
|
|
public void set(JobAttributes attr)
|
|
{
|
|
copies = attr.copies;
|
|
selection = attr.selection;
|
|
destination = attr.destination;
|
|
dialog = attr.dialog;
|
|
filename = attr.filename;
|
|
maxPage = attr.maxPage;
|
|
minPage = attr.minPage;
|
|
multiple = attr.multiple;
|
|
pageRanges = (int[][]) attr.pageRanges.clone();
|
|
printer = attr.printer;
|
|
sides = attr.sides;
|
|
fromPage = attr.fromPage;
|
|
toPage = attr.toPage;
|
|
}
|
|
|
|
public int getCopies()
|
|
{
|
|
return copies;
|
|
}
|
|
|
|
public void setCopies(int copies)
|
|
{
|
|
if (copies <= 0)
|
|
throw new IllegalArgumentException();
|
|
this.copies = copies;
|
|
}
|
|
|
|
public void setCopiesToDefault()
|
|
{
|
|
copies = 1;
|
|
}
|
|
|
|
public DefaultSelectionType getDefaultSelection()
|
|
{
|
|
return selection;
|
|
}
|
|
|
|
public void setDefaultSelection(DefaultSelectionType selection)
|
|
{
|
|
if (selection == null)
|
|
throw new IllegalArgumentException();
|
|
this.selection = selection;
|
|
}
|
|
|
|
public DestinationType getDestination()
|
|
{
|
|
return destination;
|
|
}
|
|
|
|
public void setDestination(DestinationType destination)
|
|
{
|
|
if (destination == null)
|
|
throw new IllegalArgumentException();
|
|
this.destination = destination;
|
|
}
|
|
|
|
public DialogType getDialog()
|
|
{
|
|
return dialog;
|
|
}
|
|
|
|
public void setDialog(DialogType dialog)
|
|
{
|
|
if (dialog == null)
|
|
throw new IllegalArgumentException();
|
|
this.dialog = dialog;
|
|
}
|
|
|
|
public String getFileName()
|
|
{
|
|
return filename;
|
|
}
|
|
|
|
public void setFileName(String filename)
|
|
{
|
|
this.filename = filename;
|
|
}
|
|
|
|
public int getFromPage()
|
|
{
|
|
return fromPage != 0 ? fromPage
|
|
: pageRanges != null ? pageRanges[0][0]
|
|
: toPage != 0 ? toPage : minPage;
|
|
}
|
|
|
|
public void setFromPage(int fromPage)
|
|
{
|
|
if (fromPage < minPage || (fromPage > toPage && toPage != 0)
|
|
|| fromPage > maxPage)
|
|
throw new IllegalArgumentException();
|
|
if (pageRanges == null)
|
|
this.fromPage = fromPage;
|
|
}
|
|
|
|
public int getMaxPage()
|
|
{
|
|
return maxPage;
|
|
}
|
|
|
|
public void setMaxPage(int maxPage)
|
|
{
|
|
if (maxPage < minPage)
|
|
throw new IllegalArgumentException();
|
|
this.maxPage = maxPage;
|
|
if (maxPage < fromPage)
|
|
fromPage = maxPage;
|
|
if (maxPage < toPage)
|
|
toPage = maxPage;
|
|
if (pageRanges != null)
|
|
{
|
|
int i = pageRanges.length - 1;
|
|
while (i >= 0 && maxPage < pageRanges[i][1])
|
|
i--;
|
|
if (maxPage >= pageRanges[++i][0])
|
|
pageRanges[i++][1] = maxPage;
|
|
if (i == 0)
|
|
pageRanges = null;
|
|
else if (i < pageRanges.length)
|
|
{
|
|
int[][] tmp = new int[i][];
|
|
System.arraycopy(pageRanges, 0, tmp, 0, i);
|
|
pageRanges = tmp;
|
|
}
|
|
}
|
|
}
|
|
|
|
public int getMinPage()
|
|
{
|
|
return minPage;
|
|
}
|
|
|
|
public void setMinPage(int minPage)
|
|
{
|
|
if (minPage <= 0 || minPage > maxPage)
|
|
throw new IllegalArgumentException();
|
|
this.minPage = minPage;
|
|
if (minPage > toPage)
|
|
toPage = minPage;
|
|
if (minPage > fromPage)
|
|
fromPage = minPage;
|
|
if (pageRanges != null)
|
|
{
|
|
int size = pageRanges.length;
|
|
int i = 0;
|
|
while (i < size && minPage > pageRanges[i][0])
|
|
i++;
|
|
if (minPage <= pageRanges[i - 1][1])
|
|
pageRanges[--i][0] = minPage;
|
|
if (i == size)
|
|
pageRanges = null;
|
|
else if (i > 0)
|
|
{
|
|
int[][] tmp = new int[size - i][];
|
|
System.arraycopy(pageRanges, i, tmp, 0, size - i);
|
|
pageRanges = tmp;
|
|
}
|
|
}
|
|
}
|
|
|
|
public MultipleDocumentHandlingType getMultipleDocumentHandling()
|
|
{
|
|
return multiple;
|
|
}
|
|
|
|
public void setMultipleDocumentHandling
|
|
(MultipleDocumentHandlingType multiple)
|
|
{
|
|
if (multiple == null)
|
|
throw new IllegalArgumentException();
|
|
this.multiple = multiple;
|
|
}
|
|
|
|
public void setMultipleDocumentHandlingToDefault()
|
|
{
|
|
multiple
|
|
= MultipleDocumentHandlingType.SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
|
|
}
|
|
|
|
public int[][] getPageRanges()
|
|
{
|
|
if (pageRanges == null)
|
|
return new int[][] { { getFromPage(), getToPage() } };
|
|
// Perform a deep clone, so user code cannot affect original arrays.
|
|
int i = pageRanges.length;
|
|
int[][] result = new int[i][];
|
|
while (--i >= 0)
|
|
result[i] = (int[]) pageRanges[i].clone();
|
|
return result;
|
|
}
|
|
|
|
public void setPageRanges(int[][] pageRanges)
|
|
{
|
|
int size = pageRanges == null ? 0 : pageRanges.length;
|
|
if (size == 0)
|
|
throw new IllegalArgumentException();
|
|
while (--size >= 0)
|
|
{
|
|
int[] range = pageRanges[size];
|
|
if (range == null || range.length != 2
|
|
|| range[0] < minPage || range[1] < range[0] || range[1] > maxPage
|
|
|| (size != 0 && range[0] <= pageRanges[size - 1][1]))
|
|
throw new IllegalArgumentException();
|
|
}
|
|
size = pageRanges.length;
|
|
if (fromPage > 0 && pageRanges[0][0] > fromPage)
|
|
fromPage = pageRanges[0][0];
|
|
if (toPage > 0 && pageRanges[size - 1][1] < toPage)
|
|
toPage = pageRanges[size - 1][1];
|
|
this.pageRanges = new int[size][];
|
|
while (--size >= 0)
|
|
this.pageRanges[size] = (int[]) pageRanges[size].clone();
|
|
}
|
|
|
|
public String getPrinter()
|
|
{
|
|
return printer;
|
|
}
|
|
|
|
public void setPrinter(String printer)
|
|
{
|
|
this.printer = printer;
|
|
}
|
|
|
|
public SidesType getSides()
|
|
{
|
|
return sides;
|
|
}
|
|
|
|
public void setSides(SidesType sides)
|
|
{
|
|
if (sides == null)
|
|
throw new IllegalArgumentException();
|
|
this.sides = sides;
|
|
}
|
|
|
|
public void setSidesToDefault()
|
|
{
|
|
sides = SidesType.ONE_SIDED;
|
|
}
|
|
|
|
public int getToPage()
|
|
{
|
|
return toPage != 0 ? toPage
|
|
: pageRanges != null ? pageRanges[pageRanges.length - 1][1]
|
|
: fromPage != 0 ? fromPage : maxPage;
|
|
}
|
|
|
|
public void setToPage(int toPage)
|
|
{
|
|
if (toPage < minPage || (fromPage > toPage && fromPage != 0)
|
|
|| toPage > maxPage)
|
|
throw new IllegalArgumentException();
|
|
if (pageRanges == null)
|
|
this.toPage = toPage;
|
|
}
|
|
|
|
public boolean equals(Object o)
|
|
{
|
|
if (this == o)
|
|
return true;
|
|
if (! (o instanceof JobAttributes))
|
|
return false;
|
|
JobAttributes ja = (JobAttributes) o;
|
|
if (copies != ja.copies || selection != ja.selection
|
|
|| destination != ja.destination || dialog != ja.dialog
|
|
|| ! filename.equals(ja.filename) || maxPage != ja.maxPage
|
|
|| minPage != ja.minPage || multiple != ja.multiple
|
|
|| fromPage != ja.fromPage || toPage != ja.toPage
|
|
|| ! printer.equals(ja.printer) || sides != ja.sides
|
|
|| (pageRanges == null) != (ja.pageRanges == null))
|
|
return false;
|
|
if (pageRanges != ja.pageRanges)
|
|
for (int i = pageRanges.length; --i >= 0; )
|
|
if (pageRanges[i][0] != ja.pageRanges[i][0]
|
|
|| pageRanges[i][1] != ja.pageRanges[i][1])
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
public int hashCode()
|
|
{
|
|
int hash = (selection.value << 6) ^ (destination.value << 5)
|
|
^ (dialog.value << 3) ^ (multiple.value << 2) ^ sides.value
|
|
^ (filename == null ? 0 : filename.hashCode())
|
|
^ (printer == null ? 0 : printer.hashCode());
|
|
// The effect of the above fields on the hashcode match the JDK. However,
|
|
// I am unable to reverse engineer the effect of the fields listed below,
|
|
// so I am using my own implementation. Note that this still satisfies
|
|
// the general contract of hashcode, it just doesn't match the JDK.
|
|
hash ^= (copies << 27) ^ (maxPage << 22) ^ (minPage << 17);
|
|
if (pageRanges == null)
|
|
hash ^= (getFromPage() << 13) ^ (getToPage() << 8);
|
|
else
|
|
for (int i = pageRanges.length; --i >= 0; )
|
|
hash ^= (pageRanges[i][0] << 13) ^ (pageRanges[i][1] << 8);
|
|
return hash;
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
CPStringBuilder s = new CPStringBuilder("copies=").append(copies)
|
|
.append(",defaultSelection=").append(selection).append(",destination=")
|
|
.append(destination).append(",dialog=").append(dialog)
|
|
.append(",fileName=").append(filename).append(",fromPage=")
|
|
.append(getFromPage()).append(",maxPage=").append(maxPage)
|
|
.append(",minPage=").append(minPage)
|
|
.append(",multiple-document-handling=").append(multiple)
|
|
.append(",page-ranges=[");
|
|
if (pageRanges == null)
|
|
s.append(minPage).append(':').append(minPage).append(']');
|
|
else
|
|
for (int i = 0; i < pageRanges.length; i++)
|
|
s.append(pageRanges[i][0]).append(':').append(pageRanges[i][1])
|
|
.append(',');
|
|
s.setLength(s.length() - 1);
|
|
return s.append("],printer=").append(printer).append(",sides=")
|
|
.append(sides).append(",toPage=").append(getToPage()).toString();
|
|
}
|
|
} // class JobAttributes
|