git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GNU Classpath import (libgcj-snapshot-20100921). 

2010-10-12  Andrew John Hughes  <ahughes@redhat.com>

	Import GNU Classpath (libgcj-snapshot-20100921).

	* libjava/Makefile.in: Regenerated.
	* libjava/javax/swing/text/html/StyleSheet.h,
	* libjava/javax/swing/text/html/MinimalHTMLWriter.h,
	* libjava/javax/swing/text/html/HTMLWriter.h,
	* libjava/javax/xml/stream/XMLEventFactory.h,
	* libjava/javax/xml/stream/XMLOutputFactory.h,
	* libjava/javax/xml/stream/events/Namespace.h,
	* libjava/javax/xml/stream/util/StreamReaderDelegate.h,
	* libjava/javax/security/auth/kerberos/KeyImpl.h,
	* libjava/javax/security/auth/kerberos/KerberosTicket.h:
	Regenerated.
	* libjava/classpath/Makefile.in,
	* libjava/classpath/depcomp,
	* libjava/classpath/scripts/Makefile.in,
	* libjava/classpath/resource/Makefile.in,
	* libjava/classpath/tools/Makefile.in:
	Regenerated.  Use libtool from top-level config directory.
	* libjava/classpath/tools/classes/gnu/classpath/tools/StringToolkit.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml$State.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/IOToolkit.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$OptionProcessor.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportClassFile.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocProxy.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BlockSourceComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree$FileNode.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/IgnoredFileParseException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TextTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$Context.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/InheritDocTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FunctionComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/AdditionExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Type.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NegateExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantDouble.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/EqualExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantChar.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Evaluator.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/DivisionExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantInteger.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantShort.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantLong.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantByte.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnaryExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantFloat.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ModuloExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantString.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NotExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/AndExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Context.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantNull.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantExpression.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportNotFound.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParamTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Timer.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourceComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/CommentComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionPackage.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/StaticBlockComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ValueTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SeeTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TemporaryStore.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionClass.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BracketClose.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParameterImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ScheduledClass.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportPackageFile.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SlashSlashCommentComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ErrorReporter.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MemberDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Debug.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MethodDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageDocImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ThrowsTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/EmptyStatementComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/LinkTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/AbstractTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParseException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Whitespace.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ImportComponent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourcePositionImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/JavadocWrapper.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeVariableImpl.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/NotifyingInputStreamReader.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniPrintStream.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/HashFinder.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/WrapUnWrapper.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/MethodGenerator.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceRmicCompiler.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/MalformedInputEvent.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletConfigurationException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$InterfaceRelation.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTag.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/TargetContext.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet$DocErrorReporterOutputStream.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$UsageType.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$NullErrorReporter.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer$TagInfo.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionColonSeparated.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$UsageType.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionString.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/CssClass.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$TreeNode.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/InvalidPackageWildcardException.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionFlag.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageMatcher.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/StandardTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionFile.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOption.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$IndexKey.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionGroup.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTagletPath.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageGroup.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader$JarStreamInfo.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader$FileStreamInfo.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CodeTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/GenericTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/ValueTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/AuthorTaglet$EmailReplacement.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/DeprecatedTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/SinceTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/AuthorTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/TagletContext.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/VersionTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CopyrightTaglet.class,
	* libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader.class,
	* libjava/classpath/tools/classes/com/sun/tools/javadoc/Main.class: Regenerated.
	* libjava/classpath/doc/Makefile.in,
	* libjava/classpath/doc/api/Makefile.in,
	* libjava/classpath/doc/texinfo.tex,
	* libjava/classpath/external/Makefile.in,
	* libjava/classpath/external/jsr166/Makefile.in,
	* libjava/classpath/external/sax/Makefile.in,
	* libjava/classpath/external/w3c_dom/Makefile.in,
	* libjava/classpath/external/relaxngDatatype/Makefile.in,
	* libjava/classpath/include/Makefile.in: Regenerated.
	* libjava/classpath/m4/lib-prefix.m4,
	* libjava/classpath/m4/lib-link.m4,
	* libjava/classpath/m4/lib-ld.m4: Removed.
	* libjava/classpath/native/jni/classpath/Makefile.in,
	* libjava/classpath/native/jni/gstreamer-peer/Makefile.in,
	* libjava/classpath/native/jni/midi-dssi/Makefile.in,
	* libjava/classpath/native/jni/Makefile.in,
	* libjava/classpath/native/jni/gconf-peer/Makefile.in,
	* libjava/classpath/native/jni/java-io/Makefile.in,
	* libjava/classpath/native/jni/native-lib/Makefile.in,
	* libjava/classpath/native/jni/native-lib/cpnet.c,
	* libjava/classpath/native/jni/java-util/Makefile.in,
	* libjava/classpath/native/jni/java-lang/Makefile.in,
	* libjava/classpath/native/jni/midi-alsa/Makefile.in,
	* libjava/classpath/native/jni/java-nio/Makefile.in,
	* libjava/classpath/native/jni/java-net/Makefile.in,
	* libjava/classpath/native/jni/java-math/Makefile.in,
	* libjava/classpath/native/jni/xmlj/Makefile.in,
	* libjava/classpath/native/jni/qt-peer/Makefile.in,
	* libjava/classpath/native/jni/gtk-peer/Makefile.in,
	* libjava/classpath/native/Makefile.in,
	* libjava/classpath/native/jawt/Makefile.in,
	* libjava/classpath/native/fdlibm/Makefile.in,
	* libjava/classpath/native/plugin/Makefile.in,
	* libjava/classpath/lib/java/util/regex/Matcher.class,
	* libjava/classpath/lib/java/util/TreeMap$3.class,
	* libjava/classpath/lib/java/util/Scanner.class,
	* libjava/classpath/lib/Makefile.in,
	* libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class,
	* libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class,
	* libjava/classpath/lib/org/omg/CORBA/portable/InputStream.class,
	* libjava/classpath/lib/org/omg/CORBA/portable/ObjectImpl.class,
	* libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class,
	* libjava/classpath/lib/org/omg/CORBA/LocalObject.class,
	* libjava/classpath/lib/org/omg/CORBA_2_3/portable/InputStream.class,
	* libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynValueStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynEnumStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynUnionStub.class,
	* libjava/classpath/lib/org/omg/DynamicAny/_DynFixedStub.class,
	* libjava/classpath/lib/org/ietf/jgss/GSSManager.class,
	* libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class,
	* libjava/classpath/lib/gnu/xml/stream/XIncludeFilter.class,
	* libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class,
	* libjava/classpath/lib/gnu/xml/stream/XMLEventFactoryImpl.class,
	* libjava/classpath/lib/gnu/xml/stream/XMLEventAllocatorImpl.class,
	* libjava/classpath/lib/gnu/xml/stream/XMLStreamWriterImpl.class,
	* libjava/classpath/lib/gnu/java/locale/LocaleData.class,
	* libjava/classpath/lib/gnu/javax/swing/text/html/css/Selector.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OperationsSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/SidesDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobId.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobMoreInfo.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/StatusMessage.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class,
	* libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class,
	* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class,
	* libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class,
	* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class,
	* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class,
	* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class,
	* libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache.class,
	* libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class,
	* libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class,
	* libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class,
	* libjava/classpath/lib/javax/swing/text/html/TableView$RowView.class,
	* libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.class,
	* libjava/classpath/lib/javax/swing/text/html/MultiStyle.class,
	* libjava/classpath/lib/javax/swing/text/html/ImageView.class,
	* libjava/classpath/lib/javax/swing/text/html/TableView$CellView.class,
	* libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet.class,
	* libjava/classpath/lib/javax/swing/text/html/ImageView$1.class,
	* libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class,
	* libjava/classpath/lib/javax/swing/text/html/TableView.class,
	* libjava/classpath/lib/javax/swing/text/html/StyleSheet.class,
	* libjava/classpath/lib/javax/swing/text/html/ObjectView.class,
	* libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class,
	* libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class,
	* libjava/classpath/lib/javax/swing/undo/StateEdit.class,
	* libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class,
	* libjava/classpath/lib/javax/xml/stream/events/Namespace.class,
	* libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class,
	* libjava/classpath/lib/javax/xml/stream/util/StreamReaderDelegate.class,
	* libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class,
	* libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class,
	* libjava/classpath/lib/javax/security/auth/kerberos/KeyImpl.class,
	* libjava/classpath/missing,
	* libjava/classpath/aclocal.m4,
	* libjava/classpath/examples/Makefile.in,
	* libjava/classpath/install-sh,
	* libjava/gnu/xml/stream/FilteredStreamReader.h,
	* libjava/gnu/xml/stream/XMLStreamWriterImpl.h,
	* libjava/gnu/xml/stream/NamespaceImpl.h,
	* libjava/gnu/xml/stream/XIncludeFilter.h,
	* libjava/gnu/javax/swing/text/html/css/Selector.h,
	* libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h,
	* libjava/sources.am: Regenerated.

2010-05-27  Andrew John Hughes  <ahughes@redhat.com>

	* configure.ac:
	Disable plugin by default and warn about
	unmaintained status when enabled.

2010-05-04  Andrew John Hughes  <ahughes@redhat.com>

	* configure.ac:
	Call AC_PROG_JAVA_WORKS and AC_PROG_JAVAC_WORKS
	in place of AC_PROG_JAVA and AC_PROG_JAVAC
	respectively, as this is the real test we want.
	* m4/ac_prog_java.m4:
	(AC_PROG_JAVA): Don't include AC_PROG_JAVA_WORKS.
	* m4/ac_prog_java_works.m4:
	(AC_PROG_JAVA_WORKS): Require AC_PROG_JAVA and be
	defined only once.  Require AC_PROG_JAVAC_WORKS for
	compilation of test class.  Remove inclusion of
	AC_PROG_JAVAC.
	(AC_TRY_COMPILE_JAVA): Require AC_PROG_JAVAC_WORKS
	rather than AC_PROG_JAVAC.  Be defined only once.
	* m4/ac_prog_javac.m:
	(AC_PROG_JAVAC): Be defined only once.  Don't include
	AC_PROG_JAVAC_WORKS.
	* m4/ac_prog_javac_works.m4:
	(AC_PROG_JAVAC_WORKS): Be defined only once.  Require
	AC_PROG_JAVAC.

2010-05-04  Andrew Haley  <aph@redhat.com>

	* lib/gen-classlist.sh.in: Use absolute pathnames for all the
	directory names in the output file.

2010-05-04  Andrew John Hughes  <ahughes@redhat.com>

	* m4/ac_prog_javac.m4:
	Capture all output from javac --version
	to avoid excess output.  Make sure no appears
	when javac is not gcj.

2010-05-04  Andrew John Hughes  <ahughes@redhat.com>

	* configure.ac:
	Add output to GMP directory detection and
	only perform when compiling GMP.

2010-05-04  Mike Stump  <mikestump@comcast.net>

	* configure.ac:
	Allow prefix, libdir and includedir of GMP
	to be specified via --with-gmp, --with-gmp-include
	and --with-gmp-lib.

2010-04-28  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/print/ipp/IppPrintService.java:
	(printerAttr): Add generic typing.
	(printServiceAttributeListener): Likewise.
	(flavors): Likewise.
	(printerUris): Likewise.
	(IppPrintService(URI uri, String username, String password)):
	Use generic types in initialising listener set.
	(getPrinterAttributes()): Add generic types.  Remove cast.
	(getPrinterAttributeSet(Class<T>)): Return a set containing
	attributes of type T.  Now creates a new set and checks that
	all elements of the original set can be cast and added to this
	new set.
	(getPrinterDefaultAttribute(Class<? extends Attribute>)): Add
	generic types.
	(processResponse()): Add generic types.
	(getAttribute(Class<T>)): Use generic types corresponding to
	parent interface.
	(getSupportedAttributeCategories()): Use generic types.
	(getSupportedAttributeValues()): Likewise.
	(handleSupportedAttributeValuesResponse(IppResponse,Class<? extends Attribute>)):
	Likewise.
	(isAttributeCategorySupported(Class<? extends Attribute>)): Likewise.
	* gnu/javax/print/ipp/IppResponse.java:
	(parseResponse(InputStream)): Use generic types.
	(parseAttributes(Map<Class<? extends Attribute>, Set<Attribute>, DataInputStream)):
	Likewise.
	(addAttribute(Map<Class<? extends Attribute>, Set<Attribute>>, Attribute): Likewise.
	(IppResponse(URI, short)): Create lists with appropriate type parameters.
	(getJobAttributes()): Use generic return type.
	(getOperationAttributes()): Likewise.
	(getPrinterAttributes()): Likewise.
	(getUnsupportedAttributes()): Likewise.
	* gnu/javax/print/ipp/attribute/supported/CompressionSupported.java:
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/MediaSupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.
	* gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java,
	(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
	as set type parameter and cast when looping over it.

2010-04-28  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/print/ipp/IppUtilities.java:
	(INTEGER_CLASS_ARRAY): Use generic typing.
	(TEXT_CLASS_ARRAY): Likewise.
	(classesByName): Likewise.
	(instanceByClass): Likewise.
	(getClass(String)): Remove cast.  Return generic type.
	(getSupportedAttrName(Class<? extends Attribute>)): Remove cast.
	Add generic type to parameter.
	(getSupportedCategory(Class<?> extends Attribute>)): Likewise.
	(getEnumAttribute(String,Object)): Add missing generic types on Class.
	(getIntegerAttribute(String,int)): Likewise and on Constructor.
	(getTextAttribute(String,byte,byte[])): Likewise.

2010-04-27  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/print/ipp/IppRequest.java:
	(write(RequestedAttributes)): Fix for change in return value
	of RequestedAttributes.getValues().
	* gnu/javax/print/ipp/attribute/DetailedStatusMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/DocumentAccessError.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/RequestedAttributes.java:
	(RequestedAttributes()): Use appropriate generic type with attributes
	ArrayList.
	(getValues()): Return an array-based snapshot of the current state of
	attributes rather than providing direct mutable access to it.
	* gnu/javax/print/ipp/attribute/StatusMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/UnknownAttribute.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/MediaDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/defaults/SidesDefault.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/AttributesCharset.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobId.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobMoreInfo.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobPrinterUri.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobStateMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/job/JobUri.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/DocumentFormat.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java:
	(getCategory()): Fix return value.
	* gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java:
	(getCategory()): Fix return value.

2010-04-27  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/print/CupsIppOperation.java,
	* gnu/javax/print/CupsMediaMapping.java,
	* gnu/javax/print/CupsPrintService.java,
	* gnu/javax/print/CupsPrintServiceLookup.java,
	* gnu/javax/print/CupsServer.java,
	* gnu/javax/print/PrintAttributeException.java,
	* gnu/javax/print/PrintFlavorException.java,
	* gnu/javax/print/PrintUriException.java,
	* gnu/javax/print/PrinterDialog.java,
	* gnu/javax/print/ipp/DocPrintJobImpl.java,
	* gnu/javax/print/ipp/IppDelimiterTag.java,
	* gnu/javax/print/ipp/IppException.java,
	* gnu/javax/print/ipp/IppMultiDocPrintService.java,
	* gnu/javax/print/ipp/IppRequest.java,
	* gnu/javax/print/ipp/IppResponse.java,
	* gnu/javax/print/ipp/IppStatusCode.java,
	* gnu/javax/print/ipp/IppUtilities.java,
	* gnu/javax/print/ipp/IppValueTag.java,
	* gnu/javax/print/ipp/MultiDocPrintJobImpl.java,
	* gnu/javax/print/ipp/attribute/CharsetSyntax.java,
	* gnu/javax/print/ipp/attribute/DefaultValueAttribute.java,
	* gnu/javax/print/ipp/attribute/DetailedStatusMessage.java,
	* gnu/javax/print/ipp/attribute/DocumentAccessError.java,
	* gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java,
	* gnu/javax/print/ipp/attribute/RequestedAttributes.java,
	* gnu/javax/print/ipp/attribute/StatusMessage.java,
	* gnu/javax/print/ipp/attribute/UnknownAttribute.java,
	* gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/MediaDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java,
	* gnu/javax/print/ipp/attribute/defaults/SidesDefault.java,
	* gnu/javax/print/ipp/attribute/job/AttributesCharset.java,
	* gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java,
	* gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java,
	* gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java,
	* gnu/javax/print/ipp/attribute/job/JobId.java,
	* gnu/javax/print/ipp/attribute/job/JobMoreInfo.java,
	* gnu/javax/print/ipp/attribute/job/JobPrinterUri.java,
	* gnu/javax/print/ipp/attribute/job/JobStateMessage.java,
	* gnu/javax/print/ipp/attribute/job/JobUri.java,
	* gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java,
	* gnu/javax/print/ipp/attribute/printer/DocumentFormat.java,
	* gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java,
	* gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java,
	* gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java,
	* gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java,
	* gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java,
	* gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java:
	Normalise whitespace; replace tabs with spaces and removing
	trailing whitespace.

2010-04-27  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/print/ipp/IppPrintService.java:
	Fix whitespace.  Use correct generic type for printerAttr
	map.
	(getPrinterAttributeSet(Class<? extends Attribute>)): Add
	appropriate generic type.
	* gnu/javax/print/ipp/attribute/supported/CharsetSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/CompressionSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<CompressionSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<FinishingsSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<JobSheetsSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/MediaSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<MediaSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java:
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<MultipleDocumentHandlingSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/OperationsSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<OrientationRequestedSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<PrintQualitySupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	(getAssociatedAttributeArray(Set<PrinterResolutionSupported>)): Add generic
	type to set and use for-each loop.
	* gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/SidesSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.
	* gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java,
	Fix whitespace.
	(getCategory()): Fix return type.

2010-04-27  Andrew Haley  <aph@redhat.com>

	* java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty
	list.

2010-04-27  Andrew Haley  <aph@redhat.com>

	* gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle
	IppValueTag.UNKNOWN.
	* gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes):
	Handle RequestedAttributes.
	* gnu/javax/print/ipp/IppPrintService.java (processResponse): Add
	DocFlavor.SERVICE_FORMATTED.PAGEABLE and
	DocFlavor.SERVICE_FORMATTED.PRINTABLE.

2010-03-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	PR libgcj/38251
	* tools/Makefile.am (dist-hook): Prune .svn directories in asm and
	classes copies.
	* tools/Makefile.in: Regenerate.

	Revert:
	2008-11-05  Andrew Haley  <aph@redhat.com>

	* tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
	.svn direcories.

2010-01-30  Andrew John Hughes  <ahughes@redhat.com>

	* doc/www.gnu.org/home.wml:
	Add newer JAPI results.

2010-01-30  Andrew John Hughes  <ahughes@redhat.com>

	PR classpath/41686
	* javax/security/auth/kerberos/KerberosTicket.java:
	Fix formatting.
	(toString()): Add full implementation.
	(getSessionKeyType()): Implemented.
	* javax/security/auth/kerberos/KeyImpl.java:
	(toString()): Implemented.

2010-01-30  Andrew John Hughes  <ahughes@redhat.com>

	* autogen.sh:
	Allow libtool 2.* through.
	* configure.ac:
	Updated via autoupdate.
	* m4/lib-ld.m4,
	* m4/lib-link.m4,
	* m4/lib-prefix.m4:
	Drop old libtool macros which
	result in build failure.

2010-01-18  Andreas Tobler  <andreast@fgznet.ch>

	* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
	* tools/Makefile.in: Regenerate.

2010-01-12  Jeroen Frijters  <jeroen@frijters.net>

	* java/util/zip/Inflater. java (inflate(byte[],int,int)): Fix for #41696.

2009-11-18  Andrew Haley  <aph@redhat.com>

	* java/util/TreeMap.java (anonymous class.size()): Debogosify.
	anonymous class.clear(): Likewise.

2009-10-22  Andrew Haley  <aph@redhat.com>

	* native/jni/native-lib/cpnet.c (cpnet_addMembership): Fix
	aliasing warning.
	(cpnet_dropMembership): Likewise.

2009-10-22  Richard Guenther  <rguenther@suse.de>

	PR cp-tools/39177
	* tools/gnu/classpath/tools/jar/Creator.java (writeCommandLineEntries):
	Do not use uninitialized manifest.
	* tools/classes/gnu/classpath/tools/jar/Creator.class: Re-generated.

2009-07-08  Chris Burdess  <dog@gnu.org>

	PR xml/40663:
	* javax/xml/stream/XMLEventFactory.java,
	* javax/xml/stream/XMLInputFactory.java,
	* javax/xml/stream/XMLOutputFactory.java,
	* javax/xml/stream/events/Namespace.java: Update API to match final
	  version of StAX.
	* javax/xml/stream/util/ReaderDelegate.java: Removed.
	* javax/xml/stream/util/StreamReaderDelegate.java: Added (renamed
	  from ReaderDelegate)
	* gnu/xml/stream/FilteredStreamReader.java,
	* gnu/xml/stream/NamespaceImpl.java,
	* gnu/xml/stream/XIncludeFilter.java,
	* gnu/xml/stream/XMLEventAllocatorImpl.java,
	* gnu/xml/stream/XMLEventFactoryImpl.java: Update implementation to
	  match final version of StAX API.

2009-07-06  Ludovic Claude  <ludovic.claude@laposte.net>

	PR xml/40653:
	* gnu/xml/stream/XMLStreamWriterImpl.java:
	Weaken testing of namespace prefix to match
	reference implementation and spec.

2009-07-07  Andrew John Hughes  <ahughes@redhat.com>

	PR classpath/40630
	* java/util/Scanner.java:
	(myCoreNext(boolean, Pattern)): Set tmp2 to
	null if the string is empty (i.e. we are at
	the end of the file).
	* java/util/regex/Matcher.java:
	(toMatchResult()): Check that match is non-null
	before attempting to clone it.

2009-07-07  Andrew John Hughes  <ahughes@redhat.com>

	* java/util/Scanner.java,
	* java/util/regex/Matcher.java:
	Replace tab characters with spaces.

2009-03-29  Mark Wielaard  <mark@klomp.org>

	* doc/www.gnu.org/faq/faq.wml: Fix link to cp-hacking.html.

2009-03-29  Mark Wielaard  <mark@klomp.org>

	* m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty.

2009-03-26  Andrew John Hughes  <ahughes@redhat.com>

	PR classpath/39408:
	* tools/gnu/classpath/tools/javah/ClassWrapper.java:
	(linkSupers()): Make package-private.
	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
	(writeFields(ClassWrapper, JniPrintStream)):
	Link in data from superclass before searching for fields.

2009-03-20  Andrew John Hughes  <ahughes@redhat.com>

	* tools/gnu/classpath/tools/javah/ClassWrapper.java,
	* tools/gnu/classpath/tools/javah/CniPrintStream.java,
	* tools/gnu/classpath/tools/javah/CniStubPrinter.java,
	* tools/gnu/classpath/tools/javah/GcjhMain.java,
	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java,
	* tools/gnu/classpath/tools/javah/JniPrintStream.java,
	* tools/gnu/classpath/tools/javah/JniStubPrinter.java,
	* tools/gnu/classpath/tools/javah/Keywords.java,
	* tools/gnu/classpath/tools/javah/Main.java,
	* tools/gnu/classpath/tools/javah/MethodHelper.java,
	* tools/gnu/classpath/tools/javah/PathOptionGroup.java:
	Fix generic issues in gjavah.

2009-03-17  Andrew John Hughes  <ahughes@redhat.com>

	* tools/gnu/classpath/tools/FileSystemClassLoader.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java,
	* tools/gnu/classpath/tools/gjdoc/ErrorReporter.java,
	* tools/gnu/classpath/tools/gjdoc/TemporaryStore.java,
	* tools/gnu/classpath/tools/gjdoc/WritableType.java,
	* tools/gnu/classpath/tools/taglets/AuthorTaglet.java,
	* tools/gnu/classpath/tools/taglets/CopyrightTaglet.java,
	* tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java,
	* tools/gnu/classpath/tools/taglets/GenericTaglet.java,
	* tools/gnu/classpath/tools/taglets/SinceTaglet.java,
	* tools/gnu/classpath/tools/taglets/VersionTaglet.java:
	Switch to UNIX line endings.

2009-03-17  Andrew John Hughes  <ahughes@redhat.com>

	* tools/com/sun/tools/javadoc/Main.java,
	* tools/gnu/classpath/tools/FileSystemClassLoader.java,
	* tools/gnu/classpath/tools/IOToolkit.java,
	* tools/gnu/classpath/tools/MalformedInputEvent.java,
	* tools/gnu/classpath/tools/MalformedInputListener.java,
	* tools/gnu/classpath/tools/NotifyingInputStreamReader.java,
	* tools/gnu/classpath/tools/StringToolkit.java,
	* tools/gnu/classpath/tools/doclets/AbstractDoclet.java,
	* tools/gnu/classpath/tools/doclets/DocletConfigurationException.java,
	* tools/gnu/classpath/tools/doclets/DocletOption.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionFile.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionFlag.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionString.java,
	* tools/gnu/classpath/tools/doclets/InlineTagRenderer.java,
	* tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java,
	* tools/gnu/classpath/tools/doclets/PackageGroup.java,
	* tools/gnu/classpath/tools/doclets/PackageMatcher.java,
	* tools/gnu/classpath/tools/doclets/StandardTaglet.java,
	* tools/gnu/classpath/tools/doclets/TagletPrinter.java,
	* tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java,
	* tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java,
	* tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java,
	* tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/Debug.java,
	* tools/gnu/classpath/tools/gjdoc/DirectoryTree.java,
	* tools/gnu/classpath/tools/gjdoc/DocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ErrorReporter.java,
	* tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java,
	* tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java,
	* tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java,
	* tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/Main.java,
	* tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ParameterImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ParseException.java,
	* tools/gnu/classpath/tools/gjdoc/Parser.java,
	* tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/RootDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TagContainer.java,
	* tools/gnu/classpath/tools/gjdoc/TagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TemporaryStore.java,
	* tools/gnu/classpath/tools/gjdoc/TextTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/Timer.java,
	* tools/gnu/classpath/tools/gjdoc/TimerDoclet.java,
	* tools/gnu/classpath/tools/gjdoc/TypeImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/WritableType.java,
	* tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Context.java,
	* tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java,
	* tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Expression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java,
	* tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Type.java,
	* tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java,
	* tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java,
	* tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java,
	* tools/gnu/classpath/tools/rmic/CompilationError.java,
	* tools/gnu/classpath/tools/rmic/Generator.java,
	* tools/gnu/classpath/tools/rmic/GiopIo.java,
	* tools/gnu/classpath/tools/rmic/HashFinder.java,
	* tools/gnu/classpath/tools/rmic/Main.java,
	* tools/gnu/classpath/tools/rmic/MethodGenerator.java,
	* tools/gnu/classpath/tools/rmic/RMICException.java,
	* tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java,
	* tools/gnu/classpath/tools/rmic/RmicBackend.java,
	* tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java,
	* tools/gnu/classpath/tools/rmic/Variables.java,
	* tools/gnu/classpath/tools/rmic/WrapUnWrapper.java,
	* tools/gnu/classpath/tools/serialver/SerialVer.java,
	* tools/gnu/classpath/tools/taglets/AuthorTaglet.java,
	* tools/gnu/classpath/tools/taglets/CodeTaglet.java,
	* tools/gnu/classpath/tools/taglets/CopyrightTaglet.java,
	* tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java,
	* tools/gnu/classpath/tools/taglets/GenericTaglet.java,
	* tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java,
	* tools/gnu/classpath/tools/taglets/SinceTaglet.java,
	* tools/gnu/classpath/tools/taglets/TagletContext.java,
	* tools/gnu/classpath/tools/taglets/ValueTaglet.java,
	* tools/gnu/classpath/tools/taglets/VersionTaglet.java:
	Fix license headers to GPLv2+Classpath exception.

2009-03-09  Andrew John Hughes  <ahughes@redhat.com>

	* gnu/javax/swing/text/html/css/Selector.java:
	Use CPStringBuilder.  Use typed list of maps
	rather than an array for type safety.
	* javax/swing/text/html/HTMLEditorKit.java,
	* javax/swing/text/html/HTMLWriter.java:
	Add generic typing where appropriate.
	* javax/swing/text/html/ImageView.java:
	Remove unused AttributeSet variables.
	* javax/swing/text/html/MinimalHTMLWriter.java:
	Switch to an ArrayDeque to avoid unnecessary
	internal synchronisation on a private variable.
	Add generic typing.
	* javax/swing/text/html/MultiAttributeSet.java:
	Add generic typing.
	* javax/swing/text/html/MultiStyle.java:
	Add generic typing, make class package-private
	as not part of the standard classes.
	* javax/swing/text/html/ObjectView.java,
	* javax/swing/text/html/StyleSheet.java:
	Add generic typing.
	* javax/swing/text/html/TableView.java:
	Remove unused variable.
	* javax/swing/tree/DefaultMutableTreeNode.java:
	Add generic typing, mute warnings where necessary.
	* javax/swing/tree/FixedHeightLayoutCache.java:
	Add generic typing.
	* javax/swing/tree/TreeNode.java:
	Mute warnings where necessary.
	* javax/swing/tree/VariableHeightLayoutCache.java,
	* javax/swing/undo/StateEdit.java,
	* javax/swing/undo/UndoableEditSupport.java,
	* org/ietf/jgss/GSSManager.java:
	Add generic typing.

2009-02-14  Andrew John Hughes  <ahughes@redhat.com>

	* org/omg/CORBA/LocalObject.java,
	* org/omg/CORBA/portable/Delegate.java,
	* org/omg/CORBA/portable/InputStream.java,
	* org/omg/CORBA/portable/ObjectImpl.java,
	* org/omg/CORBA_2_3/portable/InputStream.java,
	* org/omg/CORBA_2_3/portable/OutputStream.java,
	* org/omg/DynamicAny/_DynAnyFactoryStub.java,
	* org/omg/DynamicAny/_DynAnyStub.java,
	* org/omg/DynamicAny/_DynArrayStub.java,
	* org/omg/DynamicAny/_DynEnumStub.java,
	* org/omg/DynamicAny/_DynFixedStub.java,
	* org/omg/DynamicAny/_DynSequenceStub.java,
	* org/omg/DynamicAny/_DynStructStub.java,
	* org/omg/DynamicAny/_DynUnionStub.java,
	* org/omg/DynamicAny/_DynValueStub.java,
	* org/omg/PortableServer/_ServantActivatorStub.java,
	* org/omg/PortableServer/_ServantLocatorStub.java:
	Turn off warnings where Class is used; forced
	to use raw type for API compatibility.

2009-02-06  Andrew John Hughes  <ahughes@redhat.com>

	* NEWS:
	Add stub for 0.99.
	* configure.ac:
	Bump to 0.99.
	* doc/www.gnu.org/announce/20090205.wml,
	* doc/www.gnu.org/downloads/downloads.wml,
	* doc/www.gnu.org/newsitems.txt:
	Update website.

2009-02-05  Andrew John Hughes  <ahughes@redhat.com>

	* NEWS: Add VM updates.

From-SVN: r165383
This commit is contained in:
Andrew John Hughes 2010-10-12 15:55:12 +00:00
parent 533f611ac4
commit 729530c035
735 changed files with 13374 additions and 9248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

433
libjava/ChangeLog
View File

@ -1,3 +1,436 @@
2010-10-12 Andrew John Hughes <ahughes@redhat.com>
Import GNU Classpath (libgcj-snapshot-20100921).
* libjava/Makefile.in: Regenerated.
* libjava/javax/swing/text/html/StyleSheet.h,
* libjava/javax/swing/text/html/MinimalHTMLWriter.h,
* libjava/javax/swing/text/html/HTMLWriter.h,
* libjava/javax/xml/stream/XMLEventFactory.h,
* libjava/javax/xml/stream/XMLOutputFactory.h,
* libjava/javax/xml/stream/events/Namespace.h,
* libjava/javax/xml/stream/util/StreamReaderDelegate.h,
* libjava/javax/security/auth/kerberos/KeyImpl.h,
* libjava/javax/security/auth/kerberos/KerberosTicket.h:
Regenerated.
* libjava/classpath/Makefile.in,
* libjava/classpath/depcomp,
* libjava/classpath/scripts/Makefile.in,
* libjava/classpath/resource/Makefile.in,
* libjava/classpath/tools/Makefile.in:
Regenerated. Use libtool from top-level config directory.
* libjava/classpath/tools/classes/gnu/classpath/tools/StringToolkit.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml$State.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/IOToolkit.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$OptionProcessor.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportClassFile.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocProxy.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BlockSourceComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree$FileNode.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/IgnoredFileParseException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TextTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$Context.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/InheritDocTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FunctionComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/AdditionExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Type.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NegateExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantDouble.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/EqualExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantChar.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Evaluator.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/DivisionExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantInteger.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantShort.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantLong.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantByte.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnaryExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantFloat.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ModuloExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantString.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NotExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/AndExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Context.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantNull.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantExpression.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportNotFound.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParamTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Timer.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourceComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/CommentComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionPackage.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/StaticBlockComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ValueTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SeeTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TemporaryStore.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionClass.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BracketClose.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParameterImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ScheduledClass.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportPackageFile.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SlashSlashCommentComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ErrorReporter.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MemberDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Debug.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MethodDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageDocImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ThrowsTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/EmptyStatementComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/LinkTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/AbstractTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParseException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Whitespace.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ImportComponent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourcePositionImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/JavadocWrapper.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeVariableImpl.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/NotifyingInputStreamReader.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniPrintStream.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/HashFinder.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/WrapUnWrapper.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/MethodGenerator.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceRmicCompiler.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/MalformedInputEvent.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletConfigurationException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$InterfaceRelation.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTag.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/TargetContext.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet$DocErrorReporterOutputStream.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$UsageType.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$NullErrorReporter.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer$TagInfo.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionColonSeparated.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$UsageType.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionString.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/CssClass.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$TreeNode.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/InvalidPackageWildcardException.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionFlag.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageMatcher.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/StandardTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionFile.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOption.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$IndexKey.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionGroup.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTagletPath.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageGroup.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader$JarStreamInfo.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader$FileStreamInfo.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CodeTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/GenericTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/ValueTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/AuthorTaglet$EmailReplacement.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/DeprecatedTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/SinceTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/AuthorTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/TagletContext.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/VersionTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CopyrightTaglet.class,
* libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader.class,
* libjava/classpath/tools/classes/com/sun/tools/javadoc/Main.class: Regenerated.
* libjava/classpath/doc/Makefile.in,
* libjava/classpath/doc/api/Makefile.in,
* libjava/classpath/doc/texinfo.tex,
* libjava/classpath/external/Makefile.in,
* libjava/classpath/external/jsr166/Makefile.in,
* libjava/classpath/external/sax/Makefile.in,
* libjava/classpath/external/w3c_dom/Makefile.in,
* libjava/classpath/external/relaxngDatatype/Makefile.in,
* libjava/classpath/include/Makefile.in: Regenerated.
* libjava/classpath/m4/lib-prefix.m4,
* libjava/classpath/m4/lib-link.m4,
* libjava/classpath/m4/lib-ld.m4: Removed.
* libjava/classpath/native/jni/classpath/Makefile.in,
* libjava/classpath/native/jni/gstreamer-peer/Makefile.in,
* libjava/classpath/native/jni/midi-dssi/Makefile.in,
* libjava/classpath/native/jni/Makefile.in,
* libjava/classpath/native/jni/gconf-peer/Makefile.in,
* libjava/classpath/native/jni/java-io/Makefile.in,
* libjava/classpath/native/jni/native-lib/Makefile.in,
* libjava/classpath/native/jni/native-lib/cpnet.c,
* libjava/classpath/native/jni/java-util/Makefile.in,
* libjava/classpath/native/jni/java-lang/Makefile.in,
* libjava/classpath/native/jni/midi-alsa/Makefile.in,
* libjava/classpath/native/jni/java-nio/Makefile.in,
* libjava/classpath/native/jni/java-net/Makefile.in,
* libjava/classpath/native/jni/java-math/Makefile.in,
* libjava/classpath/native/jni/xmlj/Makefile.in,
* libjava/classpath/native/jni/qt-peer/Makefile.in,
* libjava/classpath/native/jni/gtk-peer/Makefile.in,
* libjava/classpath/native/Makefile.in,
* libjava/classpath/native/jawt/Makefile.in,
* libjava/classpath/native/fdlibm/Makefile.in,
* libjava/classpath/native/plugin/Makefile.in,
* libjava/classpath/lib/java/util/regex/Matcher.class,
* libjava/classpath/lib/java/util/TreeMap$3.class,
* libjava/classpath/lib/java/util/Scanner.class,
* libjava/classpath/lib/Makefile.in,
* libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class,
* libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class,
* libjava/classpath/lib/org/omg/CORBA/portable/InputStream.class,
* libjava/classpath/lib/org/omg/CORBA/portable/ObjectImpl.class,
* libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class,
* libjava/classpath/lib/org/omg/CORBA/LocalObject.class,
* libjava/classpath/lib/org/omg/CORBA_2_3/portable/InputStream.class,
* libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynValueStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynEnumStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynUnionStub.class,
* libjava/classpath/lib/org/omg/DynamicAny/_DynFixedStub.class,
* libjava/classpath/lib/org/ietf/jgss/GSSManager.class,
* libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class,
* libjava/classpath/lib/gnu/xml/stream/XIncludeFilter.class,
* libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class,
* libjava/classpath/lib/gnu/xml/stream/XMLEventFactoryImpl.class,
* libjava/classpath/lib/gnu/xml/stream/XMLEventAllocatorImpl.class,
* libjava/classpath/lib/gnu/xml/stream/XMLStreamWriterImpl.class,
* libjava/classpath/lib/gnu/java/locale/LocaleData.class,
* libjava/classpath/lib/gnu/javax/swing/text/html/css/Selector.class,
* libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class,
* libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OperationsSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/SidesDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobId.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobMoreInfo.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/StatusMessage.class,
* libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class,
* libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class,
* libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class,
* libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class,
* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class,
* libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class,
* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class,
* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class,
* libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class,
* libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache.class,
* libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class,
* libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class,
* libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class,
* libjava/classpath/lib/javax/swing/text/html/TableView$RowView.class,
* libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.class,
* libjava/classpath/lib/javax/swing/text/html/MultiStyle.class,
* libjava/classpath/lib/javax/swing/text/html/ImageView.class,
* libjava/classpath/lib/javax/swing/text/html/TableView$CellView.class,
* libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet.class,
* libjava/classpath/lib/javax/swing/text/html/ImageView$1.class,
* libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class,
* libjava/classpath/lib/javax/swing/text/html/TableView.class,
* libjava/classpath/lib/javax/swing/text/html/StyleSheet.class,
* libjava/classpath/lib/javax/swing/text/html/ObjectView.class,
* libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class,
* libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class,
* libjava/classpath/lib/javax/swing/undo/StateEdit.class,
* libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class,
* libjava/classpath/lib/javax/xml/stream/events/Namespace.class,
* libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class,
* libjava/classpath/lib/javax/xml/stream/util/StreamReaderDelegate.class,
* libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class,
* libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class,
* libjava/classpath/lib/javax/security/auth/kerberos/KeyImpl.class,
* libjava/classpath/missing,
* libjava/classpath/aclocal.m4,
* libjava/classpath/examples/Makefile.in,
* libjava/classpath/install-sh,
* libjava/gnu/xml/stream/FilteredStreamReader.h,
* libjava/gnu/xml/stream/XMLStreamWriterImpl.h,
* libjava/gnu/xml/stream/NamespaceImpl.h,
* libjava/gnu/xml/stream/XIncludeFilter.h,
* libjava/gnu/javax/swing/text/html/css/Selector.h,
* libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h,
* libjava/sources.am: Regenerated.
2010-09-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2010-09-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libjava/Makefile.in: Regenerate. * libjava/Makefile.in: Regenerate.

2
libjava/Makefile.in
View File

@ -6617,7 +6617,7 @@ classpath/javax/xml/stream/events/StartDocument.java \
classpath/javax/xml/stream/events/StartElement.java \ classpath/javax/xml/stream/events/StartElement.java \
classpath/javax/xml/stream/events/XMLEvent.java \ classpath/javax/xml/stream/events/XMLEvent.java \
classpath/javax/xml/stream/util/EventReaderDelegate.java \ classpath/javax/xml/stream/util/EventReaderDelegate.java \
classpath/javax/xml/stream/util/ReaderDelegate.java \ classpath/javax/xml/stream/util/StreamReaderDelegate.java \
classpath/javax/xml/stream/util/XMLEventAllocator.java \ classpath/javax/xml/stream/util/XMLEventAllocator.java \
classpath/javax/xml/stream/util/XMLEventConsumer.java \ classpath/javax/xml/stream/util/XMLEventConsumer.java \
classpath/javax/xml/transform/ErrorListener.java \ classpath/javax/xml/transform/ErrorListener.java \

711
libjava/classpath/ChangeLog
View File

@ -12,11 +12,358 @@
* configure: Regenerate. * configure: Regenerate.
2010-05-27 Andrew John Hughes <ahughes@redhat.com>
* configure.ac:
Disable plugin by default and warn about
unmaintained status when enabled.
2010-05-04 Andrew John Hughes <ahughes@redhat.com>
* configure.ac:
Call AC_PROG_JAVA_WORKS and AC_PROG_JAVAC_WORKS
in place of AC_PROG_JAVA and AC_PROG_JAVAC
respectively, as this is the real test we want.
* m4/ac_prog_java.m4:
(AC_PROG_JAVA): Don't include AC_PROG_JAVA_WORKS.
* m4/ac_prog_java_works.m4:
(AC_PROG_JAVA_WORKS): Require AC_PROG_JAVA and be
defined only once. Require AC_PROG_JAVAC_WORKS for
compilation of test class. Remove inclusion of
AC_PROG_JAVAC.
(AC_TRY_COMPILE_JAVA): Require AC_PROG_JAVAC_WORKS
rather than AC_PROG_JAVAC. Be defined only once.
* m4/ac_prog_javac.m:
(AC_PROG_JAVAC): Be defined only once. Don't include
AC_PROG_JAVAC_WORKS.
* m4/ac_prog_javac_works.m4:
(AC_PROG_JAVAC_WORKS): Be defined only once. Require
AC_PROG_JAVAC.
2010-05-04 Andrew Haley <aph@redhat.com> 2010-05-04 Andrew Haley <aph@redhat.com>
* lib/gen-classlist.sh.in: Use absolute pathnames for all the * lib/gen-classlist.sh.in: Use absolute pathnames for all the
directory names in the output file. directory names in the output file.
2010-05-04 Andrew John Hughes <ahughes@redhat.com>
* m4/ac_prog_javac.m4:
Capture all output from javac --version
to avoid excess output. Make sure no appears
when javac is not gcj.
2010-05-04 Andrew John Hughes <ahughes@redhat.com>
* configure.ac:
Add output to GMP directory detection and
only perform when compiling GMP.
2010-05-04 Mike Stump <mikestump@comcast.net>
* configure.ac:
Allow prefix, libdir and includedir of GMP
to be specified via --with-gmp, --with-gmp-include
and --with-gmp-lib.
2010-04-28 Andrew John Hughes <ahughes@redhat.com>
* gnu/javax/print/ipp/IppPrintService.java:
(printerAttr): Add generic typing.
(printServiceAttributeListener): Likewise.
(flavors): Likewise.
(printerUris): Likewise.
(IppPrintService(URI uri, String username, String password)):
Use generic types in initialising listener set.
(getPrinterAttributes()): Add generic types. Remove cast.
(getPrinterAttributeSet(Class<T>)): Return a set containing
attributes of type T. Now creates a new set and checks that
all elements of the original set can be cast and added to this
new set.
(getPrinterDefaultAttribute(Class<? extends Attribute>)): Add
generic types.
(processResponse()): Add generic types.
(getAttribute(Class<T>)): Use generic types corresponding to
parent interface.
(getSupportedAttributeCategories()): Use generic types.
(getSupportedAttributeValues()): Likewise.
(handleSupportedAttributeValuesResponse(IppResponse,Class<? extends Attribute>)):
Likewise.
(isAttributeCategorySupported(Class<? extends Attribute>)): Likewise.
* gnu/javax/print/ipp/IppResponse.java:
(parseResponse(InputStream)): Use generic types.
(parseAttributes(Map<Class<? extends Attribute>, Set<Attribute>, DataInputStream)):
Likewise.
(addAttribute(Map<Class<? extends Attribute>, Set<Attribute>>, Attribute): Likewise.
(IppResponse(URI, short)): Create lists with appropriate type parameters.
(getJobAttributes()): Use generic return type.
(getOperationAttributes()): Likewise.
(getPrinterAttributes()): Likewise.
(getUnsupportedAttributes()): Likewise.
* gnu/javax/print/ipp/attribute/supported/CompressionSupported.java:
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/MediaSupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
* gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java,
(getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute
as set type parameter and cast when looping over it.
2010-04-28 Andrew John Hughes <ahughes@redhat.com>
* gnu/javax/print/ipp/IppUtilities.java:
(INTEGER_CLASS_ARRAY): Use generic typing.
(TEXT_CLASS_ARRAY): Likewise.
(classesByName): Likewise.
(instanceByClass): Likewise.
(getClass(String)): Remove cast. Return generic type.
(getSupportedAttrName(Class<? extends Attribute>)): Remove cast.
Add generic type to parameter.
(getSupportedCategory(Class<?> extends Attribute>)): Likewise.
(getEnumAttribute(String,Object)): Add missing generic types on Class.
(getIntegerAttribute(String,int)): Likewise and on Constructor.
(getTextAttribute(String,byte,byte[])): Likewise.
2010-04-27 Andrew John Hughes <ahughes@redhat.com>
* gnu/javax/print/ipp/IppRequest.java:
(write(RequestedAttributes)): Fix for change in return value
of RequestedAttributes.getValues().
* gnu/javax/print/ipp/attribute/DetailedStatusMessage.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/DocumentAccessError.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/RequestedAttributes.java:
(RequestedAttributes()): Use appropriate generic type with attributes
ArrayList.
(getValues()): Return an array-based snapshot of the current state of
attributes rather than providing direct mutable access to it.
* gnu/javax/print/ipp/attribute/StatusMessage.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/UnknownAttribute.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/MediaDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/defaults/SidesDefault.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/AttributesCharset.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobId.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobMoreInfo.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobPrinterUri.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobStateMessage.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/job/JobUri.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/DocumentFormat.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java:
(getCategory()): Fix return value.
* gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java:
(getCategory()): Fix return value.
2010-04-27 Andrew John Hughes <ahughes@redhat.com>
* gnu/javax/print/CupsIppOperation.java,
* gnu/javax/print/CupsMediaMapping.java,
* gnu/javax/print/CupsPrintService.java,
* gnu/javax/print/CupsPrintServiceLookup.java,
* gnu/javax/print/CupsServer.java,
* gnu/javax/print/PrintAttributeException.java,
* gnu/javax/print/PrintFlavorException.java,
* gnu/javax/print/PrintUriException.java,
* gnu/javax/print/PrinterDialog.java,
* gnu/javax/print/ipp/DocPrintJobImpl.java,
* gnu/javax/print/ipp/IppDelimiterTag.java,
* gnu/javax/print/ipp/IppException.java,
* gnu/javax/print/ipp/IppMultiDocPrintService.java,
* gnu/javax/print/ipp/IppRequest.java,
* gnu/javax/print/ipp/IppResponse.java,
* gnu/javax/print/ipp/IppStatusCode.java,
* gnu/javax/print/ipp/IppUtilities.java,
* gnu/javax/print/ipp/IppValueTag.java,
* gnu/javax/print/ipp/MultiDocPrintJobImpl.java,
* gnu/javax/print/ipp/attribute/CharsetSyntax.java,
* gnu/javax/print/ipp/attribute/DefaultValueAttribute.java,
* gnu/javax/print/ipp/attribute/DetailedStatusMessage.java,
* gnu/javax/print/ipp/attribute/DocumentAccessError.java,
* gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java,
* gnu/javax/print/ipp/attribute/RequestedAttributes.java,
* gnu/javax/print/ipp/attribute/StatusMessage.java,
* gnu/javax/print/ipp/attribute/UnknownAttribute.java,
* gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java,
* gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java,
* gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java,
* gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java,
* gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java,
* gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java,
* gnu/javax/print/ipp/attribute/defaults/MediaDefault.java,
* gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java,
* gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java,
* gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java,
* gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java,
* gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java,
* gnu/javax/print/ipp/attribute/defaults/SidesDefault.java,
* gnu/javax/print/ipp/attribute/job/AttributesCharset.java,
* gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java,
* gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java,
* gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java,
* gnu/javax/print/ipp/attribute/job/JobId.java,
* gnu/javax/print/ipp/attribute/job/JobMoreInfo.java,
* gnu/javax/print/ipp/attribute/job/JobPrinterUri.java,
* gnu/javax/print/ipp/attribute/job/JobStateMessage.java,
* gnu/javax/print/ipp/attribute/job/JobUri.java,
* gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java,
* gnu/javax/print/ipp/attribute/printer/DocumentFormat.java,
* gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java,
* gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java,
* gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java,
* gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java,
* gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java,
* gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java:
Normalise whitespace; replace tabs with spaces and removing
trailing whitespace.
2010-04-27 Andrew John Hughes <ahughes@redhat.com>
* gnu/javax/print/ipp/IppPrintService.java:
Fix whitespace. Use correct generic type for printerAttr
map.
(getPrinterAttributeSet(Class<? extends Attribute>)): Add
appropriate generic type.
* gnu/javax/print/ipp/attribute/supported/CharsetSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/CompressionSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<CompressionSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<FinishingsSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<JobSheetsSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/MediaSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<MediaSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java:
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<MultipleDocumentHandlingSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/OperationsSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<OrientationRequestedSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java,
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<PrintQualitySupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
(getAssociatedAttributeArray(Set<PrinterResolutionSupported>)): Add generic
type to set and use for-each loop.
* gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/SidesSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java,
Fix whitespace.
(getCategory()): Fix return type.
* gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java,
Fix whitespace.
(getCategory()): Fix return type.
2010-04-27 Andrew Haley <aph@redhat.com> 2010-04-27 Andrew Haley <aph@redhat.com>
* java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty
@ -70,6 +417,7 @@
* resource/Makefile.in: Regenerate. * resource/Makefile.in: Regenerate.
* scripts/Makefile.in: Regenerate. * scripts/Makefile.in: Regenerate.
* tools/Makefile.in: Regenerate. * tools/Makefile.in: Regenerate.
2010-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2010-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libgcj/38251 PR libgcj/38251
@ -83,11 +431,42 @@
* tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
.svn direcories. .svn direcories.
2010-01-30 Andrew John Hughes <ahughes@redhat.com>
* doc/www.gnu.org/home.wml:
Add newer JAPI results.
2010-01-30 Andrew John Hughes <ahughes@redhat.com>
PR classpath/41686
* javax/security/auth/kerberos/KerberosTicket.java:
Fix formatting.
(toString()): Add full implementation.
(getSessionKeyType()): Implemented.
* javax/security/auth/kerberos/KeyImpl.java:
(toString()): Implemented.
2010-01-30 Andrew John Hughes <ahughes@redhat.com>
* autogen.sh:
Allow libtool 2.* through.
* configure.ac:
Updated via autoupdate.
* m4/lib-ld.m4,
* m4/lib-link.m4,
* m4/lib-prefix.m4:
Drop old libtool macros which
result in build failure.
2010-01-18 Andreas Tobler <andreast@fgznet.ch> 2010-01-18 Andreas Tobler <andreast@fgznet.ch>
* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
* tools/Makefile.in: Regenerate. * tools/Makefile.in: Regenerate.
2010-01-12 Jeroen Frijters <jeroen@frijters.net>
* java/util/zip/Inflater. java (inflate(byte[],int,int)): Fix for #41696.
2009-12-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2009-12-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate. * Makefile.in: Regenerate.
@ -126,6 +505,17 @@
* scripts/Makefile.in: Regenerate. * scripts/Makefile.in: Regenerate.
* tools/Makefile.in: Regenerate. * tools/Makefile.in: Regenerate.
2009-11-18 Andrew Haley <aph@redhat.com>
* java/util/TreeMap.java (anonymous class.size()): Debogosify.
anonymous class.clear(): Likewise.
2009-10-22 Andrew Haley <aph@redhat.com>
* native/jni/native-lib/cpnet.c (cpnet_addMembership): Fix
aliasing warning.
(cpnet_dropMembership): Likewise.
2009-10-22 Richard Guenther <rguenther@suse.de> 2009-10-22 Richard Guenther <rguenther@suse.de>
PR cp-tools/39177 PR cp-tools/39177
@ -193,6 +583,48 @@
(func_mode_link): Add new -bindir option, and use it to place (func_mode_link): Add new -bindir option, and use it to place
output DLL if specified. output DLL if specified.
2009-07-08 Chris Burdess <dog@gnu.org>
PR xml/40663:
* javax/xml/stream/XMLEventFactory.java,
* javax/xml/stream/XMLInputFactory.java,
* javax/xml/stream/XMLOutputFactory.java,
* javax/xml/stream/events/Namespace.java: Update API to match final
version of StAX.
* javax/xml/stream/util/ReaderDelegate.java: Removed.
* javax/xml/stream/util/StreamReaderDelegate.java: Added (renamed
from ReaderDelegate)
* gnu/xml/stream/FilteredStreamReader.java,
* gnu/xml/stream/NamespaceImpl.java,
* gnu/xml/stream/XIncludeFilter.java,
* gnu/xml/stream/XMLEventAllocatorImpl.java,
* gnu/xml/stream/XMLEventFactoryImpl.java: Update implementation to
match final version of StAX API.
2009-07-06 Ludovic Claude <ludovic.claude@laposte.net>
PR xml/40653:
* gnu/xml/stream/XMLStreamWriterImpl.java:
Weaken testing of namespace prefix to match
reference implementation and spec.
2009-07-07 Andrew John Hughes <ahughes@redhat.com>
PR classpath/40630
* java/util/Scanner.java:
(myCoreNext(boolean, Pattern)): Set tmp2 to
null if the string is empty (i.e. we are at
the end of the file).
* java/util/regex/Matcher.java:
(toMatchResult()): Check that match is non-null
before attempting to clone it.
2009-07-07 Andrew John Hughes <ahughes@redhat.com>
* java/util/Scanner.java,
* java/util/regex/Matcher.java:
Replace tab characters with spaces.
2009-06-29 Andrew Haley <aph@redhat.com> 2009-06-29 Andrew Haley <aph@redhat.com>
PR java/40590 PR java/40590
@ -216,6 +648,285 @@
New methods. New methods.
(moveToPackage): Use printName(). (moveToPackage): Use printName().
2009-03-29 Mark Wielaard <mark@klomp.org>
* doc/www.gnu.org/faq/faq.wml: Fix link to cp-hacking.html.
2009-03-29 Mark Wielaard <mark@klomp.org>
* m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty.
2009-03-26 Andrew John Hughes <ahughes@redhat.com>
PR classpath/39408:
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(linkSupers()): Make package-private.
* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
(writeFields(ClassWrapper, JniPrintStream)):
Link in data from superclass before searching for fields.
2009-03-20 Andrew John Hughes <ahughes@redhat.com>
* tools/gnu/classpath/tools/javah/ClassWrapper.java,
* tools/gnu/classpath/tools/javah/CniPrintStream.java,
* tools/gnu/classpath/tools/javah/CniStubPrinter.java,
* tools/gnu/classpath/tools/javah/GcjhMain.java,
* tools/gnu/classpath/tools/javah/JniIncludePrinter.java,
* tools/gnu/classpath/tools/javah/JniPrintStream.java,
* tools/gnu/classpath/tools/javah/JniStubPrinter.java,
* tools/gnu/classpath/tools/javah/Keywords.java,
* tools/gnu/classpath/tools/javah/Main.java,
* tools/gnu/classpath/tools/javah/MethodHelper.java,
* tools/gnu/classpath/tools/javah/PathOptionGroup.java:
Fix generic issues in gjavah.
2009-03-17 Andrew John Hughes <ahughes@redhat.com>
* tools/gnu/classpath/tools/FileSystemClassLoader.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java,
* tools/gnu/classpath/tools/gjdoc/ErrorReporter.java,
* tools/gnu/classpath/tools/gjdoc/TemporaryStore.java,
* tools/gnu/classpath/tools/gjdoc/WritableType.java,
* tools/gnu/classpath/tools/taglets/AuthorTaglet.java,
* tools/gnu/classpath/tools/taglets/CopyrightTaglet.java,
* tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java,
* tools/gnu/classpath/tools/taglets/GenericTaglet.java,
* tools/gnu/classpath/tools/taglets/SinceTaglet.java,
* tools/gnu/classpath/tools/taglets/VersionTaglet.java:
Switch to UNIX line endings.
2009-03-17 Andrew John Hughes <ahughes@redhat.com>
* tools/com/sun/tools/javadoc/Main.java,
* tools/gnu/classpath/tools/FileSystemClassLoader.java,
* tools/gnu/classpath/tools/IOToolkit.java,
* tools/gnu/classpath/tools/MalformedInputEvent.java,
* tools/gnu/classpath/tools/MalformedInputListener.java,
* tools/gnu/classpath/tools/NotifyingInputStreamReader.java,
* tools/gnu/classpath/tools/StringToolkit.java,
* tools/gnu/classpath/tools/doclets/AbstractDoclet.java,
* tools/gnu/classpath/tools/doclets/DocletConfigurationException.java,
* tools/gnu/classpath/tools/doclets/DocletOption.java,
* tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java,
* tools/gnu/classpath/tools/doclets/DocletOptionFile.java,
* tools/gnu/classpath/tools/doclets/DocletOptionFlag.java,
* tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java,
* tools/gnu/classpath/tools/doclets/DocletOptionString.java,
* tools/gnu/classpath/tools/doclets/InlineTagRenderer.java,
* tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java,
* tools/gnu/classpath/tools/doclets/PackageGroup.java,
* tools/gnu/classpath/tools/doclets/PackageMatcher.java,
* tools/gnu/classpath/tools/doclets/StandardTaglet.java,
* tools/gnu/classpath/tools/doclets/TagletPrinter.java,
* tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java,
* tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java,
* tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java,
* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java,
* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java,
* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java,
* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java,
* tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java,
* tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java,
* tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java,
* tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/Debug.java,
* tools/gnu/classpath/tools/gjdoc/DirectoryTree.java,
* tools/gnu/classpath/tools/gjdoc/DocImpl.java,
* tools/gnu/classpath/tools/gjdoc/ErrorReporter.java,
* tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java,
* tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java,
* tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java,
* tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/Main.java,
* tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/ParameterImpl.java,
* tools/gnu/classpath/tools/gjdoc/ParseException.java,
* tools/gnu/classpath/tools/gjdoc/Parser.java,
* tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/RootDocImpl.java,
* tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java,
* tools/gnu/classpath/tools/gjdoc/TagContainer.java,
* tools/gnu/classpath/tools/gjdoc/TagImpl.java,
* tools/gnu/classpath/tools/gjdoc/TemporaryStore.java,
* tools/gnu/classpath/tools/gjdoc/TextTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/Timer.java,
* tools/gnu/classpath/tools/gjdoc/TimerDoclet.java,
* tools/gnu/classpath/tools/gjdoc/TypeImpl.java,
* tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java,
* tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java,
* tools/gnu/classpath/tools/gjdoc/WritableType.java,
* tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java,
* tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java,
* tools/gnu/classpath/tools/gjdoc/expr/Context.java,
* tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java,
* tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java,
* tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/Expression.java,
* tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java,
* tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/Type.java,
* tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java,
* tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java,
* tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java,
* tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java,
* tools/gnu/classpath/tools/rmic/CompilationError.java,
* tools/gnu/classpath/tools/rmic/Generator.java,
* tools/gnu/classpath/tools/rmic/GiopIo.java,
* tools/gnu/classpath/tools/rmic/HashFinder.java,
* tools/gnu/classpath/tools/rmic/Main.java,
* tools/gnu/classpath/tools/rmic/MethodGenerator.java,
* tools/gnu/classpath/tools/rmic/RMICException.java,
* tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java,
* tools/gnu/classpath/tools/rmic/RmicBackend.java,
* tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java,
* tools/gnu/classpath/tools/rmic/Variables.java,
* tools/gnu/classpath/tools/rmic/WrapUnWrapper.java,
* tools/gnu/classpath/tools/serialver/SerialVer.java,
* tools/gnu/classpath/tools/taglets/AuthorTaglet.java,
* tools/gnu/classpath/tools/taglets/CodeTaglet.java,
* tools/gnu/classpath/tools/taglets/CopyrightTaglet.java,
* tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java,
* tools/gnu/classpath/tools/taglets/GenericTaglet.java,
* tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java,
* tools/gnu/classpath/tools/taglets/SinceTaglet.java,
* tools/gnu/classpath/tools/taglets/TagletContext.java,
* tools/gnu/classpath/tools/taglets/ValueTaglet.java,
* tools/gnu/classpath/tools/taglets/VersionTaglet.java:
Fix license headers to GPLv2+Classpath exception.
2009-03-09 Andrew John Hughes <ahughes@redhat.com>
* gnu/javax/swing/text/html/css/Selector.java:
Use CPStringBuilder. Use typed list of maps
rather than an array for type safety.
* javax/swing/text/html/HTMLEditorKit.java,
* javax/swing/text/html/HTMLWriter.java:
Add generic typing where appropriate.
* javax/swing/text/html/ImageView.java:
Remove unused AttributeSet variables.
* javax/swing/text/html/MinimalHTMLWriter.java:
Switch to an ArrayDeque to avoid unnecessary
internal synchronisation on a private variable.
Add generic typing.
* javax/swing/text/html/MultiAttributeSet.java:
Add generic typing.
* javax/swing/text/html/MultiStyle.java:
Add generic typing, make class package-private
as not part of the standard classes.
* javax/swing/text/html/ObjectView.java,
* javax/swing/text/html/StyleSheet.java:
Add generic typing.
* javax/swing/text/html/TableView.java:
Remove unused variable.
* javax/swing/tree/DefaultMutableTreeNode.java:
Add generic typing, mute warnings where necessary.
* javax/swing/tree/FixedHeightLayoutCache.java:
Add generic typing.
* javax/swing/tree/TreeNode.java:
Mute warnings where necessary.
* javax/swing/tree/VariableHeightLayoutCache.java,
* javax/swing/undo/StateEdit.java,
* javax/swing/undo/UndoableEditSupport.java,
* org/ietf/jgss/GSSManager.java:
Add generic typing.
2009-02-14 Andrew John Hughes <ahughes@redhat.com>
* org/omg/CORBA/LocalObject.java,
* org/omg/CORBA/portable/Delegate.java,
* org/omg/CORBA/portable/InputStream.java,
* org/omg/CORBA/portable/ObjectImpl.java,
* org/omg/CORBA_2_3/portable/InputStream.java,
* org/omg/CORBA_2_3/portable/OutputStream.java,
* org/omg/DynamicAny/_DynAnyFactoryStub.java,
* org/omg/DynamicAny/_DynAnyStub.java,
* org/omg/DynamicAny/_DynArrayStub.java,
* org/omg/DynamicAny/_DynEnumStub.java,
* org/omg/DynamicAny/_DynFixedStub.java,
* org/omg/DynamicAny/_DynSequenceStub.java,
* org/omg/DynamicAny/_DynStructStub.java,
* org/omg/DynamicAny/_DynUnionStub.java,
* org/omg/DynamicAny/_DynValueStub.java,
* org/omg/PortableServer/_ServantActivatorStub.java,
* org/omg/PortableServer/_ServantLocatorStub.java:
Turn off warnings where Class is used; forced
to use raw type for API compatibility.
2009-02-06 Andrew John Hughes <ahughes@redhat.com>
* NEWS:
Add stub for 0.99.
* configure.ac:
Bump to 0.99.
* doc/www.gnu.org/announce/20090205.wml,
* doc/www.gnu.org/downloads/downloads.wml,
* doc/www.gnu.org/newsitems.txt:
Update website.
2009-03-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2009-03-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate. * configure: Regenerate.

112
libjava/classpath/INSTALL
View File

@ -2,10 +2,12 @@ Installation Instructions
************************* *************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008 Free Software Foundation, Inc. 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives Copying and distribution of this file, with or without modification,
unlimited permission to copy, distribute and modify it. are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without warranty of any kind.
Basic Installation Basic Installation
================== ==================
@ -13,7 +15,11 @@ Basic Installation
Briefly, the shell commands `./configure; make; make install' should Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for more-detailed instructions are generic; see the `README' file for
instructions specific to this package. instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses various system-dependent variables used during compilation. It uses
@ -42,7 +48,7 @@ may remove or edit it.
you want to change it or regenerate `configure' using a newer version you want to change it or regenerate `configure' using a newer version
of `autoconf'. of `autoconf'.
The simplest way to compile this package is: The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type 1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. `./configure' to configure the package for your system.
@ -53,12 +59,22 @@ The simplest way to compile this package is:
2. Type `make' to compile the package. 2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with 3. Optionally, type `make check' to run any self-tests that come with
the package. the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and 4. Type `make install' to install the programs and any data files and
documentation. documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
user, and only the `make install' phase executed with root
privileges.
5. You can remove the program binaries and object files from the 5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
regular user, particularly if the prior `make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is a different kind of computer), type `make distclean'. There is
@ -67,8 +83,15 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came all sorts of other programs in order to regenerate files that came
with the distribution. with the distribution.
6. Often, you can also type `make uninstall' to remove the installed 7. Often, you can also type `make uninstall' to remove the installed
files again. files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
8. Some packages, particularly those that use Automake, provide `make
distcheck', which can by used by developers to test that all other
targets like `make install' and `make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options Compilers and Options
===================== =====================
@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'. source code in the directory that `configure' is in and in `..'. This
is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have architecture at a time in the source code directory. After you have
@ -120,7 +144,8 @@ Installation Names
By default, `make install' installs the package's commands under By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You `/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'. `configure' the option `--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you architecture-specific files and architecture-independent files. If you
@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them. you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
`make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
affected directory. For example, `make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
`${prefix}'. Any directories that were specified during `configure',
but not in terms of `${prefix}', must each be overridden at install
time for the entire installation to be relocated. The approach of
makefile variable overrides for each directory variable is required by
the GNU Coding Standards, and ideally causes no recompilation.
However, some platforms have known limitations with the semantics of
shared libraries that end up requiring recompilation when using this
method, particularly noticeable in packages that use GNU Libtool.
The second method involves providing the `DESTDIR' variable. For
example, `make install DESTDIR=/alternate/directory' will prepend
`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
at `configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package. `configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations. `--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
execution of `make' will be. For these packages, running `./configure
--enable-silent-rules' sets the default to minimal output, which can be
overridden with `make V=1'; while running `./configure
--disable-silent-rules' sets the default to verbose, which can be
overridden with `make V=0'.
Particular systems Particular systems
================== ==================
@ -159,7 +222,7 @@ Particular systems
CC is not installed, it is recommended to use the following options in CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler: order to use an ANSI C compiler:
./configure CC="cc -Ae" ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX. and if that doesn't work, install pre-built binaries of GCC for HP-UX.
@ -174,6 +237,16 @@ and if that doesn't work, try
./configure CC="cc -nodtk" ./configure CC="cc -nodtk"
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
directory contains several dysfunctional programs; working variants of
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
in your `PATH', put it _after_ `/usr/bin'.
On Haiku, software installed for all users goes in `/boot/common',
not `/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type Specifying the System Type
========================== ==========================
@ -189,7 +262,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms: where SYSTEM can have one of these forms:
OS KERNEL-OS OS
KERNEL-OS
See the file `config.sub' for the possible values of each field. If See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't `config.sub' isn't included in this package, then this package doesn't
@ -277,7 +351,7 @@ operates.
`configure' can determine that directory automatically. `configure' can determine that directory automatically.
`--prefix=DIR' `--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names:: Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning for more details, including other options available for fine-tuning
the installation locations. the installation locations.

11
libjava/classpath/Makefile.in
View File

@ -51,12 +51,15 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \
../../config.rpath ../../config.sub ../../depcomp \ ../../config.rpath ../../config.sub ../../depcomp \
../../install-sh ../../ltmain.sh ../../missing \ ../../install-sh ../../ltmain.sh ../../missing \
../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \ ../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \
INSTALL NEWS TODO compile config.guess config.sub depcomp \ INSTALL NEWS TODO compile config.guess config.rpath config.sub \
install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \ depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \
ltmain.sh missing mkinstalldirs ltmain.sh missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -75,9 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

2
libjava/classpath/NEWS
View File

@ -1,3 +1,5 @@
New in release 0.99 (XXX XX, XXXX)
New in release 0.98 (Feb 05, 2009) New in release 0.98 (Feb 05, 2009)
* Native support for BigInteger is now provided using the GMP * Native support for BigInteger is now provided using the GMP

6
libjava/classpath/aclocal.m4 vendored
View File

@ -1062,6 +1062,9 @@ AC_SUBST([am__untar])
m4_include([../../config/depstand.m4]) m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4]) m4_include([../../config/lead-dot.m4])
m4_include([../../config/lib-ld.m4])
m4_include([../../config/lib-link.m4])
m4_include([../../config/lib-prefix.m4])
m4_include([../../config/multi.m4]) m4_include([../../config/multi.m4])
m4_include([../../config/no-executables.m4]) m4_include([../../config/no-executables.m4])
m4_include([../../config/override.m4]) m4_include([../../config/override.m4])
@ -1082,7 +1085,4 @@ m4_include([m4/ax_create_stdint_h.m4])
m4_include([m4/ax_func_which_gethostbyname_r.m4]) m4_include([m4/ax_func_which_gethostbyname_r.m4])
m4_include([m4/gcc_attribute.m4]) m4_include([m4/gcc_attribute.m4])
m4_include([m4/iconv.m4]) m4_include([m4/iconv.m4])
m4_include([m4/lib-ld.m4])
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
m4_include([m4/pkg.m4]) m4_include([m4/pkg.m4])

2
libjava/classpath/autogen.sh
View File

@ -18,7 +18,7 @@ have_libtool=false
if ${LIBTOOLIZE} --version < /dev/null > /dev/null 2>&1 ; then if ${LIBTOOLIZE} --version < /dev/null > /dev/null 2>&1 ; then
libtool_version=`${LIBTOOLIZE} --version | sed 's/^.*[^0-9.]\([0-9]\{1,\}\.[0-9.]\{1,\}\).*/\1/'` libtool_version=`${LIBTOOLIZE} --version | sed 's/^.*[^0-9.]\([0-9]\{1,\}\.[0-9.]\{1,\}\).*/\1/'`
case $libtool_version in case $libtool_version in
1.5*) 1.5*|2.*)
have_libtool=true have_libtool=true
;; ;;
esac esac

672
libjava/classpath/config.rpath Executable file
View File

@ -0,0 +1,672 @@
#! /bin/sh
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-2010 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
#
# The first argument passed to this file is the canonical host specification,
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
# should be set by the caller.
#
# The set of defined variables is at the end of this script.
# Known limitations:
# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
# than 256 bytes, otherwise the compiler driver will dump core. The only
# known workaround is to choose shorter directory names for the build
# directory and/or the installation directory.
# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
shrext=.so
host="$1"
host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
# Code taken from libtool.m4's _LT_CC_BASENAME.
for cc_temp in $CC""; do
case $cc_temp in
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
\-*) ;;
*) break;;
esac
done
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
# Code taken from libtool.m4's _LT_COMPILER_PIC.
wl=
if test "$GCC" = yes; then
wl='-Wl,'
else
case "$host_os" in
aix*)
wl='-Wl,'
;;
darwin*)
case $cc_basename in
xlc*)
wl='-Wl,'
;;
esac
;;
mingw* | cygwin* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
;;
irix5* | irix6* | nonstopux*)
wl='-Wl,'
;;
newsos6)
;;
linux* | k*bsd*-gnu)
case $cc_basename in
ecc*)
wl='-Wl,'
;;
icc* | ifort*)
wl='-Wl,'
;;
lf95*)
wl='-Wl,'
;;
pgcc | pgf77 | pgf90)
wl='-Wl,'
;;
ccc*)
wl='-Wl,'
;;
como)
wl='-lopt='
;;
*)
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
wl='-Wl,'
;;
esac
;;
esac
;;
osf3* | osf4* | osf5*)
wl='-Wl,'
;;
rdos*)
;;
solaris*)
wl='-Wl,'
;;
sunos4*)
wl='-Qoption ld '
;;
sysv4 | sysv4.2uw2* | sysv4.3*)
wl='-Wl,'
;;
sysv4*MP*)
;;
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
wl='-Wl,'
;;
unicos*)
wl='-Wl,'
;;
uts4*)
;;
esac
fi
# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
hardcode_libdir_flag_spec=
hardcode_libdir_separator=
hardcode_direct=no
hardcode_minus_L=no
case "$host_os" in
cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
if test "$GCC" != yes; then
with_gnu_ld=no
fi
;;
interix*)
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
openbsd*)
with_gnu_ld=no
;;
esac
ld_shlibs=yes
if test "$with_gnu_ld" = yes; then
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
# Unlike libtool, we use -rpath here, not --rpath, since the documented
# option of GNU ld is called -rpath, not --rpath.
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
case "$host_os" in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
fi
;;
amigaos*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
# that the semantics of dynamic libraries on AmigaOS, at least up
# to version 4, is to share data among multiple programs linked
# with the same dynamic library. Since this doesn't match the
# behavior of shared libraries on other platforms, we cannot use
# them.
ld_shlibs=no
;;
beos*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
cygwin* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
interix[3-9]*)
hardcode_direct=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
netbsd*)
;;
solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
ld_shlibs=no
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
else
ld_shlibs=no
fi
;;
esac
;;
sunos4*)
hardcode_direct=yes
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
esac
if test "$ld_shlibs" = no; then
hardcode_libdir_flag_spec=
fi
else
case "$host_os" in
aix3*)
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
if test "$GCC" = yes; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
fi
;;
aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
break
fi
done
;;
esac
fi
hardcode_direct=yes
hardcode_libdir_separator=':'
if test "$GCC" = yes; then
case $host_os in aix4.[012]|aix4.[012].*)
collect2name=`${CC} -print-prog-name=collect2`
if test -f "$collect2name" && \
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
:
else
# We have old collect2
hardcode_direct=unsupported
hardcode_minus_L=yes
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
;;
esac
fi
# Begin _LT_AC_SYS_LIBPATH_AIX.
echo 'int main () { return 0; }' > conftest.c
${CC} ${LDFLAGS} conftest.c -o conftest
aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
fi
if test -z "$aix_libpath"; then
aix_libpath="/usr/lib:/lib"
fi
rm -f conftest.c conftest
# End _LT_AC_SYS_LIBPATH_AIX.
if test "$aix_use_runtimelinking" = yes; then
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
else
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
fi
fi
;;
amigaos*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# see comment about different semantics on the GNU ld section
ld_shlibs=no
;;
bsdi[45]*)
;;
cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
libext=lib
;;
darwin* | rhapsody*)
hardcode_direct=no
if test "$GCC" = yes ; then
:
else
case $cc_basename in
xlc*)
;;
*)
ld_shlibs=no
;;
esac
fi
;;
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
freebsd1*)
ld_shlibs=no
;;
freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
freebsd2*)
hardcode_direct=yes
hardcode_minus_L=yes
;;
freebsd* | dragonfly*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
hpux9*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
;;
hpux10*)
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
fi
;;
hpux11*)
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
case $host_cpu in
hppa*64*|ia64*)
hardcode_direct=no
;;
*)
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
;;
esac
fi
;;
irix5* | irix6* | nonstopux*)
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
netbsd*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
newsos6)
hardcode_direct=yes
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
openbsd*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
else
case "$host_os" in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
fi
else
ld_shlibs=no
fi
;;
os2*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
;;
osf3*)
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*)
if test "$GCC" = yes; then
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
# Both cc and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
fi
hardcode_libdir_separator=:
;;
solaris*)
hardcode_libdir_flag_spec='-R$libdir'
;;
sunos4*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=yes
hardcode_minus_L=yes
;;
sysv4)
case $host_vendor in
sni)
hardcode_direct=yes # is this really true???
;;
siemens)
hardcode_direct=no
;;
motorola)
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
;;
sysv4.3*)
;;
sysv4*MP*)
if test -d /usr/nec; then
ld_shlibs=yes
fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
;;
sysv5* | sco3.2v5* | sco5v6*)
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
hardcode_libdir_separator=':'
;;
uts4*)
hardcode_libdir_flag_spec='-L$libdir'
;;
*)
ld_shlibs=no
;;
esac
fi
# Check dynamic linker characteristics
# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
# only about the one the linker finds when passed -lNAME. This is the last
# element of library_names_spec in libtool.m4, or possibly two of them if the
# linker has special search rules.
library_names_spec= # the last element of library_names_spec in libtool.m4
libname_spec='lib$name'
case "$host_os" in
aix3*)
library_names_spec='$libname.a'
;;
aix[4-9]*)
library_names_spec='$libname$shrext'
;;
amigaos*)
library_names_spec='$libname.a'
;;
beos*)
library_names_spec='$libname$shrext'
;;
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
cygwin* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
darwin* | rhapsody*)
shrext=.dylib
library_names_spec='$libname$shrext'
;;
dgux*)
library_names_spec='$libname$shrext'
;;
freebsd1*)
;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
esac
;;
gnu*)
library_names_spec='$libname$shrext'
;;
hpux9* | hpux10* | hpux11*)
case $host_cpu in
ia64*)
shrext=.so
;;
hppa*64*)
shrext=.sl
;;
*)
shrext=.sl
;;
esac
library_names_spec='$libname$shrext'
;;
interix[3-9]*)
library_names_spec='$libname$shrext'
;;
irix5* | irix6* | nonstopux*)
library_names_spec='$libname$shrext'
case "$host_os" in
irix5* | nonstopux*)
libsuff= shlibsuff=
;;
*)
case $LD in
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
*-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
*) libsuff= shlibsuff= ;;
esac
;;
esac
;;
linux*oldld* | linux*aout* | linux*coff*)
;;
linux* | k*bsd*-gnu)
library_names_spec='$libname$shrext'
;;
knetbsd*-gnu)
library_names_spec='$libname$shrext'
;;
netbsd*)
library_names_spec='$libname$shrext'
;;
newsos6)
library_names_spec='$libname$shrext'
;;
nto-qnx*)
library_names_spec='$libname$shrext'
;;
openbsd*)
library_names_spec='$libname$shrext$versuffix'
;;
os2*)
libname_spec='$name'
shrext=.dll
library_names_spec='$libname.a'
;;
osf3* | osf4* | osf5*)
library_names_spec='$libname$shrext'
;;
rdos*)
;;
solaris*)
library_names_spec='$libname$shrext'
;;
sunos4*)
library_names_spec='$libname$shrext$versuffix'
;;
sysv4 | sysv4.3*)
library_names_spec='$libname$shrext'
;;
sysv4*MP*)
library_names_spec='$libname$shrext'
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
library_names_spec='$libname$shrext'
;;
uts4*)
library_names_spec='$libname$shrext'
;;
esac
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
# How to pass a linker flag through the compiler.
wl="$escaped_wl"
# Static library suffix (normally "a").
libext="$libext"
# Shared library suffix (normally "so").
shlibext="$shlibext"
# Format of library name prefix.
libname_spec="$escaped_libname_spec"
# Library names that the linker finds when passed -lNAME.
library_names_spec="$escaped_library_names_spec"
# Flag to hardcode \$libdir into a binary during linking.
# This must work even if \$libdir does not exist.
hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
# Whether we need a single -rpath flag with a separated argument.
hardcode_libdir_separator="$hardcode_libdir_separator"
# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
# resulting binary.
hardcode_direct="$hardcode_direct"
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L="$hardcode_minus_L"
EOF

396
libjava/classpath/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for GNU Classpath 0.98. # Generated by GNU Autoconf 2.64 for GNU Classpath 0.99-pre.
# #
# Report bugs to <classpath@gnu.org>. # Report bugs to <classpath@gnu.org>.
# #
@ -559,8 +559,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='GNU Classpath' PACKAGE_NAME='GNU Classpath'
PACKAGE_TARNAME='classpath' PACKAGE_TARNAME='classpath'
PACKAGE_VERSION='0.98' PACKAGE_VERSION='0.99-pre'
PACKAGE_STRING='GNU Classpath 0.98' PACKAGE_STRING='GNU Classpath 0.99-pre'
PACKAGE_BUGREPORT='classpath@gnu.org' PACKAGE_BUGREPORT='classpath@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/classpath/' PACKAGE_URL='http://www.gnu.org/software/classpath/'
@ -1490,7 +1490,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures GNU Classpath 0.98 to adapt to many kinds of systems. \`configure' configures GNU Classpath 0.99-pre to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1565,7 +1565,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of GNU Classpath 0.98:";; short | recursive ) echo "Configuration of GNU Classpath 0.99-pre:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1757,7 +1757,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
GNU Classpath configure 0.98 GNU Classpath configure 0.99-pre
generated by GNU Autoconf 2.64 generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2009 Free Software Foundation, Inc.
@ -2586,7 +2586,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by GNU Classpath $as_me 0.98, which was It was created by GNU Classpath $as_me 0.99-pre, which was
generated by GNU Autoconf 2.64. Invocation command line was generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@ $ $0 $@
@ -2938,6 +2938,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir= ac_aux_dir=
for ac_dir in ../.. "$srcdir"/../..; do for ac_dir in ../.. "$srcdir"/../..; do
for ac_t in install-sh install.sh shtool; do for ac_t in install-sh install.sh shtool; do
@ -3620,7 +3621,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='classpath' PACKAGE='classpath'
VERSION='0.98' VERSION='0.99-pre'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -5474,7 +5475,7 @@ if test "${enable_plugin+set}" = set; then :
*) COMPILE_PLUGIN=yes ;; *) COMPILE_PLUGIN=yes ;;
esac esac
else else
COMPILE_PLUGIN=yes COMPILE_PLUGIN=no
fi fi
if test "x${COMPILE_PLUGIN}" = xyes; then if test "x${COMPILE_PLUGIN}" = xyes; then
@ -11818,7 +11819,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11821 "configure" #line 11822 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11924,7 +11925,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11927 "configure" #line 11928 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -21956,6 +21957,24 @@ fi
fi fi
if test "x${COMPILE_GMP}" = xyes; then if test "x${COMPILE_GMP}" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP directories" >&5
$as_echo_n "checking for GMP directories... " >&6; }
if test "x$with_gmp" != x; then
gmplibs="-L$with_gmp/lib -lgmp"
gmpinc="-I$with_gmp/include"
if test "x$with_gmp_include" != x; then
gmpinc="-I$with_gmp_include $gmpinc"
fi
if test "x$with_gmp_lib" != x; then
gmplibs="-L$with_gmp_lib $gmplibs"
fi
else
with_gmp="/usr"
gmplibs="-lgmp"
gmpinc="-I/usr/include"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc" >&5
$as_echo "prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_mul_si in -lgmp" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_mul_si in -lgmp" >&5
$as_echo_n "checking for __gmpz_mul_si in -lgmp... " >&6; } $as_echo_n "checking for __gmpz_mul_si in -lgmp... " >&6; }
if test "${ac_cv_lib_gmp___gmpz_mul_si+set}" = set; then : if test "${ac_cv_lib_gmp___gmpz_mul_si+set}" = set; then :
@ -23676,82 +23695,6 @@ test -n "$JAVA" || JAVA="$JAVAPREFIX"
fi fi
test "x$JAVA" = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 test "x$JAVA" = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
# Extract the first word of "uudecode$EXEEXT", so it can be a program name with args.
set dummy uudecode$EXEEXT; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_uudecode+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$uudecode"; then
ac_cv_prog_uudecode="$uudecode" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_uudecode="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
uudecode=$ac_cv_prog_uudecode
if test -n "$uudecode"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uudecode" >&5
$as_echo "$uudecode" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test x$uudecode = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if uudecode can decode base 64 file" >&5
$as_echo_n "checking if uudecode can decode base 64 file... " >&6; }
if test "${ac_cv_prog_uudecode_base64+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat << \EOF > Test.uue
begin-base64 644 Test.class
yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE
bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51
bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s
YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG
aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB
AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB
AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ=
====
EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 23737: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
fi
rm -f Test.uue
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_uudecode_base64" >&5
$as_echo "$ac_cv_prog_uudecode_base64" >&6; }
fi
if test x$ac_cv_prog_uudecode_base64 != xyes; then
rm -f Test.class
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I have to compile Test.class from scratch" >&5
$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
if test x$ac_cv_prog_javac_works = xno; then
as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
fi
if test x$ac_cv_prog_javac_works = x; then
ECJ_OPTS="-warn:-deprecation,serial,unusedImport" ECJ_OPTS="-warn:-deprecation,serial,unusedImport"
JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides" JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides"
@ -23851,10 +23794,13 @@ if test "${ac_cv_prog_javac_is_gcj+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
if $JAVAC --version | grep gcj > /dev/null; then if $JAVAC --version 2>&1 | grep gcj >&5 ; then
ac_cv_prog_javac_is_gcj=yes; ac_cv_prog_javac_is_gcj=yes;
JAVAC="$JAVAC $GCJ_OPTS"; JAVAC="$JAVAC $GCJ_OPTS";
else
ac_cv_prog_javac_is_gcj=no;
fi fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_is_gcj" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_is_gcj" >&5
$as_echo "$ac_cv_prog_javac_is_gcj" >&6; } $as_echo "$ac_cv_prog_javac_is_gcj" >&6; }
@ -23868,7 +23814,8 @@ else
GCJ_JAVAC_FALSE= GCJ_JAVAC_FALSE=
fi fi
if test "$enable_java_maintainer_mode" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVAC works" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVAC works" >&5
$as_echo_n "checking if $JAVAC works... " >&6; } $as_echo_n "checking if $JAVAC works... " >&6; }
@ -23879,7 +23826,7 @@ else
JAVA_TEST=Object.java JAVA_TEST=Object.java
CLASS_TEST=Object.class CLASS_TEST=Object.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 23882 "configure" */ /* #line 23829 "configure" */
package java.lang; package java.lang;
public class Object public class Object
@ -23912,8 +23859,82 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
$as_echo "$ac_cv_prog_javac_works" >&6; } $as_echo "$ac_cv_prog_javac_works" >&6; }
# Extract the first word of "uudecode$EXEEXT", so it can be a program name with args.
set dummy uudecode$EXEEXT; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_uudecode+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$uudecode"; then
ac_cv_prog_uudecode="$uudecode" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_uudecode="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
uudecode=$ac_cv_prog_uudecode
if test -n "$uudecode"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uudecode" >&5
$as_echo "$uudecode" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi fi
if test x$uudecode = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if uudecode can decode base 64 file" >&5
$as_echo_n "checking if uudecode can decode base 64 file... " >&6; }
if test "${ac_cv_prog_uudecode_base64+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat << \EOF > Test.uue
begin-base64 644 Test.class
yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE
bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51
bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s
YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG
aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB
AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB
AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ=
====
EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 23922: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
fi
rm -f Test.uue
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_uudecode_base64" >&5
$as_echo "$ac_cv_prog_uudecode_base64" >&6; }
fi
if test x$ac_cv_prog_uudecode_base64 != xyes; then
rm -f Test.class
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I have to compile Test.class from scratch" >&5
$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
if test x$ac_cv_prog_javac_works = xno; then
as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
fi fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVA works" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVA works" >&5
@ -23926,13 +23947,14 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
TEST=Test TEST=Test
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* [#]line 23929 "configure" */ /* [#]line 23950 "configure" */
public class Test { public class Test {
public static void main (String args[]) { public static void main (String args[]) {
System.exit (0); System.exit (0);
} } } }
EOF EOF
if test x$ac_cv_prog_uudecode_base64 != xyes; then if test x$ac_cv_prog_uudecode_base64 != xyes; then
if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST' if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
@ -23965,7 +23987,6 @@ fi
$as_echo "$ac_cv_prog_java_works" >&6; } $as_echo "$ac_cv_prog_java_works" >&6; }
fi fi
if test "x${COMPILE_GJDOC}" = xyes; then if test "x${COMPILE_GJDOC}" = xyes; then
@ -24092,7 +24113,11 @@ fi
if test -z "$JAVA"; then if test -z "$JAVA"; then
as_fn_error "Failed to find either an antlr binary or a suitable Java runtime for ANTLR." "$LINENO" 5 as_fn_error "Failed to find either an antlr binary or a suitable Java runtime for ANTLR." "$LINENO" 5
else else
ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool" if test -z "$ANTLR_JAR"; then
as_fn_error "Failed to find either an antlr binary or a suitable antlr jar file." "$LINENO" 5
else
ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool"
fi
fi fi
fi fi
@ -24124,174 +24149,13 @@ fi
if test "x${use_glibj_zip}" = xfalse || \ if test "x${use_glibj_zip}" = xfalse || \
test "x${EXAMPLESDIR}" != x || \ test "x${EXAMPLESDIR}" != x || \
test "x${TOOLSDIR}" != x && \ test "x${TOOLSDIR}" != x && \
test "x${build_class_files}" != xno; then test "x${build_class_files}" != xno && \
test "${enable_java_maintainer_mode}" = yes; then
ECJ_OPTS="-warn:-deprecation,serial,unusedImport"
JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides"
GCJ_OPTS="-g"
if test "x$JAVAPREFIX" = x; then
test "x$JAVAC" = x && for ac_prog in "ecj$EXEEXT $ECJ_OPTS" "ecj-3.3$EXEEXT $ECJ_OPTS" "ecj-3.2$EXEEXT $ECJ_OPTS" "javac$EXEEXT $JAVAC_OPTS" "gcj$EXEEXT -C"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_JAVAC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$JAVAC"; then
ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_JAVAC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
JAVAC=$ac_cv_prog_JAVAC
if test -n "$JAVAC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
$as_echo "$JAVAC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$JAVAC" && break
done
else
test "x$JAVAC" = x && for ac_prog in "ecj$EXEEXT $ECJ_OPTS" "ecj-3.3$EXEEXT $ECJ_OPTS" "ecj-3.2$EXEEXT $ECJ_OPTS" "javac$EXEEXT $JAVAC_OPTS" "gcj$EXEEXT -C"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_JAVAC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$JAVAC"; then
ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_JAVAC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
JAVAC=$ac_cv_prog_JAVAC
if test -n "$JAVAC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
$as_echo "$JAVAC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$JAVAC" && break
done
test -n "$JAVAC" || JAVAC="$JAVAPREFIX"
fi
test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVAC is a version of gcj" >&5
$as_echo_n "checking if $JAVAC is a version of gcj... " >&6; }
if test "${ac_cv_prog_javac_is_gcj+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if $JAVAC --version | grep gcj > /dev/null; then
ac_cv_prog_javac_is_gcj=yes;
JAVAC="$JAVAC $GCJ_OPTS";
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_is_gcj" >&5
$as_echo "$ac_cv_prog_javac_is_gcj" >&6; }
JAVAC_IS_GCJ=$ac_cv_prog_javac_is_gcj
if test x"${JAVAC_IS_GCJ}" = xyes; then
GCJ_JAVAC_TRUE=
GCJ_JAVAC_FALSE='#'
else
GCJ_JAVAC_TRUE='#'
GCJ_JAVAC_FALSE=
fi
if test "$enable_java_maintainer_mode" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVAC works" >&5
$as_echo_n "checking if $JAVAC works... " >&6; }
if test "${ac_cv_prog_javac_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
JAVA_TEST=Object.java
CLASS_TEST=Object.class
cat << \EOF > $JAVA_TEST
/* #line 24255 "configure" */
package java.lang;
public class Object
{
static <T> void doStuff()
{
}
}
EOF
if test x$JAVAC_IS_GCJ = xyes; then
CMD="$JAVAC $JAVACFLAGS -fsource=1.5 -ftarget=1.5 $JAVA_TEST"
else
CMD="$JAVAC $JAVACFLAGS -source 1.5 -target 1.5 $JAVA_TEST"
fi
if { ac_try='$CMD'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; } >/dev/null 2>&1; then
ac_cv_prog_javac_works=yes
else
as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
echo "configure: failed program was:" >&5
cat $JAVA_TEST >&5
fi
rm -f $JAVA_TEST $CLASS_TEST
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
$as_echo "$ac_cv_prog_javac_works" >&6; }
fi
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 24294 "configure" */ /* #line 24158 "configure" */
public class Test public class Test
{ {
public static void main(String args) public static void main(String args)
@ -24317,6 +24181,15 @@ $as_echo "no" >&6; }
rm -f $JAVA_TEST $CLASS_TEST rm -f $JAVA_TEST $CLASS_TEST
else
if no; then
GCJ_JAVAC_TRUE=
GCJ_JAVAC_FALSE='#'
else
GCJ_JAVAC_TRUE='#'
GCJ_JAVAC_FALSE=
fi
fi fi
@ -25127,7 +25000,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by GNU Classpath $as_me 0.98, which was This file was extended by GNU Classpath $as_me 0.99-pre, which was
generated by GNU Autoconf 2.64. Invocation command line was generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -25197,7 +25070,7 @@ General help using GNU software: <http://www.gnu.org/gethelp/>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
GNU Classpath config.status 0.98 GNU Classpath config.status 0.99-pre
configured by $0, generated by GNU Autoconf 2.64, configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -27869,3 +27742,8 @@ cat ${srcdir}/lib/standard.omit.in > lib/standard.omit
if test x$use_escher != xtrue; then if test x$use_escher != xtrue; then
echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit
fi fi
if test "x${COMPILE_PLUGIN}" = "xyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have enabled the browser plugin. Please note that this is no longer maintained as part of GNU Classpath; development has moved to the IcedTea project." >&5
$as_echo "$as_me: WARNING: You have enabled the browser plugin. Please note that this is no longer maintained as part of GNU Classpath; development has moved to the IcedTea project." >&2;}
fi

65
libjava/classpath/configure.ac
View File

@ -6,8 +6,9 @@ dnl -----------------------------------------------------------
dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_LOAD], )dnl
dnl define([AC_CACHE_SAVE], )dnl dnl define([AC_CACHE_SAVE], )dnl
AC_INIT([GNU Classpath],[0.98],[classpath@gnu.org],[classpath]) AC_INIT([GNU Classpath],[0.99-pre],[classpath@gnu.org],[classpath])
AC_CONFIG_SRCDIR(java/lang/System.java) AC_CONFIG_SRCDIR(java/lang/System.java)
AC_CONFIG_MACRO_DIR([m4])
dnl GCJ LOCAL dnl GCJ LOCAL
AC_CONFIG_AUX_DIR(../..) AC_CONFIG_AUX_DIR(../..)
@ -273,7 +274,7 @@ AC_ARG_ENABLE([qt-peer],
AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes) AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl Plugin (enabled by default) dnl Plugin (disabled by default)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
AC_ARG_ENABLE([plugin], AC_ARG_ENABLE([plugin],
[AS_HELP_STRING(--disable-plugin,compile gcjwebplugin (disabled by --disable-plugin) [default=yes])], [AS_HELP_STRING(--disable-plugin,compile gcjwebplugin (disabled by --disable-plugin) [default=yes])],
@ -282,7 +283,7 @@ AC_ARG_ENABLE([plugin],
no) COMPILE_PLUGIN=no ;; no) COMPILE_PLUGIN=no ;;
*) COMPILE_PLUGIN=yes ;; *) COMPILE_PLUGIN=yes ;;
esac], esac],
[COMPILE_PLUGIN=yes]) [COMPILE_PLUGIN=no])
AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes) AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes)
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
@ -424,7 +425,7 @@ dnl -----------------------------------------------------------
dnl Initialize libtool dnl Initialize libtool
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL LT_INIT
AC_PROG_AWK AC_PROG_AWK
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
@ -739,35 +740,26 @@ if test "x${COMPILE_JNI}" = xyes; then
dnl Check for MSG_NOSIGNAL dnl Check for MSG_NOSIGNAL
dnl ********************************************************************** dnl **********************************************************************
AC_MSG_CHECKING(for MSG_NOSIGNAL) AC_MSG_CHECKING(for MSG_NOSIGNAL)
AC_TRY_COMPILE([#include <sys/socket.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = MSG_NOSIGNAL; ]])],[ AC_MSG_RESULT(yes)
[ int f = MSG_NOSIGNAL; ],
[ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, AC_DEFINE(HAVE_MSG_NOSIGNAL, 1,
[Define this symbol if you have MSG_NOSIGNAL]) ], [Define this symbol if you have MSG_NOSIGNAL]) ],[ AC_MSG_RESULT(no)
[ AC_MSG_RESULT(no)] ])
)
dnl ********************************************************************** dnl **********************************************************************
dnl Check for SO_NOSIGPIPE (Darwin equivalent for MSG_NOSIGNAL) dnl Check for SO_NOSIGPIPE (Darwin equivalent for MSG_NOSIGNAL)
dnl ********************************************************************** dnl **********************************************************************
AC_MSG_CHECKING(for SO_NOSIGPIPE ) AC_MSG_CHECKING(for SO_NOSIGPIPE )
AC_TRY_COMPILE([#include <sys/socket.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = SO_NOSIGPIPE; ]])],[ AC_MSG_RESULT(yes)
[ int f = SO_NOSIGPIPE; ],
[ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_SO_NOSIGPIPE, 1, AC_DEFINE(HAVE_SO_NOSIGPIPE, 1,
[Define this symbol if you have SO_NOSIGPIPE]) ], [Define this symbol if you have SO_NOSIGPIPE]) ],[ AC_MSG_RESULT(no)
[ AC_MSG_RESULT(no)] ])
)
dnl ********************************************************************** dnl **********************************************************************
dnl Check for MSG_WAITALL dnl Check for MSG_WAITALL
dnl ********************************************************************** dnl **********************************************************************
AC_MSG_CHECKING(for MSG_WAITALL) AC_MSG_CHECKING(for MSG_WAITALL)
AC_TRY_COMPILE([#include <sys/socket.h>], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = MSG_WAITALL; ]])],[ AC_MSG_RESULT(yes)
[ int f = MSG_WAITALL; ],
[ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MSG_WAITALL, 1, AC_DEFINE(HAVE_MSG_WAITALL, 1,
[Define this symbol if you have MSG_WAITALL]) ], [Define this symbol if you have MSG_WAITALL]) ],[ AC_MSG_RESULT(no)
[ AC_MSG_RESULT(no)] ])
)
dnl Check for plugin support headers and libraries. dnl Check for plugin support headers and libraries.
if test "x${COMPILE_PLUGIN}" = xyes; then if test "x${COMPILE_PLUGIN}" = xyes; then
@ -835,6 +827,22 @@ if test "x${COMPILE_JNI}" = xyes; then
fi fi
if test "x${COMPILE_GMP}" = xyes; then if test "x${COMPILE_GMP}" = xyes; then
AC_MSG_CHECKING([for GMP directories])
if test "x$with_gmp" != x; then
gmplibs="-L$with_gmp/lib -lgmp"
gmpinc="-I$with_gmp/include"
if test "x$with_gmp_include" != x; then
gmpinc="-I$with_gmp_include $gmpinc"
fi
if test "x$with_gmp_lib" != x; then
gmplibs="-L$with_gmp_lib $gmplibs"
fi
else
with_gmp="/usr"
gmplibs="-lgmp"
gmpinc="-I/usr/include"
fi
AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc])
AC_CHECK_LIB(gmp, __gmpz_mul_si, AC_CHECK_LIB(gmp, __gmpz_mul_si,
[GMP_CFLAGS="$gmpinc" [GMP_CFLAGS="$gmpinc"
GMP_LIBS="$gmplibs" ], GMP_LIBS="$gmplibs" ],
@ -1044,7 +1052,7 @@ AC_SUBST(PATH_TO_GLIBJ_ZIP)
if test "x${TOOLSDIR}" != x; then if test "x${TOOLSDIR}" != x; then
dnl GCJ LOCAL dnl GCJ LOCAL
if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then
AC_PROG_JAVA AC_PROG_JAVA_WORKS
fi fi
dnl END GCJ LOCAL dnl END GCJ LOCAL
if test "x${COMPILE_GJDOC}" = xyes; then if test "x${COMPILE_GJDOC}" = xyes; then
@ -1063,9 +1071,12 @@ fi
if test "x${use_glibj_zip}" = xfalse || \ if test "x${use_glibj_zip}" = xfalse || \
test "x${EXAMPLESDIR}" != x || \ test "x${EXAMPLESDIR}" != x || \
test "x${TOOLSDIR}" != x && \ test "x${TOOLSDIR}" != x && \
test "x${build_class_files}" != xno; then test "x${build_class_files}" != xno && \
AC_PROG_JAVAC test "${enable_java_maintainer_mode}" = yes; then dnl GCJ_LOCAL
AC_PROG_JAVAC_WORKS
CLASSPATH_JAVAC_MEM_CHECK CLASSPATH_JAVAC_MEM_CHECK
else
AM_CONDITIONAL(GCJ_JAVAC, no)
fi fi
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
@ -1232,3 +1243,7 @@ cat ${srcdir}/lib/standard.omit.in > lib/standard.omit
if test x$use_escher != xtrue; then if test x$use_escher != xtrue; then
echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit
fi fi
if test "x${COMPILE_PLUGIN}" = "xyes" ; then
AC_MSG_WARN([You have enabled the browser plugin. Please note that this is no longer maintained as part of GNU Classpath; development has moved to the IcedTea project.])
fi

87
libjava/classpath/depcomp
View File

@ -1,10 +1,10 @@
#! /bin/sh #! /bin/sh
# depcomp - compile a program generating dependencies as side-effects # depcomp - compile a program generating dependencies as side-effects
scriptversion=2007-03-29.01 scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
# Foundation, Inc. # Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,9 +17,7 @@ scriptversion=2007-03-29.01
# GNU General Public License for more details. # GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout depmode=dashmstdout
fi fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
# This is just like msvisualcpp but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
cygpath_u="sed s,\\\\\\\\,/,g"
depmode=msvisualcpp
fi
case "$depmode" in case "$depmode" in
gcc3) gcc3)
## gcc 3 implements dependency tracking that does exactly what ## gcc 3 implements dependency tracking that does exactly what
@ -192,14 +199,14 @@ sgi)
' < "$tmpdepfile" \ ' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr ' tr '
' ' ' >> $depfile ' ' ' >> "$depfile"
echo >> $depfile echo >> "$depfile"
# The second pass generates a dummy entry for each header file. # The second pass generates a dummy entry for each header file.
tr ' ' ' tr ' ' '
' < "$tmpdepfile" \ ' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> $depfile >> "$depfile"
else else
# The sourcefile does not contain any dependencies, so just # The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile # store a dummy comment line, to avoid errors with the Makefile
@ -328,7 +335,12 @@ hp2)
if test -f "$tmpdepfile"; then if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add `dependent.h:' lines. # Add `dependent.h:' lines.
sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" sed -ne '2,${
s/^ *//
s/ \\*$//
s/$/:/
p
}' "$tmpdepfile" >> "$depfile"
else else
echo "#dummy" > "$depfile" echo "#dummy" > "$depfile"
fi fi
@ -404,7 +416,7 @@ dashmstdout)
# Remove the call to Libtool. # Remove the call to Libtool.
if test "$libtool" = yes; then if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do while test "X$1" != 'X--mode=compile'; do
shift shift
done done
shift shift
@ -455,32 +467,39 @@ makedepend)
"$@" || exit $? "$@" || exit $?
# Remove any Libtool call # Remove any Libtool call
if test "$libtool" = yes; then if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do while test "X$1" != 'X--mode=compile'; do
shift shift
done done
shift shift
fi fi
# X makedepend # X makedepend
shift shift
cleared=no cleared=no eat=no
for arg in "$@"; do for arg
do
case $cleared in case $cleared in
no) no)
set ""; shift set ""; shift
cleared=yes ;; cleared=yes ;;
esac esac
if test $eat = yes; then
eat=no
continue
fi
case "$arg" in case "$arg" in
-D*|-I*) -D*|-I*)
set fnord "$@" "$arg"; shift ;; set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove # Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file. # the object too, otherwise makedepend will parse it as a source file.
-arch)
eat=yes ;;
-*|$object) -*|$object)
;; ;;
*) *)
set fnord "$@" "$arg"; shift ;; set fnord "$@" "$arg"; shift ;;
esac esac
done done
obj_suffix="`echo $object | sed 's/^.*\././'`" obj_suffix=`echo "$object" | sed 's/^.*\././'`
touch "$tmpdepfile" touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile" rm -f "$depfile"
@ -500,7 +519,7 @@ cpp)
# Remove the call to Libtool. # Remove the call to Libtool.
if test "$libtool" = yes; then if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do while test "X$1" != 'X--mode=compile'; do
shift shift
done done
shift shift
@ -538,13 +557,27 @@ cpp)
msvisualcpp) msvisualcpp)
# Important note: in order to support this mode, a compiler *must* # Important note: in order to support this mode, a compiler *must*
# always write the preprocessed file to stdout, regardless of -o, # always write the preprocessed file to stdout.
# because we must use -o when running libtool.
"$@" || exit $? "$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
IFS=" " IFS=" "
for arg for arg
do do
case "$arg" in case "$arg" in
-o)
shift
;;
$object)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@" set fnord "$@"
shift shift
@ -557,16 +590,23 @@ msvisualcpp)
;; ;;
esac esac
done done
"$@" -E | "$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile" rm -f "$depfile"
echo "$object : \\" > "$depfile" echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile" echo " " >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile" rm -f "$tmpdepfile"
;; ;;
msvcmsys)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
none) none)
exec "$@" exec "$@"
;; ;;
@ -585,5 +625,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion=" # time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$" # time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End: # End:

7
libjava/classpath/doc/Makefile.in
View File

@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -57,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

7
libjava/classpath/doc/api/Makefile.in
View File

@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -58,9 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

2
libjava/classpath/doc/cp-hacking.texinfo
View File

@ -11,7 +11,7 @@
This file contains important information you will need to know if you This file contains important information you will need to know if you
are going to hack on the GNU Classpath project code. are going to hack on the GNU Classpath project code.
Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005,2007 Free Software Foundation, Inc. Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005,2007,2009 Free Software Foundation, Inc.
@ifnotplaintext @ifnotplaintext
@dircategory GNU Libraries @dircategory GNU Libraries

594
libjava/classpath/doc/texinfo.tex
View File

@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex. % Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
% %
\def\texinfoversion{2008-11-17.21} \def\texinfoversion{2009-08-14.15}
% %
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
% 2007, 2008 Free Software Foundation, Inc. % 2007, 2008, 2009 Free Software Foundation, Inc.
% %
% This texinfo.tex file is free software: you can redistribute it and/or % This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as % modify it under the terms of the GNU General Public License as
@ -100,6 +100,7 @@
\let\ptextop=\top \let\ptextop=\top
{\catcode`\'=\active {\catcode`\'=\active
\global\let\ptexquoteright'}% Math-mode def from plain.tex. \global\let\ptexquoteright'}% Math-mode def from plain.tex.
\let\ptexraggedright=\raggedright
% If this character appears in an error message or help string, it % If this character appears in an error message or help string, it
% starts a new line in the output. % starts a new line in the output.
@ -1331,11 +1332,17 @@ output) for that.)}
\ifpdf \ifpdf
% %
% Color manipulation macros based on pdfcolor.tex. % Color manipulation macros based on pdfcolor.tex,
\def\cmykDarkRed{0.28 1 1 0.35} % except using rgb instead of cmyk; the latter is said to render as a
\def\cmykBlack{0 0 0 1} % very dark gray on-screen and a very dark halftone in print, instead
% of actual black.
\def\rgbDarkRed{0.50 0.09 0.12}
\def\rgbBlack{0 0 0}
%
% k sets the color for filling (usual text, etc.);
% K sets the color for stroking (thin rules, e.g., normal _'s).
\def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}}
% %
\def\pdfsetcolor#1{\pdfliteral{#1 k}}
% Set color, and create a mark which defines \thiscolor accordingly, % Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore. % so that \makeheadline knows which color to restore.
\def\setcolor#1{% \def\setcolor#1{%
@ -1344,7 +1351,7 @@ output) for that.)}
\pdfsetcolor{#1}% \pdfsetcolor{#1}%
} }
% %
\def\maincolor{\cmykBlack} \def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor} \pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor} \edef\thiscolor{\maincolor}
\def\lastcolordefs{} \def\lastcolordefs{}
@ -1439,8 +1446,8 @@ output) for that.)}
% %
% by default, use a color that is dark enough to print on paper as % by default, use a color that is dark enough to print on paper as
% nearly black, but still distinguishable for online viewing. % nearly black, but still distinguishable for online viewing.
\def\urlcolor{\cmykDarkRed} \def\urlcolor{\rgbDarkRed}
\def\linkcolor{\cmykDarkRed} \def\linkcolor{\rgbDarkRed}
\def\endlink{\setcolor{\maincolor}\pdfendlink} \def\endlink{\setcolor{\maincolor}\pdfendlink}
% %
% Adding outlines to PDF; macros for calculating structure of outlines % Adding outlines to PDF; macros for calculating structure of outlines
@ -1574,6 +1581,10 @@ output) for that.)}
\def\@{@}% \def\@{@}%
\let\/=\empty \let\/=\empty
\makevalueexpandable \makevalueexpandable
% do we want to go so far as to use \indexnofonts instead of just
% special-casing \var here?
\def\var##1{##1}%
%
\leavevmode\setcolor{\urlcolor}% \leavevmode\setcolor{\urlcolor}%
\startlink attr{/Border [0 0 0]}% \startlink attr{/Border [0 0 0]}%
user{/Subtype /Link /A << /S /URI /URI (#1) >>}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
@ -1604,6 +1615,7 @@ output) for that.)}
\setcolor{\linkcolor}#1\endlink} \setcolor{\linkcolor}#1\endlink}
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
\else \else
% non-pdf mode
\let\pdfmkdest = \gobble \let\pdfmkdest = \gobble
\let\pdfurl = \gobble \let\pdfurl = \gobble
\let\endlink = \relax \let\endlink = \relax
@ -2348,6 +2360,16 @@ end
\def\lsize{smaller}\def\lllsize{smaller}% \def\lsize{smaller}\def\lllsize{smaller}%
\resetmathfonts \setleading{9.5pt}} \resetmathfonts \setleading{9.5pt}}
% Fonts for short table of contents.
\setfont\shortcontrm\rmshape{12}{1000}{OT1}
\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
\setfont\shortcontsl\slshape{12}{1000}{OT1}
\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
% Define these just so they can be easily changed for other fonts.
\def\angleleft{$\langle$}
\def\angleright{$\rangle$}
% Set the fonts to use with the @small... environments. % Set the fonts to use with the @small... environments.
\let\smallexamplefonts = \smallfonts \let\smallexamplefonts = \smallfonts
@ -2361,28 +2383,128 @@ end
% %
% By the way, for comparison, here's what fits with @example (10pt): % By the way, for comparison, here's what fits with @example (10pt):
% 8.5x11=71 smallbook=60 a4=75 a5=58 % 8.5x11=71 smallbook=60 a4=75 a5=58
%
% I wish the USA used A4 paper.
% --karl, 24jan03. % --karl, 24jan03.
% Set up the default fonts, so we can use them for creating boxes. % Set up the default fonts, so we can use them for creating boxes.
% %
\definetextfontsizexi \definetextfontsizexi
% Define these so they can be easily changed for other fonts.
\def\angleleft{$\langle$} \message{markup,}
\def\angleright{$\rangle$}
% Check if we are currently using a typewriter font. Since all the
% Computer Modern typewriter fonts have zero interword stretch (and
% shrink), and it is reasonable to expect all typewriter fonts to have
% this property, we can check that font parameter.
%
\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
% define and register \INITMACRO to be called on markup style changes.
% \INITMACRO can check \currentmarkupstyle for the innermost
% style and the set of \ifmarkupSTYLE switches for all styles
% currently in effect.
\newif\ifmarkupvar
\newif\ifmarkupsamp
\newif\ifmarkupkey
%\newif\ifmarkupfile % @file == @samp.
%\newif\ifmarkupoption % @option == @samp.
\newif\ifmarkupcode
\newif\ifmarkupkbd
%\newif\ifmarkupenv % @env == @code.
%\newif\ifmarkupcommand % @command == @code.
\newif\ifmarkuptex % @tex (and part of @math, for now).
\newif\ifmarkupexample
\newif\ifmarkupverb
\newif\ifmarkupverbatim
\let\currentmarkupstyle\empty
\def\setupmarkupstyle#1{%
\csname markup#1true\endcsname
\def\currentmarkupstyle{#1}%
\markupstylesetup
}
\let\markupstylesetup\empty
\def\defmarkupstylesetup#1{%
\expandafter\def\expandafter\markupstylesetup
\expandafter{\markupstylesetup #1}%
\def#1%
}
% Markup style setup for left and right quotes.
\defmarkupstylesetup\markupsetuplq{%
\expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
\ifx\temp\relax \markupsetuplqdefault \else \temp \fi
}
\defmarkupstylesetup\markupsetuprq{%
\expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
\ifx\temp\relax \markupsetuprqdefault \else \temp \fi
}
{
\catcode`\'=\active
\catcode`\`=\active
\gdef\markupsetuplqdefault{\let`\lq}
\gdef\markupsetuprqdefault{\let'\rq}
\gdef\markupsetcodequoteleft{\let`\codequoteleft}
\gdef\markupsetcodequoteright{\let'\codequoteright}
\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
}
\let\markupsetuplqcode \markupsetcodequoteleft
\let\markupsetuprqcode \markupsetcodequoteright
\let\markupsetuplqexample \markupsetcodequoteleft
\let\markupsetuprqexample \markupsetcodequoteright
\let\markupsetuplqverb \markupsetcodequoteleft
\let\markupsetuprqverb \markupsetcodequoteright
\let\markupsetuplqverbatim \markupsetcodequoteleft
\let\markupsetuprqverbatim \markupsetcodequoteright
\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
% Allow an option to not replace quotes with a regular directed right
% quote/apostrophe (char 0x27), but instead use the undirected quote
% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
% the default, but it works for pasting with more pdf viewers (at least
% evince), the lilypond developers report. xpdf does work with the
% regular 0x27.
%
\def\codequoteright{%
\expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
\expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
'%
\else \char'15 \fi
\else \char'15 \fi
}
%
% and a similar option for the left quote char vs. a grave accent.
% Modern fonts display ASCII 0x60 as a grave accent, so some people like
% the code environments to do likewise.
%
\def\codequoteleft{%
\expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
\expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
% [Knuth] pp. 380,381,391
% \relax disables Spanish ligatures ?` and !` of \tt font.
\relax`%
\else \char'22 \fi
\else \char'22 \fi
}
% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
\def\noligaturesquoteleft{\relax\lq}
% Count depth in font-changes, for error checks % Count depth in font-changes, for error checks
\newcount\fontdepth \fontdepth=0 \newcount\fontdepth \fontdepth=0
% Fonts for short table of contents.
\setfont\shortcontrm\rmshape{12}{1000}{OT1}
\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
\setfont\shortcontsl\slshape{12}{1000}{OT1}
\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
%% Add scribe-like font environments, plus @l for inline lisp (usually sans %% Add scribe-like font environments, plus @l for inline lisp (usually sans
%% serif) and @ii for TeX italic %% serif) and @ii for TeX italic
@ -2397,7 +2519,7 @@ end
% @var is set to this for defun arguments. % @var is set to this for defun arguments.
\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} \def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
% like \smartslanted except unconditionally use \sl. We never want % @cite is like \smartslanted except unconditionally use \sl. We never want
% ttsl for book titles, do we? % ttsl for book titles, do we?
\def\cite#1{{\sl #1}\futurelet\next\smartitalicx} \def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
@ -2407,7 +2529,12 @@ end
\let\dfn=\smartslanted \let\dfn=\smartslanted
\let\emph=\smartitalic \let\emph=\smartitalic
% @b, explicit bold. % Explicit font changes: @r, @sc, undocumented @ii.
\def\r#1{{\rm #1}} % roman font
\def\sc#1{{\smallcaps#1}} % smallcaps font
\def\ii#1{{\it #1}} % italic font
% @b, explicit bold. Also @strong.
\def\b#1{{\bf #1}} \def\b#1{{\bf #1}}
\let\strong=\b \let\strong=\b
@ -2439,22 +2566,35 @@ end
\catcode`@=\other \catcode`@=\other
\def\endofsentencespacefactor{3000}% default \def\endofsentencespacefactor{3000}% default
% @t, explicit typewriter.
\def\t#1{% \def\t#1{%
{\tt \rawbackslash \plainfrenchspacing #1}% {\tt \rawbackslash \plainfrenchspacing #1}%
\null \null
} }
% @samp.
\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
\setfont\keyrm\rmshape{8}{1000}{OT1}
\font\keysy=cmsy9 % definition of @key that produces a lozenge. Doesn't adjust to text size.
\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% %\setfont\keyrm\rmshape{8}{1000}{OT1}
\raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% %\font\keysy=cmsy9
\vbox{\hrule\kern-0.4pt %\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
\hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% % \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
\kern-0.4pt\hrule}% % \vbox{\hrule\kern-0.4pt
\kern-.06em\raise0.4pt\hbox{\angleright}}}} % \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
\def\key #1{{\setupmarkupstyle{key}\nohyphenation \uppercase{#1}}\null} % \kern-0.4pt\hrule}%
% The old definition, with no lozenge: % \kern-.06em\raise0.4pt\hbox{\angleright}}}}
%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
% definition of @key with no lozenge. If the current font is already
% monospace, don't change it; that way, we respect @kbdinputstyle. But
% if it isn't monospace, then use \tt.
%
\def\key#1{{\setupmarkupstyle{key}%
\nohyphenation
\ifmonospace\else\tt\fi
#1}\null}
% ctrl is no longer a Texinfo command.
\def\ctrl #1{{\tt \rawbackslash \hat}#1} \def\ctrl #1{{\tt \rawbackslash \hat}#1}
% @file, @option are the same as @samp. % @file, @option are the same as @samp.
@ -2552,6 +2692,7 @@ end
% @kbd is like @code, except that if the argument is just one @key command, % @kbd is like @code, except that if the argument is just one @key command,
% then @kbd has no effect. % then @kbd has no effect.
\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
% `example' (@kbd uses ttsl only inside of @example and friends), % `example' (@kbd uses ttsl only inside of @example and friends),
@ -2573,7 +2714,7 @@ end
\def\wordexample{example} \def\wordexample{example}
\def\wordcode{code} \def\wordcode{code}
% Default is `distinct.' % Default is `distinct'.
\kbdinputstyle distinct \kbdinputstyle distinct
\def\xkey{\key} \def\xkey{\key}
@ -2643,30 +2784,16 @@ end
\let\email=\uref \let\email=\uref
\fi \fi
% Check if we are currently using a typewriter font. Since all the
% Computer Modern typewriter fonts have zero interword stretch (and
% shrink), and it is reasonable to expect all typewriter fonts to have
% this property, we can check that font parameter.
%
\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
% Typeset a dimension, e.g., `in' or `pt'. The only reason for the % Typeset a dimension, e.g., `in' or `pt'. The only reason for the
% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
% %
\def\dmn#1{\thinspace #1} \def\dmn#1{\thinspace #1}
\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
% @l was never documented to mean ``switch to the Lisp font'', % @l was never documented to mean ``switch to the Lisp font'',
% and it is not used as such in any manual I can find. We need it for % and it is not used as such in any manual I can find. We need it for
% Polish suppressed-l. --karl, 22sep96. % Polish suppressed-l. --karl, 22sep96.
%\def\l#1{{\li #1}\null} %\def\l#1{{\li #1}\null}
% Explicit font changes: @r, @sc, undocumented @ii.
\def\r#1{{\rm #1}} % roman font
\def\sc#1{{\smallcaps#1}} % smallcaps font
\def\ii#1{{\it #1}} % italic font
% @acronym for "FBI", "NATO", and the like. % @acronym for "FBI", "NATO", and the like.
% We print this one point size smaller, since it's intended for % We print this one point size smaller, since it's intended for
% all-uppercase. % all-uppercase.
@ -2692,6 +2819,44 @@ end
\fi \fi
} }
\message{glyphs,}
% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
%
% Since these characters are used in examples, they should be an even number of
% \tt widths. Each \tt character is 1en, so two makes it 1em.
%
\def\point{$\star$}
\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
% The @error{} command.
% Adapted from the TeXbook's \boxit.
%
\newbox\errorbox
%
{\tentt \global\dimen0 = 3em}% Width of the box.
\dimen2 = .55pt % Thickness of rules
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
%
\setbox\errorbox=\hbox to \dimen0{\hfil
\hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
\advance\hsize by -2\dimen2 % Rules.
\vbox{%
\hrule height\dimen2
\hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
\vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
\kern3pt\vrule width\dimen2}% Space to right.
\hrule height\dimen2}
\hfil}
%
\def\error{\leavevmode\lower.7ex\copy\errorbox}
% @pounds{} is a sterling sign, which Knuth put in the CM italic font. % @pounds{} is a sterling sign, which Knuth put in the CM italic font.
% %
\def\pounds{{\it\$}} \def\pounds{{\it\$}}
@ -2744,9 +2909,16 @@ end
\thiseurofont \thiseurofont
} }
% Hacks for glyphs from the EC fonts similar to \euro. We don't % Glyphs from the EC fonts. We don't use \let for the aliases, because
% use \let for the aliases, because sometimes we redefine the original % sometimes we redefine the original macro, and the alias should reflect
% macro, and the alias should reflect the redefinition. % the redefinition.
%
% Use LaTeX names for the Icelandic letters.
\def\DH{{\ecfont \char"D0}} % Eth
\def\dh{{\ecfont \char"F0}} % eth
\def\TH{{\ecfont \char"DE}} % Thorn
\def\th{{\ecfont \char"FE}} % thorn
%
\def\guillemetleft{{\ecfont \char"13}} \def\guillemetleft{{\ecfont \char"13}}
\def\guillemotleft{\guillemetleft} \def\guillemotleft{\guillemetleft}
\def\guillemetright{{\ecfont \char"14}} \def\guillemetright{{\ecfont \char"14}}
@ -2783,6 +2955,7 @@ end
\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
% %
% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
\def\ecfont{% \def\ecfont{%
% We can't distinguish serif/sans and italic/slanted, but this % We can't distinguish serif/sans and italic/slanted, but this
% is used for crude hacks anyway (like adding French and German % is used for crude hacks anyway (like adding French and German
@ -3257,9 +3430,18 @@ end
\parindent=0pt \parindent=0pt
\parskip=\smallskipamount \parskip=\smallskipamount
\ifdim\parskip=0pt \parskip=2pt \fi \ifdim\parskip=0pt \parskip=2pt \fi
%
% Try typesetting the item mark that if the document erroneously says
% something like @itemize @samp (intending @table), there's an error
% right away at the @itemize. It's not the best error message in the
% world, but it's better than leaving it to the @item. This means if
% the user wants an empty mark, they have to say @w{} not just @w.
\def\itemcontents{#1}% \def\itemcontents{#1}%
\setbox0 = \hbox{\itemcontents}%
%
% @itemize with no arg is equivalent to @itemize @bullet. % @itemize with no arg is equivalent to @itemize @bullet.
\ifx\itemcontents\empty\def\itemcontents{\bullet}\fi \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
%
\let\item=\itemizeitem \let\item=\itemizeitem
} }
@ -3280,6 +3462,7 @@ end
\ifnum\lastpenalty<10000 \parskip=0in \fi \ifnum\lastpenalty<10000 \parskip=0in \fi
\noindent \noindent
\hbox to 0pt{\hss \itemcontents \kern\itemmargin}% \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
%
\vadjust{\penalty 1200}}% not good to break after first line of item. \vadjust{\penalty 1200}}% not good to break after first line of item.
\flushcr \flushcr
} }
@ -3501,12 +3684,19 @@ end
% %
% @headitem starts a heading row, which we typeset in bold. % @headitem starts a heading row, which we typeset in bold.
% Assignments have to be global since we are inside the implicit group % Assignments have to be global since we are inside the implicit group
% of an alignment entry. Note that \everycr resets \everytab. % of an alignment entry. \everycr resets \everytab so we don't have to
\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}% % undo it ourselves.
\def\headitemfont{\b}% for people to use in the template row; not changeable
\def\headitem{%
\checkenv\multitable
\crcr
\global\everytab={\bf}% can't use \headitemfont since the parsing differs
\the\everytab % for the first item
}%
% %
% A \tab used to include \hskip1sp. But then the space in a template % A \tab used to include \hskip1sp. But then the space in a template
% line is not enough. That is bad. So let's go back to just `&' until % line is not enough. That is bad. So let's go back to just `&' until
% we encounter the problem it was intended to solve again. % we again encounter the problem the 1sp was intended to solve.
% --karl, nathan@acm.org, 20apr99. % --karl, nathan@acm.org, 20apr99.
\def\tab{\checkenv\multitable &\the\everytab}% \def\tab{\checkenv\multitable &\the\everytab}%
@ -4024,19 +4214,23 @@ end
% Non-English letters. % Non-English letters.
\definedummyword\AA \definedummyword\AA
\definedummyword\AE \definedummyword\AE
\definedummyword\DH
\definedummyword\L \definedummyword\L
\definedummyword\OE
\definedummyword\O \definedummyword\O
\definedummyword\OE
\definedummyword\TH
\definedummyword\aa \definedummyword\aa
\definedummyword\ae \definedummyword\ae
\definedummyword\l \definedummyword\dh
\definedummyword\oe
\definedummyword\o
\definedummyword\ss
\definedummyword\exclamdown \definedummyword\exclamdown
\definedummyword\questiondown \definedummyword\l
\definedummyword\o
\definedummyword\oe
\definedummyword\ordf \definedummyword\ordf
\definedummyword\ordm \definedummyword\ordm
\definedummyword\questiondown
\definedummyword\ss
\definedummyword\th
% %
% Although these internal commands shouldn't show up, sometimes they do. % Although these internal commands shouldn't show up, sometimes they do.
\definedummyword\bf \definedummyword\bf
@ -4131,6 +4325,7 @@ end
\definedummyword\code \definedummyword\code
\definedummyword\command \definedummyword\command
\definedummyword\dfn \definedummyword\dfn
\definedummyword\email
\definedummyword\emph \definedummyword\emph
\definedummyword\env \definedummyword\env
\definedummyword\file \definedummyword\file
@ -4179,19 +4374,23 @@ end
% Non-English letters. % Non-English letters.
\def\AA{AA}% \def\AA{AA}%
\def\AE{AE}% \def\AE{AE}%
\def\DH{DZZ}%
\def\L{L}% \def\L{L}%
\def\OE{OE}% \def\OE{OE}%
\def\O{O}% \def\O{O}%
\def\TH{ZZZ}%
\def\aa{aa}% \def\aa{aa}%
\def\ae{ae}% \def\ae{ae}%
\def\dh{dzz}%
\def\exclamdown{!}%
\def\l{l}% \def\l{l}%
\def\oe{oe}% \def\oe{oe}%
\def\o{o}%
\def\ss{ss}%
\def\exclamdown{!}%
\def\questiondown{?}%
\def\ordf{a}% \def\ordf{a}%
\def\ordm{o}% \def\ordm{o}%
\def\o{o}%
\def\questiondown{?}%
\def\ss{ss}%
\def\th{zzz}%
% %
\def\LaTeX{LaTeX}% \def\LaTeX{LaTeX}%
\def\TeX{TeX}% \def\TeX{TeX}%
@ -4201,20 +4400,19 @@ end
\def\bullet{bullet}% \def\bullet{bullet}%
\def\comma{,}% \def\comma{,}%
\def\copyright{copyright}% \def\copyright{copyright}%
\def\registeredsymbol{R}%
\def\dots{...}% \def\dots{...}%
\def\enddots{...}% \def\enddots{...}%
\def\equiv{==}% \def\equiv{==}%
\def\error{error}% \def\error{error}%
\def\euro{euro}% \def\euro{euro}%
\def\expansion{==>}%
\def\guillemetleft{<<}% \def\guillemetleft{<<}%
\def\guillemetright{>>}% \def\guillemetright{>>}%
\def\guilsinglleft{<}% \def\guilsinglleft{<}%
\def\guilsinglright{>}% \def\guilsinglright{>}%
\def\expansion{==>}%
\def\minus{-}% \def\minus{-}%
\def\pounds{pounds}%
\def\point{.}% \def\point{.}%
\def\pounds{pounds}%
\def\print{-|}% \def\print{-|}%
\def\quotedblbase{"}% \def\quotedblbase{"}%
\def\quotedblleft{"}% \def\quotedblleft{"}%
@ -4222,8 +4420,9 @@ end
\def\quoteleft{`}% \def\quoteleft{`}%
\def\quoteright{'}% \def\quoteright{'}%
\def\quotesinglbase{,}% \def\quotesinglbase{,}%
\def\registeredsymbol{R}%
\def\result{=>}% \def\result{=>}%
\def\textdegree{degrees}% \def\textdegree{o}%
% %
% We need to get rid of all macros, leaving only the arguments (if present). % We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now. % Of course this is not nearly correct, but it is the best we can do for now.
@ -4943,7 +5142,9 @@ end
\gdef\chaplevelprefix{\the\chapno.}% \gdef\chaplevelprefix{\the\chapno.}%
\resetallfloatnos \resetallfloatnos
% %
\message{\putwordChapter\space \the\chapno}% % \putwordChapter can contain complex things in translations.
\toks0=\expandafter{\putwordChapter}%
\message{\the\toks0 \space \the\chapno}%
% %
% Write the actual heading. % Write the actual heading.
\chapmacro{#1}{Ynumbered}{\the\chapno}% \chapmacro{#1}{Ynumbered}{\the\chapno}%
@ -4954,15 +5155,17 @@ end
\global\let\subsubsection = \numberedsubsubsec \global\let\subsubsection = \numberedsubsubsec
} }
\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz \outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
%
\def\appendixzzz#1{% \def\appendixzzz#1{%
\global\secno=0 \global\subsecno=0 \global\subsubsecno=0 \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
\global\advance\appendixno by 1 \global\advance\appendixno by 1
\gdef\chaplevelprefix{\appendixletter.}% \gdef\chaplevelprefix{\appendixletter.}%
\resetallfloatnos \resetallfloatnos
% %
\def\appendixnum{\putwordAppendix\space \appendixletter}% % \putwordAppendix can contain complex things in translations.
\message{\appendixnum}% \toks0=\expandafter{\putwordAppendix}%
\message{\the\toks0 \space \appendixletter}%
% %
\chapmacro{#1}{Yappendix}{\appendixletter}% \chapmacro{#1}{Yappendix}{\appendixletter}%
% %
@ -5102,7 +5305,7 @@ end
\def\chapheading{\chapbreak \parsearg\chapheadingzzz} \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
\def\chapheadingzzz#1{% \def\chapheadingzzz#1{%
{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
\parindent=0pt\raggedright \parindent=0pt\ptexraggedright
\rmisbold #1\hfill}}% \rmisbold #1\hfill}}%
\bigskip \par\penalty 200\relax \bigskip \par\penalty 200\relax
\suppressfirstparagraphindent \suppressfirstparagraphindent
@ -5195,7 +5398,10 @@ end
\xdef\lastchapterdefs{% \xdef\lastchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\appendixletter}% \gdef\noexpand\thischapternum{\appendixletter}%
\gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum: % \noexpand\putwordAppendix avoids expanding indigestible
% commands in some of the translations.
\gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
\noexpand\thischapternum:
\noexpand\thischaptername}% \noexpand\thischaptername}%
}% }%
\else \else
@ -5203,7 +5409,10 @@ end
\xdef\lastchapterdefs{% \xdef\lastchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\the\chapno}% \gdef\noexpand\thischapternum{\the\chapno}%
\gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum: % \noexpand\putwordChapter avoids expanding indigestible
% commands in some of the translations.
\gdef\noexpand\thischapter{\noexpand\putwordChapter{}
\noexpand\thischapternum:
\noexpand\thischaptername}% \noexpand\thischaptername}%
}% }%
\fi\fi\fi \fi\fi\fi
@ -5259,7 +5468,7 @@ end
% %
% Typeset the actual heading. % Typeset the actual heading.
\nobreak % Avoid page breaks at the interline glue. \nobreak % Avoid page breaks at the interline glue.
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
\hangindent=\wd0 \centerparametersmaybe \hangindent=\wd0 \centerparametersmaybe
\unhbox0 #1\par}% \unhbox0 #1\par}%
}% }%
@ -5283,7 +5492,7 @@ end
% %
\def\unnchfopen #1{% \def\unnchfopen #1{%
\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
\parindent=0pt\raggedright \parindent=0pt\ptexraggedright
\rmisbold #1\hfill}}\bigskip \par\nobreak \rmisbold #1\hfill}}\bigskip \par\nobreak
} }
\def\chfopen #1#2{\chapoddpage {\chapfonts \def\chfopen #1#2{\chapoddpage {\chapfonts
@ -5346,7 +5555,10 @@ end
\xdef\lastsectiondefs{% \xdef\lastsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}% \gdef\noexpand\thissectionnum{#4}%
\gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: % \noexpand\putwordSection avoids expanding indigestible
% commands in some of the translations.
\gdef\noexpand\thissection{\noexpand\putwordSection{}
\noexpand\thissectionnum:
\noexpand\thissectionname}% \noexpand\thissectionname}%
}% }%
\fi \fi
@ -5356,12 +5568,20 @@ end
\xdef\lastsectiondefs{% \xdef\lastsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}% \gdef\noexpand\thissectionnum{#4}%
\gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: % \noexpand\putwordSection avoids expanding indigestible
% commands in some of the translations.
\gdef\noexpand\thissection{\noexpand\putwordSection{}
\noexpand\thissectionnum:
\noexpand\thissectionname}% \noexpand\thissectionname}%
}% }%
\fi \fi
\fi\fi\fi \fi\fi\fi
% %
% Go into vertical mode. Usually we'll already be there, but we
% don't want the following whatsit to end up in a preceding paragraph
% if the document didn't happen to have a blank line.
\par
%
% Output the mark. Pass it through \safewhatsit, to take care of % Output the mark. Pass it through \safewhatsit, to take care of
% the preceding space. % the preceding space.
\safewhatsit\domark \safewhatsit\domark
@ -5411,7 +5631,7 @@ end
\nobreak \nobreak
% %
% Output the actual section heading. % Output the actual section heading.
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
\hangindent=\wd0 % zero if no section number \hangindent=\wd0 % zero if no section number
\unhbox0 #1}% \unhbox0 #1}%
}% }%
@ -5709,144 +5929,6 @@ end
\message{environments,} \message{environments,}
% @foo ... @end foo. % @foo ... @end foo.
% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
% define and register \INITMACRO to be called on markup style changes.
% \INITMACRO can check \currentmarkupstyle for the innermost
% style and the set of \ifmarkupSTYLE switches for all styles
% currently in effect.
\newif\ifmarkupvar
\newif\ifmarkupsamp
\newif\ifmarkupkey
%\newif\ifmarkupfile % @file == @samp.
%\newif\ifmarkupoption % @option == @samp.
\newif\ifmarkupcode
\newif\ifmarkupkbd
%\newif\ifmarkupenv % @env == @code.
%\newif\ifmarkupcommand % @command == @code.
\newif\ifmarkuptex % @tex (and part of @math, for now).
\newif\ifmarkupexample
\newif\ifmarkupverb
\newif\ifmarkupverbatim
\let\currentmarkupstyle\empty
\def\setupmarkupstyle#1{%
\csname markup#1true\endcsname
\def\currentmarkupstyle{#1}%
\markupstylesetup
}
\let\markupstylesetup\empty
\def\defmarkupstylesetup#1{%
\expandafter\def\expandafter\markupstylesetup
\expandafter{\markupstylesetup #1}%
\def#1%
}
% Markup style setup for left and right quotes.
\defmarkupstylesetup\markupsetuplq{%
\expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
\ifx\temp\relax \markupsetuplqdefault \else \temp \fi
}
\defmarkupstylesetup\markupsetuprq{%
\expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
\ifx\temp\relax \markupsetuprqdefault \else \temp \fi
}
{
\catcode`\'=\active
\catcode`\`=\active
\gdef\markupsetuplqdefault{\let`\lq}
\gdef\markupsetuprqdefault{\let'\rq}
\gdef\markupsetcodequoteleft{\let`\codequoteleft}
\gdef\markupsetcodequoteright{\let'\codequoteright}
\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
}
\let\markupsetuplqcode \markupsetcodequoteleft
\let\markupsetuprqcode \markupsetcodequoteright
\let\markupsetuplqexample \markupsetcodequoteleft
\let\markupsetuprqexample \markupsetcodequoteright
\let\markupsetuplqverb \markupsetcodequoteleft
\let\markupsetuprqverb \markupsetcodequoteright
\let\markupsetuplqverbatim \markupsetcodequoteleft
\let\markupsetuprqverbatim \markupsetcodequoteright
\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
% Allow an option to not replace quotes with a regular directed right
% quote/apostrophe (char 0x27), but instead use the undirected quote
% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
% the default, but it works for pasting with more pdf viewers (at least
% evince), the lilypond developers report. xpdf does work with the
% regular 0x27.
%
\def\codequoteright{%
\expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
\expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
'%
\else \char'15 \fi
\else \char'15 \fi
}
%
% and a similar option for the left quote char vs. a grave accent.
% Modern fonts display ASCII 0x60 as a grave accent, so some people like
% the code environments to do likewise.
%
\def\codequoteleft{%
\expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
\expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
% [Knuth] pp. 380,381,391
% \relax disables Spanish ligatures ?` and !` of \tt font.
\relax`%
\else \char'22 \fi
\else \char'22 \fi
}
% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
\def\noligaturesquoteleft{\relax\lq}
% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
%
% Since these characters are used in examples, they should be an even number of
% \tt widths. Each \tt character is 1en, so two makes it 1em.
%
\def\point{$\star$}
\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
% The @error{} command.
% Adapted from the TeXbook's \boxit.
%
\newbox\errorbox
%
{\tentt \global\dimen0 = 3em}% Width of the box.
\dimen2 = .55pt % Thickness of rules
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
%
\setbox\errorbox=\hbox to \dimen0{\hfil
\hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
\advance\hsize by -2\dimen2 % Rules.
\vbox{%
\hrule height\dimen2
\hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
\vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
\kern3pt\vrule width\dimen2}% Space to right.
\hrule height\dimen2}
\hfil}
%
\def\error{\leavevmode\lower.7ex\copy\errorbox}
% @tex ... @end tex escapes into raw Tex temporarily. % @tex ... @end tex escapes into raw Tex temporarily.
% One exception: @ is still an escape character, so that @end tex works. % One exception: @ is still an escape character, so that @end tex works.
% But \@ or @@ will get a plain tex @ character. % But \@ or @@ will get a plain tex @ character.
@ -5999,6 +6081,7 @@ end
% This macro is called at the beginning of all the @example variants, % This macro is called at the beginning of all the @example variants,
% inside a group. % inside a group.
\newdimen\nonfillparindent
\def\nonfillstart{% \def\nonfillstart{%
\aboveenvbreak \aboveenvbreak
\hfuzz = 12pt % Don't be fussy \hfuzz = 12pt % Don't be fussy
@ -6006,7 +6089,12 @@ end
\let\par = \lisppar % don't ignore blank lines \let\par = \lisppar % don't ignore blank lines
\obeylines % each line of input is a line of output \obeylines % each line of input is a line of output
\parskip = 0pt \parskip = 0pt
% Turn off paragraph indentation but redefine \indent to emulate
% the normal \indent.
\nonfillparindent=\parindent
\parindent = 0pt \parindent = 0pt
\let\indent\nonfillindent
%
\emergencystretch = 0pt % don't try to avoid overfull boxes \emergencystretch = 0pt % don't try to avoid overfull boxes
\ifx\nonarrowing\relax \ifx\nonarrowing\relax
\advance \leftskip by \lispnarrowing \advance \leftskip by \lispnarrowing
@ -6017,6 +6105,24 @@ end
\let\exdent=\nofillexdent \let\exdent=\nofillexdent
} }
\begingroup
\obeyspaces
% We want to swallow spaces (but not other tokens) after the fake
% @indent in our nonfill-environments, where spaces are normally
% active and set to @tie, resulting in them not being ignored after
% @indent.
\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
\gdef\nonfillindentcheck{%
\ifx\temp %
\expandafter\nonfillindentgobble%
\else%
\leavevmode\nonfillindentbox%
\fi%
}%
\endgroup
\def\nonfillindentgobble#1{\nonfillindent}
\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
% If you want all examples etc. small: @set dispenvsize small. % If you want all examples etc. small: @set dispenvsize small.
% If you want even small examples the full size: @set dispenvsize nosmall. % If you want even small examples the full size: @set dispenvsize nosmall.
% This affects the following displayed environments: % This affects the following displayed environments:
@ -6103,6 +6209,30 @@ end
\let\Eflushright = \afterenvbreak \let\Eflushright = \afterenvbreak
% @raggedright does more-or-less normal line breaking but no right
% justification. From plain.tex.
\envdef\raggedright{%
\rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
}
\let\Eraggedright\par
\envdef\raggedleft{%
\parindent=0pt \leftskip0pt plus2em
\spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
\hbadness=10000 % Last line will usually be underfull, so turn off
% badness reporting.
}
\let\Eraggedleft\par
\envdef\raggedcenter{%
\parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
\spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
\hbadness=10000 % Last line will usually be underfull, so turn off
% badness reporting.
}
\let\Eraggedcenter\par
% @quotation does normal linebreaking (hence we can't use \nonfillstart) % @quotation does normal linebreaking (hence we can't use \nonfillstart)
% and narrows the margins. We keep \parskip nonzero in general, since % and narrows the margins. We keep \parskip nonzero in general, since
% we're doing normal filling. So, when using \aboveenvbreak and % we're doing normal filling. So, when using \aboveenvbreak and
@ -7881,21 +8011,22 @@ end
\closein 1 \closein 1
\endgroup % end raw TeX \endgroup % end raw TeX
\endgroup} \endgroup}
}
% %
% If they passed de_DE, and txi-de_DE.tex doesn't exist, % If they passed de_DE, and txi-de_DE.tex doesn't exist,
% try txi-de.tex. % try txi-de.tex.
% %
\def\documentlanguagetrywithoutunderscore#1_#2\finish{% \gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
\openin 1 txi-#1.tex \openin 1 txi-#1.tex
\ifeof 1 \ifeof 1
\errhelp = \nolanghelp \errhelp = \nolanghelp
\errmessage{Cannot read language file txi-#1.tex}% \errmessage{Cannot read language file txi-#1.tex}%
\else \else
\globaldefs = 1 % everything in the txi-LL files needs to persist
\input txi-#1.tex \input txi-#1.tex
\fi \fi
\closein 1 \closein 1
} }
}% end of special _ catcode
% %
\newhelp\nolanghelp{The given language definition file cannot be found or \newhelp\nolanghelp{The given language definition file cannot be found or
is empty. Maybe you need to install it? Putting it in the current is empty. Maybe you need to install it? Putting it in the current
@ -8058,7 +8189,7 @@ directory should work if nowhere else does.}
\gdef^^ce{\^I} \gdef^^ce{\^I}
\gdef^^cf{\"I} \gdef^^cf{\"I}
% %
\gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} \gdef^^d0{\DH}
\gdef^^d1{\~N} \gdef^^d1{\~N}
\gdef^^d2{\`O} \gdef^^d2{\`O}
\gdef^^d3{\'O} \gdef^^d3{\'O}
@ -8072,7 +8203,7 @@ directory should work if nowhere else does.}
\gdef^^db{\^U} \gdef^^db{\^U}
\gdef^^dc{\"U} \gdef^^dc{\"U}
\gdef^^dd{\'Y} \gdef^^dd{\'Y}
\gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} \gdef^^de{\TH}
\gdef^^df{\ss} \gdef^^df{\ss}
% %
\gdef^^e0{\`a} \gdef^^e0{\`a}
@ -8092,7 +8223,7 @@ directory should work if nowhere else does.}
\gdef^^ee{\^{\dotless i}} \gdef^^ee{\^{\dotless i}}
\gdef^^ef{\"{\dotless i}} \gdef^^ef{\"{\dotless i}}
% %
\gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} \gdef^^f0{\dh}
\gdef^^f1{\~n} \gdef^^f1{\~n}
\gdef^^f2{\`o} \gdef^^f2{\`o}
\gdef^^f3{\'o} \gdef^^f3{\'o}
@ -8106,7 +8237,7 @@ directory should work if nowhere else does.}
\gdef^^fb{\^u} \gdef^^fb{\^u}
\gdef^^fc{\"u} \gdef^^fc{\"u}
\gdef^^fd{\'y} \gdef^^fd{\'y}
\gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} \gdef^^fe{\th}
\gdef^^ff{\"y} \gdef^^ff{\"y}
} }
@ -8178,7 +8309,7 @@ directory should work if nowhere else does.}
\gdef^^ce{\^I} \gdef^^ce{\^I}
\gdef^^cf{\v D} \gdef^^cf{\v D}
% %
\gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} \gdef^^d0{\DH}
\gdef^^d1{\'N} \gdef^^d1{\'N}
\gdef^^d2{\v N} \gdef^^d2{\v N}
\gdef^^d3{\'O} \gdef^^d3{\'O}
@ -8212,7 +8343,7 @@ directory should work if nowhere else does.}
\gdef^^ee{\^\i} \gdef^^ee{\^\i}
\gdef^^ef{\v d} \gdef^^ef{\v d}
% %
\gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} \gdef^^f0{\dh}
\gdef^^f1{\'n} \gdef^^f1{\'n}
\gdef^^f2{\v n} \gdef^^f2{\v n}
\gdef^^f3{\'o} \gdef^^f3{\'o}
@ -8385,6 +8516,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00CE}{\^I} \DeclareUnicodeCharacter{00CE}{\^I}
\DeclareUnicodeCharacter{00CF}{\"I} \DeclareUnicodeCharacter{00CF}{\"I}
\DeclareUnicodeCharacter{00D0}{\DH}
\DeclareUnicodeCharacter{00D1}{\~N} \DeclareUnicodeCharacter{00D1}{\~N}
\DeclareUnicodeCharacter{00D2}{\`O} \DeclareUnicodeCharacter{00D2}{\`O}
\DeclareUnicodeCharacter{00D3}{\'O} \DeclareUnicodeCharacter{00D3}{\'O}
@ -8397,6 +8529,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00DB}{\^U} \DeclareUnicodeCharacter{00DB}{\^U}
\DeclareUnicodeCharacter{00DC}{\"U} \DeclareUnicodeCharacter{00DC}{\"U}
\DeclareUnicodeCharacter{00DD}{\'Y} \DeclareUnicodeCharacter{00DD}{\'Y}
\DeclareUnicodeCharacter{00DE}{\TH}
\DeclareUnicodeCharacter{00DF}{\ss} \DeclareUnicodeCharacter{00DF}{\ss}
\DeclareUnicodeCharacter{00E0}{\`a} \DeclareUnicodeCharacter{00E0}{\`a}
@ -8416,6 +8549,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
\DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
\DeclareUnicodeCharacter{00F0}{\dh}
\DeclareUnicodeCharacter{00F1}{\~n} \DeclareUnicodeCharacter{00F1}{\~n}
\DeclareUnicodeCharacter{00F2}{\`o} \DeclareUnicodeCharacter{00F2}{\`o}
\DeclareUnicodeCharacter{00F3}{\'o} \DeclareUnicodeCharacter{00F3}{\'o}
@ -8428,6 +8562,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00FB}{\^u} \DeclareUnicodeCharacter{00FB}{\^u}
\DeclareUnicodeCharacter{00FC}{\"u} \DeclareUnicodeCharacter{00FC}{\"u}
\DeclareUnicodeCharacter{00FD}{\'y} \DeclareUnicodeCharacter{00FD}{\'y}
\DeclareUnicodeCharacter{00FE}{\th}
\DeclareUnicodeCharacter{00FF}{\"y} \DeclareUnicodeCharacter{00FF}{\"y}
\DeclareUnicodeCharacter{0100}{\=A} \DeclareUnicodeCharacter{0100}{\=A}
@ -8972,6 +9107,9 @@ directory should work if nowhere else does.}
\message{and turning on texinfo input format.} \message{and turning on texinfo input format.}
% DEL is a comment character, in case @c does not suffice.
\catcode`\^^? = 14
% Define macros to output various characters with catcode for normal text. % Define macros to output various characters with catcode for normal text.
\catcode`\"=\other \catcode`\"=\other
\catcode`\~=\other \catcode`\~=\other

7
libjava/classpath/examples/Makefile.in
View File

@ -41,6 +41,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -59,9 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

7
libjava/classpath/external/Makefile.in vendored
View File

@ -39,6 +39,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -57,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

7
libjava/classpath/external/jsr166/Makefile.in vendored
View File

@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -57,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

7
libjava/classpath/external/relaxngDatatype/Makefile.in vendored
View File

@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -57,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

7
libjava/classpath/external/sax/Makefile.in vendored
View File

@ -39,6 +39,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -57,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

7
libjava/classpath/external/w3c_dom/Makefile.in vendored
View File

@ -39,6 +39,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -57,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

12
libjava/classpath/gnu/javax/print/CupsServer.java
View File

@ -100,13 +100,13 @@ public class CupsServer
this.uri = null; this.uri = null;
try try
{ {
String serv = System.getProperty("gnu.javax.print.server"); String serv = System.getProperty("gnu.javax.print.server");
if( serv != null ) if( serv != null )
this.uri = new URI("http://"+serv+":631"); this.uri = new URI("http://"+serv+":631");
} }
catch(URISyntaxException use) catch(URISyntaxException use)
{ {
throw new RuntimeException("gnu.javax.print.CupsServer value is not a valid hostname."); throw new RuntimeException("gnu.javax.print.CupsServer value is not a valid hostname.");
} }
catch(SecurityException se) catch(SecurityException se)
{ {
@ -114,8 +114,8 @@ public class CupsServer
try try
{ {
if( this.uri == null ) if( this.uri == null )
this.uri = new URI("http://localhost:631"); this.uri = new URI("http://localhost:631");
} }
catch (URISyntaxException e) catch (URISyntaxException e)
{ {

141
libjava/classpath/gnu/javax/print/ipp/IppPrintService.java
View File

@ -143,10 +143,10 @@ public class IppPrintService implements PrintService
* IPP may return sets of attributes e.g. for supported * IPP may return sets of attributes e.g. for supported
* compression methods so we need to map to sets here. * compression methods so we need to map to sets here.
*/ */
private Map printerAttr; private Map<Class<? extends Attribute>, Set<Attribute>> printerAttr;
/** The set of listeners.*/ /** The set of listeners.*/
private HashSet printServiceAttributeListener; private HashSet<PrintServiceAttributeListener> printServiceAttributeListener;
/** The username. */ /** The username. */
private transient String user; private transient String user;
@ -158,13 +158,13 @@ public class IppPrintService implements PrintService
private String name; private String name;
/** The list of supported document flavors. */ /** The list of supported document flavors. */
private List flavors; private List<DocFlavor> flavors;
/** The standard printer URI. */ /** The standard printer URI. */
private PrinterURI printerUri; private PrinterURI printerUri;
/** The list of all supported printer URIs. */ /** The list of all supported printer URIs. */
private ArrayList printerUris; private ArrayList<PrinterURI> printerUris;
/** /**
* Logger for tracing - enable by passing * Logger for tracing - enable by passing
@ -207,7 +207,8 @@ public class IppPrintService implements PrintService
user = username; user = username;
passwd = password; passwd = password;
printServiceAttributeListener = new HashSet(); printServiceAttributeListener =
new HashSet<PrintServiceAttributeListener>();
printerAttr = getPrinterAttributes(); printerAttr = getPrinterAttributes();
processResponse(); processResponse();
@ -219,7 +220,8 @@ public class IppPrintService implements PrintService
* @return The Map with the printer attributes. * @return The Map with the printer attributes.
* @throws IppException if an error occurs. * @throws IppException if an error occurs.
*/ */
private Map getPrinterAttributes() throws IppException private Map<Class<? extends Attribute>, Set<Attribute>> getPrinterAttributes()
throws IppException
{ {
IppResponse response = null; IppResponse response = null;
@ -239,7 +241,7 @@ public class IppPrintService implements PrintService
throw new IppException("IOException in IPP request/response.", e); throw new IppException("IOException in IPP request/response.", e);
} }
return (Map) response.getPrinterAttributes().get(0); return response.getPrinterAttributes().get(0);
} }
/** /**
@ -249,9 +251,13 @@ public class IppPrintService implements PrintService
* @param attributeClass the category * @param attributeClass the category
* @return The set of attributes of the category. * @return The set of attributes of the category.
*/ */
private Set getPrinterAttributeSet(Class attributeClass) private <T extends Attribute> Set<T> getPrinterAttributeSet(Class<T> attributeClass)
{ {
return (Set) printerAttr.get(attributeClass); Set<Attribute> set = printerAttr.get(attributeClass);
Set<T> attSet = new HashSet<T>();
for (Attribute att : set)
attSet.add(attributeClass.cast(att));
return attSet;
} }
/** /**
@ -264,9 +270,9 @@ public class IppPrintService implements PrintService
* @throws ClassCastException if attributClass is not an * @throws ClassCastException if attributClass is not an
* instance of <code>DefaultValueAttribute</code>. * instance of <code>DefaultValueAttribute</code>.
*/ */
private Attribute getPrinterDefaultAttribute(Class attributeClass) private Attribute getPrinterDefaultAttribute(Class<? extends Attribute> attributeClass)
{ {
Set set = (Set) printerAttr.get(attributeClass); Set<Attribute> set = printerAttr.get(attributeClass);
return ((DefaultValueAttribute) set.toArray()[0]).getAssociatedAttribute(); return ((DefaultValueAttribute) set.toArray()[0]).getAssociatedAttribute();
} }
@ -276,8 +282,7 @@ public class IppPrintService implements PrintService
private void processResponse() private void processResponse()
{ {
// printer name // printer name
PrinterName[] tmp = (PrinterName[]) getPrinterAttributeSet( PrinterName[] tmp = getPrinterAttributeSet(PrinterName.class).toArray(new PrinterName[1]);
PrinterName.class).toArray(new PrinterName[1]);
name = tmp[0].getValue(); name = tmp[0].getValue();
// supported flavors // supported flavors
@ -285,13 +290,13 @@ public class IppPrintService implements PrintService
// for text doc flavors as cups doesn't send charset parameters // for text doc flavors as cups doesn't send charset parameters
// utf-8 is supported at least - so we go with this only for now // utf-8 is supported at least - so we go with this only for now
flavors = new ArrayList(); flavors = new ArrayList<DocFlavor>();
Set flavorAttributes = getPrinterAttributeSet(DocumentFormatSupported.class); Set<DocumentFormatSupported> flavorAttributes = getPrinterAttributeSet(DocumentFormatSupported.class);
if (flavorAttributes != null) if (flavorAttributes != null)
{ {
for (Iterator it = flavorAttributes.iterator(); it.hasNext();) for (DocumentFormatSupported dfs : flavorAttributes)
{ {
String mimeType = ((DocumentFormatSupported) it.next()).getValue(); String mimeType = dfs.getValue();
if (mimeType.equals("text/plain")) if (mimeType.equals("text/plain"))
{ {
@ -318,9 +323,10 @@ public class IppPrintService implements PrintService
boolean changed = false; boolean changed = false;
try try
{ {
Class[] clazzes = new Class[] { DocFlavor.BYTE_ARRAY.class, Class<?>[] clazzes = new Class<?>[] { DocFlavor.BYTE_ARRAY.class,
DocFlavor.INPUT_STREAM.class, DocFlavor.INPUT_STREAM.class,
DocFlavor.URL.class }; DocFlavor.URL.class
};
for (int j = 0; j < clazzes.length; j++) for (int j = 0; j < clazzes.length; j++)
{ {
@ -357,23 +363,21 @@ public class IppPrintService implements PrintService
} }
} }
if (this.getClass() if (this.getClass()
.isAssignableFrom(gnu.javax.print.CupsPrintService.class)) .isAssignableFrom(gnu.javax.print.CupsPrintService.class))
{ {
// CUPS always provides filters to convert from Postscript. // CUPS always provides filters to convert from Postscript.
// This logic looks odd, but it's what OpenJDK does. // This logic looks odd, but it's what OpenJDK does.
flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE); flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE);
flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE); flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE);
} }
} }
// printer uris // printer uris
Set uris = getPrinterAttributeSet(PrinterUriSupported.class); Set<PrinterUriSupported> uris = getPrinterAttributeSet(PrinterUriSupported.class);
printerUris = new ArrayList(uris.size()); printerUris = new ArrayList<PrinterURI>(uris.size());
Iterator it = uris.iterator(); for (PrinterUriSupported uri : uris)
while (it.hasNext())
{ {
PrinterUriSupported uri = (PrinterUriSupported) it.next();
printerUris.add( new PrinterURI(uri.getURI())); printerUris.add( new PrinterURI(uri.getURI()));
} }
} }
@ -392,7 +396,7 @@ public class IppPrintService implements PrintService
/** /**
* @see javax.print.PrintService#getAttribute(java.lang.Class) * @see javax.print.PrintService#getAttribute(java.lang.Class)
*/ */
public PrintServiceAttribute getAttribute(Class category) public <T extends PrintServiceAttribute> T getAttribute(Class<T> category)
{ {
if (category == null) if (category == null)
throw new NullPointerException("category may not be null"); throw new NullPointerException("category may not be null");
@ -401,9 +405,9 @@ public class IppPrintService implements PrintService
throw new IllegalArgumentException( throw new IllegalArgumentException(
"category must be of type PrintServiceAttribute"); "category must be of type PrintServiceAttribute");
Set set = getPrinterAttributeSet(category); Set<T> set = getPrinterAttributeSet(category);
if (set != null && set.size() > 0) if (set != null && set.size() > 0)
return (PrintServiceAttribute) set.toArray()[0]; return set.iterator().next();
return null; return null;
} }
@ -415,13 +419,10 @@ public class IppPrintService implements PrintService
{ {
PrintServiceAttributeSet set = new HashPrintServiceAttributeSet(); PrintServiceAttributeSet set = new HashPrintServiceAttributeSet();
Iterator it = printerAttr.values().iterator(); for (Set<Attribute> attrSet : printerAttr.values())
while (it.hasNext())
{ {
Iterator it2 = ((Set) it.next()).iterator(); for (Attribute attr : attrSet)
while (it2.hasNext())
{ {
Attribute attr = (Attribute) it2.next();
if (attr instanceof PrintServiceAttribute) if (attr instanceof PrintServiceAttribute)
set.add(attr); set.add(attr);
} }
@ -433,7 +434,7 @@ public class IppPrintService implements PrintService
/** /**
* @see javax.print.PrintService#getDefaultAttributeValue(java.lang.Class) * @see javax.print.PrintService#getDefaultAttributeValue(java.lang.Class)
*/ */
public Object getDefaultAttributeValue(Class category) public Object getDefaultAttributeValue(Class<? extends Attribute> category)
{ {
// required attributes // required attributes
if (category.equals(Fidelity.class)) if (category.equals(Fidelity.class))
@ -515,9 +516,10 @@ public class IppPrintService implements PrintService
/** /**
* @see javax.print.PrintService#getSupportedAttributeCategories() * @see javax.print.PrintService#getSupportedAttributeCategories()
*/ */
public Class[] getSupportedAttributeCategories() public Class<?>[] getSupportedAttributeCategories()
{ {
Set categories = new HashSet(); Set<Class<? extends Attribute>> categories =
new HashSet<Class<? extends Attribute>>();
// Should only be job template attributes as of section 4.2 // Should only be job template attributes as of section 4.2
if (printerAttr.containsKey(JobPrioritySupported.class)) if (printerAttr.containsKey(JobPrioritySupported.class))
@ -533,7 +535,7 @@ public class IppPrintService implements PrintService
if (printerAttr.containsKey(FinishingsSupported.class)) if (printerAttr.containsKey(FinishingsSupported.class))
{ {
// if only none finishing is supported - it does not count as supported // if only none finishing is supported - it does not count as supported
Set set = getPrinterAttributeSet(FinishingsSupported.class); Set<FinishingsSupported> set = getPrinterAttributeSet(FinishingsSupported.class);
if (! (set.size() == 1 && set.contains(FinishingsSupported.NONE))) if (! (set.size() == 1 && set.contains(FinishingsSupported.NONE)))
categories.add(Finishings.class); categories.add(Finishings.class);
} }
@ -570,7 +572,7 @@ public class IppPrintService implements PrintService
categories.add(JobName.class); categories.add(JobName.class);
categories.add(RequestingUserName.class); categories.add(RequestingUserName.class);
return (Class[]) categories.toArray(new Class[categories.size()]); return categories.toArray(new Class[categories.size()]);
} }
/** /**
@ -582,8 +584,8 @@ public class IppPrintService implements PrintService
* @see PrintService#getSupportedAttributeValues(Class, DocFlavor, AttributeSet) * @see PrintService#getSupportedAttributeValues(Class, DocFlavor, AttributeSet)
* @see #handleSupportedAttributeValuesResponse(IppResponse, Class) * @see #handleSupportedAttributeValuesResponse(IppResponse, Class)
*/ */
public Object getSupportedAttributeValues(Class category, DocFlavor flavor, public Object getSupportedAttributeValues(Class<? extends Attribute> category,
AttributeSet attributes) DocFlavor flavor, AttributeSet attributes)
{ {
// We currently ignore the attribute set - there is nothing in the IPP // We currently ignore the attribute set - there is nothing in the IPP
// specification which would come closer to what we do here. // specification which would come closer to what we do here.
@ -665,14 +667,15 @@ public class IppPrintService implements PrintService
* @see #getSupportedAttributeValues(Class, DocFlavor, AttributeSet) * @see #getSupportedAttributeValues(Class, DocFlavor, AttributeSet)
*/ */
protected Object handleSupportedAttributeValuesResponse(IppResponse response, protected Object handleSupportedAttributeValuesResponse(IppResponse response,
Class category) Class<? extends Attribute> category)
{ {
List printerAtts = response.getPrinterAttributes(); List<Map<Class<? extends Attribute>, Set<Attribute>>> printerAtts =
response.getPrinterAttributes();
// only one will be returned // only one will be returned
Map printerAttribute = (Map) printerAtts.get(0); Map<Class<? extends Attribute>, Set<Attribute>> printerAttribute = printerAtts.get(0);
Class suppCategory = IppUtilities.getSupportedCategory(category); Class<? extends Attribute> suppCategory = IppUtilities.getSupportedCategory(category);
Set attr = (Set) printerAttribute.get(suppCategory); Set<Attribute> attr = printerAttribute.get(suppCategory);
// We sometime assume its a single instance with arbritrary value just indicating // We sometime assume its a single instance with arbritrary value just indicating
// support or an array which is returned. This is because I sometimes just choosed // support or an array which is returned. This is because I sometimes just choosed
@ -681,7 +684,7 @@ public class IppPrintService implements PrintService
// Map whats in the JSP API // Map whats in the JSP API
if (suppCategory.equals(JobPrioritySupported.class)) if (suppCategory.equals(JobPrioritySupported.class))
return (JobPrioritySupported) attr.toArray(new JobPrioritySupported[1])[0]; return (JobPrioritySupported) attr.iterator().next();
if (suppCategory.equals(JobHoldUntilSupported.class)) if (suppCategory.equals(JobHoldUntilSupported.class))
return new JobHoldUntil(new Date()); return new JobHoldUntil(new Date());
if (suppCategory.equals(JobSheetsSupported.class)) if (suppCategory.equals(JobSheetsSupported.class))
@ -689,7 +692,7 @@ public class IppPrintService implements PrintService
if (suppCategory.equals(MultipleDocumentHandlingSupported.class)) if (suppCategory.equals(MultipleDocumentHandlingSupported.class))
return MultipleDocumentHandlingSupported.getAssociatedAttributeArray(attr); return MultipleDocumentHandlingSupported.getAssociatedAttributeArray(attr);
if (suppCategory.equals(CopiesSupported.class)) if (suppCategory.equals(CopiesSupported.class))
return (CopiesSupported) attr.toArray(new CopiesSupported[1])[0]; return (CopiesSupported) attr.iterator().next();
if (suppCategory.equals(FinishingsSupported.class)) if (suppCategory.equals(FinishingsSupported.class))
return FinishingsSupported.getAssociatedAttributeArray(attr); return FinishingsSupported.getAssociatedAttributeArray(attr);
if (suppCategory.equals(PageRangesSupported.class)) if (suppCategory.equals(PageRangesSupported.class))
@ -707,16 +710,14 @@ public class IppPrintService implements PrintService
// Special handling as it might also be in range of integers // Special handling as it might also be in range of integers
if (suppCategory.equals(NumberUpSupported.class)) if (suppCategory.equals(NumberUpSupported.class))
{ {
NumberUpSupported[] tmp = (NumberUpSupported[])
attr.toArray(new NumberUpSupported[attr.size()]);
if (attr.size() == 1) // number-up maybe in rangeofintegers if (attr.size() == 1) // number-up maybe in rangeofintegers
return tmp[0]; return attr.iterator().next();
int[][] members = new int[attr.size()][2]; int[][] members = new int[attr.size()][2];
Iterator<Attribute> it = attr.iterator();
for (int j = 0; j < attr.size(); j++) for (int j = 0; j < attr.size(); j++)
{ {
int value = tmp[j].getMembers()[0][0]; int value = ((NumberUpSupported) it.next()).getMembers()[0][0];
members[j] = new int[] { value, value }; members[j] = new int[] { value, value };
} }
@ -732,7 +733,7 @@ public class IppPrintService implements PrintService
*/ */
public DocFlavor[] getSupportedDocFlavors() public DocFlavor[] getSupportedDocFlavors()
{ {
return (DocFlavor[]) flavors.toArray(new DocFlavor[flavors.size()]); return flavors.toArray(new DocFlavor[flavors.size()]);
} }
/** /**
@ -792,24 +793,22 @@ public class IppPrintService implements PrintService
} }
// Validate Jobs returns only Unsupported and Operation // Validate Jobs returns only Unsupported and Operation
List unsupportedMaps = response.getUnsupportedAttributes(); List<Map<Class<? extends Attribute>, Set<Attribute>>> unsupportedMaps =
response.getUnsupportedAttributes();
if (unsupportedMaps.size() == 0) if (unsupportedMaps.size() == 0)
return null; return null;
Map unsupportedAttr = (Map) unsupportedMaps.get(0); Map<Class<? extends Attribute>, Set<Attribute>> unsupportedAttr = unsupportedMaps.get(0);
if (unsupportedAttr.size() == 0) if (unsupportedAttr.size() == 0)
return null; return null;
// Convert the return map with unsupported attributes // Convert the return map with unsupported attributes
// into an AttribueSet instance // into an AttribueSet instance
HashAttributeSet set = new HashAttributeSet(); HashAttributeSet set = new HashAttributeSet();
Iterator it = unsupportedAttr.values().iterator(); for (Set<Attribute> unsupported : unsupportedAttr.values())
while (it.hasNext())
{ {
Set unsupported = (Set) it.next(); for (Attribute att : unsupported)
Iterator it2 = unsupported.iterator(); set.add(att);
while (it2.hasNext())
set.add((Attribute) it2.next());
} }
return set; return set;
@ -818,7 +817,7 @@ public class IppPrintService implements PrintService
/** /**
* @see PrintService#isAttributeCategorySupported(Class) * @see PrintService#isAttributeCategorySupported(Class)
*/ */
public boolean isAttributeCategorySupported(Class category) public boolean isAttributeCategorySupported(Class<? extends Attribute> category)
{ {
if (category == null) if (category == null)
throw new NullPointerException("category may not be null"); throw new NullPointerException("category may not be null");

22
libjava/classpath/gnu/javax/print/ipp/IppRequest.java
View File

@ -380,21 +380,21 @@ public class IppRequest
*/ */
private void write(RequestedAttributes attribute) throws IOException private void write(RequestedAttributes attribute) throws IOException
{ {
List values = attribute.getValues(); String[] values = attribute.getValues();
String name = ((Attribute) attribute).getName(); String name = ((Attribute) attribute).getName();
out.writeByte(IppValueTag.KEYWORD); out.writeByte(IppValueTag.KEYWORD);
out.writeShort(name.length()); out.writeShort(name.length());
out.write(name.getBytes()); out.write(name.getBytes());
out.writeShort(((String) values.get(0)).length()); out.writeShort(values[0].length());
out.write(((String) values.get(0)).getBytes()); out.write(values[0].getBytes());
for (int i=1; i < values.size(); i++) for (int i=1; i < values.length; i++)
{ {
out.writeByte(IppValueTag.KEYWORD); out.writeByte(IppValueTag.KEYWORD);
out.writeShort(0x0000); // length for additional value out.writeShort(0x0000); // length for additional value
out.writeShort(((String) values.get(i)).length()); out.writeShort(values[i].length());
out.write(((String) values.get(i)).getBytes()); out.write(values[i].getBytes());
} }
} }
@ -470,11 +470,11 @@ public class IppRequest
.getName() + "> Value: <" + jobUri.toString() + ">"); .getName() + "> Value: <" + jobUri.toString() + ">");
} }
else if (reqAttrs != null) else if (reqAttrs != null)
{ {
write(reqAttrs); write(reqAttrs);
attributes.remove(RequestedAttributes.class); attributes.remove(RequestedAttributes.class);
logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">"); logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">");
} }
else else
{ {
throw new IppException("Unknown target operation attribute combination."); throw new IppException("Unknown target operation attribute combination.");

68
libjava/classpath/gnu/javax/print/ipp/IppResponse.java
View File

@ -184,7 +184,7 @@ public class IppResponse
byte tag = 0; byte tag = 0;
boolean proceed = true; boolean proceed = true;
HashMap tmp; HashMap<Class<? extends Attribute>, Set<Attribute>> tmp;
// iterate over attribute-groups until end-of-attributes-tag is found // iterate over attribute-groups until end-of-attributes-tag is found
while (proceed) while (proceed)
{ {
@ -200,23 +200,23 @@ public class IppResponse
proceed = false; proceed = false;
break; break;
case IppDelimiterTag.OPERATION_ATTRIBUTES_TAG: case IppDelimiterTag.OPERATION_ATTRIBUTES_TAG:
tmp = new HashMap(); tmp = new HashMap<Class<? extends Attribute>, Set<Attribute>>();
tag = parseAttributes(tmp, stream); tag = parseAttributes(tmp, stream);
operationAttributes.add(tmp); operationAttributes.add(tmp);
break; break;
case IppDelimiterTag.JOB_ATTRIBUTES_TAG: case IppDelimiterTag.JOB_ATTRIBUTES_TAG:
tmp = new HashMap(); tmp = new HashMap<Class<? extends Attribute>, Set<Attribute>>();
tag = parseAttributes(tmp, stream); tag = parseAttributes(tmp, stream);
jobAttributes.add(tmp); jobAttributes.add(tmp);
break; break;
case IppDelimiterTag.PRINTER_ATTRIBUTES_TAG: case IppDelimiterTag.PRINTER_ATTRIBUTES_TAG:
tmp = new HashMap(); tmp = new HashMap<Class<? extends Attribute>, Set<Attribute>>();
tag = parseAttributes(tmp, stream); tag = parseAttributes(tmp, stream);
printerAttributes.add(tmp); printerAttributes.add(tmp);
break; break;
case IppDelimiterTag.UNSUPPORTED_ATTRIBUTES_TAG: case IppDelimiterTag.UNSUPPORTED_ATTRIBUTES_TAG:
System.out.println("Called"); System.out.println("Called");
tmp = new HashMap(); tmp = new HashMap<Class<? extends Attribute>, Set<Attribute>>();
tag = parseAttributes(tmp, stream); tag = parseAttributes(tmp, stream);
unsupportedAttributes.add(tmp); unsupportedAttributes.add(tmp);
break; break;
@ -247,7 +247,8 @@ public class IppResponse
* @throws IppException if unexpected exceptions occur. * @throws IppException if unexpected exceptions occur.
* @throws IOException if IO problems with the underlying inputstream occur. * @throws IOException if IO problems with the underlying inputstream occur.
*/ */
private byte parseAttributes(Map attributes, DataInputStream stream) private byte parseAttributes(Map<Class<? extends Attribute>, Set<Attribute>> attributes,
DataInputStream stream)
throws IppException, IOException throws IppException, IOException
{ {
Attribute lastAttribute = null; Attribute lastAttribute = null;
@ -304,12 +305,12 @@ public class IppResponse
case IppValueTag.UNKNOWN: case IppValueTag.UNKNOWN:
// TODO implement out-of-band handling // TODO implement out-of-band handling
// We currently throw an exception to see when it occurs - not yet :-) // We currently throw an exception to see when it occurs - not yet :-)
throw new IppException( throw new IppException(
"Unexpected name value for out-of-band value tag " + tag); "Unexpected name value for out-of-band value tag " + tag);
case IppValueTag.NO_VALUE: case IppValueTag.NO_VALUE:
attribute = null; attribute = null;
break; break;
case IppValueTag.INTEGER: case IppValueTag.INTEGER:
int intValue = IppUtilities.convertToInt(value); int intValue = IppUtilities.convertToInt(value);
attribute = IppUtilities.getIntegerAttribute(name, intValue); attribute = IppUtilities.getIntegerAttribute(name, intValue);
@ -386,7 +387,7 @@ public class IppResponse
else if (name.equals("media-supported")) else if (name.equals("media-supported"))
attribute = new MediaSupported(str, null); attribute = new MediaSupported(str, null);
else if (name.equals("media-default")) else if (name.equals("media-default"))
attribute = new MediaDefault(str, null); attribute = new MediaDefault(str, null);
else if (name.equals("job-sheets-default")) else if (name.equals("job-sheets-default"))
attribute = new JobSheetsDefault(str, null); attribute = new JobSheetsDefault(str, null);
else if (name.equals("job-sheets-supported")) else if (name.equals("job-sheets-supported"))
@ -473,7 +474,7 @@ public class IppResponse
} }
if (attribute == null) if (attribute == null)
attribute = new UnknownAttribute(tag, name, value); attribute = new UnknownAttribute(tag, name, value);
addAttribute(attributes, attribute); addAttribute(attributes, attribute);
lastAttribute = attribute; lastAttribute = attribute;
@ -492,14 +493,15 @@ public class IppResponse
* @param attribute * @param attribute
* the attribute to add * the attribute to add
*/ */
private void addAttribute(Map attributeGroup, Attribute attribute) private void addAttribute(Map<Class<? extends Attribute>, Set<Attribute>> attributeGroup,
Attribute attribute)
{ {
Class clazz = attribute.getCategory(); Class<? extends Attribute> clazz = attribute.getCategory();
Set attributeValues = (Set) attributeGroup.get(clazz); Set<Attribute> attributeValues = attributeGroup.get(clazz);
if (attributeValues == null) // first attribute of this category if (attributeValues == null) // first attribute of this category
{ {
attributeValues = new HashSet(); attributeValues = new HashSet<Attribute>();
attributeGroup.put(clazz, attributeValues); attributeGroup.put(clazz, attributeValues);
} }
@ -637,10 +639,10 @@ public class IppResponse
short status_code; short status_code;
int request_id; int request_id;
List operationAttributes; List<Map<Class<? extends Attribute>, Set<Attribute>>> operationAttributes;
List printerAttributes; List<Map<Class<? extends Attribute>, Set<Attribute>>> printerAttributes;
List jobAttributes; List<Map<Class<? extends Attribute>, Set<Attribute>>> jobAttributes;
List unsupportedAttributes; List<Map<Class<? extends Attribute>, Set<Attribute>>> unsupportedAttributes;
byte[] data; byte[] data;
@ -654,10 +656,14 @@ public class IppResponse
{ {
this.uri = uri; this.uri = uri;
this.operation_id = operation_id; this.operation_id = operation_id;
operationAttributes = new ArrayList(); operationAttributes =
jobAttributes = new ArrayList(); new ArrayList<Map<Class<? extends Attribute>, Set<Attribute>>>();
printerAttributes = new ArrayList(); jobAttributes =
unsupportedAttributes = new ArrayList(); new ArrayList<Map<Class<? extends Attribute>, Set<Attribute>>>();
printerAttributes =
new ArrayList<Map<Class<? extends Attribute>, Set<Attribute>>>();
unsupportedAttributes =
new ArrayList<Map<Class<? extends Attribute>, Set<Attribute>>>();
} }
/** /**
@ -704,9 +710,9 @@ public class IppResponse
* There may occur more than one group of type job attribute in a response * There may occur more than one group of type job attribute in a response
* because of e.g. multiple job or print service informations requested. * because of e.g. multiple job or print service informations requested.
* *
* @return The list of job attribute grou maps. * @return The list of job attribute group maps.
*/ */
public List getJobAttributes() public List<Map<Class<? extends Attribute>, Set<Attribute>>> getJobAttributes()
{ {
return jobAttributes; return jobAttributes;
} }
@ -716,9 +722,9 @@ public class IppResponse
* There may occur more than one group of type job attribute in a response * There may occur more than one group of type job attribute in a response
* because of e.g. multiple job or print service informations requested. * because of e.g. multiple job or print service informations requested.
* *
* @return The list of operation attribute grou maps. * @return The list of operation attribute group maps.
*/ */
public List getOperationAttributes() public List<Map<Class<? extends Attribute>, Set<Attribute>>> getOperationAttributes()
{ {
return operationAttributes; return operationAttributes;
} }
@ -728,9 +734,9 @@ public class IppResponse
* There may occur more than one group of type job attribute in a response * There may occur more than one group of type job attribute in a response
* because of e.g. multiple job or print service informations requested. * because of e.g. multiple job or print service informations requested.
* *
* @return The list of printer attribute grou maps. * @return The list of printer attribute group maps.
*/ */
public List getPrinterAttributes() public List<Map<Class<? extends Attribute>, Set<Attribute>>> getPrinterAttributes()
{ {
return printerAttributes; return printerAttributes;
} }
@ -761,9 +767,9 @@ public class IppResponse
* There may occur more than one group of type job attribute in a response * There may occur more than one group of type job attribute in a response
* because of e.g. multiple job or print service informations requested. * because of e.g. multiple job or print service informations requested.
* *
* @return The list of unsupported attribute grou maps. * @return The list of unsupported attribute group maps.
*/ */
public List getUnsupportedAttributes() public List<Map<Class<? extends Attribute>, Set<Attribute>>> getUnsupportedAttributes()
{ {
return unsupportedAttributes; return unsupportedAttributes;
} }

34
libjava/classpath/gnu/javax/print/ipp/IppUtilities.java
View File

@ -147,14 +147,16 @@ public final class IppUtilities
{ {
// These are reused in the reflection code to not instantiate an array everytime // These are reused in the reflection code to not instantiate an array everytime
private static Object[] INTEGER_ATT_VALUE = new Object[1]; private static Object[] INTEGER_ATT_VALUE = new Object[1];
private static Class[] INTEGER_CLASS_ARRAY = new Class[] {int.class}; private static Class<?>[] INTEGER_CLASS_ARRAY = new Class[] {int.class};
private static Object[] TEXT_ATT_VALUE = new Object[2]; private static Object[] TEXT_ATT_VALUE = new Object[2];
private static Class[] TEXT_CLASS_ARRAY = new Class[] {String.class, Locale.class}; private static Class<?>[] TEXT_CLASS_ARRAY = new Class[] {String.class, Locale.class};
// The map -> Attribute name to Attribute class // The map -> Attribute name to Attribute class
private static HashMap classesByName = new HashMap(); private static HashMap<String,Class<? extends Attribute>> classesByName =
new HashMap<String,Class<? extends Attribute>>();
// The map -> StandardAttribute class to SupportedAttribute category name // The map -> StandardAttribute class to SupportedAttribute category name
private static HashMap instanceByClass = new HashMap(); private static HashMap<Class<? extends Attribute>,SupportedValuesAttribute> instanceByClass =
new HashMap<Class<? extends Attribute>,SupportedValuesAttribute>();
/** /**
* All the currently needed attributes * All the currently needed attributes
@ -312,9 +314,9 @@ public final class IppUtilities
* @param name the attribute name * @param name the attribute name
* @return The <code>Class</code> object. * @return The <code>Class</code> object.
*/ */
public static Class getClass(String name) public static Class<? extends Attribute> getClass(String name)
{ {
return (Class) classesByName.get(name); return classesByName.get(name);
} }
/** /**
@ -324,9 +326,9 @@ public final class IppUtilities
* @param clazz the standard attribute category * @param clazz the standard attribute category
* @return The name of the supported attribute category. * @return The name of the supported attribute category.
*/ */
public static String getSupportedAttrName(Class clazz) public static String getSupportedAttrName(Class<? extends Attribute> clazz)
{ {
return ((SupportedValuesAttribute) instanceByClass.get(clazz)).getName(); return instanceByClass.get(clazz).getName();
} }
/** /**
@ -336,9 +338,9 @@ public final class IppUtilities
* @param clazz the standard attribute category * @param clazz the standard attribute category
* @return The supported attribute category. * @return The supported attribute category.
*/ */
public static Class getSupportedCategory(Class clazz) public static Class<? extends Attribute> getSupportedCategory(Class<? extends Attribute> clazz)
{ {
return ((SupportedValuesAttribute) instanceByClass.get(clazz)).getCategory(); return instanceByClass.get(clazz).getCategory();
} }
/** /**
@ -387,7 +389,7 @@ public final class IppUtilities
*/ */
public static Attribute getEnumAttribute(String name, Object value) public static Attribute getEnumAttribute(String name, Object value)
{ {
Class attrClass = getClass(name); Class<?> attrClass = getClass(name);
// There might be unknown enums we have no mapped class for // There might be unknown enums we have no mapped class for
if (attrClass == null) if (attrClass == null)
@ -439,7 +441,7 @@ public final class IppUtilities
*/ */
public static Attribute getIntegerAttribute(String name, int value) public static Attribute getIntegerAttribute(String name, int value)
{ {
Class attrClass = getClass(name); Class<?> attrClass = getClass(name);
// There might be unknown attributes we have no mapped class for // There might be unknown attributes we have no mapped class for
if (attrClass == null) if (attrClass == null)
@ -447,8 +449,8 @@ public final class IppUtilities
try try
{ {
INTEGER_ATT_VALUE[0] = new Integer(value); INTEGER_ATT_VALUE[0] = Integer.valueOf(value);
Constructor c = attrClass.getDeclaredConstructor(INTEGER_CLASS_ARRAY); Constructor<?> c = attrClass.getDeclaredConstructor(INTEGER_CLASS_ARRAY);
return (Attribute) c.newInstance(INTEGER_ATT_VALUE); return (Attribute) c.newInstance(INTEGER_ATT_VALUE);
} }
catch (SecurityException e) catch (SecurityException e)
@ -514,7 +516,7 @@ public final class IppUtilities
TEXT_ATT_VALUE[1] = locale; TEXT_ATT_VALUE[1] = locale;
} }
Class attrClass = getClass(name); Class<?> attrClass = getClass(name);
// There might be unknown attributes we have no mapped class for // There might be unknown attributes we have no mapped class for
if (attrClass == null) if (attrClass == null)
@ -522,7 +524,7 @@ public final class IppUtilities
try try
{ {
Constructor c = attrClass.getDeclaredConstructor(TEXT_CLASS_ARRAY); Constructor<?> c = attrClass.getDeclaredConstructor(TEXT_CLASS_ARRAY);
return (Attribute) c.newInstance(TEXT_ATT_VALUE); return (Attribute) c.newInstance(TEXT_ATT_VALUE);
} }
catch (SecurityException e) catch (SecurityException e)

2
libjava/classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java
View File

@ -74,7 +74,7 @@ public final class DetailedStatusMessage extends TextSyntax
* *
* @return The class <code>DetailedStatusMessage</code> itself. * @return The class <code>DetailedStatusMessage</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return DetailedStatusMessage.class; return DetailedStatusMessage.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java
View File

@ -74,7 +74,7 @@ public final class DocumentAccessError extends TextSyntax
* *
* @return The class <code>DocumentAccessError</code> itself. * @return The class <code>DocumentAccessError</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return DocumentAccessError.class; return DocumentAccessError.class;
} }

10
libjava/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java
View File

@ -53,7 +53,7 @@ import javax.print.attribute.Attribute;
*/ */
public final class RequestedAttributes implements Attribute public final class RequestedAttributes implements Attribute
{ {
private ArrayList attributes; private ArrayList<String> attributes;
/** /**
* Creates a <code>RequestedAttributes</code> object with * Creates a <code>RequestedAttributes</code> object with
@ -68,7 +68,7 @@ public final class RequestedAttributes implements Attribute
if (value == null) if (value == null)
throw new NullPointerException(); throw new NullPointerException();
attributes = new ArrayList(); attributes = new ArrayList<String>();
attributes.add(value); attributes.add(value);
} }
@ -87,9 +87,9 @@ public final class RequestedAttributes implements Attribute
* *
* @return The values as list. * @return The values as list.
*/ */
public List getValues() public String[] getValues()
{ {
return attributes; return attributes.toArray(new String[attributes.size()]);
} }
/** /**
@ -97,7 +97,7 @@ public final class RequestedAttributes implements Attribute
* *
* @return The class <code>DocumentFormat</code> itself. * @return The class <code>DocumentFormat</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return RequestedAttributes.class; return RequestedAttributes.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/StatusMessage.java
View File

@ -73,7 +73,7 @@ public final class StatusMessage extends TextSyntax implements Attribute
* *
* @return The class <code>StatusMessage</code> itself. * @return The class <code>StatusMessage</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return StatusMessage.class; return StatusMessage.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java
View File

@ -77,7 +77,7 @@ public final class UnknownAttribute implements Attribute
* *
* @return The class <code>UnknownAttribute</code> itself. * @return The class <code>UnknownAttribute</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return UnknownAttribute.class; return UnknownAttribute.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java
View File

@ -89,7 +89,7 @@ public final class CopiesDefault extends IntegerSyntax
* *
* @return The class <code>CopiesDefault</code> itself. * @return The class <code>CopiesDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return CopiesDefault.class; return CopiesDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java
View File

@ -77,7 +77,7 @@ public final class DocumentFormatDefault extends TextSyntax
* *
* @return The class <code>DocumentFormatDefault</code> itself. * @return The class <code>DocumentFormatDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return DocumentFormatDefault.class; return DocumentFormatDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java
View File

@ -204,7 +204,7 @@ public final class FinishingsDefault extends EnumSyntax
* *
* @return the class <code>FinishingsDefault</code> itself * @return the class <code>FinishingsDefault</code> itself
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return FinishingsDefault.class; return FinishingsDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java
View File

@ -119,7 +119,7 @@ public final class JobHoldUntilDefault extends TextSyntax
* *
* @return The class <code>JobHoldUntilDefault</code> itself. * @return The class <code>JobHoldUntilDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobHoldUntilDefault.class; return JobHoldUntilDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java
View File

@ -90,7 +90,7 @@ public final class JobPriorityDefault extends IntegerSyntax
* *
* @return The class <code>JobPriorityDefault</code> itself. * @return The class <code>JobPriorityDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobPriorityDefault.class; return JobPriorityDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java
View File

@ -87,7 +87,7 @@ public final class JobSheetsDefault extends TextSyntax
* *
* @return The class <code>JobSheetsDefault</code> itself. * @return The class <code>JobSheetsDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobSheetsDefault.class; return JobSheetsDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java
View File

@ -76,7 +76,7 @@ public final class MediaDefault extends TextSyntax
* *
* @return The class <code>MediaDefault</code> itself. * @return The class <code>MediaDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return MediaDefault.class; return MediaDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java
View File

@ -102,7 +102,7 @@ public final class MultipleDocumentHandlingDefault extends EnumSyntax
* *
* @return The class <code>MultipleDocumentHandlingDefault</code> itself. * @return The class <code>MultipleDocumentHandlingDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return MultipleDocumentHandlingDefault.class; return MultipleDocumentHandlingDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java
View File

@ -85,7 +85,7 @@ public final class NumberUpDefault extends IntegerSyntax
* *
* @return The class <code>NumberUpDefault</code> itself. * @return The class <code>NumberUpDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return NumberUpDefault.class; return NumberUpDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java
View File

@ -94,7 +94,7 @@ public final class OrientationRequestedDefault extends EnumSyntax
* *
* @return The class <code>OrientationRequestedDefault</code> itself. * @return The class <code>OrientationRequestedDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return OrientationRequestedDefault.class; return OrientationRequestedDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java
View File

@ -81,7 +81,7 @@ public final class PrintQualityDefault extends EnumSyntax
* *
* @return The class <code>PrintQualityDefault</code> itself. * @return The class <code>PrintQualityDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrintQualityDefault.class; return PrintQualityDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java
View File

@ -90,7 +90,7 @@ public final class PrinterResolutionDefault extends ResolutionSyntax
* *
* @return The class <code>PrinterResolutionDefault</code> itself. * @return The class <code>PrinterResolutionDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterResolutionDefault.class; return PrinterResolutionDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java
View File

@ -101,7 +101,7 @@ public final class SidesDefault extends EnumSyntax
* *
* @return The class <code>SidesDefault</code> itself. * @return The class <code>SidesDefault</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return SidesDefault.class; return SidesDefault.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java
View File

@ -76,7 +76,7 @@ public final class AttributesCharset extends CharsetSyntax
* *
* @return The class <code>AttributesCharset</code> itself. * @return The class <code>AttributesCharset</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return AttributesCharset.class; return AttributesCharset.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java
View File

@ -78,7 +78,7 @@ public final class AttributesNaturalLanguage extends NaturalLanguageSyntax
* *
* @return The class <code>AttributesNaturalLanguage</code> itself. * @return The class <code>AttributesNaturalLanguage</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return AttributesNaturalLanguage.class; return AttributesNaturalLanguage.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
View File

@ -73,7 +73,7 @@ public final class JobDetailedStatusMessages
* *
* @return The class <code>JobDetailedStatusMessages</code> itself. * @return The class <code>JobDetailedStatusMessages</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobDetailedStatusMessages.class; return JobDetailedStatusMessages.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
View File

@ -74,7 +74,7 @@ public final class JobDocumentAccessErrors
* *
* @return The class <code>JobDocumentAccessErrors</code> itself. * @return The class <code>JobDocumentAccessErrors</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobDocumentAccessErrors.class; return JobDocumentAccessErrors.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobId.java
View File

@ -69,7 +69,7 @@ public final class JobId extends IntegerSyntax implements Attribute
* *
* @return The class <code>JobId</code> itself. * @return The class <code>JobId</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobId.class; return JobId.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java
View File

@ -69,7 +69,7 @@ public final class JobMoreInfo extends URISyntax implements Attribute
* *
* @return The class <code>JobMoreInfo</code> itself. * @return The class <code>JobMoreInfo</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobMoreInfo.class; return JobMoreInfo.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java
View File

@ -69,7 +69,7 @@ public final class JobPrinterUri extends URISyntax implements Attribute
* *
* @return The class <code>JobPrinterUri</code> itself. * @return The class <code>JobPrinterUri</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobPrinterUri.class; return JobPrinterUri.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java
View File

@ -73,7 +73,7 @@ public final class JobStateMessage
* *
* @return The class <code>JobStateMessage</code> itself. * @return The class <code>JobStateMessage</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobStateMessage.class; return JobStateMessage.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/job/JobUri.java
View File

@ -69,7 +69,7 @@ public final class JobUri extends URISyntax implements Attribute
* *
* @return The class <code>JobUri</code> itself. * @return The class <code>JobUri</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobUri.class; return JobUri.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java
View File

@ -68,7 +68,7 @@ public final class CharsetConfigured extends CharsetSyntax
* *
* @return The class <code>CharsetConfigured</code> itself. * @return The class <code>CharsetConfigured</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return CharsetConfigured.class; return CharsetConfigured.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java
View File

@ -41,6 +41,7 @@ package gnu.javax.print.ipp.attribute.printer;
import java.util.Locale; import java.util.Locale;
import javax.print.DocFlavor; import javax.print.DocFlavor;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.TextSyntax; import javax.print.attribute.TextSyntax;
@ -92,7 +93,7 @@ public final class DocumentFormat extends TextSyntax
* *
* @return The class <code>DocumentFormat</code> itself. * @return The class <code>DocumentFormat</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return DocumentFormat.class; return DocumentFormat.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java
View File

@ -68,7 +68,7 @@ public final class MultipleOperationTimeOut extends IntegerSyntax
* *
* @return The class <code>MultipleOperationTimeOut</code> itself. * @return The class <code>MultipleOperationTimeOut</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return MultipleOperationTimeOut.class; return MultipleOperationTimeOut.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java
View File

@ -68,7 +68,7 @@ public final class NaturalLanguageConfigured extends NaturalLanguageSyntax
* *
* @return The class <code>NaturalLanguageConfigured</code> itself. * @return The class <code>NaturalLanguageConfigured</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return NaturalLanguageConfigured.class; return NaturalLanguageConfigured.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.printer;
import java.util.Date; import java.util.Date;
import javax.print.attribute.Attribute;
import javax.print.attribute.DateTimeSyntax; import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintServiceAttribute; import javax.print.attribute.PrintServiceAttribute;
@ -88,7 +89,7 @@ public final class PrinterCurrentTime extends DateTimeSyntax
* *
* @return The class <code>PrinterCurrentTime</code> itself. * @return The class <code>PrinterCurrentTime</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterCurrentTime.class; return PrinterCurrentTime.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java
View File

@ -70,7 +70,7 @@ public final class PrinterDriverInstaller extends URISyntax
* *
* @return The class <code>PrinterDriverInstaller</code> itself. * @return The class <code>PrinterDriverInstaller</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterDriverInstaller.class; return PrinterDriverInstaller.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.printer;
import java.util.Locale; import java.util.Locale;
import javax.print.attribute.Attribute;
import javax.print.attribute.PrintServiceAttribute; import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax; import javax.print.attribute.TextSyntax;
@ -75,7 +76,7 @@ public final class PrinterStateMessage extends TextSyntax
* *
* @return The class <code>PrinterStateMessage</code> itself. * @return The class <code>PrinterStateMessage</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterStateMessage.class; return PrinterStateMessage.class;
} }

2
libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java
View File

@ -68,7 +68,7 @@ public final class PrinterUpTime extends IntegerSyntax
* *
* @return The class <code>PrinterUpTime</code> itself. * @return The class <code>PrinterUpTime</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterUpTime.class; return PrinterUpTime.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported;
import gnu.javax.print.ipp.attribute.CharsetSyntax; import gnu.javax.print.ipp.attribute.CharsetSyntax;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
/** /**
@ -69,7 +70,7 @@ public final class CharsetSupported extends CharsetSyntax
* *
* @return The class <code>CharsetSupported</code> itself. * @return The class <code>CharsetSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return CharsetSupported.class; return CharsetSupported.class;
} }

13
libjava/classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java
View File

@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.standard.Compression; import javax.print.attribute.standard.Compression;
@ -90,7 +91,7 @@ public final class CompressionSupported extends EnumSyntax
* *
* @return The class <code>CompressionSupported</code> itself. * @return The class <code>CompressionSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return CompressionSupported.class; return CompressionSupported.class;
} }
@ -145,16 +146,14 @@ public final class CompressionSupported extends EnumSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static Compression[] getAssociatedAttributeArray(Set set) public static Compression[]
getAssociatedAttributeArray(Set<Attribute> set)
{ {
CompressionSupported tmp;
Compression[] result = new Compression[set.size()]; Compression[] result = new Compression[set.size()];
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (CompressionSupported) it.next(); result[j] = ((CompressionSupported) tmp).getAssociatedAttribute();
result[j] = tmp.getAssociatedAttribute();
j++; j++;
} }
return result; return result;

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported;
import java.util.Locale; import java.util.Locale;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.TextSyntax; import javax.print.attribute.TextSyntax;
@ -73,7 +74,7 @@ public final class DocumentFormatSupported extends TextSyntax
* *
* @return The class <code>DocumentFormatSupported</code> itself. * @return The class <code>DocumentFormatSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return DocumentFormatSupported.class; return DocumentFormatSupported.class;
} }

13
libjava/classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java
View File

@ -43,6 +43,7 @@ import gnu.javax.print.ipp.IppUtilities;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.standard.Finishings; import javax.print.attribute.standard.Finishings;
@ -221,7 +222,7 @@ public final class FinishingsSupported extends EnumSyntax
* *
* @return the class <code>FinishingsSupported</code> itself * @return the class <code>FinishingsSupported</code> itself
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return FinishingsSupported.class; return FinishingsSupported.class;
} }
@ -286,16 +287,14 @@ public final class FinishingsSupported extends EnumSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static Finishings[] getAssociatedAttributeArray(Set set) public static Finishings[]
getAssociatedAttributeArray(Set<Attribute> set)
{ {
FinishingsSupported tmp;
Finishings[] result = new Finishings[set.size()]; Finishings[] result = new Finishings[set.size()];
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (FinishingsSupported) it.next(); result[j] = ((FinishingsSupported) tmp).getAssociatedAttribute();
result[j] = tmp.getAssociatedAttribute();
j++; j++;
} }
return result; return result;

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported;
import gnu.javax.print.ipp.attribute.NaturalLanguageSyntax; import gnu.javax.print.ipp.attribute.NaturalLanguageSyntax;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
/** /**
@ -70,7 +71,7 @@ public final class GeneratedNaturalLanguageSupported
* *
* @return The class <code>GeneratedNaturalLanguageSupported</code> itself. * @return The class <code>GeneratedNaturalLanguageSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return GeneratedNaturalLanguageSupported.class; return GeneratedNaturalLanguageSupported.class;
} }

5
libjava/classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java
View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
@ -78,11 +79,11 @@ public final class IppVersionsSupported extends EnumSyntax
} }
/** /**
* Returns category of this class. * Returns the category of this class.
* *
* @return The class <code>IppVersionsSupported</code> itself. * @return The class <code>IppVersionsSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return IppVersionsSupported.class; return IppVersionsSupported.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported;
import java.util.Locale; import java.util.Locale;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.TextSyntax; import javax.print.attribute.TextSyntax;
@ -115,7 +116,7 @@ public final class JobHoldUntilSupported extends TextSyntax
* *
* @return The class <code>JobHoldUntilSupported</code> itself. * @return The class <code>JobHoldUntilSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobHoldUntilSupported.class; return JobHoldUntilSupported.class;
} }

16
libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java
View File

@ -91,7 +91,7 @@ public final class JobSheetsSupported extends TextSyntax
* *
* @return The class <code>JobSheetsSupported</code> itself. * @return The class <code>JobSheetsSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return JobSheetsSupported.class; return JobSheetsSupported.class;
} }
@ -130,21 +130,19 @@ public final class JobSheetsSupported extends TextSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static JobSheets[] getAssociatedAttributeArray(Set set) public static JobSheets[]
getAssociatedAttributeArray(Set<Attribute> set)
{ {
JobSheetsSupported tmp; ArrayList<JobSheets> result = new ArrayList<JobSheets>();
ArrayList result = new ArrayList();
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (JobSheetsSupported) it.next(); JobSheets att = ((JobSheetsSupported) tmp).getAssociatedAttribute();
Attribute att = tmp.getAssociatedAttribute();
if (att != null) if (att != null)
result.add(att); result.add(att);
j++; j++;
} }
return (JobSheets[]) result.toArray(new JobSheets[result.size()]); return result.toArray(new JobSheets[result.size()]);
} }
} }

14
libjava/classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java
View File

@ -45,6 +45,7 @@ import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.TextSyntax; import javax.print.attribute.TextSyntax;
import javax.print.attribute.standard.Media; import javax.print.attribute.standard.Media;
@ -79,7 +80,7 @@ public final class MediaSupported extends TextSyntax
* *
* @return The class <code>MediaSupported</code> itself. * @return The class <code>MediaSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return MediaSupported.class; return MediaSupported.class;
} }
@ -99,20 +100,17 @@ public final class MediaSupported extends TextSyntax
* @param set set to process * @param set set to process
* @return The constructed array. * @return The constructed array.
*/ */
public static Media[] getAssociatedAttributeArray(Set set) public static Media[] getAssociatedAttributeArray(Set<Attribute> set)
{ {
MediaSupported tmp;
Media tmp2; Media tmp2;
ArrayList result = new ArrayList(); ArrayList<Media> result = new ArrayList<Media>();
Iterator it = set.iterator(); for (Attribute tmp : set)
while (it.hasNext())
{ {
tmp = (MediaSupported) it.next();
tmp2 = (Media) IppUtilities.getEnumAttribute("media", tmp.toString()); tmp2 = (Media) IppUtilities.getEnumAttribute("media", tmp.toString());
if (tmp2 != null) if (tmp2 != null)
result.add(tmp2); result.add(tmp2);
} }
return (Media[]) result.toArray(new Media[result.size()]); return result.toArray(new Media[result.size()]);
} }
} }

13
libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java
View File

@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.standard.MultipleDocumentHandling; import javax.print.attribute.standard.MultipleDocumentHandling;
@ -105,7 +106,7 @@ public final class MultipleDocumentHandlingSupported extends EnumSyntax
* *
* @return The class <code>MultipleDocumentHandlingSupported</code> itself. * @return The class <code>MultipleDocumentHandlingSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return MultipleDocumentHandlingSupported.class; return MultipleDocumentHandlingSupported.class;
} }
@ -160,16 +161,14 @@ public final class MultipleDocumentHandlingSupported extends EnumSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static MultipleDocumentHandling[] getAssociatedAttributeArray(Set set) public static MultipleDocumentHandling[]
getAssociatedAttributeArray(Set<Attribute> set)
{ {
MultipleDocumentHandlingSupported tmp;
MultipleDocumentHandling[] result = new MultipleDocumentHandling[set.size()]; MultipleDocumentHandling[] result = new MultipleDocumentHandling[set.size()];
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (MultipleDocumentHandlingSupported) it.next(); result[j] = ((MultipleDocumentHandlingSupported) tmp).getAssociatedAttribute();
result[j] = tmp.getAssociatedAttribute();
j++; j++;
} }
return result; return result;

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java
View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
@ -79,7 +80,7 @@ public class MultipleDocumentJobsSupported extends EnumSyntax
* *
* @return The class <code>MultipleDocumentJobsSupported</code> itself. * @return The class <code>MultipleDocumentJobsSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return MultipleDocumentJobsSupported.class; return MultipleDocumentJobsSupported.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java
View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
@ -186,7 +187,7 @@ public final class OperationsSupported extends EnumSyntax
* *
* @return The class <code>OperationsSupported</code> itself. * @return The class <code>OperationsSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return OperationsSupported.class; return OperationsSupported.class;
} }

13
libjava/classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java
View File

@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.standard.OrientationRequested; import javax.print.attribute.standard.OrientationRequested;
@ -97,7 +98,7 @@ public final class OrientationRequestedSupported extends EnumSyntax
* *
* @return The class <code>OrientationRequestedSupported</code> itself. * @return The class <code>OrientationRequestedSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return OrientationRequestedSupported.class; return OrientationRequestedSupported.class;
} }
@ -162,16 +163,14 @@ public final class OrientationRequestedSupported extends EnumSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static OrientationRequested[] getAssociatedAttributeArray(Set set) public static OrientationRequested[]
getAssociatedAttributeArray(Set<Attribute> set)
{ {
OrientationRequestedSupported tmp;
OrientationRequested[] result = new OrientationRequested[set.size()]; OrientationRequested[] result = new OrientationRequested[set.size()];
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (OrientationRequestedSupported) it.next(); result[j] = ((OrientationRequestedSupported) tmp).getAssociatedAttribute();
result[j] = tmp.getAssociatedAttribute();
j++; j++;
} }
return result; return result;

4
libjava/classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java
View File

@ -37,10 +37,10 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
/** /**
* <code>PageRangesSupported</code> is a boolean typed * <code>PageRangesSupported</code> is a boolean typed
* attribute indicating (as EnumSyntax) if page ranges * attribute indicating (as EnumSyntax) if page ranges
@ -79,7 +79,7 @@ public final class PageRangesSupported extends EnumSyntax
* *
* @return The class <code>PageRangesSupported</code> itself. * @return The class <code>PageRangesSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PageRangesSupported.class; return PageRangesSupported.class;
} }

12
libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java
View File

@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.standard.PrintQuality; import javax.print.attribute.standard.PrintQuality;
@ -89,7 +90,7 @@ public final class PrintQualitySupported extends EnumSyntax
* *
* @return The class <code>PrintQualitySupported</code> itself. * @return The class <code>PrintQualitySupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrintQualitySupported.class; return PrintQualitySupported.class;
} }
@ -154,16 +155,13 @@ public final class PrintQualitySupported extends EnumSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static PrintQuality[] getAssociatedAttributeArray(Set set) public static PrintQuality[] getAssociatedAttributeArray(Set<Attribute> set)
{ {
PrintQualitySupported tmp;
PrintQuality[] result = new PrintQuality[set.size()]; PrintQuality[] result = new PrintQuality[set.size()];
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (PrintQualitySupported) it.next(); result[j] = ((PrintQualitySupported) tmp).getAssociatedAttribute();
result[j] = tmp.getAssociatedAttribute();
j++; j++;
} }
return result; return result;

13
libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.print.attribute.Attribute;
import javax.print.attribute.ResolutionSyntax; import javax.print.attribute.ResolutionSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.standard.PrinterResolution; import javax.print.attribute.standard.PrinterResolution;
@ -92,7 +93,7 @@ public final class PrinterResolutionSupported extends ResolutionSyntax
* *
* @return The class <code>PrinterResolutionSupported</code> itself. * @return The class <code>PrinterResolutionSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterResolutionSupported.class; return PrinterResolutionSupported.class;
} }
@ -126,16 +127,14 @@ public final class PrinterResolutionSupported extends ResolutionSyntax
* *
* @see #getAssociatedAttribute() * @see #getAssociatedAttribute()
*/ */
public static PrinterResolution[] getAssociatedAttributeArray(Set set) public static PrinterResolution[]
getAssociatedAttributeArray(Set<Attribute> set)
{ {
PrinterResolutionSupported tmp;
PrinterResolution[] result = new PrinterResolution[set.size()]; PrinterResolution[] result = new PrinterResolution[set.size()];
Iterator it = set.iterator();
int j = 0; int j = 0;
while (it.hasNext()) for (Attribute tmp : set)
{ {
tmp = (PrinterResolutionSupported) it.next(); result[j] = ((PrinterResolutionSupported) tmp).getAssociatedAttribute();
result[j] = tmp.getAssociatedAttribute();
j++; j++;
} }
return result; return result;

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java
View File

@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported;
import java.net.URI; import java.net.URI;
import javax.print.attribute.Attribute;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
import javax.print.attribute.URISyntax; import javax.print.attribute.URISyntax;
@ -70,7 +71,7 @@ public final class PrinterUriSupported extends URISyntax
* *
* @return The class <code>PrinterUriSupported</code> itself. * @return The class <code>PrinterUriSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return PrinterUriSupported.class; return PrinterUriSupported.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java
View File

@ -37,6 +37,7 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
@ -98,7 +99,7 @@ public final class SidesSupported extends EnumSyntax
* *
* @return The class <code>SidesSupported</code> itself. * @return The class <code>SidesSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return SidesSupported.class; return SidesSupported.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java
View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
@ -102,7 +103,7 @@ public final class UriAuthenticationSupported extends EnumSyntax
* *
* @return The class <code>UriAuthenticationSupported</code> itself. * @return The class <code>UriAuthenticationSupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return UriAuthenticationSupported.class; return UriAuthenticationSupported.class;
} }

3
libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java
View File

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.javax.print.ipp.attribute.supported; package gnu.javax.print.ipp.attribute.supported;
import javax.print.attribute.Attribute;
import javax.print.attribute.EnumSyntax; import javax.print.attribute.EnumSyntax;
import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.SupportedValuesAttribute;
@ -87,7 +88,7 @@ public final class UriSecuritySupported extends EnumSyntax
* *
* @return The class <code>UriSecuritySupported</code> itself. * @return The class <code>UriSecuritySupported</code> itself.
*/ */
public Class getCategory() public Class<? extends Attribute> getCategory()
{ {
return UriSecuritySupported.class; return UriSecuritySupported.class;
} }

15
libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
View File

@ -38,6 +38,9 @@ exception statement from your version. */
package gnu.javax.swing.text.html.css; package gnu.javax.swing.text.html.css;
import gnu.java.lang.CPStringBuilder;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
@ -97,7 +100,7 @@ public class Selector
* @return <code>true</code> when this selector matches the element path, * @return <code>true</code> when this selector matches the element path,
* <code>false</code> otherwise * <code>false</code> otherwise
*/ */
public boolean matches(String[] tags, Map[] attributes) public boolean matches(String[] tags, List<Map<String,String>> attributes)
{ {
// TODO: This implements class, id and descendent matching. These are // TODO: This implements class, id and descendent matching. These are
// the most commonly used selector matchers in CSS together with HTML. // the most commonly used selector matchers in CSS together with HTML.
@ -118,11 +121,11 @@ public class Selector
boolean tagMatch = false; boolean tagMatch = false;
for (; tagIndex < numTags && tagMatch == false; tagIndex++) for (; tagIndex < numTags && tagMatch == false; tagIndex++)
{ {
Object pathClass = attributes[tagIndex].get("class"); Object pathClass = attributes.get(tagIndex).get("class");
// Try pseudo class too. // Try pseudo class too.
Object pseudoClass = attributes[tagIndex].get("_pseudo"); Object pseudoClass = attributes.get(tagIndex).get("_pseudo");
Object dynClass = attributes[tagIndex].get("_dynamic"); Object dynClass = attributes.get(tagIndex).get("_dynamic");
Object pathId = attributes[tagIndex].get("id"); Object pathId = attributes.get(tagIndex).get("id");
String tag = elements[j]; String tag = elements[j];
String clazz = classes[j]; String clazz = classes[j];
String id = ids[j]; String id = ids[j];
@ -167,7 +170,7 @@ public class Selector
*/ */
public String toString() public String toString()
{ {
StringBuilder b = new StringBuilder(); CPStringBuilder b = new CPStringBuilder();
for (int i = selector.length - 1; i >= 0; i--) for (int i = selector.length - 1; i >= 0; i--)
{ {
b.append(selector[i]); b.append(selector[i]);

4
libjava/classpath/gnu/xml/stream/FilteredStreamReader.java
View File

@ -40,10 +40,10 @@ package gnu.xml.stream;
import javax.xml.stream.StreamFilter; import javax.xml.stream.StreamFilter;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.ReaderDelegate; import javax.xml.stream.util.StreamReaderDelegate;
class FilteredStreamReader class FilteredStreamReader
extends ReaderDelegate extends StreamReaderDelegate
{ {
final XMLStreamReader reader; final XMLStreamReader reader;

29
libjava/classpath/gnu/xml/stream/NamespaceImpl.java
View File

@ -39,6 +39,7 @@ package gnu.xml.stream;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
import javax.xml.namespace.QName;
import javax.xml.stream.Location; import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Namespace; import javax.xml.stream.events.Namespace;
@ -55,12 +56,15 @@ public class NamespaceImpl
protected final String prefix; protected final String prefix;
protected final String uri; protected final String uri;
protected final boolean specified;
protected NamespaceImpl(Location location, String prefix, String uri) protected NamespaceImpl(Location location, String prefix, String uri,
boolean specified)
{ {
super(location); super(location);
this.prefix = prefix; this.prefix = prefix;
this.uri = uri; this.uri = uri;
this.specified = specified;
} }
public int getEventType() public int getEventType()
@ -78,6 +82,29 @@ public class NamespaceImpl
return uri; return uri;
} }
public boolean isSpecified()
{
return specified;
}
public QName getName()
{
if (isDefaultNamespaceDeclaration())
return new QName("", "xmlns", null);
else
return new QName("", prefix, "xmlns");
}
public String getDTDType()
{
return "CDATA";
}
public String getValue()
{
return uri;
}
public boolean isDefaultNamespaceDeclaration() public boolean isDefaultNamespaceDeclaration()
{ {
return (prefix == null || "".equals(prefix)); return (prefix == null || "".equals(prefix));

4
libjava/classpath/gnu/xml/stream/XIncludeFilter.java
View File

@ -54,7 +54,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.ReaderDelegate; import javax.xml.stream.util.StreamReaderDelegate;
import org.w3c.dom.Attr; import org.w3c.dom.Attr;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@ -81,7 +81,7 @@ import org.xml.sax.SAXException;
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
*/ */
class XIncludeFilter class XIncludeFilter
extends ReaderDelegate extends StreamReaderDelegate
{ {
static final String XINCLUDE_NS_URI = "http://www.w3.org/2001/XInclude"; static final String XINCLUDE_NS_URI = "http://www.w3.org/2001/XInclude";

6
libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java
View File

@ -110,7 +110,8 @@ public class XMLEventAllocatorImpl
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
namespaces.add(new NamespaceImpl(location, namespaces.add(new NamespaceImpl(location,
reader.getNamespacePrefix(i), reader.getNamespacePrefix(i),
reader.getNamespaceURI(i))); reader.getNamespaceURI(i),
false));
return new EndElementImpl(location, return new EndElementImpl(location,
reader.getName(), reader.getName(),
namespaces); namespaces);
@ -158,7 +159,8 @@ public class XMLEventAllocatorImpl
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
namespaces.add(new NamespaceImpl(location, namespaces.add(new NamespaceImpl(location,
reader.getNamespacePrefix(i), reader.getNamespacePrefix(i),
reader.getNamespaceURI(i))); reader.getNamespaceURI(i),
false));
len = reader.getAttributeCount(); len = reader.getAttributeCount();
List attributes = new LinkedList(); List attributes = new LinkedList();
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)

6
libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java
View File

@ -98,12 +98,14 @@ public class XMLEventFactoryImpl
public Namespace createNamespace(String namespaceURI) public Namespace createNamespace(String namespaceURI)
{ {
return new NamespaceImpl(location, return new NamespaceImpl(location,
XMLConstants.DEFAULT_NS_PREFIX, namespaceURI); XMLConstants.DEFAULT_NS_PREFIX,
namespaceURI,
true);
} }
public Namespace createNamespace(String prefix, String namespaceUri) public Namespace createNamespace(String prefix, String namespaceUri)
{ {
return new NamespaceImpl(location, prefix, namespaceUri); return new NamespaceImpl(location, prefix, namespaceUri, true);
} }
public StartElement createStartElement(QName name, public StartElement createStartElement(QName name,

23
libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java
View File

@ -242,7 +242,7 @@ public class XMLStreamWriterImpl
{ {
if (namespaceURI != null && !isURI(namespaceURI)) if (namespaceURI != null && !isURI(namespaceURI))
throw new IllegalArgumentException("illegal URI: " + namespaceURI); throw new IllegalArgumentException("illegal URI: " + namespaceURI);
if (prefix != null && !isNCName(prefix)) if (prefix != null && !isPrefix(prefix))
throw new IllegalArgumentException("illegal NCName: " + prefix); throw new IllegalArgumentException("illegal NCName: " + prefix);
if (!isNCName(localName)) if (!isNCName(localName))
throw new IllegalArgumentException("illegal NCName: " + localName); throw new IllegalArgumentException("illegal NCName: " + localName);
@ -394,7 +394,7 @@ public class XMLStreamWriterImpl
{ {
if (namespaceURI != null && !isURI(namespaceURI)) if (namespaceURI != null && !isURI(namespaceURI))
throw new IllegalArgumentException("illegal URI: " + namespaceURI); throw new IllegalArgumentException("illegal URI: " + namespaceURI);
if (prefix != null && !isNCName(prefix)) if (prefix != null && !isPrefix(prefix))
throw new IllegalArgumentException("illegal NCName: " + prefix); throw new IllegalArgumentException("illegal NCName: " + prefix);
if (!isNCName(localName)) if (!isNCName(localName))
throw new IllegalArgumentException("illegal NCName: " + localName); throw new IllegalArgumentException("illegal NCName: " + localName);
@ -490,13 +490,18 @@ public class XMLStreamWriterImpl
public void writeNamespace(String prefix, String namespaceURI) public void writeNamespace(String prefix, String namespaceURI)
throws XMLStreamException throws XMLStreamException
{ {
if (prefix == null || "".equals(prefix) || "xmlns".equals(prefix))
{
writeDefaultNamespace(namespaceURI);
return;
}
if (!inStartElement) if (!inStartElement)
throw new IllegalStateException(); throw new IllegalStateException();
try try
{ {
if (!isURI(namespaceURI)) if (!isURI(namespaceURI))
throw new IllegalArgumentException("illegal URI: " + namespaceURI); throw new IllegalArgumentException("illegal URI: " + namespaceURI);
if (!isNCName(prefix)) if (!isPrefix(prefix))
throw new IllegalArgumentException("illegal NCName: " + prefix); throw new IllegalArgumentException("illegal NCName: " + prefix);
} }
catch (IOException e) catch (IOException e)
@ -790,7 +795,7 @@ public class XMLStreamWriterImpl
{ {
if (!isURI(uri)) if (!isURI(uri))
throw new IllegalArgumentException("illegal URI: " + uri); throw new IllegalArgumentException("illegal URI: " + uri);
if (!isNCName(prefix)) if (!isPrefix(prefix))
throw new IllegalArgumentException("illegal NCName: " + prefix); throw new IllegalArgumentException("illegal NCName: " + prefix);
} }
catch (IOException e) catch (IOException e)
@ -938,6 +943,15 @@ public class XMLStreamWriterImpl
return true; return true;
} }
private boolean isPrefix(String text)
throws IOException
{
if (XMLConstants.DEFAULT_NS_PREFIX.equals(text)) {
return true;
}
return isNCName(text);
}
private boolean isNCName(String text) private boolean isNCName(String text)
throws IOException throws IOException
{ {
@ -1001,3 +1015,4 @@ public class XMLStreamWriterImpl
} }

7
libjava/classpath/include/Makefile.in
View File

@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/lib-ld.m4 \
$(top_srcdir)/../../config/lib-link.m4 \
$(top_srcdir)/../../config/lib-prefix.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../config/override.m4 \ $(top_srcdir)/../../config/override.m4 \
@ -58,9 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs

11
libjava/classpath/install-sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# install - install a program, script, or datafile # install - install a program, script, or datafile
scriptversion=2006-12-25.00 scriptversion=2010-02-06.18; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # later released in X11R6 (xc/config/util/install.sh) with the
@ -200,7 +200,11 @@ if test $# -eq 0; then
fi fi
if test -z "$dir_arg"; then if test -z "$dir_arg"; then
trap '(exit $?); exit' 1 2 13 15 do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes. # Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps. # However, 'strip' requires both read and write access to temps.
@ -515,5 +519,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion=" # time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$" # time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End: # End:

566
libjava/classpath/java/util/Scanner.java
View File

File diff suppressed because it is too large Load Diff

4
libjava/classpath/java/util/TreeMap.java
View File

@ -2745,7 +2745,7 @@ public class TreeMap<K, V> extends AbstractMap<K, V>
{ {
public int size() public int size()
{ {
return size(); return DescendingMap.this.size();
} }
public Iterator<DV> iterator() public Iterator<DV> iterator()
@ -2786,7 +2786,7 @@ public class TreeMap<K, V> extends AbstractMap<K, V>
public void clear() public void clear()
{ {
clear(); DescendingMap.this.clear();
} }
}; };
return values; return values;

85
libjava/classpath/java/util/regex/Matcher.java
View File

@ -116,9 +116,9 @@ public final class Matcher implements MatchResult
{ {
assertMatchOp(); assertMatchOp();
sb.append(input.subSequence(appendPosition, sb.append(input.subSequence(appendPosition,
match.getStartIndex()).toString()); match.getStartIndex()).toString());
sb.append(RE.getReplacement(replacement, match, sb.append(RE.getReplacement(replacement, match,
RE.REG_REPLACE_USE_BACKSLASHESCAPE)); RE.REG_REPLACE_USE_BACKSLASHESCAPE));
appendPosition = match.getEndIndex(); appendPosition = match.getEndIndex();
return this; return this;
} }
@ -165,25 +165,25 @@ public final class Matcher implements MatchResult
match = pattern.getRE().getMatch(inputCharIndexed, position, anchoringBounds); match = pattern.getRE().getMatch(inputCharIndexed, position, anchoringBounds);
else else
match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd),
position, anchoringBounds); position, anchoringBounds);
if (match != null) if (match != null)
{ {
int endIndex = match.getEndIndex(); int endIndex = match.getEndIndex();
// Are we stuck at the same position? // Are we stuck at the same position?
if (!first && endIndex == position) if (!first && endIndex == position)
{ {
match = null; match = null;
// Not at the end of the input yet? // Not at the end of the input yet?
if (position < input.length() - 1) if (position < input.length() - 1)
{ {
position++; position++;
return find(position); return find(position);
} }
else else
return false; return false;
} }
position = endIndex; position = endIndex;
return true; return true;
} }
return false; return false;
} }
@ -200,11 +200,11 @@ public final class Matcher implements MatchResult
match = pattern.getRE().getMatch(inputCharIndexed, start, anchoringBounds); match = pattern.getRE().getMatch(inputCharIndexed, start, anchoringBounds);
else else
match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd),
start, anchoringBounds); start, anchoringBounds);
if (match != null) if (match != null)
{ {
position = match.getEndIndex(); position = match.getEndIndex();
return true; return true;
} }
return false; return false;
} }
@ -242,7 +242,7 @@ public final class Matcher implements MatchResult
reset(); reset();
// Semantics might not quite match // Semantics might not quite match
return pattern.getRE().substitute(input, replacement, position, return pattern.getRE().substitute(input, replacement, position,
RE.REG_REPLACE_USE_BACKSLASHESCAPE); RE.REG_REPLACE_USE_BACKSLASHESCAPE);
} }
/** /**
@ -252,7 +252,7 @@ public final class Matcher implements MatchResult
{ {
reset(); reset();
return pattern.getRE().substituteAll(input, replacement, position, return pattern.getRE().substituteAll(input, replacement, position,
RE.REG_REPLACE_USE_BACKSLASHESCAPE); RE.REG_REPLACE_USE_BACKSLASHESCAPE);
} }
public int groupCount () public int groupCount ()
@ -264,18 +264,18 @@ public final class Matcher implements MatchResult
{ {
if (transparentBounds || (regionStart == 0 && regionEnd == input.length())) if (transparentBounds || (regionStart == 0 && regionEnd == input.length()))
match = pattern.getRE().getMatch(inputCharIndexed, regionStart, match = pattern.getRE().getMatch(inputCharIndexed, regionStart,
anchoringBounds|RE.REG_FIX_STARTING_POSITION|RE.REG_ANCHORINDEX); anchoringBounds|RE.REG_FIX_STARTING_POSITION|RE.REG_ANCHORINDEX);
else else
match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), 0, match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), 0,
anchoringBounds|RE.REG_FIX_STARTING_POSITION); anchoringBounds|RE.REG_FIX_STARTING_POSITION);
if (match != null) if (match != null)
{ {
if (match.getStartIndex() == 0) if (match.getStartIndex() == 0)
{ {
position = match.getEndIndex(); position = match.getEndIndex();
return true; return true;
} }
match = null; match = null;
} }
return false; return false;
} }
@ -294,19 +294,19 @@ public final class Matcher implements MatchResult
{ {
if (transparentBounds || (regionStart == 0 && regionEnd == input.length())) if (transparentBounds || (regionStart == 0 && regionEnd == input.length()))
match = pattern.getRE().getMatch(inputCharIndexed, regionStart, match = pattern.getRE().getMatch(inputCharIndexed, regionStart,
anchoringBounds|RE.REG_TRY_ENTIRE_MATCH|RE.REG_FIX_STARTING_POSITION|RE.REG_ANCHORINDEX); anchoringBounds|RE.REG_TRY_ENTIRE_MATCH|RE.REG_FIX_STARTING_POSITION|RE.REG_ANCHORINDEX);
else else
match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), 0, match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), 0,
anchoringBounds|RE.REG_TRY_ENTIRE_MATCH|RE.REG_FIX_STARTING_POSITION); anchoringBounds|RE.REG_TRY_ENTIRE_MATCH|RE.REG_FIX_STARTING_POSITION);
if (match != null) if (match != null)
{ {
if (match.getStartIndex() == 0) if (match.getStartIndex() == 0)
{ {
position = match.getEndIndex(); position = match.getEndIndex();
if (position == input.length()) if (position == input.length())
return true; return true;
} }
match = null; match = null;
} }
return false; return false;
} }
@ -603,7 +603,8 @@ public final class Matcher implements MatchResult
public MatchResult toMatchResult() public MatchResult toMatchResult()
{ {
Matcher snapshot = new Matcher(pattern, input); Matcher snapshot = new Matcher(pattern, input);
snapshot.match = (REMatch) match.clone(); if (match != null)
snapshot.match = (REMatch) match.clone();
return snapshot; return snapshot;
} }

42
libjava/classpath/java/util/zip/Inflater.java
View File

@ -311,37 +311,29 @@ public class Inflater
*/ */
public int inflate (byte[] buf, int off, int len) throws DataFormatException public int inflate (byte[] buf, int off, int len) throws DataFormatException
{ {
/* Special case: len may be zero */
if (len == 0)
return 0;
/* Check for correct buff, off, len triple */ /* Check for correct buff, off, len triple */
if (0 > off || off > off + len || off + len > buf.length) if (0 > off || off > off + len || off + len > buf.length)
throw new ArrayIndexOutOfBoundsException(); throw new ArrayIndexOutOfBoundsException();
int count = 0; int count = 0;
int more; for (;;)
do
{ {
if (mode != DECODE_CHKSUM) if (outputWindow.getAvailable() == 0)
{ {
/* Don't give away any output, if we are waiting for the if (!decode())
* checksum in the input stream. break;
* }
* With this trick we have always: else if (len > 0)
* needsInput() and not finished() {
* implies more output can be produced. int more = outputWindow.copyOutput(buf, off, len);
*/ adler.update(buf, off, more);
more = outputWindow.copyOutput(buf, off, len); off += more;
adler.update(buf, off, more); count += more;
off += more; totalOut += more;
count += more; len -= more;
totalOut += more; }
len -= more; else
if (len == 0) break;
return count;
}
} }
while (decode() || (outputWindow.getAvailable() > 0
&& mode != DECODE_CHKSUM));
return count; return count;
} }

35
libjava/classpath/javax/security/auth/kerberos/KerberosTicket.java
View File

@ -334,6 +334,39 @@ public class KerberosTicket
public String toString() public String toString()
{ {
return "FIXME bob"; return getClass().getName() +
"[client=" + client +
",server=" + server +
",sessionKey=" + sessionKey +
",flags=" + flags +
",authTime=" + authTime +
",startTime= " + startTime +
",endTime=" + endTime +
",renewTill=" + renewTill +
",clientAddresses=" + clientAddresses +
"]";
} }
/**
* <p>
* Returns the type of the session key in accordance with
* RFC1510. This usually corresponds to the encryption
* algorithm used by the key, though more than one algorithm
* may use the same key type (e.g. DES with different checksum
* mechanisms and chaining modes). Negative values are reserved
* for local use. Non-negative values are for officially assigned
* type fields. The RFC defines:
* </p>
* <ul>
* <li>0 &mdash; null</li>
* <li>1 &mdash; DES (in CBC mode with either MD4 or MD5 checksums)</li>
* </ul>
*
* @return the type of session key used by this ticket.
*/
public final int getSessionKeyType()
{
return sessionKey.type;
}
} }

9
libjava/classpath/javax/security/auth/kerberos/KeyImpl.java
View File

@ -90,4 +90,13 @@ final class KeyImpl implements Serializable, SecretKey
// FIXME. // FIXME.
return null; return null;
} }
public String toString()
{
return getClass().getName() +
"[type=" + type +
",algorithm=" + algorithm +
"]";
}
} }

2
libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
View File

@ -1454,7 +1454,7 @@ public class HTMLEditorKit
try try
{ {
styleSheet = new StyleSheet(); styleSheet = new StyleSheet();
Class c = HTMLEditorKit.class; Class<?> c = HTMLEditorKit.class;
InputStream in = c.getResourceAsStream(DEFAULT_CSS); InputStream in = c.getResourceAsStream(DEFAULT_CSS);
InputStreamReader r = new InputStreamReader(in); InputStreamReader r = new InputStreamReader(in);
styleSheet.loadRules(r, null); styleSheet.loadRules(r, null);

36
libjava/classpath/javax/swing/text/html/HTMLWriter.java
View File

@ -79,9 +79,9 @@ public class HTMLWriter
private HTMLDocument htmlDoc = null; private HTMLDocument htmlDoc = null;
/** /**
* Used to keep track of which embeded has been written out. * Used to keep track of which embedded has been written out.
*/ */
private HashSet openEmbededTagHashSet = null; private HashSet<HTML.Tag> openEmbeddedTagHashSet = null;
private String new_line_str = "" + NEWLINE; private String new_line_str = "" + NEWLINE;
@ -95,7 +95,7 @@ public class HTMLWriter
private int doc_len = -1; private int doc_len = -1;
private int doc_offset_remaining = -1; private int doc_offset_remaining = -1;
private int doc_len_remaining = -1; private int doc_len_remaining = -1;
private HashSet htmlFragmentParentHashSet = null; private HashSet<Element> htmlFragmentParentHashSet = null;
private Element startElem = null; private Element startElem = null;
private Element endElem = null; private Element endElem = null;
private boolean fg_pass_start_elem = false; private boolean fg_pass_start_elem = false;
@ -112,7 +112,7 @@ public class HTMLWriter
super(writer, doc); super(writer, doc);
outWriter = writer; outWriter = writer;
htmlDoc = doc; htmlDoc = doc;
openEmbededTagHashSet = new HashSet(); openEmbeddedTagHashSet = new HashSet<HTML.Tag>();
} // public HTMLWriter(Writer writer, HTMLDocument doc) } // public HTMLWriter(Writer writer, HTMLDocument doc)
/** /**
@ -129,13 +129,13 @@ public class HTMLWriter
super(writer, doc, pos, len); super(writer, doc, pos, len);
outWriter = writer; outWriter = writer;
htmlDoc = doc; htmlDoc = doc;
openEmbededTagHashSet = new HashSet(); openEmbeddedTagHashSet = new HashSet<HTML.Tag>();
doc_pos = pos; doc_pos = pos;
doc_offset_remaining = pos; doc_offset_remaining = pos;
doc_len = len; doc_len = len;
doc_len_remaining = len; doc_len_remaining = len;
htmlFragmentParentHashSet = new HashSet(); htmlFragmentParentHashSet = new HashSet<Element>();
} // public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len) } // public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len)
/** /**
@ -197,7 +197,8 @@ public class HTMLWriter
} // else } // else
// NOTE: close out remaining open embeded tags. // NOTE: close out remaining open embeded tags.
Object[] tag_arr = openEmbededTagHashSet.toArray(); HTML.Tag[] tag_arr =
openEmbeddedTagHashSet.toArray(new HTML.Tag[openEmbeddedTagHashSet.size()]);
for (int i = 0; i < tag_arr.length; i++) for (int i = 0; i < tag_arr.length; i++)
{ {
@ -219,7 +220,7 @@ public class HTMLWriter
protected void writeAttributes(AttributeSet attrSet) protected void writeAttributes(AttributeSet attrSet)
throws IOException throws IOException
{ {
Enumeration attrNameEnum = attrSet.getAttributeNames(); Enumeration<?> attrNameEnum = attrSet.getAttributeNames();
while (attrNameEnum.hasMoreElements()) while (attrNameEnum.hasMoreElements())
{ {
@ -502,7 +503,7 @@ public class HTMLWriter
protected void writeEmbeddedTags(AttributeSet attrSet) protected void writeEmbeddedTags(AttributeSet attrSet)
throws IOException throws IOException
{ {
Enumeration attrNameEnum = attrSet.getAttributeNames(); Enumeration<?> attrNameEnum = attrSet.getAttributeNames();
while (attrNameEnum.hasMoreElements()) while (attrNameEnum.hasMoreElements())
{ {
@ -511,12 +512,12 @@ public class HTMLWriter
if (key instanceof HTML.Tag) if (key instanceof HTML.Tag)
{ {
if (!openEmbededTagHashSet.contains(key)) if (!openEmbeddedTagHashSet.contains(key))
{ {
writeRaw("<" + key); writeRaw("<" + key);
writeAttributes((AttributeSet) value); writeAttributes((AttributeSet) value);
writeRaw(">"); writeRaw(">");
openEmbededTagHashSet.add(key); openEmbeddedTagHashSet.add((HTML.Tag) key);
} // if(!openEmbededTagHashSet.contains(key)) } // if(!openEmbededTagHashSet.contains(key))
} // if(key instanceof HTML.Tag) } // if(key instanceof HTML.Tag)
} // while(attrNameEnum.hasMoreElements()) } // while(attrNameEnum.hasMoreElements())
@ -535,16 +536,17 @@ public class HTMLWriter
protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet) protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet)
throws IOException throws IOException
{ {
Object[] tag_arr = openEmbededTagHashSet.toArray(); HTML.Tag[] tag_arr =
openEmbeddedTagHashSet.toArray(new HTML.Tag[openEmbeddedTagHashSet.size()]);
for (int i = 0; i < tag_arr.length; i++) for (int i = 0; i < tag_arr.length; i++)
{ {
HTML.Tag key = (HTML.Tag) tag_arr[i]; HTML.Tag key = tag_arr[i];
if (!attrSet.isDefined(key)) if (!attrSet.isDefined(key))
{ {
writeRaw("</" + key.toString() + ">"); writeRaw("</" + key.toString() + ">");
openEmbededTagHashSet.remove(key); openEmbeddedTagHashSet.remove(key);
} // if(!attrSet.isDefined(key)) } // if(!attrSet.isDefined(key))
} // for(int i = 0; i < tag_arr.length; i++) } // for(int i = 0; i < tag_arr.length; i++)
@ -645,7 +647,7 @@ public class HTMLWriter
if (matchNameAttribute(attrSet, HTML.Tag.TITLE)) if (matchNameAttribute(attrSet, HTML.Tag.TITLE))
{ {
boolean fg_is_end_tag = false; boolean fg_is_end_tag = false;
Enumeration attrNameEnum = attrSet.getAttributeNames(); Enumeration<?> attrNameEnum = attrSet.getAttributeNames();
while (attrNameEnum.hasMoreElements()) while (attrNameEnum.hasMoreElements())
{ {
@ -860,7 +862,7 @@ public class HTMLWriter
if (matchNameAttribute(attrSet, HTML.Tag.TITLE)) if (matchNameAttribute(attrSet, HTML.Tag.TITLE))
{ {
boolean fg_is_end_tag = false; boolean fg_is_end_tag = false;
Enumeration attrNameEnum = attrSet.getAttributeNames(); Enumeration<?> attrNameEnum = attrSet.getAttributeNames();
while (attrNameEnum.hasMoreElements()) while (attrNameEnum.hasMoreElements())
{ {
@ -996,7 +998,7 @@ public class HTMLWriter
private void writeAllAttributes(AttributeSet attrSet) private void writeAllAttributes(AttributeSet attrSet)
throws IOException throws IOException
{ {
Enumeration attrNameEnum = attrSet.getAttributeNames(); Enumeration<?> attrNameEnum = attrSet.getAttributeNames();
while (attrNameEnum.hasMoreElements()) while (attrNameEnum.hasMoreElements())
{ {

3
libjava/classpath/javax/swing/text/html/ImageView.java
View File

@ -323,8 +323,6 @@ public class ImageView extends View
*/ */
public float getPreferredSpan(int axis) public float getPreferredSpan(int axis)
{ {
AttributeSet attrs = getAttributes();
Image image = getImage(); Image image = getImage();
if (axis == View.X_AXIS) if (axis == View.X_AXIS)
@ -522,7 +520,6 @@ public class ImageView extends View
Image newIm = getImage(); Image newIm = getImage();
if (newIm != null) if (newIm != null)
{ {
AttributeSet atts = getAttributes();
// Fetch width. // Fetch width.
Length l = spans[X_AXIS]; Length l = spans[X_AXIS];
if (l != null) if (l != null)

Some files were not shown because too many files have changed in this diff Show More