From 729530c035d094bc047f0a0802db5bf3bfdca197 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Tue, 12 Oct 2010 15:55:12 +0000 Subject: [PATCH] GNU Classpath import (libgcj-snapshot-20100921). 2010-10-12 Andrew John Hughes 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 * configure.ac: Disable plugin by default and warn about unmaintained status when enabled. 2010-05-04 Andrew John Hughes * 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 * lib/gen-classlist.sh.in: Use absolute pathnames for all the directory names in the output file. 2010-05-04 Andrew John Hughes * 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 * configure.ac: Add output to GMP directory detection and only perform when compiling GMP. 2010-05-04 Mike Stump * 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 * 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)): 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)): Add generic types. (processResponse()): Add generic types. (getAttribute(Class)): Use generic types corresponding to parent interface. (getSupportedAttributeCategories()): Use generic types. (getSupportedAttributeValues()): Likewise. (handleSupportedAttributeValuesResponse(IppResponse,Class)): Likewise. (isAttributeCategorySupported(Class)): Likewise. * gnu/javax/print/ipp/IppResponse.java: (parseResponse(InputStream)): Use generic types. (parseAttributes(Map, Set, DataInputStream)): Likewise. (addAttribute(Map, Set>, 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)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/MediaSupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java, (getAssociatedAttributeArray(Set)): Use superclass Attribute as set type parameter and cast when looping over it. 2010-04-28 Andrew John Hughes * 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)): 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 * 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 * 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 * gnu/javax/print/ipp/IppPrintService.java: Fix whitespace. Use correct generic type for printerAttr map. (getPrinterAttributeSet(Class)): 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)): 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)): 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)): 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)): 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)): 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)): 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)): 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)): 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 * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty list. 2010-04-27 Andrew Haley * 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 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 * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude .svn direcories. 2010-01-30 Andrew John Hughes * doc/www.gnu.org/home.wml: Add newer JAPI results. 2010-01-30 Andrew John Hughes 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 * 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 * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. * tools/Makefile.in: Regenerate. 2010-01-12 Jeroen Frijters * java/util/zip/Inflater. java (inflate(byte[],int,int)): Fix for #41696. 2009-11-18 Andrew Haley * java/util/TreeMap.java (anonymous class.size()): Debogosify. anonymous class.clear(): Likewise. 2009-10-22 Andrew Haley * native/jni/native-lib/cpnet.c (cpnet_addMembership): Fix aliasing warning. (cpnet_dropMembership): Likewise. 2009-10-22 Richard Guenther 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 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 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 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 * java/util/Scanner.java, * java/util/regex/Matcher.java: Replace tab characters with spaces. 2009-03-29 Mark Wielaard * doc/www.gnu.org/faq/faq.wml: Fix link to cp-hacking.html. 2009-03-29 Mark Wielaard * m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty. 2009-03-26 Andrew John Hughes 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 * 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 * 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 * 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 * 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 * 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 * 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 * NEWS: Add VM updates. From-SVN: r165383 --- libjava/ChangeLog | 433 ++ libjava/Makefile.in | 2 +- libjava/classpath/ChangeLog | 715 ++- libjava/classpath/INSTALL | 112 +- libjava/classpath/Makefile.in | 11 +- libjava/classpath/NEWS | 2 + libjava/classpath/aclocal.m4 | 6 +- libjava/classpath/autogen.sh | 2 +- libjava/classpath/config.rpath | 672 +++ libjava/classpath/configure | 396 +- libjava/classpath/configure.ac | 65 +- libjava/classpath/depcomp | 87 +- libjava/classpath/doc/Makefile.in | 7 +- libjava/classpath/doc/api/Makefile.in | 7 +- libjava/classpath/doc/cp-hacking.texinfo | 2 +- libjava/classpath/doc/texinfo.tex | 716 ++- libjava/classpath/examples/Makefile.in | 7 +- libjava/classpath/external/Makefile.in | 7 +- libjava/classpath/external/jsr166/Makefile.in | 7 +- .../external/relaxngDatatype/Makefile.in | 7 +- libjava/classpath/external/sax/Makefile.in | 7 +- .../classpath/external/w3c_dom/Makefile.in | 7 +- .../gnu/javax/print/CupsIppOperation.java | 38 +- .../gnu/javax/print/CupsMediaMapping.java | 30 +- .../gnu/javax/print/CupsPrintService.java | 18 +- .../javax/print/CupsPrintServiceLookup.java | 84 +- .../classpath/gnu/javax/print/CupsServer.java | 132 +- .../javax/print/PrintAttributeException.java | 34 +- .../gnu/javax/print/PrintFlavorException.java | 20 +- .../gnu/javax/print/PrintUriException.java | 26 +- .../gnu/javax/print/PrinterDialog.java | 606 +- .../gnu/javax/print/ipp/DocPrintJobImpl.java | 148 +- .../gnu/javax/print/ipp/IppDelimiterTag.java | 34 +- .../gnu/javax/print/ipp/IppException.java | 6 +- .../print/ipp/IppMultiDocPrintService.java | 16 +- .../gnu/javax/print/ipp/IppPrintService.java | 427 +- .../gnu/javax/print/ipp/IppRequest.java | 256 +- .../gnu/javax/print/ipp/IppResponse.java | 200 +- .../gnu/javax/print/ipp/IppStatusCode.java | 44 +- .../gnu/javax/print/ipp/IppUtilities.java | 284 +- .../gnu/javax/print/ipp/IppValueTag.java | 82 +- .../javax/print/ipp/MultiDocPrintJobImpl.java | 8 +- .../print/ipp/attribute/CharsetSyntax.java | 10 +- .../ipp/attribute/DefaultValueAttribute.java | 8 +- .../ipp/attribute/DetailedStatusMessage.java | 10 +- .../ipp/attribute/DocumentAccessError.java | 10 +- .../ipp/attribute/NaturalLanguageSyntax.java | 14 +- .../ipp/attribute/RequestedAttributes.java | 34 +- .../print/ipp/attribute/StatusMessage.java | 8 +- .../print/ipp/attribute/UnknownAttribute.java | 30 +- .../ipp/attribute/defaults/CopiesDefault.java | 18 +- .../defaults/DocumentFormatDefault.java | 16 +- .../attribute/defaults/FinishingsDefault.java | 106 +- .../defaults/JobHoldUntilDefault.java | 72 +- .../defaults/JobPriorityDefault.java | 16 +- .../attribute/defaults/JobSheetsDefault.java | 32 +- .../ipp/attribute/defaults/MediaDefault.java | 20 +- .../MultipleDocumentHandlingDefault.java | 42 +- .../attribute/defaults/NumberUpDefault.java | 18 +- .../defaults/OrientationRequestedDefault.java | 36 +- .../defaults/PrintQualityDefault.java | 24 +- .../defaults/PrinterResolutionDefault.java | 22 +- .../ipp/attribute/defaults/SidesDefault.java | 46 +- .../ipp/attribute/job/AttributesCharset.java | 12 +- .../job/AttributesNaturalLanguage.java | 16 +- .../job/JobDetailedStatusMessages.java | 8 +- .../job/JobDocumentAccessErrors.java | 8 +- .../javax/print/ipp/attribute/job/JobId.java | 8 +- .../print/ipp/attribute/job/JobMoreInfo.java | 6 +- .../ipp/attribute/job/JobPrinterUri.java | 6 +- .../ipp/attribute/job/JobStateMessage.java | 8 +- .../javax/print/ipp/attribute/job/JobUri.java | 6 +- .../attribute/printer/CharsetConfigured.java | 10 +- .../ipp/attribute/printer/DocumentFormat.java | 17 +- .../printer/MultipleOperationTimeOut.java | 8 +- .../printer/NaturalLanguageConfigured.java | 12 +- .../attribute/printer/PrinterCurrentTime.java | 13 +- .../printer/PrinterDriverInstaller.java | 8 +- .../printer/PrinterStateMessage.java | 11 +- .../ipp/attribute/printer/PrinterUpTime.java | 10 +- .../attribute/supported/CharsetSupported.java | 13 +- .../supported/CompressionSupported.java | 49 +- .../supported/DocumentFormatSupported.java | 11 +- .../supported/FinishingsSupported.java | 171 +- .../GeneratedNaturalLanguageSupported.java | 17 +- .../supported/IppVersionsSupported.java | 31 +- .../supported/JobHoldUntilSupported.java | 67 +- .../supported/JobSheetsSupported.java | 54 +- .../attribute/supported/MediaSupported.java | 26 +- .../MultipleDocumentHandlingSupported.java | 59 +- .../MultipleDocumentJobsSupported.java | 27 +- .../supported/OperationsSupported.java | 115 +- .../OrientationRequestedSupported.java | 53 +- .../supported/PageRangesSupported.java | 20 +- .../supported/PrintQualitySupported.java | 52 +- .../supported/PrinterResolutionSupported.java | 45 +- .../supported/PrinterUriSupported.java | 9 +- .../attribute/supported/SidesSupported.java | 41 +- .../supported/UriAuthenticationSupported.java | 51 +- .../supported/UriSecuritySupported.java | 33 +- .../javax/swing/text/html/css/Selector.java | 15 +- .../gnu/xml/stream/FilteredStreamReader.java | 4 +- .../gnu/xml/stream/NamespaceImpl.java | 29 +- .../gnu/xml/stream/XIncludeFilter.java | 4 +- .../gnu/xml/stream/XMLEventAllocatorImpl.java | 6 +- .../gnu/xml/stream/XMLEventFactoryImpl.java | 6 +- .../gnu/xml/stream/XMLStreamWriterImpl.java | 23 +- libjava/classpath/include/Makefile.in | 7 +- libjava/classpath/install-sh | 11 +- libjava/classpath/java/util/Scanner.java | 742 +-- libjava/classpath/java/util/TreeMap.java | 4 +- .../classpath/java/util/regex/Matcher.java | 121 +- libjava/classpath/java/util/zip/Inflater.java | 42 +- .../auth/kerberos/KerberosTicket.java | 51 +- .../javax/security/auth/kerberos/KeyImpl.java | 9 + .../javax/swing/text/html/HTMLEditorKit.java | 2 +- .../javax/swing/text/html/HTMLWriter.java | 38 +- .../javax/swing/text/html/ImageView.java | 3 - .../swing/text/html/MinimalHTMLWriter.java | 17 +- .../swing/text/html/MultiAttributeSet.java | 8 +- .../javax/swing/text/html/MultiStyle.java | 4 +- .../javax/swing/text/html/ObjectView.java | 2 +- .../javax/swing/text/html/StyleSheet.java | 31 +- .../javax/swing/text/html/TableView.java | 1 - .../swing/tree/DefaultMutableTreeNode.java | 14 +- .../swing/tree/FixedHeightLayoutCache.java | 4 +- .../classpath/javax/swing/tree/TreeNode.java | 1 + .../swing/tree/VariableHeightLayoutCache.java | 8 +- .../classpath/javax/swing/undo/StateEdit.java | 2 +- .../javax/swing/undo/UndoableEditSupport.java | 6 +- .../javax/xml/stream/XMLEventFactory.java | 10 +- .../javax/xml/stream/XMLInputFactory.java | 7 +- .../javax/xml/stream/XMLOutputFactory.java | 46 +- .../javax/xml/stream/events/Namespace.java | 2 +- ...elegate.java => StreamReaderDelegate.java} | 10 +- libjava/classpath/lib/Makefile.in | 7 +- .../lib/gnu/java/locale/LocaleData.class | Bin 7402 -> 7402 bytes .../gnu/javax/print/ipp/IppPrintService.class | Bin 20439 -> 22794 bytes .../print/ipp/IppRequest$RequestWriter.class | Bin 9426 -> 9321 bytes .../ipp/IppResponse$ResponseReader.class | Bin 13186 -> 14012 bytes .../lib/gnu/javax/print/ipp/IppResponse.class | Bin 2476 -> 2868 bytes .../gnu/javax/print/ipp/IppUtilities.class | Bin 15594 -> 16465 bytes .../ipp/attribute/DetailedStatusMessage.class | Bin 740 -> 818 bytes .../ipp/attribute/DocumentAccessError.class | Bin 732 -> 810 bytes .../ipp/attribute/RequestedAttributes.class | Bin 1660 -> 1861 bytes .../print/ipp/attribute/StatusMessage.class | Bin 707 -> 785 bytes .../ipp/attribute/UnknownAttribute.class | Bin 2180 -> 2258 bytes .../attribute/defaults/CopiesDefault.class | Bin 1151 -> 1229 bytes .../defaults/DocumentFormatDefault.class | Bin 1042 -> 1120 bytes .../defaults/FinishingsDefault.class | Bin 3187 -> 3265 bytes .../defaults/JobHoldUntilDefault.class | Bin 1603 -> 1681 bytes .../defaults/JobPriorityDefault.class | Bin 1173 -> 1251 bytes .../attribute/defaults/JobSheetsDefault.class | Bin 1338 -> 1416 bytes .../ipp/attribute/defaults/MediaDefault.class | Bin 1043 -> 1121 bytes .../MultipleDocumentHandlingDefault.class | Bin 2077 -> 2155 bytes .../attribute/defaults/NumberUpDefault.class | Bin 1031 -> 1109 bytes .../OrientationRequestedDefault.class | Bin 1998 -> 2076 bytes .../defaults/PrintQualityDefault.class | Bin 1778 -> 1856 bytes .../defaults/PrinterResolutionDefault.class | Bin 1207 -> 1285 bytes .../ipp/attribute/defaults/SidesDefault.class | Bin 1850 -> 1928 bytes .../ipp/attribute/job/AttributesCharset.class | Bin 804 -> 882 bytes .../job/AttributesNaturalLanguage.class | Bin 844 -> 922 bytes .../job/JobDetailedStatusMessages.class | Bin 765 -> 843 bytes .../job/JobDocumentAccessErrors.class | Bin 757 -> 835 bytes .../javax/print/ipp/attribute/job/JobId.class | Bin 725 -> 803 bytes .../print/ipp/attribute/job/JobMoreInfo.class | Bin 638 -> 716 bytes .../ipp/attribute/job/JobPrinterUri.class | Bin 646 -> 724 bytes .../ipp/attribute/job/JobStateMessage.class | Bin 724 -> 802 bytes .../print/ipp/attribute/job/JobUri.class | Bin 617 -> 695 bytes .../attribute/printer/CharsetConfigured.class | Bin 691 -> 769 bytes .../attribute/printer/DocumentFormat.class | Bin 1481 -> 1559 bytes .../printer/MultipleOperationTimeOut.class | Bin 679 -> 757 bytes .../printer/NaturalLanguageConfigured.class | Bin 732 -> 810 bytes .../printer/PrinterCurrentTime.class | Bin 856 -> 934 bytes .../printer/PrinterDriverInstaller.class | Bin 690 -> 768 bytes .../printer/PrinterStateMessage.class | Bin 760 -> 838 bytes .../ipp/attribute/printer/PrinterUpTime.class | Bin 634 -> 712 bytes .../supported/CharsetSupported.class | Bin 706 -> 784 bytes .../supported/CompressionSupported.class | Bin 2442 -> 2755 bytes .../supported/DocumentFormatSupported.class | Bin 783 -> 861 bytes .../supported/FinishingsSupported.class | Bin 3892 -> 4204 bytes .../GeneratedNaturalLanguageSupported.class | Bin 784 -> 862 bytes .../supported/IppVersionsSupported.class | Bin 1309 -> 1387 bytes .../supported/JobHoldUntilSupported.class | Bin 1363 -> 1441 bytes .../supported/JobSheetsSupported.class | Bin 2290 -> 2644 bytes .../attribute/supported/MediaSupported.class | Bin 1762 -> 2161 bytes .../MultipleDocumentHandlingSupported.class | Bin 2774 -> 3100 bytes .../MultipleDocumentJobsSupported.class | Bin 1375 -> 1453 bytes .../supported/OperationsSupported.class | Bin 2682 -> 2760 bytes .../OrientationRequestedSupported.class | Bin 2679 -> 3001 bytes .../supported/PageRangesSupported.class | Bin 1332 -> 1410 bytes .../supported/PrintQualitySupported.class | Bin 2459 -> 2773 bytes .../PrinterResolutionSupported.class | Bin 1820 -> 2139 bytes .../supported/PrinterUriSupported.class | Bin 697 -> 775 bytes .../attribute/supported/SidesSupported.class | Bin 1511 -> 1589 bytes .../UriAuthenticationSupported.class | Bin 1598 -> 1676 bytes .../supported/UriSecuritySupported.class | Bin 1372 -> 1450 bytes .../javax/swing/text/html/css/Selector.class | Bin 3283 -> 3622 bytes .../gnu/xml/stream/FilteredStreamReader.class | Bin 1128 -> 1134 bytes .../lib/gnu/xml/stream/NamespaceImpl.class | Bin 1777 -> 2315 bytes .../lib/gnu/xml/stream/XIncludeFilter.class | Bin 17456 -> 17462 bytes .../xml/stream/XMLEventAllocatorImpl.class | Bin 5771 -> 5856 bytes .../gnu/xml/stream/XMLEventFactoryImpl.class | Bin 7555 -> 7640 bytes .../gnu/xml/stream/XMLStreamWriterImpl.class | Bin 14899 -> 15076 bytes libjava/classpath/lib/java/util/Scanner.class | Bin 22993 -> 22990 bytes .../classpath/lib/java/util/TreeMap$3.class | Bin 1087 -> 1093 bytes .../lib/java/util/regex/Matcher.class | Bin 7093 -> 7104 bytes .../auth/kerberos/KerberosTicket.class | Bin 4697 -> 5448 bytes .../security/auth/kerberos/KeyImpl.class | Bin 1062 -> 1579 bytes .../javax/swing/text/html/HTMLEditorKit.class | Bin 10427 -> 10493 bytes .../javax/swing/text/html/HTMLWriter.class | Bin 13208 -> 13569 bytes .../javax/swing/text/html/ImageView$1.class | Bin 842 -> 842 bytes .../lib/javax/swing/text/html/ImageView.class | Bin 8916 -> 8898 bytes .../swing/text/html/MinimalHTMLWriter.class | Bin 9010 -> 9209 bytes ...ltiAttributeSet$MultiNameEnumeration.class | Bin 1245 -> 1366 bytes .../swing/text/html/MultiAttributeSet.class | Bin 2791 -> 2914 bytes .../javax/swing/text/html/MultiStyle.class | Bin 1900 -> 2024 bytes .../javax/swing/text/html/ObjectView.class | Bin 1388 -> 1454 bytes .../text/html/StyleSheet$BoxPainter.class | Bin 3549 -> 3549 bytes .../text/html/StyleSheet$ListPainter.class | Bin 2769 -> 2769 bytes .../javax/swing/text/html/StyleSheet.class | Bin 17636 -> 18289 bytes .../swing/text/html/TableView$CellView.class | Bin 1846 -> 1846 bytes .../swing/text/html/TableView$RowView.class | Bin 3280 -> 3273 bytes .../lib/javax/swing/text/html/TableView.class | Bin 12606 -> 12606 bytes ...ableTreeNode$BreadthFirstEnumeration.class | Bin 1664 -> 1664 bytes ...MutableTreeNode$PostorderEnumeration.class | Bin 2190 -> 2190 bytes ...tMutableTreeNode$PreorderEnumeration.class | Bin 2076 -> 2076 bytes .../swing/tree/DefaultMutableTreeNode.class | Bin 10910 -> 10957 bytes .../swing/tree/FixedHeightLayoutCache.class | Bin 7465 -> 7536 bytes .../tree/VariableHeightLayoutCache.class | Bin 8375 -> 8464 bytes .../lib/javax/swing/undo/StateEdit.class | Bin 2261 -> 2347 bytes .../swing/undo/UndoableEditSupport.class | Bin 3518 -> 3647 bytes .../javax/xml/stream/XMLEventFactory.class | Bin 5614 -> 5614 bytes .../javax/xml/stream/XMLInputFactory.class | Bin 5951 -> 5951 bytes .../javax/xml/stream/XMLOutputFactory.class | Bin 4299 -> 4268 bytes .../javax/xml/stream/events/Namespace.class | Bin 278 -> 279 bytes .../stream/util/StreamReaderDelegate.class | Bin 0 -> 6619 bytes .../lib/org/ietf/jgss/GSSManager.class | Bin 2374 -> 2440 bytes .../lib/org/omg/CORBA/LocalObject.class | Bin 4238 -> 4238 bytes .../lib/org/omg/CORBA/portable/Delegate.class | Bin 4474 -> 4474 bytes .../org/omg/CORBA/portable/InputStream.class | Bin 1973 -> 1973 bytes .../org/omg/CORBA/portable/ObjectImpl.class | Bin 6331 -> 6331 bytes .../omg/CORBA_2_3/portable/InputStream.class | Bin 2118 -> 2118 bytes .../omg/CORBA_2_3/portable/OutputStream.class | Bin 1870 -> 1870 bytes .../omg/DynamicAny/_DynAnyFactoryStub.class | Bin 1629 -> 1629 bytes .../lib/org/omg/DynamicAny/_DynAnyStub.class | Bin 6420 -> 6420 bytes .../org/omg/DynamicAny/_DynArrayStub.class | Bin 6920 -> 6920 bytes .../lib/org/omg/DynamicAny/_DynEnumStub.class | Bin 6718 -> 6718 bytes .../org/omg/DynamicAny/_DynFixedStub.class | Bin 6558 -> 6558 bytes .../org/omg/DynamicAny/_DynSequenceStub.class | Bin 7118 -> 7118 bytes .../org/omg/DynamicAny/_DynStructStub.class | Bin 7220 -> 7220 bytes .../org/omg/DynamicAny/_DynUnionStub.class | Bin 7225 -> 7225 bytes .../org/omg/DynamicAny/_DynValueStub.class | Bin 7486 -> 7486 bytes .../_ServantActivatorStub.class | Bin 1441 -> 1441 bytes .../PortableServer/_ServantLocatorStub.class | Bin 1730 -> 1730 bytes libjava/classpath/m4/ac_prog_antlr.m4 | 6 +- libjava/classpath/m4/ac_prog_java.m4 | 1 - libjava/classpath/m4/ac_prog_java_works.m4 | 11 +- libjava/classpath/m4/ac_prog_javac.m4 | 13 +- libjava/classpath/m4/ac_prog_javac_works.m4 | 3 +- libjava/classpath/m4/lib-ld.m4 | 110 - libjava/classpath/m4/lib-link.m4 | 551 -- libjava/classpath/m4/lib-prefix.m4 | 155 - libjava/classpath/missing | 49 +- libjava/classpath/native/Makefile.in | 7 +- libjava/classpath/native/fdlibm/Makefile.in | 7 +- libjava/classpath/native/jawt/Makefile.in | 7 +- libjava/classpath/native/jni/Makefile.in | 7 +- .../native/jni/classpath/Makefile.in | 7 +- .../native/jni/gconf-peer/Makefile.in | 7 +- .../native/jni/gstreamer-peer/Makefile.in | 7 +- .../classpath/native/jni/gtk-peer/Makefile.in | 7 +- .../classpath/native/jni/java-io/Makefile.in | 7 +- .../native/jni/java-lang/Makefile.in | 7 +- .../native/jni/java-math/Makefile.in | 7 +- .../classpath/native/jni/java-net/Makefile.in | 7 +- .../classpath/native/jni/java-nio/Makefile.in | 7 +- .../native/jni/java-util/Makefile.in | 7 +- .../native/jni/midi-alsa/Makefile.in | 7 +- .../native/jni/midi-dssi/Makefile.in | 7 +- .../native/jni/native-lib/Makefile.in | 7 +- .../classpath/native/jni/native-lib/cpnet.c | 6 +- .../classpath/native/jni/qt-peer/Makefile.in | 7 +- libjava/classpath/native/jni/xmlj/Makefile.in | 7 +- libjava/classpath/native/plugin/Makefile.in | 7 +- .../classpath/org/ietf/jgss/GSSManager.java | 2 +- .../classpath/org/omg/CORBA/LocalObject.java | 1 + .../org/omg/CORBA/portable/Delegate.java | 3 +- .../org/omg/CORBA/portable/InputStream.java | 1 + .../org/omg/CORBA/portable/ObjectImpl.java | 1 + .../omg/CORBA_2_3/portable/InputStream.java | 2 + .../omg/CORBA_2_3/portable/OutputStream.java | 1 + .../omg/DynamicAny/_DynAnyFactoryStub.java | 1 + .../org/omg/DynamicAny/_DynAnyStub.java | 1 + .../org/omg/DynamicAny/_DynArrayStub.java | 1 + .../org/omg/DynamicAny/_DynEnumStub.java | 1 + .../org/omg/DynamicAny/_DynFixedStub.java | 1 + .../org/omg/DynamicAny/_DynSequenceStub.java | 1 + .../org/omg/DynamicAny/_DynStructStub.java | 1 + .../org/omg/DynamicAny/_DynUnionStub.java | 1 + .../org/omg/DynamicAny/_DynValueStub.java | 1 + .../PortableServer/_ServantActivatorStub.java | 1 + .../PortableServer/_ServantLocatorStub.java | 1 + libjava/classpath/resource/Makefile.in | 7 +- libjava/classpath/scripts/Makefile.in | 7 +- libjava/classpath/tools/Makefile.in | 7 +- .../classes/com/sun/tools/javadoc/Main.class | Bin 453 -> 453 bytes ...FileSystemClassLoader$FileStreamInfo.class | Bin 1086 -> 1086 bytes .../FileSystemClassLoader$JarStreamInfo.class | Bin 1741 -> 1741 bytes .../tools/FileSystemClassLoader.class | Bin 6253 -> 6253 bytes .../gnu/classpath/tools/IOToolkit.class | Bin 3753 -> 3753 bytes .../classpath/tools/MalformedInputEvent.class | Bin 1267 -> 1267 bytes .../tools/NotifyingInputStreamReader.class | Bin 5878 -> 5878 bytes .../gnu/classpath/tools/StringToolkit.class | Bin 1124 -> 1124 bytes .../AbstractDoclet$DocletOptionGroup.class | Bin 2075 -> 2075 bytes .../AbstractDoclet$DocletOptionTag.class | Bin 3296 -> 3296 bytes .../AbstractDoclet$DocletOptionTaglet.class | Bin 4359 -> 4359 bytes ...bstractDoclet$DocletOptionTagletPath.class | Bin 955 -> 955 bytes .../doclets/AbstractDoclet$IndexKey.class | Bin 1129 -> 1129 bytes .../AbstractDoclet$InterfaceRelation.class | Bin 663 -> 663 bytes .../doclets/AbstractDoclet$UsageType.class | Bin 1848 -> 1848 bytes .../tools/doclets/AbstractDoclet.class | Bin 27182 -> 27182 bytes .../DocletConfigurationException.class | Bin 432 -> 432 bytes .../tools/doclets/DocletOption.class | Bin 575 -> 575 bytes .../doclets/DocletOptionColonSeparated.class | Bin 1139 -> 1139 bytes .../tools/doclets/DocletOptionFile.class | Bin 962 -> 962 bytes .../tools/doclets/DocletOptionFlag.class | Bin 755 -> 755 bytes .../doclets/DocletOptionPackageWildcard.class | Bin 2108 -> 2108 bytes .../tools/doclets/DocletOptionString.class | Bin 776 -> 776 bytes .../InvalidPackageWildcardException.class | Bin 437 -> 437 bytes .../tools/doclets/PackageGroup.class | Bin 698 -> 698 bytes .../tools/doclets/PackageMatcher.class | Bin 2907 -> 2907 bytes .../tools/doclets/StandardTaglet.class | Bin 1341 -> 1341 bytes .../doclets/debugdoclet/DebugDoclet.class | Bin 4081 -> 4081 bytes .../tools/doclets/htmldoclet/CssClass.class | Bin 14612 -> 14612 bytes .../doclets/htmldoclet/ExternalDocSet.class | Bin 3836 -> 3836 bytes .../doclets/htmldoclet/HtmlDoclet$1.class | Bin 1205 -> 1205 bytes .../doclets/htmldoclet/HtmlDoclet$2.class | Bin 1207 -> 1207 bytes .../doclets/htmldoclet/HtmlDoclet$3.class | Bin 1401 -> 1401 bytes .../htmldoclet/HtmlDoclet$TreeNode.class | Bin 1088 -> 1088 bytes .../tools/doclets/htmldoclet/HtmlDoclet.class | Bin 79930 -> 79930 bytes .../tools/doclets/htmldoclet/HtmlPage.class | Bin 12297 -> 12297 bytes .../htmldoclet/HtmlTagletContext.class | Bin 876 -> 876 bytes .../tools/doclets/xmldoclet/Driver$1.class | Bin 935 -> 935 bytes .../xmldoclet/Driver$NullErrorReporter.class | Bin 793 -> 793 bytes .../doclets/xmldoclet/Driver$UsageType.class | Bin 1537 -> 1537 bytes .../tools/doclets/xmldoclet/Driver.class | Bin 52598 -> 52598 bytes .../tools/doclets/xmldoclet/Driver1_4.class | Bin 955 -> 955 bytes .../xmldoclet/HtmlRepairer$TagInfo.class | Bin 1043 -> 1043 bytes .../doclets/xmldoclet/HtmlRepairer.class | Bin 10463 -> 10463 bytes .../doclets/xmldoclet/TargetContext.class | Bin 1172 -> 1172 bytes ...ranslet$DocErrorReporterOutputStream.class | Bin 1093 -> 1093 bytes .../xmldoclet/doctranslet/DocTranslet.class | Bin 14435 -> 14435 bytes .../DocTransletConfigurationException.class | Bin 774 -> 774 bytes .../doctranslet/DocTransletException.class | Bin 1218 -> 1218 bytes .../doctranslet/DocTransletOptions.class | Bin 865 -> 865 bytes .../doctranslet/JarClassLoader.class | Bin 2127 -> 2127 bytes .../doctranslet/OutputFileInfo.class | Bin 1467 -> 1467 bytes .../tools/gjdoc/AbstractTagImpl.class | Bin 2825 -> 2825 bytes .../tools/gjdoc/ArrayCharacterIterator.class | Bin 1762 -> 1762 bytes .../tools/gjdoc/BlockSourceComponent.class | Bin 629 -> 629 bytes .../classpath/tools/gjdoc/BracketClose.class | Bin 862 -> 862 bytes .../tools/gjdoc/ClassComponent.class | Bin 2610 -> 2610 bytes .../classpath/tools/gjdoc/ClassDocImpl.class | Bin 25782 -> 25782 bytes .../classpath/tools/gjdoc/ClassDocProxy.class | Bin 7577 -> 7577 bytes .../tools/gjdoc/ClassDocReflectedImpl.class | Bin 8685 -> 8685 bytes .../tools/gjdoc/CommentComponent.class | Bin 1517 -> 1517 bytes .../tools/gjdoc/ConstructorDocImpl.class | Bin 757 -> 757 bytes .../gnu/classpath/tools/gjdoc/Debug.class | Bin 1447 -> 1447 bytes .../tools/gjdoc/DirectoryTree$FileNode.class | Bin 943 -> 943 bytes .../classpath/tools/gjdoc/DirectoryTree.class | Bin 1226 -> 1226 bytes .../gnu/classpath/tools/gjdoc/DocImpl.class | Bin 19116 -> 19116 bytes .../tools/gjdoc/EmptyStatementComponent.class | Bin 612 -> 612 bytes .../classpath/tools/gjdoc/ErrorReporter.class | Bin 1660 -> 1660 bytes .../tools/gjdoc/ExecutableMemberDocImpl.class | Bin 9289 -> 9289 bytes .../tools/gjdoc/FieldComponent.class | Bin 3110 -> 3110 bytes .../classpath/tools/gjdoc/FieldDocImpl.class | Bin 8266 -> 8266 bytes .../tools/gjdoc/FunctionComponent.class | Bin 2992 -> 2992 bytes .../gjdoc/IgnoredFileParseException.class | Bin 357 -> 357 bytes .../tools/gjdoc/ImportComponent.class | Bin 1226 -> 1226 bytes .../tools/gjdoc/InheritDocTagImpl.class | Bin 1838 -> 1838 bytes .../tools/gjdoc/JavadocWrapper.class | Bin 960 -> 960 bytes .../classpath/tools/gjdoc/LinkTagImpl.class | Bin 918 -> 918 bytes .../gnu/classpath/tools/gjdoc/Main$1.class | Bin 825 -> 825 bytes .../gnu/classpath/tools/gjdoc/Main$10.class | Bin 1221 -> 1221 bytes .../gnu/classpath/tools/gjdoc/Main$11.class | Bin 1728 -> 1728 bytes .../gnu/classpath/tools/gjdoc/Main$12.class | Bin 1799 -> 1799 bytes .../gnu/classpath/tools/gjdoc/Main$13.class | Bin 1800 -> 1800 bytes .../gnu/classpath/tools/gjdoc/Main$14.class | Bin 1002 -> 1002 bytes .../gnu/classpath/tools/gjdoc/Main$15.class | Bin 924 -> 924 bytes .../gnu/classpath/tools/gjdoc/Main$16.class | Bin 1715 -> 1715 bytes .../gnu/classpath/tools/gjdoc/Main$17.class | Bin 828 -> 828 bytes .../gnu/classpath/tools/gjdoc/Main$18.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$19.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$2.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$20.class | Bin 1382 -> 1382 bytes .../gnu/classpath/tools/gjdoc/Main$21.class | Bin 1401 -> 1401 bytes .../gnu/classpath/tools/gjdoc/Main$22.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$23.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$24.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$25.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$3.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$4.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$5.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$6.class | Bin 806 -> 806 bytes .../gnu/classpath/tools/gjdoc/Main$7.class | Bin 825 -> 825 bytes .../gnu/classpath/tools/gjdoc/Main$8.class | Bin 825 -> 825 bytes .../gnu/classpath/tools/gjdoc/Main$9.class | Bin 806 -> 806 bytes .../tools/gjdoc/Main$OptionProcessor.class | Bin 727 -> 727 bytes .../gnu/classpath/tools/gjdoc/Main.class | Bin 29338 -> 29338 bytes .../classpath/tools/gjdoc/MemberDocImpl.class | Bin 5337 -> 5337 bytes .../classpath/tools/gjdoc/MethodDocImpl.class | Bin 1247 -> 1247 bytes .../tools/gjdoc/PackageComponent.class | Bin 1142 -> 1142 bytes .../tools/gjdoc/PackageDocImpl.class | Bin 5798 -> 5798 bytes .../classpath/tools/gjdoc/ParamTagImpl.class | Bin 1368 -> 1368 bytes .../classpath/tools/gjdoc/ParameterImpl.class | Bin 1682 -> 1682 bytes .../tools/gjdoc/ParseException.class | Bin 463 -> 463 bytes .../gnu/classpath/tools/gjdoc/Parser$1.class | Bin 1669 -> 1669 bytes .../tools/gjdoc/Parser$Context.class | Bin 1209 -> 1209 bytes .../gnu/classpath/tools/gjdoc/Parser.class | Bin 13190 -> 13190 bytes .../tools/gjdoc/ProgramElementDocImpl.class | Bin 3566 -> 3566 bytes .../RootDocImpl$ResolvedImportClassFile.class | Bin 3100 -> 3100 bytes .../RootDocImpl$ResolvedImportNotFound.class | Bin 1664 -> 1664 bytes ...ootDocImpl$ResolvedImportPackageFile.class | Bin 3932 -> 3932 bytes ...ocImpl$ResolvedImportReflectionClass.class | Bin 1980 -> 1980 bytes ...Impl$ResolvedImportReflectionPackage.class | Bin 2039 -> 2039 bytes .../gjdoc/RootDocImpl$ScheduledClass.class | Bin 1036 -> 1036 bytes .../classpath/tools/gjdoc/RootDocImpl.class | Bin 20655 -> 20655 bytes .../classpath/tools/gjdoc/SeeTagImpl.class | Bin 4114 -> 4114 bytes .../tools/gjdoc/SerialFieldTagImpl.class | Bin 2862 -> 2862 bytes .../gjdoc/SlashSlashCommentComponent.class | Bin 556 -> 556 bytes .../tools/gjdoc/SourceComponent.class | Bin 787 -> 787 bytes .../tools/gjdoc/SourcePositionImpl.class | Bin 1095 -> 1095 bytes .../tools/gjdoc/StaticBlockComponent.class | Bin 1030 -> 1030 bytes .../gnu/classpath/tools/gjdoc/TagImpl.class | Bin 1350 -> 1350 bytes .../tools/gjdoc/TemporaryStore.class | Bin 548 -> 548 bytes .../classpath/tools/gjdoc/TextTagImpl.class | Bin 1026 -> 1026 bytes .../classpath/tools/gjdoc/ThrowsTagImpl.class | Bin 2479 -> 2479 bytes .../gnu/classpath/tools/gjdoc/Timer.class | Bin 2568 -> 2568 bytes .../classpath/tools/gjdoc/TimerDoclet$1.class | Bin 900 -> 900 bytes .../classpath/tools/gjdoc/TimerDoclet.class | Bin 2637 -> 2637 bytes .../gnu/classpath/tools/gjdoc/TypeImpl.class | Bin 2694 -> 2694 bytes .../tools/gjdoc/TypeVariableImpl.class | Bin 1292 -> 1292 bytes .../classpath/tools/gjdoc/ValueTagImpl.class | Bin 1032 -> 1032 bytes .../classpath/tools/gjdoc/Whitespace.class | Bin 591 -> 591 bytes .../tools/gjdoc/expr/AdditionExpression.class | Bin 2306 -> 2306 bytes .../tools/gjdoc/expr/AndExpression.class | Bin 756 -> 756 bytes .../gjdoc/expr/BinaryBitwiseExpression.class | Bin 1711 -> 1711 bytes .../expr/BinaryComputationExpression.class | Bin 2769 -> 2769 bytes .../gjdoc/expr/BinaryEqualityExpression.class | Bin 2071 -> 2071 bytes .../tools/gjdoc/expr/BinaryExpression.class | Bin 615 -> 615 bytes .../gjdoc/expr/BinaryLogicalExpression.class | Bin 1593 -> 1593 bytes .../gjdoc/expr/BinaryRelationExpression.class | Bin 1928 -> 1928 bytes .../gjdoc/expr/BinaryShiftExpression.class | Bin 1691 -> 1691 bytes .../gjdoc/expr/BitShiftRightExpression.class | Bin 784 -> 784 bytes .../expr/CircularExpressionException.class | Bin 618 -> 618 bytes .../gjdoc/expr/ConditionalExpression.class | Bin 1670 -> 1670 bytes .../tools/gjdoc/expr/ConstantBoolean.class | Bin 1371 -> 1371 bytes .../tools/gjdoc/expr/ConstantByte.class | Bin 1082 -> 1082 bytes .../tools/gjdoc/expr/ConstantChar.class | Bin 1634 -> 1634 bytes .../tools/gjdoc/expr/ConstantDouble.class | Bin 1288 -> 1288 bytes .../tools/gjdoc/expr/ConstantExpression.class | Bin 787 -> 787 bytes .../tools/gjdoc/expr/ConstantFloat.class | Bin 1448 -> 1448 bytes .../tools/gjdoc/expr/ConstantInteger.class | Bin 1378 -> 1378 bytes .../tools/gjdoc/expr/ConstantLong.class | Bin 1599 -> 1599 bytes .../tools/gjdoc/expr/ConstantNull.class | Bin 829 -> 829 bytes .../tools/gjdoc/expr/ConstantShort.class | Bin 1088 -> 1088 bytes .../tools/gjdoc/expr/ConstantString.class | Bin 1025 -> 1025 bytes .../classpath/tools/gjdoc/expr/Context.class | Bin 818 -> 818 bytes .../tools/gjdoc/expr/DivisionExpression.class | Bin 959 -> 959 bytes .../tools/gjdoc/expr/EqualExpression.class | Bin 1067 -> 1067 bytes .../tools/gjdoc/expr/Evaluator.class | Bin 3343 -> 3343 bytes .../gjdoc/expr/ExclusiveOrExpression.class | Bin 780 -> 780 bytes .../gjdoc/expr/GreaterThanExpression.class | Bin 988 -> 988 bytes .../expr/GreaterThanOrEqualExpression.class | Bin 1009 -> 1009 bytes .../gjdoc/expr/IdentifierExpression.class | Bin 2874 -> 2874 bytes .../expr/IllegalExpressionException.class | Bin 577 -> 577 bytes .../gjdoc/expr/InclusiveOrExpression.class | Bin 773 -> 773 bytes .../tools/gjdoc/expr/LessThanExpression.class | Bin 979 -> 979 bytes .../expr/LessThanOrEqualExpression.class | Bin 1000 -> 1000 bytes .../gjdoc/expr/LogicalAndExpression.class | Bin 693 -> 693 bytes .../gjdoc/expr/LogicalNotExpression.class | Bin 1557 -> 1557 bytes .../gjdoc/expr/LogicalOrExpression.class | Bin 683 -> 683 bytes .../tools/gjdoc/expr/ModuloExpression.class | Bin 953 -> 953 bytes .../gjdoc/expr/MultiplicationExpression.class | Bin 977 -> 977 bytes .../tools/gjdoc/expr/NegateExpression.class | Bin 1696 -> 1696 bytes .../tools/gjdoc/expr/NotEqualExpression.class | Bin 1071 -> 1071 bytes .../tools/gjdoc/expr/NotExpression.class | Bin 1467 -> 1467 bytes .../gjdoc/expr/ShiftLeftExpression.class | Bin 772 -> 772 bytes .../gjdoc/expr/ShiftRightExpression.class | Bin 775 -> 775 bytes .../gjdoc/expr/SubtractionExpression.class | Bin 968 -> 968 bytes .../gnu/classpath/tools/gjdoc/expr/Type.class | Bin 1204 -> 1204 bytes .../tools/gjdoc/expr/TypeCastExpression.class | Bin 2687 -> 2687 bytes .../tools/gjdoc/expr/UnaryExpression.class | Bin 524 -> 524 bytes .../expr/UnknownIdentifierException.class | Bin 473 -> 473 bytes .../tools/java2xhtml/Java2xhtml$State.class | Bin 900 -> 900 bytes .../tools/java2xhtml/Java2xhtml.class | Bin 26673 -> 26673 bytes .../classpath/tools/javah/ClassWrapper.class | Bin 8421 -> 9260 bytes .../tools/javah/CniPrintStream.class | Bin 5349 -> 5411 bytes .../tools/javah/CniStubPrinter.class | Bin 4018 -> 4087 bytes .../gnu/classpath/tools/javah/GcjhMain.class | Bin 3020 -> 3098 bytes .../tools/javah/JniIncludePrinter.class | Bin 4472 -> 4600 bytes .../tools/javah/JniPrintStream.class | Bin 3119 -> 3289 bytes .../tools/javah/JniStubPrinter.class | Bin 3530 -> 3599 bytes .../gnu/classpath/tools/javah/Keywords.class | Bin 3576 -> 3638 bytes .../gnu/classpath/tools/javah/Main.class | Bin 10907 -> 11933 bytes .../classpath/tools/javah/MethodHelper.class | Bin 2924 -> 2993 bytes .../tools/javah/PathOptionGroup.class | Bin 3353 -> 3678 bytes .../rmic/ClassRmicCompiler$MethodRef.class | Bin 2719 -> 2719 bytes .../tools/rmic/ClassRmicCompiler.class | Bin 30526 -> 30526 bytes .../tools/rmic/CompilationError.class | Bin 624 -> 624 bytes .../gnu/classpath/tools/rmic/Generator.class | Bin 2901 -> 2901 bytes .../gnu/classpath/tools/rmic/GiopIo.class | Bin 2777 -> 2777 bytes .../gnu/classpath/tools/rmic/HashFinder.class | Bin 1064 -> 1064 bytes .../gnu/classpath/tools/rmic/Main$1.class | Bin 969 -> 969 bytes .../gnu/classpath/tools/rmic/Main$10.class | Bin 971 -> 971 bytes .../gnu/classpath/tools/rmic/Main$11.class | Bin 900 -> 900 bytes .../gnu/classpath/tools/rmic/Main$12.class | Bin 971 -> 971 bytes .../gnu/classpath/tools/rmic/Main$13.class | Bin 971 -> 971 bytes .../gnu/classpath/tools/rmic/Main$14.class | Bin 971 -> 971 bytes .../gnu/classpath/tools/rmic/Main$15.class | Bin 1039 -> 1039 bytes .../gnu/classpath/tools/rmic/Main$16.class | Bin 972 -> 972 bytes .../gnu/classpath/tools/rmic/Main$17.class | Bin 1039 -> 1039 bytes .../gnu/classpath/tools/rmic/Main$18.class | Bin 900 -> 900 bytes .../gnu/classpath/tools/rmic/Main$2.class | Bin 969 -> 969 bytes .../gnu/classpath/tools/rmic/Main$3.class | Bin 969 -> 969 bytes .../gnu/classpath/tools/rmic/Main$4.class | Bin 1048 -> 1048 bytes .../gnu/classpath/tools/rmic/Main$5.class | Bin 1048 -> 1048 bytes .../gnu/classpath/tools/rmic/Main$6.class | Bin 960 -> 960 bytes .../gnu/classpath/tools/rmic/Main$7.class | Bin 960 -> 960 bytes .../gnu/classpath/tools/rmic/Main$8.class | Bin 969 -> 969 bytes .../gnu/classpath/tools/rmic/Main$9.class | Bin 969 -> 969 bytes .../gnu/classpath/tools/rmic/Main.class | Bin 6058 -> 6058 bytes .../tools/rmic/MethodGenerator.class | Bin 5280 -> 5280 bytes .../classpath/tools/rmic/RMICException.class | Bin 555 -> 555 bytes .../tools/rmic/RmiMethodGenerator.class | Bin 5116 -> 5116 bytes .../tools/rmic/SourceRmicCompiler.class | Bin 3894 -> 3894 bytes .../gnu/classpath/tools/rmic/Variables.class | Bin 3290 -> 3290 bytes .../classpath/tools/rmic/WrapUnWrapper.class | Bin 1244 -> 1244 bytes .../tools/serialver/SerialVer$1.class | Bin 1171 -> 1171 bytes .../tools/serialver/SerialVer$2.class | Bin 1197 -> 1197 bytes .../tools/serialver/SerialVer$3.class | Bin 950 -> 950 bytes .../classpath/tools/serialver/SerialVer.class | Bin 4636 -> 4636 bytes .../AuthorTaglet$EmailReplacement.class | Bin 714 -> 714 bytes .../tools/taglets/AuthorTaglet.class | Bin 4878 -> 4878 bytes .../classpath/tools/taglets/CodeTaglet.class | Bin 1529 -> 1529 bytes .../tools/taglets/CopyrightTaglet.class | Bin 2366 -> 2366 bytes .../tools/taglets/DeprecatedTaglet.class | Bin 2371 -> 2371 bytes .../tools/taglets/GenericTaglet.class | Bin 2708 -> 2708 bytes .../classpath/tools/taglets/SinceTaglet.class | Bin 2962 -> 2962 bytes .../tools/taglets/TagletContext.class | Bin 858 -> 858 bytes .../classpath/tools/taglets/ValueTaglet.class | Bin 2695 -> 2695 bytes .../tools/taglets/VersionTaglet.class | Bin 2580 -> 2580 bytes .../tools/com/sun/tools/javadoc/Main.java | 37 + .../tools/FileSystemClassLoader.java | 609 +- .../tools/gnu/classpath/tools/IOToolkit.java | 19 +- .../classpath/tools/MalformedInputEvent.java | 19 +- .../tools/MalformedInputListener.java | 19 +- .../tools/NotifyingInputStreamReader.java | 19 +- .../gnu/classpath/tools/StringToolkit.java | 19 +- .../tools/doclets/AbstractDoclet.java | 19 +- .../doclets/DocletConfigurationException.java | 19 +- .../classpath/tools/doclets/DocletOption.java | 19 +- .../doclets/DocletOptionColonSeparated.java | 19 +- .../tools/doclets/DocletOptionFile.java | 19 +- .../tools/doclets/DocletOptionFlag.java | 19 +- .../doclets/DocletOptionPackageWildcard.java | 19 +- .../tools/doclets/DocletOptionString.java | 19 +- .../tools/doclets/InlineTagRenderer.java | 19 +- .../InvalidPackageWildcardException.java | 19 +- .../classpath/tools/doclets/PackageGroup.java | 19 +- .../tools/doclets/PackageMatcher.java | 19 +- .../tools/doclets/StandardTaglet.java | 19 +- .../tools/doclets/TagletPrinter.java | 19 +- .../doclets/debugdoclet/DebugDoclet.java | 37 + .../tools/doclets/htmldoclet/CssClass.java | 19 +- .../doclets/htmldoclet/ExternalDocSet.java | 19 +- .../tools/doclets/htmldoclet/HtmlDoclet.java | 19 +- .../tools/doclets/htmldoclet/HtmlPage.java | 19 +- .../doclets/htmldoclet/HtmlTagletContext.java | 19 +- .../tools/doclets/xmldoclet/Driver.java | 4885 +++++++++-------- .../tools/doclets/xmldoclet/Driver1_4.java | 151 +- .../tools/doclets/xmldoclet/HtmlRepairer.java | 1365 ++--- .../doclets/xmldoclet/TargetContext.java | 189 +- .../xmldoclet/doctranslet/DocTranslet.java | 19 +- .../DocTransletConfigurationException.java | 19 +- .../doctranslet/DocTransletException.java | 19 +- .../doctranslet/DocTransletOptions.java | 19 +- .../xmldoclet/doctranslet/JarClassLoader.java | 19 +- .../xmldoclet/doctranslet/OutputFileInfo.java | 115 +- .../tools/gjdoc/AbstractTagImpl.java | 19 +- .../tools/gjdoc/ArrayCharacterIterator.java | 19 +- .../classpath/tools/gjdoc/ClassDocImpl.java | 19 +- .../classpath/tools/gjdoc/ClassDocProxy.java | 19 +- .../tools/gjdoc/ClassDocReflectedImpl.java | 19 +- .../tools/gjdoc/ConstructorDocImpl.java | 19 +- .../gnu/classpath/tools/gjdoc/Debug.java | 19 +- .../classpath/tools/gjdoc/DirectoryTree.java | 19 +- .../gnu/classpath/tools/gjdoc/DocImpl.java | 19 +- .../classpath/tools/gjdoc/ErrorReporter.java | 225 +- .../tools/gjdoc/ExecutableMemberDocImpl.java | 19 +- .../classpath/tools/gjdoc/FieldDocImpl.java | 19 +- .../tools/gjdoc/GjdocPackageDoc.java | 19 +- .../classpath/tools/gjdoc/GjdocRootDoc.java | 19 +- .../tools/gjdoc/InheritDocTagImpl.java | 19 +- .../classpath/tools/gjdoc/JavadocWrapper.java | 19 +- .../classpath/tools/gjdoc/LinkTagImpl.java | 19 +- .../tools/gnu/classpath/tools/gjdoc/Main.java | 19 +- .../classpath/tools/gjdoc/MemberDocImpl.java | 19 +- .../classpath/tools/gjdoc/MethodDocImpl.java | 19 +- .../classpath/tools/gjdoc/PackageDocImpl.java | 19 +- .../classpath/tools/gjdoc/ParamTagImpl.java | 19 +- .../classpath/tools/gjdoc/ParameterImpl.java | 19 +- .../classpath/tools/gjdoc/ParseException.java | 19 +- .../gnu/classpath/tools/gjdoc/Parser.java | 19 +- .../tools/gjdoc/ProgramElementDocImpl.java | 19 +- .../classpath/tools/gjdoc/RootDocImpl.java | 19 +- .../gnu/classpath/tools/gjdoc/SeeTagImpl.java | 19 +- .../tools/gjdoc/SerialFieldTagImpl.java | 19 +- .../tools/gjdoc/SourcePositionImpl.java | 19 +- .../classpath/tools/gjdoc/TagContainer.java | 19 +- .../gnu/classpath/tools/gjdoc/TagImpl.java | 19 +- .../classpath/tools/gjdoc/TemporaryStore.java | 247 +- .../classpath/tools/gjdoc/TextTagImpl.java | 19 +- .../classpath/tools/gjdoc/ThrowsTagImpl.java | 19 +- .../gnu/classpath/tools/gjdoc/Timer.java | 19 +- .../classpath/tools/gjdoc/TimerDoclet.java | 19 +- .../gnu/classpath/tools/gjdoc/TypeImpl.java | 19 +- .../tools/gjdoc/TypeVariableImpl.java | 19 +- .../classpath/tools/gjdoc/ValueTagImpl.java | 19 +- .../classpath/tools/gjdoc/WritableType.java | 71 +- .../tools/gjdoc/expr/AdditionExpression.java | 19 +- .../tools/gjdoc/expr/AndExpression.java | 19 +- .../gjdoc/expr/BinaryBitwiseExpression.java | 19 +- .../expr/BinaryComputationExpression.java | 19 +- .../gjdoc/expr/BinaryEqualityExpression.java | 19 +- .../tools/gjdoc/expr/BinaryExpression.java | 19 +- .../gjdoc/expr/BinaryLogicalExpression.java | 19 +- .../gjdoc/expr/BinaryRelationExpression.java | 19 +- .../gjdoc/expr/BinaryShiftExpression.java | 19 +- .../gjdoc/expr/BitShiftRightExpression.java | 19 +- .../expr/CircularExpressionException.java | 19 +- .../gjdoc/expr/ConditionalExpression.java | 19 +- .../tools/gjdoc/expr/ConstantBoolean.java | 19 +- .../tools/gjdoc/expr/ConstantByte.java | 19 +- .../tools/gjdoc/expr/ConstantChar.java | 19 +- .../tools/gjdoc/expr/ConstantDouble.java | 19 +- .../tools/gjdoc/expr/ConstantExpression.java | 19 +- .../tools/gjdoc/expr/ConstantFloat.java | 19 +- .../tools/gjdoc/expr/ConstantInteger.java | 19 +- .../tools/gjdoc/expr/ConstantLong.java | 19 +- .../tools/gjdoc/expr/ConstantNull.java | 19 +- .../tools/gjdoc/expr/ConstantShort.java | 19 +- .../tools/gjdoc/expr/ConstantString.java | 19 +- .../classpath/tools/gjdoc/expr/Context.java | 19 +- .../tools/gjdoc/expr/DivisionExpression.java | 19 +- .../tools/gjdoc/expr/EqualExpression.java | 19 +- .../classpath/tools/gjdoc/expr/Evaluator.java | 19 +- .../gjdoc/expr/EvaluatorEnvironment.java | 19 +- .../gjdoc/expr/ExclusiveOrExpression.java | 19 +- .../tools/gjdoc/expr/Expression.java | 19 +- .../gjdoc/expr/GreaterThanExpression.java | 19 +- .../expr/GreaterThanOrEqualExpression.java | 19 +- .../gjdoc/expr/IdentifierExpression.java | 19 +- .../expr/IllegalExpressionException.java | 19 +- .../gjdoc/expr/InclusiveOrExpression.java | 19 +- .../tools/gjdoc/expr/LessThanExpression.java | 19 +- .../gjdoc/expr/LessThanOrEqualExpression.java | 19 +- .../gjdoc/expr/LogicalAndExpression.java | 19 +- .../gjdoc/expr/LogicalNotExpression.java | 19 +- .../tools/gjdoc/expr/LogicalOrExpression.java | 19 +- .../tools/gjdoc/expr/ModuloExpression.java | 19 +- .../gjdoc/expr/MultiplicationExpression.java | 19 +- .../tools/gjdoc/expr/NegateExpression.java | 19 +- .../tools/gjdoc/expr/NotEqualExpression.java | 19 +- .../tools/gjdoc/expr/NotExpression.java | 19 +- .../tools/gjdoc/expr/ShiftLeftExpression.java | 19 +- .../gjdoc/expr/ShiftRightExpression.java | 19 +- .../gjdoc/expr/SubtractionExpression.java | 19 +- .../gnu/classpath/tools/gjdoc/expr/Type.java | 19 +- .../tools/gjdoc/expr/TypeCastExpression.java | 19 +- .../tools/gjdoc/expr/UnaryExpression.java | 19 +- .../expr/UnknownIdentifierException.java | 19 +- .../tools/java2xhtml/Java2xhtml.java | 19 +- .../classpath/tools/javah/ClassWrapper.java | 52 +- .../classpath/tools/javah/CniPrintStream.java | 4 +- .../classpath/tools/javah/CniStubPrinter.java | 2 +- .../gnu/classpath/tools/javah/GcjhMain.java | 2 +- .../tools/javah/JniIncludePrinter.java | 6 +- .../classpath/tools/javah/JniPrintStream.java | 10 +- .../classpath/tools/javah/JniStubPrinter.java | 2 +- .../gnu/classpath/tools/javah/Keywords.java | 4 +- .../tools/gnu/classpath/tools/javah/Main.java | 30 +- .../classpath/tools/javah/MethodHelper.java | 2 +- .../tools/javah/PathOptionGroup.java | 16 +- .../tools/rmic/ClassRmicCompiler.java | 19 +- .../tools/rmic/CompilationError.java | 19 +- .../gnu/classpath/tools/rmic/Generator.java | 19 +- .../gnu/classpath/tools/rmic/GiopIo.java | 19 +- .../gnu/classpath/tools/rmic/HashFinder.java | 18 +- .../tools/gnu/classpath/tools/rmic/Main.java | 19 +- .../classpath/tools/rmic/MethodGenerator.java | 19 +- .../classpath/tools/rmic/RMICException.java | 20 +- .../tools/rmic/RmiMethodGenerator.java | 12 +- .../gnu/classpath/tools/rmic/RmicBackend.java | 19 +- .../tools/rmic/SourceRmicCompiler.java | 12 +- .../gnu/classpath/tools/rmic/Variables.java | 19 +- .../classpath/tools/rmic/WrapUnWrapper.java | 18 +- .../classpath/tools/serialver/SerialVer.java | 18 +- .../classpath/tools/taglets/AuthorTaglet.java | 569 +- .../classpath/tools/taglets/CodeTaglet.java | 19 +- .../tools/taglets/CopyrightTaglet.java | 229 +- .../tools/taglets/DeprecatedTaglet.java | 247 +- .../tools/taglets/GenericTaglet.java | 297 +- .../tools/taglets/GnuExtendedTaglet.java | 19 +- .../classpath/tools/taglets/SinceTaglet.java | 305 +- .../tools/taglets/TagletContext.java | 37 + .../classpath/tools/taglets/ValueTaglet.java | 19 +- .../tools/taglets/VersionTaglet.java | 289 +- .../print/ipp/attribute/RequestedAttributes.h | 4 +- .../gnu/javax/swing/text/html/css/Selector.h | 2 +- libjava/gnu/xml/stream/FilteredStreamReader.h | 6 +- libjava/gnu/xml/stream/NamespaceImpl.h | 11 +- libjava/gnu/xml/stream/XIncludeFilter.h | 6 +- libjava/gnu/xml/stream/XMLStreamWriterImpl.h | 1 + .../security/auth/kerberos/KerberosTicket.h | 1 + .../javax/security/auth/kerberos/KeyImpl.h | 1 + libjava/javax/swing/text/html/HTMLWriter.h | 2 +- .../javax/swing/text/html/MinimalHTMLWriter.h | 2 +- libjava/javax/swing/text/html/StyleSheet.h | 2 +- libjava/javax/xml/stream/XMLEventFactory.h | 1 - libjava/javax/xml/stream/XMLOutputFactory.h | 3 +- libjava/javax/xml/stream/events/Namespace.h | 4 + .../xml/stream/util/StreamReaderDelegate.h | 95 + libjava/sources.am | 2 +- 735 files changed, 13374 insertions(+), 9248 deletions(-) create mode 100755 libjava/classpath/config.rpath rename libjava/classpath/javax/xml/stream/util/{ReaderDelegate.java => StreamReaderDelegate.java} (97%) create mode 100644 libjava/classpath/lib/javax/xml/stream/util/StreamReaderDelegate.class delete mode 100644 libjava/classpath/m4/lib-ld.m4 delete mode 100644 libjava/classpath/m4/lib-link.m4 delete mode 100644 libjava/classpath/m4/lib-prefix.m4 create mode 100644 libjava/javax/xml/stream/util/StreamReaderDelegate.h diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 42d3ae06d3a..15233609890 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,436 @@ +2010-10-12 Andrew John Hughes + + 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 * libjava/Makefile.in: Regenerate. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index b33f4d311f2..dc3012a2615 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -6617,7 +6617,7 @@ classpath/javax/xml/stream/events/StartDocument.java \ classpath/javax/xml/stream/events/StartElement.java \ classpath/javax/xml/stream/events/XMLEvent.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/XMLEventConsumer.java \ classpath/javax/xml/transform/ErrorListener.java \ diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index a7ee39fdc79..7f936b0a7e4 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -12,11 +12,358 @@ * configure: Regenerate. +2010-05-27 Andrew John Hughes + + * configure.ac: + Disable plugin by default and warn about + unmaintained status when enabled. + +2010-05-04 Andrew John Hughes + + * 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 * lib/gen-classlist.sh.in: Use absolute pathnames for all the directory names in the output file. +2010-05-04 Andrew John Hughes + + * 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 + + * configure.ac: + Add output to GMP directory detection and + only perform when compiling GMP. + +2010-05-04 Mike Stump + + * 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 + + * 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)): 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)): Add + generic types. + (processResponse()): Add generic types. + (getAttribute(Class)): Use generic types corresponding to + parent interface. + (getSupportedAttributeCategories()): Use generic types. + (getSupportedAttributeValues()): Likewise. + (handleSupportedAttributeValuesResponse(IppResponse,Class)): + Likewise. + (isAttributeCategorySupported(Class)): Likewise. + * gnu/javax/print/ipp/IppResponse.java: + (parseResponse(InputStream)): Use generic types. + (parseAttributes(Map, Set, DataInputStream)): + Likewise. + (addAttribute(Map, Set>, 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)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/MediaSupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + * gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java, + (getAssociatedAttributeArray(Set)): Use superclass Attribute + as set type parameter and cast when looping over it. + +2010-04-28 Andrew John Hughes + + * 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)): 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 + + * 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 + + * 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 + + * gnu/javax/print/ipp/IppPrintService.java: + Fix whitespace. Use correct generic type for printerAttr + map. + (getPrinterAttributeSet(Class)): 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)): 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)): 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)): 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)): 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)): 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)): 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)): 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)): 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 * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty @@ -25,7 +372,7 @@ 2010-04-27 Andrew Haley * gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle - IppValueTag.UNKNOWN. + IppValueTag.UNKNOWN. * gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes): Handle RequestedAttributes. * gnu/javax/print/ipp/IppPrintService.java (processResponse): Add @@ -70,6 +417,7 @@ * resource/Makefile.in: Regenerate. * scripts/Makefile.in: Regenerate. * tools/Makefile.in: Regenerate. + 2010-03-01 Rainer Orth PR libgcj/38251 @@ -83,11 +431,42 @@ * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude .svn direcories. +2010-01-30 Andrew John Hughes + + * doc/www.gnu.org/home.wml: + Add newer JAPI results. + +2010-01-30 Andrew John Hughes + + 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 + + * 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 * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. * tools/Makefile.in: Regenerate. +2010-01-12 Jeroen Frijters + + * java/util/zip/Inflater. java (inflate(byte[],int,int)): Fix for #41696. + 2009-12-05 Ralf Wildenhues * Makefile.in: Regenerate. @@ -126,6 +505,17 @@ * scripts/Makefile.in: Regenerate. * tools/Makefile.in: Regenerate. +2009-11-18 Andrew Haley + + * java/util/TreeMap.java (anonymous class.size()): Debogosify. + anonymous class.clear(): Likewise. + +2009-10-22 Andrew Haley + + * native/jni/native-lib/cpnet.c (cpnet_addMembership): Fix + aliasing warning. + (cpnet_dropMembership): Likewise. + 2009-10-22 Richard Guenther PR cp-tools/39177 @@ -193,6 +583,48 @@ (func_mode_link): Add new -bindir option, and use it to place output DLL if specified. +2009-07-08 Chris Burdess + + 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 + + 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 + + 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 + + * java/util/Scanner.java, + * java/util/regex/Matcher.java: + Replace tab characters with spaces. + 2009-06-29 Andrew Haley PR java/40590 @@ -216,6 +648,285 @@ New methods. (moveToPackage): Use printName(). +2009-03-29 Mark Wielaard + + * doc/www.gnu.org/faq/faq.wml: Fix link to cp-hacking.html. + +2009-03-29 Mark Wielaard + + * m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty. + +2009-03-26 Andrew John Hughes + + 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 + + * 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 + + * 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 + + * 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 + + * 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 + + * 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 + + * 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 * configure: Regenerate. @@ -223,7 +934,7 @@ 2009-02-05 Andrew John Hughes * NEWS: Add VM updates. - + 2009-02-05 Andrew John Hughes * NEWS: Updated. diff --git a/libjava/classpath/INSTALL b/libjava/classpath/INSTALL index 8b82ade08e8..7d1c323beae 100644 --- a/libjava/classpath/INSTALL +++ b/libjava/classpath/INSTALL @@ -2,10 +2,12 @@ Installation Instructions ************************* 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 -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +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 ================== @@ -13,7 +15,11 @@ Basic Installation Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following 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 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 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 `./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. 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 - 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 files that `configure' created (so you can compile the package for 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 with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + 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 ===================== @@ -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 directory where you want the object files and executables to go and run 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 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 `/usr/local/bin', include files under `/usr/local/include', etc. You 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 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 options like `--bindir=DIR' to specify different values for particular 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 with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the 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 `--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 ================== @@ -159,7 +222,7 @@ Particular systems CC is not installed, it is recommended to use the following options in 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. @@ -174,6 +237,16 @@ and if that doesn't work, try ./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 ========================== @@ -189,7 +262,8 @@ type, such as `sun4', or a canonical name which has the form: 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 `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +351,7 @@ operates. `configure' can determine that directory automatically. `--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 the installation locations. diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in index f9d4b8b7563..0e8aee5b8d0 100644 --- a/libjava/classpath/Makefile.in +++ b/libjava/classpath/Makefile.in @@ -51,12 +51,15 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \ ../../config.rpath ../../config.sub ../../depcomp \ ../../install-sh ../../ltmain.sh ../../missing \ ../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \ - INSTALL NEWS TODO compile config.guess config.sub depcomp \ - install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \ + INSTALL NEWS TODO compile config.guess config.rpath config.sub \ + depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \ ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/libjava/classpath/NEWS b/libjava/classpath/NEWS index 4ae10d710d9..095f9700b8d 100644 --- a/libjava/classpath/NEWS +++ b/libjava/classpath/NEWS @@ -1,3 +1,5 @@ +New in release 0.99 (XXX XX, XXXX) + New in release 0.98 (Feb 05, 2009) * Native support for BigInteger is now provided using the GMP diff --git a/libjava/classpath/aclocal.m4 b/libjava/classpath/aclocal.m4 index c6fce4da260..e84d8d8e1a9 100644 --- a/libjava/classpath/aclocal.m4 +++ b/libjava/classpath/aclocal.m4 @@ -1062,6 +1062,9 @@ AC_SUBST([am__untar]) m4_include([../../config/depstand.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/no-executables.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/gcc_attribute.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]) diff --git a/libjava/classpath/autogen.sh b/libjava/classpath/autogen.sh index 3e46cff1d9c..adb8f0c9408 100755 --- a/libjava/classpath/autogen.sh +++ b/libjava/classpath/autogen.sh @@ -18,7 +18,7 @@ have_libtool=false 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/'` case $libtool_version in - 1.5*) + 1.5*|2.*) have_libtool=true ;; esac diff --git a/libjava/classpath/config.rpath b/libjava/classpath/config.rpath new file mode 100755 index 00000000000..17298f2348b --- /dev/null +++ b/libjava/classpath/config.rpath @@ -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 , 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 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=/' <. # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Classpath' PACKAGE_TARNAME='classpath' -PACKAGE_VERSION='0.98' -PACKAGE_STRING='GNU Classpath 0.98' +PACKAGE_VERSION='0.99-pre' +PACKAGE_STRING='GNU Classpath 0.99-pre' PACKAGE_BUGREPORT='classpath@gnu.org' 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. # This message is too long to be a string in the A/UX 3.1 sh. 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]... @@ -1565,7 +1565,7 @@ fi if test -n "$ac_init_help"; then 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 cat <<\_ACEOF @@ -1757,7 +1757,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Classpath configure 0.98 +GNU Classpath configure 0.99-pre generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2586,7 +2586,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while 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 $ $0 $@ @@ -2938,6 +2938,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= for ac_dir in ../.. "$srcdir"/../..; do for ac_t in install-sh install.sh shtool; do @@ -3620,7 +3621,7 @@ fi # Define the identity of the package. PACKAGE='classpath' - VERSION='0.98' + VERSION='0.99-pre' cat >>confdefs.h <<_ACEOF @@ -5474,7 +5475,7 @@ if test "${enable_plugin+set}" = set; then : *) COMPILE_PLUGIN=yes ;; esac else - COMPILE_PLUGIN=yes + COMPILE_PLUGIN=no fi if test "x${COMPILE_PLUGIN}" = xyes; then @@ -11818,7 +11819,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11821 "configure" +#line 11822 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11924,7 +11925,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11927 "configure" +#line 11928 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -21956,6 +21957,24 @@ fi fi 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_n "checking for __gmpz_mul_si in -lgmp... " >&6; } if test "${ac_cv_lib_gmp___gmpz_mul_si+set}" = set; then : @@ -23676,82 +23695,6 @@ test -n "$JAVA" || JAVA="$JAVAPREFIX" fi 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" 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 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; JAVAC="$JAVAC $GCJ_OPTS"; +else + ac_cv_prog_javac_is_gcj=no; 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; } @@ -23868,7 +23814,8 @@ else 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; } @@ -23879,7 +23826,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 23882 "configure" */ +/* #line 23829 "configure" */ package java.lang; public class Object @@ -23912,8 +23859,82 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5 $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 + +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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $JAVA works" >&5 @@ -23926,13 +23947,14 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 23929 "configure" */ +/* [#]line 23950 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); } } EOF if test x$ac_cv_prog_uudecode_base64 != xyes; then + if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 @@ -23965,7 +23987,6 @@ fi $as_echo "$ac_cv_prog_java_works" >&6; } - fi if test "x${COMPILE_GJDOC}" = xyes; then @@ -24092,7 +24113,11 @@ fi if test -z "$JAVA"; then as_fn_error "Failed to find either an antlr binary or a suitable Java runtime for ANTLR." "$LINENO" 5 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 @@ -24124,174 +24149,13 @@ fi if test "x${use_glibj_zip}" = xfalse || \ test "x${EXAMPLESDIR}" != x || \ test "x${TOOLSDIR}" != x && \ - test "x${build_class_files}" != xno; 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 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 - + test "x${build_class_files}" != xno && \ + test "${enable_java_maintainer_mode}" = yes; then JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 24294 "configure" */ + /* #line 24158 "configure" */ public class Test { public static void main(String args) @@ -24317,6 +24181,15 @@ $as_echo "no" >&6; } 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 @@ -25127,7 +25000,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. 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 CONFIG_FILES = $CONFIG_FILES @@ -25197,7 +25070,7 @@ General help using GNU software: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 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, 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 echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit 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 diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index d2d149fe239..ab72c161c52 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -6,8 +6,9 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )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_MACRO_DIR([m4]) dnl GCJ LOCAL 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) dnl ----------------------------------------------------------- -dnl Plugin (enabled by default) +dnl Plugin (disabled by default) dnl ----------------------------------------------------------- AC_ARG_ENABLE([plugin], [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 ;; *) COMPILE_PLUGIN=yes ;; esac], - [COMPILE_PLUGIN=yes]) + [COMPILE_PLUGIN=no]) AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes) dnl ----------------------------------------------------------- @@ -424,7 +425,7 @@ dnl ----------------------------------------------------------- dnl Initialize libtool AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT AC_PROG_AWK AC_PROG_CC AM_PROG_CC_C_O @@ -739,35 +740,26 @@ if test "x${COMPILE_JNI}" = xyes; then dnl Check for MSG_NOSIGNAL dnl ********************************************************************** AC_MSG_CHECKING(for MSG_NOSIGNAL) - AC_TRY_COMPILE([#include ], - [ int f = MSG_NOSIGNAL; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ int f = MSG_NOSIGNAL; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, - [Define this symbol if you have MSG_NOSIGNAL]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have MSG_NOSIGNAL]) ],[ AC_MSG_RESULT(no) + ]) dnl ********************************************************************** dnl Check for SO_NOSIGPIPE (Darwin equivalent for MSG_NOSIGNAL) dnl ********************************************************************** AC_MSG_CHECKING(for SO_NOSIGPIPE ) - AC_TRY_COMPILE([#include ], - [ int f = SO_NOSIGPIPE; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ int f = SO_NOSIGPIPE; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SO_NOSIGPIPE, 1, - [Define this symbol if you have SO_NOSIGPIPE]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have SO_NOSIGPIPE]) ],[ AC_MSG_RESULT(no) + ]) dnl ********************************************************************** dnl Check for MSG_WAITALL dnl ********************************************************************** AC_MSG_CHECKING(for MSG_WAITALL) - AC_TRY_COMPILE([#include ], - [ int f = MSG_WAITALL; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ int f = MSG_WAITALL; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MSG_WAITALL, 1, - [Define this symbol if you have MSG_WAITALL]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have MSG_WAITALL]) ],[ AC_MSG_RESULT(no) + ]) dnl Check for plugin support headers and libraries. if test "x${COMPILE_PLUGIN}" = xyes; then @@ -835,6 +827,22 @@ if test "x${COMPILE_JNI}" = xyes; then fi 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, [GMP_CFLAGS="$gmpinc" GMP_LIBS="$gmplibs" ], @@ -1044,7 +1052,7 @@ AC_SUBST(PATH_TO_GLIBJ_ZIP) if test "x${TOOLSDIR}" != x; then dnl GCJ LOCAL if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then - AC_PROG_JAVA + AC_PROG_JAVA_WORKS fi dnl END GCJ LOCAL if test "x${COMPILE_GJDOC}" = xyes; then @@ -1063,9 +1071,12 @@ fi if test "x${use_glibj_zip}" = xfalse || \ test "x${EXAMPLESDIR}" != x || \ test "x${TOOLSDIR}" != x && \ - test "x${build_class_files}" != xno; then - AC_PROG_JAVAC + test "x${build_class_files}" != xno && \ + test "${enable_java_maintainer_mode}" = yes; then dnl GCJ_LOCAL + AC_PROG_JAVAC_WORKS CLASSPATH_JAVAC_MEM_CHECK +else + AM_CONDITIONAL(GCJ_JAVAC, no) fi dnl ----------------------------------------------------------- @@ -1232,3 +1243,7 @@ cat ${srcdir}/lib/standard.omit.in > lib/standard.omit if test x$use_escher != xtrue; then echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit 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 diff --git a/libjava/classpath/depcomp b/libjava/classpath/depcomp index e5f9736c723..df8eea7e4ce 100755 --- a/libjava/classpath/depcomp +++ b/libjava/classpath/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # 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 -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # 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 @@ -17,9 +17,7 @@ scriptversion=2007-03-29.01 # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then depmode=dashmstdout 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 gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ sgi) ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ hp2) if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ dashmstdout) # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ makedepend) "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ cpp) # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ msvisualcpp) ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$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" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" 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) exec "$@" ;; @@ -585,5 +625,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in index f5955e12234..7a2432c0dda 100644 --- a/libjava/classpath/doc/Makefile.in +++ b/libjava/classpath/doc/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/doc/api/Makefile.in b/libjava/classpath/doc/api/Makefile.in index 069b24186ed..c811ef15ac3 100644 --- a/libjava/classpath/doc/api/Makefile.in +++ b/libjava/classpath/doc/api/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/doc/cp-hacking.texinfo b/libjava/classpath/doc/cp-hacking.texinfo index a424b56ec76..2914c5be5cd 100644 --- a/libjava/classpath/doc/cp-hacking.texinfo +++ b/libjava/classpath/doc/cp-hacking.texinfo @@ -11,7 +11,7 @@ This file contains important information you will need to know if you 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 @dircategory GNU Libraries diff --git a/libjava/classpath/doc/texinfo.tex b/libjava/classpath/doc/texinfo.tex index 3569bd5a864..91408263bc9 100644 --- a/libjava/classpath/doc/texinfo.tex +++ b/libjava/classpath/doc/texinfo.tex @@ -1,13 +1,13 @@ % texinfo.tex -- TeX macros to handle Texinfo files. -% +% % Load plain if necessary, i.e., if running under initex. \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, -% 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 % modify it under the terms of the GNU General Public License as @@ -100,6 +100,7 @@ \let\ptextop=\top {\catcode`\'=\active \global\let\ptexquoteright'}% Math-mode def from plain.tex. +\let\ptexraggedright=\raggedright % If this character appears in an error message or help string, it % starts a new line in the output. @@ -357,7 +358,7 @@ % We don't want .vr (or whatever) entries like this: % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} % "\acronym" won't work when it's read back in; - % it needs to be + % it needs to be % {\code {{\tt \backslashcurfont }acronym} \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. @@ -708,7 +709,7 @@ \def\?{?\spacefactor=\endofsentencespacefactor\space} % @frenchspacing on|off says whether to put extra space after punctuation. -% +% \def\onword{on} \def\offword{off} % @@ -1284,7 +1285,7 @@ where each line of input produces a line of output.} % that's what we do). % double active backslashes. -% +% {\catcode`\@=0 \catcode`\\=\active @gdef@activebackslashdouble{% @catcode`@\=@active @@ -1296,11 +1297,11 @@ where each line of input produces a line of output.} % us) handles it with this amazing macro to replace tokens, with minor % changes for Texinfo. It is included here under the GPL by permission % from the author, Heiko Oberdiek. -% +% % #1 is the tokens to replace. % #2 is the replacement. % #3 is the control sequence with the string. -% +% \def\HyPsdSubst#1#2#3{% \def\HyPsdReplace##1#1##2\END{% ##1% @@ -1331,11 +1332,17 @@ output) for that.)} \ifpdf % - % Color manipulation macros based on pdfcolor.tex. - \def\cmykDarkRed{0.28 1 1 0.35} - \def\cmykBlack{0 0 0 1} + % Color manipulation macros based on pdfcolor.tex, + % except using rgb instead of cmyk; the latter is said to render as a + % 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, % so that \makeheadline knows which color to restore. \def\setcolor#1{% @@ -1344,7 +1351,7 @@ output) for that.)} \pdfsetcolor{#1}% } % - \def\maincolor{\cmykBlack} + \def\maincolor{\rgbBlack} \pdfsetcolor{\maincolor} \edef\thiscolor{\maincolor} \def\lastcolordefs{} @@ -1439,8 +1446,8 @@ output) for that.)} % % by default, use a color that is dark enough to print on paper as % nearly black, but still distinguishable for online viewing. - \def\urlcolor{\cmykDarkRed} - \def\linkcolor{\cmykDarkRed} + \def\urlcolor{\rgbDarkRed} + \def\linkcolor{\rgbDarkRed} \def\endlink{\setcolor{\maincolor}\pdfendlink} % % Adding outlines to PDF; macros for calculating structure of outlines @@ -1569,11 +1576,15 @@ output) for that.)} % tried to figure out what each command should do in the context % of @url. for now, just make @/ a no-op, that's the only one % people have actually reported a problem with. - % + % \normalturnoffactive \def\@{@}% \let\/=\empty \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}% \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% @@ -1604,6 +1615,7 @@ output) for that.)} \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else + % non-pdf mode \let\pdfmkdest = \gobble \let\pdfurl = \gobble \let\endlink = \relax @@ -1972,7 +1984,7 @@ end % Definitions for a main text size of 11pt. This is the default in % Texinfo. -% +% \def\definetextfontsizexi{% % Text fonts (11.2pt, magstep1). \def\textnominalsize{11pt} @@ -2103,7 +2115,7 @@ end % section, chapter, etc., sizes following suit. This is for the GNU % Press printing of the Emacs 22 manual. Maybe other manuals in the % future. Used with @smallbook, which sets the leading to 12pt. -% +% \def\definetextfontsizex{% % Text fonts (10pt). \def\textnominalsize{10pt} @@ -2192,7 +2204,7 @@ end \setfont\secsf\sfbshape{12}{1000}{OT1} \let\secbf\secrm \setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 +\font\seci=cmmi12 \font\secsy=cmsy10 scaled \magstep1 \def\sececsize{1200} @@ -2236,7 +2248,7 @@ end % We provide the user-level command % @fonttextsize 10 % (or 11) to redefine the text font size. pt is assumed. -% +% \def\xword{10} \def\xiword{11} % @@ -2246,7 +2258,7 @@ end % % Set \globaldefs so that documents can use this inside @tex, since % makeinfo 4.8 does not support it, but we need it nonetheless. - % + % \begingroup \globaldefs=1 \ifx\textsizearg\xword \definetextfontsizex \else \ifx\textsizearg\xiword \definetextfontsizexi @@ -2348,6 +2360,16 @@ end \def\lsize{smaller}\def\lllsize{smaller}% \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. \let\smallexamplefonts = \smallfonts @@ -2361,28 +2383,128 @@ end % % By the way, for comparison, here's what fits with @example (10pt): % 8.5x11=71 smallbook=60 a4=75 a5=58 -% -% I wish the USA used A4 paper. % --karl, 24jan03. - % Set up the default fonts, so we can use them for creating boxes. % \definetextfontsizexi -% Define these so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} + +\message{markup,} + +% 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 \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 %% serif) and @ii for TeX italic @@ -2397,7 +2519,7 @@ end % @var is set to this for defun arguments. \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? \def\cite#1{{\sl #1}\futurelet\next\smartitalicx} @@ -2407,7 +2529,12 @@ end \let\dfn=\smartslanted \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}} \let\strong=\b @@ -2439,22 +2566,35 @@ end \catcode`@=\other \def\endofsentencespacefactor{3000}% default +% @t, explicit typewriter. \def\t#1{% {\tt \rawbackslash \plainfrenchspacing #1}% \null } + +% @samp. \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} -\setfont\keyrm\rmshape{8}{1000}{OT1} -\font\keysy=cmsy9 -\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% - \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% - \vbox{\hrule\kern-0.4pt - \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% - \kern-0.4pt\hrule}% - \kern-.06em\raise0.4pt\hbox{\angleright}}}} -\def\key #1{{\setupmarkupstyle{key}\nohyphenation \uppercase{#1}}\null} -% The old definition, with no lozenge: -%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} + +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% 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} % @file, @option are the same as @samp. @@ -2532,7 +2672,7 @@ end % each of the four underscores in __typeof__. This is undesirable in % some manuals, especially if they don't have long identifiers in % general. @allowcodebreaks provides a way to control this. -% +% \newif\ifallowcodebreaks \allowcodebreakstrue \def\keywordtrue{true} @@ -2552,6 +2692,7 @@ end % @kbd is like @code, except that if the argument is just one @key command, % 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), % `example' (@kbd uses ttsl only inside of @example and friends), @@ -2573,7 +2714,7 @@ end \def\wordexample{example} \def\wordcode{code} -% Default is `distinct.' +% Default is `distinct'. \kbdinputstyle distinct \def\xkey{\key} @@ -2643,34 +2784,20 @@ end \let\email=\uref \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 % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % \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'', % and it is not used as such in any manual I can find. We need it for % Polish suppressed-l. --karl, 22sep96. %\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. % We print this one point size smaller, since it's intended for % all-uppercase. -% +% \def\acronym#1{\doacronym #1,,\finish} \def\doacronym#1,#2,#3\finish{% {\selectfonts\lsize #1}% @@ -2682,7 +2809,7 @@ end % @abbr for "Comput. J." and the like. % No font change, but don't do end-of-sentence spacing. -% +% \def\abbr#1{\doabbr #1,,\finish} \def\doabbr#1,#2,#3\finish{% {\plainfrenchspacing #1}% @@ -2692,6 +2819,44 @@ end \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. % \def\pounds{{\it\$}} @@ -2701,52 +2866,59 @@ end % Theiling, which support regular, slanted, bold and bold slanted (and % "outlined" (blackboard board, sort of) versions, which we don't need). % It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% +% % Although only regular is the truly official Euro symbol, we ignore % that. The Euro is designed to be slightly taller than the regular % font height. -% +% % feymr - regular % feymo - slanted % feybr - bold % feybo - bold slanted -% +% % There is no good (free) typewriter version, to my knowledge. % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. % Hmm. -% +% % Also doesn't work in math. Do we need to do math with euro symbols? % Hope not. -% -% +% +% \def\euro{{\eurofont e}} \def\eurofont{% % We set the font at each command, rather than predefining it in % \textfonts and the other font-switching commands, so that % installations which never need the symbol don't have to have the % font installed. - % + % % There is only one designed size (nominal 10pt), so we always scale % that to the current nominal size. - % + % % By the way, simply using "at 1em" works for cmr10 and the like, but % does not work for cmbx10 and other extended/shrunken fonts. - % + % \def\eurosize{\csname\curfontsize nominalsize\endcsname}% % - \ifx\curfontstyle\bfstylename + \ifx\curfontstyle\bfstylename % bold: \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else + \else % regular: \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize \fi \thiseurofont } -% Hacks for glyphs from the EC fonts similar to \euro. We don't -% use \let for the aliases, because sometimes we redefine the original -% macro, and the alias should reflect the redefinition. +% Glyphs from the EC fonts. We don't use \let for the aliases, because +% sometimes we redefine the original macro, and the alias should reflect +% 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\guillemotleft{\guillemetleft} \def\guillemetright{{\ecfont \char"14}} @@ -2760,7 +2932,7 @@ end % we have the precomposed glyphs for the most common cases. We put the % tests to use those glyphs in the single \ogonek macro so we have fewer % dummy definitions to worry about for index entries, etc. -% +% % ogonek is also used with other letters in Lithuanian (IOU), but using % the precomposed glyphs for those is not so easy since they aren't in % the same EC font. @@ -2783,6 +2955,7 @@ end \def\Eogonek{{\ecfont \char"86}}\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{% % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German @@ -2817,7 +2990,7 @@ end % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. -% +% \ifx\Orb\undefined \def\Orb{\mathhexbox20D} \fi @@ -3163,7 +3336,7 @@ end % cause the example and the item to crash together. So we use this % bizarre value of 10001 as a signal to \aboveenvbreak to insert % \parskip glue after all. Section titles are handled this way also. - % + % \penalty 10001 \endgroup \itemxneedsnegativevskipfalse @@ -3257,9 +3430,18 @@ end \parindent=0pt \parskip=\smallskipamount \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}% + \setbox0 = \hbox{\itemcontents}% + % % @itemize with no arg is equivalent to @itemize @bullet. \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi + % \let\item=\itemizeitem } @@ -3280,6 +3462,7 @@ end \ifnum\lastpenalty<10000 \parskip=0in \fi \noindent \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% + % \vadjust{\penalty 1200}}% not good to break after first line of item. \flushcr } @@ -3501,12 +3684,19 @@ end % % @headitem starts a heading row, which we typeset in bold. % Assignments have to be global since we are inside the implicit group -% of an alignment entry. Note that \everycr resets \everytab. -\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}% +% of an alignment entry. \everycr resets \everytab so we don't have to +% 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 % 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. \def\tab{\checkenv\multitable &\the\everytab}% @@ -3959,7 +4149,7 @@ end % processing continues to some further point. On the other hand, it % seems \endinput does not hurt in the printed index arg, since that % is still getting written without apparent harm. - % + % % Sample source (mac-idx3.tex, reported by Graham Percival to % help-texinfo, 22may06): % @macro funindex {WORD} @@ -3967,12 +4157,12 @@ end % @end macro % ... % @funindex commtest - % + % % The above is not enough to reproduce the bug, but it gives the flavor. - % + % % Sample whatsit resulting: % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} - % + % % So: \let\endinput = \empty % @@ -4024,19 +4214,23 @@ end % Non-English letters. \definedummyword\AA \definedummyword\AE + \definedummyword\DH \definedummyword\L - \definedummyword\OE \definedummyword\O + \definedummyword\OE + \definedummyword\TH \definedummyword\aa \definedummyword\ae - \definedummyword\l - \definedummyword\oe - \definedummyword\o - \definedummyword\ss + \definedummyword\dh \definedummyword\exclamdown - \definedummyword\questiondown + \definedummyword\l + \definedummyword\o + \definedummyword\oe \definedummyword\ordf \definedummyword\ordm + \definedummyword\questiondown + \definedummyword\ss + \definedummyword\th % % Although these internal commands shouldn't show up, sometimes they do. \definedummyword\bf @@ -4131,6 +4325,7 @@ end \definedummyword\code \definedummyword\command \definedummyword\dfn + \definedummyword\email \definedummyword\emph \definedummyword\env \definedummyword\file @@ -4179,19 +4374,23 @@ end % Non-English letters. \def\AA{AA}% \def\AE{AE}% + \def\DH{DZZ}% \def\L{L}% \def\OE{OE}% \def\O{O}% + \def\TH{ZZZ}% \def\aa{aa}% \def\ae{ae}% + \def\dh{dzz}% + \def\exclamdown{!}% \def\l{l}% \def\oe{oe}% - \def\o{o}% - \def\ss{ss}% - \def\exclamdown{!}% - \def\questiondown{?}% \def\ordf{a}% \def\ordm{o}% + \def\o{o}% + \def\questiondown{?}% + \def\ss{ss}% + \def\th{zzz}% % \def\LaTeX{LaTeX}% \def\TeX{TeX}% @@ -4201,20 +4400,19 @@ end \def\bullet{bullet}% \def\comma{,}% \def\copyright{copyright}% - \def\registeredsymbol{R}% \def\dots{...}% \def\enddots{...}% \def\equiv{==}% \def\error{error}% \def\euro{euro}% + \def\expansion{==>}% \def\guillemetleft{<<}% \def\guillemetright{>>}% \def\guilsinglleft{<}% \def\guilsinglright{>}% - \def\expansion{==>}% \def\minus{-}% - \def\pounds{pounds}% \def\point{.}% + \def\pounds{pounds}% \def\print{-|}% \def\quotedblbase{"}% \def\quotedblleft{"}% @@ -4222,19 +4420,20 @@ end \def\quoteleft{`}% \def\quoteright{'}% \def\quotesinglbase{,}% + \def\registeredsymbol{R}% \def\result{=>}% - \def\textdegree{degrees}% + \def\textdegree{o}% % % 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. % makeinfo does not expand macros in the argument to @deffn, which ends up % writing an index entry, and texindex isn't prepared for an index sort entry % that starts with \. - % + % % Since macro invocations are followed by braces, we can just redefine them % to take a single TeX argument. The case of a macro invocation that % goes to end-of-line is not handled. - % + % \macrolist } @@ -4362,7 +4561,7 @@ end % to re-insert the same penalty (values >10000 are used for various % signals); since we just inserted a non-discardable item, any % following glue (such as a \parskip) would be a breakpoint. For example: - % + % % @deffn deffn-whatever % @vindex index-whatever % Description. @@ -4943,7 +5142,9 @@ end \gdef\chaplevelprefix{\the\chapno.}% \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. \chapmacro{#1}{Ynumbered}{\the\chapno}% @@ -4954,15 +5155,17 @@ end \global\let\subsubsection = \numberedsubsubsec } -\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz +\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz +% \def\appendixzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 \global\advance\appendixno by 1 \gdef\chaplevelprefix{\appendixletter.}% \resetallfloatnos % - \def\appendixnum{\putwordAppendix\space \appendixletter}% - \message{\appendixnum}% + % \putwordAppendix can contain complex things in translations. + \toks0=\expandafter{\putwordAppendix}% + \message{\the\toks0 \space \appendixletter}% % \chapmacro{#1}{Yappendix}{\appendixletter}% % @@ -5102,7 +5305,7 @@ end \def\chapheading{\chapbreak \parsearg\chapheadingzzz} \def\chapheadingzzz#1{% {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright + \parindent=0pt\ptexraggedright \rmisbold #1\hfill}}% \bigskip \par\penalty 200\relax \suppressfirstparagraphindent @@ -5195,7 +5398,10 @@ end \xdef\lastchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \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}% }% \else @@ -5203,7 +5409,10 @@ end \xdef\lastchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \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}% }% \fi\fi\fi @@ -5259,7 +5468,7 @@ end % % Typeset the actual heading. \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 \unhbox0 #1\par}% }% @@ -5283,7 +5492,7 @@ end % \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright + \parindent=0pt\ptexraggedright \rmisbold #1\hfill}}\bigskip \par\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts @@ -5346,7 +5555,10 @@ end \xdef\lastsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \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}% }% \fi @@ -5356,12 +5568,20 @@ end \xdef\lastsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \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}% }% \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 % the preceding space. \safewhatsit\domark @@ -5411,7 +5631,7 @@ end \nobreak % % 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 \unhbox0 #1}% }% @@ -5427,11 +5647,11 @@ end % glue accumulate. (Not a breakpoint because it's preceded by a % discardable item.) \vskip-\parskip - % + % % This is purely so the last item on the list is a known \penalty > % 10000. This is so \startdefun can avoid allowing breakpoints after % section headings. Otherwise, it would insert a valid breakpoint between: - % + % % @section sec-whatever % @deffn def-whatever \penalty 10001 @@ -5489,7 +5709,7 @@ end % These characters do not print properly in the Computer Modern roman % fonts, so we must take special care. This is more or less redundant % with the Texinfo input format setup at the end of this file. -% +% \def\activecatcodes{% \catcode`\"=\active \catcode`\$=\active @@ -5539,7 +5759,7 @@ end % redefined for the two-volume lispref. We always output on % \jobname.toc even if this is redefined. -% +% \def\tocreadfilename{\jobname.toc} % Normal (long) toc. @@ -5709,144 +5929,6 @@ end \message{environments,} % @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. % One exception: @ is still an escape character, so that @end tex works. % 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, % inside a group. +\newdimen\nonfillparindent \def\nonfillstart{% \aboveenvbreak \hfuzz = 12pt % Don't be fussy @@ -6006,7 +6089,12 @@ end \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output \parskip = 0pt + % Turn off paragraph indentation but redefine \indent to emulate + % the normal \indent. + \nonfillparindent=\parindent \parindent = 0pt + \let\indent\nonfillindent + % \emergencystretch = 0pt % don't try to avoid overfull boxes \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing @@ -6017,6 +6105,24 @@ end \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 even small examples the full size: @set dispenvsize nosmall. % This affects the following displayed environments: @@ -6103,6 +6209,30 @@ end \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) % and narrows the margins. We keep \parskip nonzero in general, since % we're doing normal filling. So, when using \aboveenvbreak and @@ -6721,7 +6851,7 @@ end % This does \let #1 = #2, with \csnames; that is, % \let \csname#1\endcsname = \csname#2\endcsname % (except of course we have to play expansion games). -% +% \def\cslet#1#2{% \expandafter\let \csname#1\expandafter\endcsname @@ -7881,21 +8011,22 @@ end \closein 1 \endgroup % end raw TeX \endgroup} -} % % If they passed de_DE, and txi-de_DE.tex doesn't exist, % try txi-de.tex. -% -\def\documentlanguagetrywithoutunderscore#1_#2\finish{% +% +\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% \openin 1 txi-#1.tex \ifeof 1 \errhelp = \nolanghelp \errmessage{Cannot read language file txi-#1.tex}% \else + \globaldefs = 1 % everything in the txi-LL files needs to persist \input txi-#1.tex \fi \closein 1 } +}% end of special _ catcode % \newhelp\nolanghelp{The given language definition file cannot be found or is empty. Maybe you need to install it? Putting it in the current @@ -7904,16 +8035,16 @@ directory should work if nowhere else does.} % This macro is called from txi-??.tex files; the first argument is the % \language name to set (without the "\lang@" prefix), the second and % third args are \{left,right}hyphenmin. -% +% % The language names to pass are determined when the format is built. % See the etex.log file created at that time, e.g., % /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. -% +% % With TeX Live 2008, etex now includes hyphenation patterns for all % available languages. This means we can support hyphenation in % Texinfo, at least to some extent. (This still doesn't solve the % accented characters problem.) -% +% \catcode`@=11 \def\txisetlanguage#1#2#3{% % do not set the language if the name is undefined in the current TeX. @@ -7968,7 +8099,7 @@ directory should work if nowhere else does.} \setnonasciicharscatcode\active \lattwochardefs % - \else \ifx \declaredencoding \latone + \else \ifx \declaredencoding \latone \setnonasciicharscatcode\active \latonechardefs % @@ -7980,7 +8111,7 @@ directory should work if nowhere else does.} \setnonasciicharscatcode\active \utfeightchardefs % - \else + \else \message{Unknown document encoding #1, ignoring.}% % \fi % utfeight @@ -7992,7 +8123,7 @@ directory should work if nowhere else does.} % A message to be logged when using a character that isn't available % the default font encoding (OT1). -% +% \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} % Take account of \c (plain) vs. \, (Texinfo) difference. @@ -8005,21 +8136,21 @@ directory should work if nowhere else does.} % % Latin1 (ISO-8859-1) character definitions. \def\latonechardefs{% - \gdef^^a0{~} + \gdef^^a0{~} \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} + \gdef^^a2{\missingcharmsg{CENT SIGN}} \gdef^^a3{{\pounds}} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a6{\missingcharmsg{BROKEN BAR}} \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} + \gdef^^a8{\"{}} + \gdef^^a9{\copyright} \gdef^^aa{\ordf} \gdef^^ab{\guillemetleft} \gdef^^ac{$\lnot$} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} + \gdef^^ad{\-} + \gdef^^ae{\registeredsymbol} \gdef^^af{\={}} % \gdef^^b0{\textdegree} @@ -8046,7 +8177,7 @@ directory should work if nowhere else does.} \gdef^^c2{\^A} \gdef^^c3{\~A} \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} + \gdef^^c5{\ringaccent A} \gdef^^c6{\AE} \gdef^^c7{\cedilla C} \gdef^^c8{\`E} @@ -8058,7 +8189,7 @@ directory should work if nowhere else does.} \gdef^^ce{\^I} \gdef^^cf{\"I} % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} + \gdef^^d0{\DH} \gdef^^d1{\~N} \gdef^^d2{\`O} \gdef^^d3{\'O} @@ -8072,7 +8203,7 @@ directory should work if nowhere else does.} \gdef^^db{\^U} \gdef^^dc{\"U} \gdef^^dd{\'Y} - \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} + \gdef^^de{\TH} \gdef^^df{\ss} % \gdef^^e0{\`a} @@ -8092,7 +8223,7 @@ directory should work if nowhere else does.} \gdef^^ee{\^{\dotless i}} \gdef^^ef{\"{\dotless i}} % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} + \gdef^^f0{\dh} \gdef^^f1{\~n} \gdef^^f2{\`o} \gdef^^f3{\'o} @@ -8106,7 +8237,7 @@ directory should work if nowhere else does.} \gdef^^fb{\^u} \gdef^^fc{\"u} \gdef^^fd{\'y} - \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} + \gdef^^fe{\th} \gdef^^ff{\"y} } @@ -8178,7 +8309,7 @@ directory should work if nowhere else does.} \gdef^^ce{\^I} \gdef^^cf{\v D} % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} + \gdef^^d0{\DH} \gdef^^d1{\'N} \gdef^^d2{\v N} \gdef^^d3{\'O} @@ -8187,7 +8318,7 @@ directory should work if nowhere else does.} \gdef^^d6{\"O} \gdef^^d7{$\times$} \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} + \gdef^^d9{\ringaccent U} \gdef^^da{\'U} \gdef^^db{\H U} \gdef^^dc{\"U} @@ -8212,7 +8343,7 @@ directory should work if nowhere else does.} \gdef^^ee{\^\i} \gdef^^ef{\v d} % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} + \gdef^^f0{\dh} \gdef^^f1{\'n} \gdef^^f2{\v n} \gdef^^f3{\'o} @@ -8231,11 +8362,11 @@ directory should work if nowhere else does.} } % UTF-8 character definitions. -% +% % This code to support UTF-8 is based on LaTeX's utf8.def, with some % changes for Texinfo conventions. It is included here under the GPL by % permission from Frank Mittelbach and the LaTeX team. -% +% \newcount\countUTFx \newcount\countUTFy \newcount\countUTFz @@ -8385,6 +8516,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00CE}{\^I} \DeclareUnicodeCharacter{00CF}{\"I} + \DeclareUnicodeCharacter{00D0}{\DH} \DeclareUnicodeCharacter{00D1}{\~N} \DeclareUnicodeCharacter{00D2}{\`O} \DeclareUnicodeCharacter{00D3}{\'O} @@ -8397,6 +8529,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00DB}{\^U} \DeclareUnicodeCharacter{00DC}{\"U} \DeclareUnicodeCharacter{00DD}{\'Y} + \DeclareUnicodeCharacter{00DE}{\TH} \DeclareUnicodeCharacter{00DF}{\ss} \DeclareUnicodeCharacter{00E0}{\`a} @@ -8416,6 +8549,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} + \DeclareUnicodeCharacter{00F0}{\dh} \DeclareUnicodeCharacter{00F1}{\~n} \DeclareUnicodeCharacter{00F2}{\`o} \DeclareUnicodeCharacter{00F3}{\'o} @@ -8428,6 +8562,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00FB}{\^u} \DeclareUnicodeCharacter{00FC}{\"u} \DeclareUnicodeCharacter{00FD}{\'y} + \DeclareUnicodeCharacter{00FE}{\th} \DeclareUnicodeCharacter{00FF}{\"y} \DeclareUnicodeCharacter{0100}{\=A} @@ -8972,6 +9107,9 @@ directory should work if nowhere else does.} \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. \catcode`\"=\other \catcode`\~=\other @@ -9081,7 +9219,7 @@ directory should work if nowhere else does.} % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of % the literal character `\'. -% +% @def@normalturnoffactive{% @let\=@normalbackslash @let"=@normaldoublequote @@ -9137,7 +9275,7 @@ directory should work if nowhere else does.} @catcode`@`=@active @markupsetuplqdefault @markupsetuprqdefault - + @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" diff --git a/libjava/classpath/examples/Makefile.in b/libjava/classpath/examples/Makefile.in index 19dcf2e24c9..1d5d02fe6b7 100644 --- a/libjava/classpath/examples/Makefile.in +++ b/libjava/classpath/examples/Makefile.in @@ -41,6 +41,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/external/Makefile.in b/libjava/classpath/external/Makefile.in index b2558cd920e..cd03f679553 100644 --- a/libjava/classpath/external/Makefile.in +++ b/libjava/classpath/external/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/external/jsr166/Makefile.in b/libjava/classpath/external/jsr166/Makefile.in index a4a08182a56..55f05841eb5 100644 --- a/libjava/classpath/external/jsr166/Makefile.in +++ b/libjava/classpath/external/jsr166/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/external/relaxngDatatype/Makefile.in b/libjava/classpath/external/relaxngDatatype/Makefile.in index 70ecad05be3..41430c160b4 100644 --- a/libjava/classpath/external/relaxngDatatype/Makefile.in +++ b/libjava/classpath/external/relaxngDatatype/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/external/sax/Makefile.in b/libjava/classpath/external/sax/Makefile.in index 8b09af251c1..774243663c7 100644 --- a/libjava/classpath/external/sax/Makefile.in +++ b/libjava/classpath/external/sax/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/external/w3c_dom/Makefile.in b/libjava/classpath/external/w3c_dom/Makefile.in index 15e2f95d9c4..76daadb2c22 100644 --- a/libjava/classpath/external/w3c_dom/Makefile.in +++ b/libjava/classpath/external/w3c_dom/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/gnu/javax/print/CupsIppOperation.java b/libjava/classpath/gnu/javax/print/CupsIppOperation.java index e9151691124..96744c1f362 100644 --- a/libjava/classpath/gnu/javax/print/CupsIppOperation.java +++ b/libjava/classpath/gnu/javax/print/CupsIppOperation.java @@ -1,4 +1,4 @@ -/* CupsIppOperation.java -- +/* CupsIppOperation.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,55 +45,55 @@ package gnu.javax.print; * See: CUPS Implementation of IPP, chapter 3.2
* http://www.cups.org/doc-1.1/ipp.html *

- * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class CupsIppOperation { /** Get the default destination - since CUPS 1.0 */ - public static final int CUPS_GET_DEFAULT = 0x4001; - + public static final int CUPS_GET_DEFAULT = 0x4001; + /** Get all of the available printers - since CUPS 1.0 */ public static final int CUPS_GET_PRINTERS = 0x4002; - + /** Add or modify a printer - since CUPS 1.0 */ public static final int CUPS_ADD_MODIFY_PRINTER = 0x4003; - + /** Delete a printer - since CUPS 1.0 */ public static final int CUPS_DELETE_PRINTER = 0x4004; - + /** Get all of the available printer classes - since CUPS 1.0 */ public static final int CUPS_GET_CLASSES = 0x4005; - + /** Add or modify a printer class - since CUPS 1.0 */ public static final int CUPS_ADD_MODIFY_CLASS = 0x4006; - + /** Delete a printer class - since CUPS 1.0 */ public static final int CUPS_DELETE_CLASS = 0x4007; - + /** Accept jobs on a printer or printer class - since CUPS 1.0 */ public static final int CUPS_ACCEPT_JOBS = 0x4008; - + /** Reject jobs on a printer or printer class - since CUPS 1.0 */ public static final int CUPS_REJECT_JOBS = 0x4009; - + /** Set the default destination - since CUPS 1.0 */ public static final int CUPS_SET_DEFAULT = 0x400A; - + /** Get all of the available PPDs - since CUPS 1.1 */ public static final int CUPS_GET_DEVICES = 0x400B; - + /** Get all of the available PPDs - since CUPS 1.1 */ public static final int CUPS_GET_PPDS = 0x400C; - + /** Move a job to a different printer - since CUPS 1.1 */ public static final int CUPS_MOVE_JOB = 0x400D; - - + + private CupsIppOperation() - { + { // not to be instantiated } - + } diff --git a/libjava/classpath/gnu/javax/print/CupsMediaMapping.java b/libjava/classpath/gnu/javax/print/CupsMediaMapping.java index eaf2d5e54ae..49bd94d6f3d 100644 --- a/libjava/classpath/gnu/javax/print/CupsMediaMapping.java +++ b/libjava/classpath/gnu/javax/print/CupsMediaMapping.java @@ -1,4 +1,4 @@ -/* CupsMediaMapping.java -- +/* CupsMediaMapping.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,12 +52,12 @@ import javax.print.attribute.standard.MediaSizeName; * for use of media attribute translation between Java JPS API and * CUPS. *

- * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class CupsMediaMapping { - // the mapping map + // the mapping map private static final HashMap ippByCups = new HashMap(); /** @@ -67,11 +67,11 @@ public class CupsMediaMapping { ippByCups.put("Postcard", MediaSizeName.JAPANESE_POSTCARD); ippByCups.put("Statement", MediaSizeName.INVOICE); - + ippByCups.put("Letter", MediaSizeName.NA_LETTER); ippByCups.put("Executive", MediaSizeName.EXECUTIVE); ippByCups.put("Legal", MediaSizeName.NA_LEGAL); - + ippByCups.put("A0", MediaSizeName.ISO_A0); ippByCups.put("A1", MediaSizeName.ISO_A1); ippByCups.put("A2", MediaSizeName.ISO_A2); @@ -83,7 +83,7 @@ public class CupsMediaMapping ippByCups.put("A8", MediaSizeName.ISO_A8); ippByCups.put("A9", MediaSizeName.ISO_A9); ippByCups.put("A10", MediaSizeName.ISO_A10); - + ippByCups.put("B0", MediaSizeName.JIS_B0); ippByCups.put("B1", MediaSizeName.JIS_B1); ippByCups.put("B2", MediaSizeName.JIS_B2); @@ -95,7 +95,7 @@ public class CupsMediaMapping ippByCups.put("B8", MediaSizeName.JIS_B8); ippByCups.put("B9", MediaSizeName.JIS_B9); ippByCups.put("B10", MediaSizeName.JIS_B10); - + ippByCups.put("ISOB0", MediaSizeName.ISO_B0); ippByCups.put("ISOB1", MediaSizeName.ISO_B1); ippByCups.put("ISOB2", MediaSizeName.ISO_B2); @@ -118,7 +118,7 @@ public class CupsMediaMapping ippByCups.put("EnvISOB8", MediaSizeName.ISO_B8); ippByCups.put("EnvISOB9", MediaSizeName.ISO_B9); ippByCups.put("EnvISOB10", MediaSizeName.ISO_B10); - + ippByCups.put("C0", MediaSizeName.ISO_C0); ippByCups.put("C1", MediaSizeName.ISO_C1); ippByCups.put("C2", MediaSizeName.ISO_C2); @@ -136,7 +136,7 @@ public class CupsMediaMapping ippByCups.put("Env12", MediaSizeName.NA_NUMBER_12_ENVELOPE); ippByCups.put("Env14", MediaSizeName.NA_NUMBER_14_ENVELOPE); ippByCups.put("c8x10", MediaSizeName.NA_8X10); - + ippByCups.put("EnvDL", MediaSizeName.ISO_DESIGNATED_LONG); ippByCups.put("DL", MediaSizeName.ISO_DESIGNATED_LONG); ippByCups.put("EnvC0", MediaSizeName.ISO_C0); @@ -145,12 +145,12 @@ public class CupsMediaMapping ippByCups.put("EnvC3", MediaSizeName.ISO_C3); ippByCups.put("EnvC4", MediaSizeName.ISO_C4); ippByCups.put("EnvC5", MediaSizeName.ISO_C5); - ippByCups.put("EnvC6", MediaSizeName.ISO_C6); + ippByCups.put("EnvC6", MediaSizeName.ISO_C6); } - + /** * Returns the IPP media name of the given cups name. - * + * * @param cupsName the name in cups * @return The IPP name if a mapping is known, null otherwise. */ @@ -158,10 +158,10 @@ public class CupsMediaMapping { return (String) ippByCups.get(cupsName); } - + /** * Returns the mapping map for iteration. - * + * * @return The mapping map as unmodifiable map. */ public static final Map getMappingMap() @@ -169,7 +169,7 @@ public class CupsMediaMapping return Collections.unmodifiableMap(ippByCups); } - private CupsMediaMapping() + private CupsMediaMapping() { // not to be instantiated } diff --git a/libjava/classpath/gnu/javax/print/CupsPrintService.java b/libjava/classpath/gnu/javax/print/CupsPrintService.java index 4f77523c530..f3bec996c49 100644 --- a/libjava/classpath/gnu/javax/print/CupsPrintService.java +++ b/libjava/classpath/gnu/javax/print/CupsPrintService.java @@ -48,9 +48,9 @@ import javax.print.DocFlavor; import javax.print.attribute.AttributeSet; /** - * Implementation of the PrintService/MultiDocPrintService + * Implementation of the PrintService/MultiDocPrintService * interface for Cups printers (supports Cups 1.1 and up) - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class CupsPrintService extends IppMultiDocPrintService @@ -58,26 +58,26 @@ public final class CupsPrintService extends IppMultiDocPrintService /** * Creates a CupsPrintService object. - * + * * @param uri the URI of the IPP printer. * @param username the user of this print service. * @param password the password of the user. - * + * * @throws IppException if an error during connection occurs. */ public CupsPrintService(URI uri, String username, String password) throws IppException { super(uri, username, password); - } - + } + /** * Overridden for CUPS specific handling of the media attribute. */ - protected Object handleSupportedAttributeValuesResponse(IppResponse response, + protected Object handleSupportedAttributeValuesResponse(IppResponse response, Class category) { - // TODO Implement different behaviour of cups here - actually the Media + // TODO Implement different behaviour of cups here - actually the Media // printing attribute stuff. For now just use IPP reference implementation. return super.handleSupportedAttributeValuesResponse(response, category); } @@ -89,7 +89,7 @@ public final class CupsPrintService extends IppMultiDocPrintService { // TODO Implement media attribute behaviour for cups here //if (category.equals(Media.class) - + return super.getDefaultAttributeValue(category); } diff --git a/libjava/classpath/gnu/javax/print/CupsPrintServiceLookup.java b/libjava/classpath/gnu/javax/print/CupsPrintServiceLookup.java index 1aa83218a8d..d537c398fa6 100644 --- a/libjava/classpath/gnu/javax/print/CupsPrintServiceLookup.java +++ b/libjava/classpath/gnu/javax/print/CupsPrintServiceLookup.java @@ -51,12 +51,12 @@ import javax.print.attribute.AttributeSet; /** * The platform default implementation based on CUPS. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class CupsPrintServiceLookup extends PrintServiceLookup -{ - private CupsServer server; +{ + private CupsServer server; /** * Default constructor checking security access. @@ -67,14 +67,14 @@ public class CupsPrintServiceLookup extends PrintServiceLookup SecurityManager sm = System.getSecurityManager(); if (sm != null) sm.checkPrintJobAccess(); - + // use the localhost cups server server = new CupsServer(null, null); } /** * This is the printer marked as default in CUPS. - * + * * @return The default lookup service or * null if there is no default. */ @@ -83,21 +83,21 @@ public class CupsPrintServiceLookup extends PrintServiceLookup try { return server.getDefaultPrinter(); - } + } catch (IppException e) { // if discovery fails treat as if there is none return null; - } + } } - + /** * All printers and printer classes of the CUPS server are checked. * If flavors or attributes are null the constraint is not used. - * + * * @param flavors the document flavors which have to be supported. * @param attributes the attributes which have to be supported. - * + * * @return The multidoc print services of the implementing lookup service * for the given parameters, or an array of length 0 if none is available. */ @@ -105,49 +105,49 @@ public class CupsPrintServiceLookup extends PrintServiceLookup AttributeSet attributes) { ArrayList result = new ArrayList(); - PrintService[] services = getPrintServices(); - + PrintService[] services = getPrintServices(); + for (int i=0; i < services.length; i++) { if (checkMultiDocPrintService(flavors, attributes, services[i])) - result.add(services[i]); + result.add(services[i]); } - + return (MultiDocPrintService[]) result.toArray( new MultiDocPrintService[result.size()]); } /** * These are all printers and printer classes of the CUPS server. - * - * @return All known print services regardless of supported features, + * + * @return All known print services regardless of supported features, * or an array of length 0 if none is available. */ public PrintService[] getPrintServices() { ArrayList result = new ArrayList(); - + try { result.addAll(server.getAllPrinters()); result.addAll(server.getAllClasses()); } catch (IppException e) - { + { // ignore as this method cannot throw exceptions // if print service discovery fails - bad luck } return (PrintService[]) result.toArray(new PrintService[result.size()]); } - - + + /** * All printers and printer classes of the CUPS server are checked. * If flavor or attributes are null the constraint is not used. - * + * * @param flavor the document flavor which has to be supported. * @param attributes the attributes which have to be supported. - * + * * @return The print services of the implementing lookup service * for the given parameters, or an array of length 0 if none is available. */ @@ -156,25 +156,25 @@ public class CupsPrintServiceLookup extends PrintServiceLookup { ArrayList result = new ArrayList(); PrintService[] services = getPrintServices(); - + for (int i=0; i < services.length; i++) { if (checkPrintService(flavor, attributes, services[i])) result.add(services[i]); } - + return (PrintService[]) result.toArray(new PrintService[result.size()]); } - + /** * Checks the given print service - own method so it can be used also * to check application registered print services from PrintServiceLookup. - * + * * @param flavor the document flavor which has to be supported. * @param attributes the attributes which have to be supported. * @param service the service to check - * - * @return true if all constraints match, false + * + * @return true if all constraints match, false * otherwise. */ public boolean checkPrintService(DocFlavor flavor, AttributeSet attributes, @@ -185,7 +185,7 @@ public class CupsPrintServiceLookup extends PrintServiceLookup { if (attributes == null || attributes.size() == 0) return allAttributesSupported; - + Attribute[] atts = attributes.toArray(); for (int i = 0; i < atts.length; i++) { @@ -197,29 +197,29 @@ public class CupsPrintServiceLookup extends PrintServiceLookup } return allAttributesSupported; } - + return false; } - + /** * Checks the given print service - own method so it can be used also * to check application registered print services from PrintServiceLookup. - * + * * @param flavors the document flavors which have to be supported. * @param attributes the attributes which have to be supported. * @param service the service to check - * - * @return true if all constraints match, false + * + * @return true if all constraints match, false * otherwise. */ - public boolean checkMultiDocPrintService(DocFlavor[] flavors, + public boolean checkMultiDocPrintService(DocFlavor[] flavors, AttributeSet attributes, PrintService service) - { + { if (service instanceof MultiDocPrintService) - { + { boolean allFlavorsSupported = true; boolean allAttributesSupported = true; - + if (flavors == null || flavors.length != 0) allFlavorsSupported = true; else @@ -233,7 +233,7 @@ public class CupsPrintServiceLookup extends PrintServiceLookup } } } - + if (attributes == null || attributes.size() == 0) allAttributesSupported = true; else @@ -249,11 +249,11 @@ public class CupsPrintServiceLookup extends PrintServiceLookup } } } - + if (allAttributesSupported && allFlavorsSupported) return true; - } - + } + return false; } diff --git a/libjava/classpath/gnu/javax/print/CupsServer.java b/libjava/classpath/gnu/javax/print/CupsServer.java index 0486e69deb0..6dbcfc7325e 100644 --- a/libjava/classpath/gnu/javax/print/CupsServer.java +++ b/libjava/classpath/gnu/javax/print/CupsServer.java @@ -1,4 +1,4 @@ -/* CupsServer.java -- +/* CupsServer.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,25 +58,25 @@ import java.util.Set; * compatible server. It mainly consists of its URI and optional * user and password combination if access is restricted. *

- * It provides methods for retrival of valid CUPS printer uris + * It provides methods for retrival of valid CUPS printer uris * that are used to construct IppPrintService objects. *

- * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class CupsServer { - /** + /** * The URI of the CUPS server. * This is something like: http://localhost:631 */ private transient URI uri; - + /** * The optional username. */ private transient String username; - + /** * The optional password for the user. */ @@ -84,11 +84,11 @@ public class CupsServer /** * Creates a CupsServer object which - * tries to connect to a cups server. + * tries to connect to a cups server. * * If gnu.javax.print.server is explicitly set, then * that hostname will be used. Otherwise it will default to localhost. - * + * * @param username the username * @param password the password for the username. */ @@ -100,13 +100,13 @@ public class CupsServer this.uri = null; try { - String serv = System.getProperty("gnu.javax.print.server"); - if( serv != null ) - this.uri = new URI("http://"+serv+":631"); + String serv = System.getProperty("gnu.javax.print.server"); + if( serv != null ) + this.uri = new URI("http://"+serv+":631"); } 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) { @@ -114,20 +114,20 @@ public class CupsServer try { - if( this.uri == null ) - this.uri = new URI("http://localhost:631"); + if( this.uri == null ) + this.uri = new URI("http://localhost:631"); } catch (URISyntaxException e) { // does not happen } } - + /** * Creates a CupsServer object which * tries to connect to a running cups server on the * given URI. - * + * * @param uri the URI of the server. * @param username the username * @param password the password for the username. @@ -138,75 +138,75 @@ public class CupsServer this.username = username; this.password = password; } - + /** * Requests the default printer from this CUPS server. * This is always returned as IppPrintService. - * + * * @return The default printer. * @throws IppException if problems during request/response processing occur. */ public IppPrintService getDefaultPrinter() throws IppException - { + { IppResponse response = null; - + try { - IppRequest request = new IppRequest(uri, username, password); - request.setOperationID((short)CupsIppOperation.CUPS_GET_DEFAULT); - request.setOperationAttributeDefaults(); - - RequestedAttributes requestedAttrs + IppRequest request = new IppRequest(uri, username, password); + request.setOperationID((short)CupsIppOperation.CUPS_GET_DEFAULT); + request.setOperationAttributeDefaults(); + + RequestedAttributes requestedAttrs = new RequestedAttributes("printer-uri-supported"); request.addOperationAttribute(requestedAttrs); - + response = request.send(); - } + } catch (IOException e) { throw new IppException("IOException in IPP request/response.", e); - } - + } + Map printerAttributes = (Map) response.getPrinterAttributes().get(0); Set uris = (Set) printerAttributes.get(PrinterUriSupported.class); PrinterUriSupported uri = (PrinterUriSupported) uris.toArray()[0]; - - IppPrintService service + + IppPrintService service = new CupsPrintService(uri.getURI(), username, password); - + return service; } - + /** * Requests all printers from this CUPS server. - * + * * @return The list of available printers. * @throws IppException if problems during request/response processing occur. */ public List getAllPrinters() throws IppException - { + { IppResponse response = null; - + try { - IppRequest request = new IppRequest(uri, username, password); - request.setOperationID((short)CupsIppOperation.CUPS_GET_PRINTERS); + IppRequest request = new IppRequest(uri, username, password); + request.setOperationID((short)CupsIppOperation.CUPS_GET_PRINTERS); request.setOperationAttributeDefaults(); - - RequestedAttributes requestedAttrs + + RequestedAttributes requestedAttrs = new RequestedAttributes("printer-uri-supported"); request.addOperationAttribute(requestedAttrs); - + response = request.send(); - } + } catch (IOException e) { throw new IppException("IOException in IPP request/response.", e); - } + } List prAttr = response.getPrinterAttributes(); List services = new ArrayList(); - + for (int i=0; i < prAttr.size(); i++) { Map printerAttributes = (Map) prAttr.get(i); @@ -224,50 +224,50 @@ public class CupsServer // do nothing, we only catch the IppException which could be // thrown during instantiation as single printers may be discovered // correctly but not usable due to other security restrictions - } - } - + } + } + return services; } - + /** * Requests all classes from this CUPS server. Classes in cups are - * collections of printers. This means jobs directed to a class + * collections of printers. This means jobs directed to a class * are forwarded to the first available printer of the collection. - * + * * @return The list of available classes. * @throws IppException if problems during request/response processing occur. */ public List getAllClasses() throws IppException - { + { IppResponse response = null; - + try { - IppRequest request = new IppRequest(uri, username, password); - request.setOperationID((short)CupsIppOperation.CUPS_GET_CLASSES); + IppRequest request = new IppRequest(uri, username, password); + request.setOperationID((short)CupsIppOperation.CUPS_GET_CLASSES); request.setOperationAttributeDefaults(); - - RequestedAttributes requestedAttrs + + RequestedAttributes requestedAttrs = new RequestedAttributes("printer-uri-supported"); request.addOperationAttribute(requestedAttrs); - + response = request.send(); - } + } catch (IOException e) { throw new IppException("IOException in IPP request/response.", e); - } - + } + List prAttr = response.getPrinterAttributes(); - List services = new ArrayList(); - + List services = new ArrayList(); + for (int i=0; i < prAttr.size(); i++) { Map printerAttributes = (Map) prAttr.get(i); Set uris = (Set) printerAttributes.get(PrinterUriSupported.class); PrinterUriSupported uri = (PrinterUriSupported) uris.toArray()[0]; - + try { CupsPrintService cups = new CupsPrintService(uri.getURI(), @@ -279,9 +279,9 @@ public class CupsServer // do nothing, we only catch the IppException which could be // thrown during instantiation as single printers may be discovered // correctly but not usable due to other security restrictions - } - } - + } + } + return services; } diff --git a/libjava/classpath/gnu/javax/print/PrintAttributeException.java b/libjava/classpath/gnu/javax/print/PrintAttributeException.java index 345193d93f7..5bcc59fc97c 100644 --- a/libjava/classpath/gnu/javax/print/PrintAttributeException.java +++ b/libjava/classpath/gnu/javax/print/PrintAttributeException.java @@ -1,4 +1,4 @@ -/* PrintAttributeException.java -- +/* PrintAttributeException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,25 +46,25 @@ import javax.print.attribute.Attribute; * A PrintException further refining the exception * cause by providing an implementation of the print exception * interface AttributeException. - * + * * @see javax.print.PrintException * @see javax.print.AttributeException - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrintAttributeException extends PrintException +public final class PrintAttributeException extends PrintException implements AttributeException { private Class[] categories; private Attribute[] values; - + /** * Constructs a PrintAttributeException * with the given unsupported attributes and/or values. - * - * @param unsupportedAttributes the unsupported categories, + * + * @param unsupportedAttributes the unsupported categories, * may be null. - * @param unsupportedValues the unsupported attribute values, + * @param unsupportedValues the unsupported attribute values, * may be null. */ public PrintAttributeException(Class[] unsupportedAttributes, @@ -78,11 +78,11 @@ public final class PrintAttributeException extends PrintException /** * Constructs a PrintAttributeException * with the given unsupported attributes and/or values. - * + * * @param e chained exception - * @param unsupportedAttributes the unsupported categories, + * @param unsupportedAttributes the unsupported categories, * may be null. - * @param unsupportedValues the unsupported attribute values, + * @param unsupportedValues the unsupported attribute values, * may be null. */ public PrintAttributeException(Exception e, @@ -96,11 +96,11 @@ public final class PrintAttributeException extends PrintException /** * Constructs a PrintAttributeException * with the given unsupported attributes and/or values. - * + * * @param s detailed message - * @param unsupportedAttributes the unsupported categories, + * @param unsupportedAttributes the unsupported categories, * may be null. - * @param unsupportedValues the unsupported attribute values, + * @param unsupportedValues the unsupported attribute values, * may be null. */ public PrintAttributeException(String s, @@ -114,12 +114,12 @@ public final class PrintAttributeException extends PrintException /** * Constructs a PrintAttributeException * with the given unsupported attributes and/or values. - * + * * @param s detailed message * @param e chained exception - * @param unsupportedAttributes the unsupported categories, + * @param unsupportedAttributes the unsupported categories, * may be null. - * @param unsupportedValues the unsupported attribute values, + * @param unsupportedValues the unsupported attribute values, * may be null. */ public PrintAttributeException(String s, Exception e, diff --git a/libjava/classpath/gnu/javax/print/PrintFlavorException.java b/libjava/classpath/gnu/javax/print/PrintFlavorException.java index 1885e9851a1..a9342db961c 100644 --- a/libjava/classpath/gnu/javax/print/PrintFlavorException.java +++ b/libjava/classpath/gnu/javax/print/PrintFlavorException.java @@ -1,4 +1,4 @@ -/* PrintFlavorException.java -- +/* PrintFlavorException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,21 +46,21 @@ import javax.print.PrintException; * A PrintException further refining the exception * cause by providing an implementation of the print exception * interface FlavorException. - * + * * @see javax.print.PrintException * @see javax.print.FlavorException - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public class PrintFlavorException extends PrintException +public class PrintFlavorException extends PrintException implements FlavorException { private DocFlavor[] flavors; - + /** * Constructs a PrintFlavorException * with the given unsupported doc flavor array - * + * * @param unsupportedFlavors the unsupported document flavors. */ public PrintFlavorException(DocFlavor[] unsupportedFlavors) @@ -72,7 +72,7 @@ public class PrintFlavorException extends PrintException /** * Constructs a PrintFlavorException * with the given unsupported doc flavor array - * + * * @param e chained exception * @param unsupportedFlavors the unsupported document flavors. */ @@ -85,7 +85,7 @@ public class PrintFlavorException extends PrintException /** * Constructs a PrintFlavorException * with the given unsupported doc flavor array - * + * * @param s detailed message * @param unsupportedFlavors the unsupported document flavors. */ @@ -98,12 +98,12 @@ public class PrintFlavorException extends PrintException /** * Constructs a PrintFlavorException * with the given unsupported doc flavor array - * + * * @param s detailed message * @param e chained exception * @param unsupportedFlavors the unsupported document flavors. */ - public PrintFlavorException(String s, Exception e, + public PrintFlavorException(String s, Exception e, DocFlavor[] unsupportedFlavors) { super(s, e); diff --git a/libjava/classpath/gnu/javax/print/PrintUriException.java b/libjava/classpath/gnu/javax/print/PrintUriException.java index d031000cadb..9c13c132a50 100644 --- a/libjava/classpath/gnu/javax/print/PrintUriException.java +++ b/libjava/classpath/gnu/javax/print/PrintUriException.java @@ -1,4 +1,4 @@ -/* PrintUriException.java -- +/* PrintUriException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,13 +47,13 @@ import javax.print.URIException; * A PrintException further refining the exception * cause by providing an implementation of the print exception * interface URIException. - * + * * @see javax.print.PrintException * @see javax.print.URIException - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrintUriException extends PrintException +public final class PrintUriException extends PrintException implements URIException { private int reason; @@ -65,20 +65,20 @@ public final class PrintUriException extends PrintException * * @param reason the reason for the exception. * @param unsupportedUri the URI which is unsupported. - * + * * @see URIException */ public PrintUriException(int reason, URI unsupportedUri) { super(); this.reason = reason; - uri = unsupportedUri; + uri = unsupportedUri; } /** * Constructs a PrintUriException with the given reason * and unsupported URI instance. - * + * * @param e chained exception * @param reason the reason for the exception. * @param unsupportedUri the URI which is unsupported. @@ -87,13 +87,13 @@ public final class PrintUriException extends PrintException { super(e); this.reason = reason; - uri = unsupportedUri; + uri = unsupportedUri; } /** * Constructs a PrintUriException with the given reason * and unsupported URI instance. - * + * * @param s detailed message * @param reason the reason for the exception. * @param unsupportedUri the URI which is unsupported. @@ -102,24 +102,24 @@ public final class PrintUriException extends PrintException { super(s); this.reason = reason; - uri = unsupportedUri; + uri = unsupportedUri; } /** * Constructs a PrintUriException with the given reason * and unsupported URI instance. - * + * * @param s detailed message * @param e chained exception * @param reason the reason for the exception. * @param unsupportedUri the URI which is unsupported. */ - public PrintUriException(String s, Exception e, + public PrintUriException(String s, Exception e, int reason, URI unsupportedUri) { super(s, e); this.reason = reason; - uri = unsupportedUri; + uri = unsupportedUri; } /** diff --git a/libjava/classpath/gnu/javax/print/PrinterDialog.java b/libjava/classpath/gnu/javax/print/PrinterDialog.java index 54d6b87b47c..6557baf4f81 100644 --- a/libjava/classpath/gnu/javax/print/PrinterDialog.java +++ b/libjava/classpath/gnu/javax/print/PrinterDialog.java @@ -98,12 +98,12 @@ import javax.swing.event.ChangeListener; * Implementation of the PrinterDialog used by * {@link javax.print.ServiceUI} for visual selection * of print services and its attributes. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class PrinterDialog extends JDialog implements ActionListener { - + /** * The General Panel used in the printing dialog. * @author Wolfgang Baer (WBaer@gmx.de) @@ -114,57 +114,57 @@ public final class PrinterDialog extends JDialog implements ActionListener * Handles the copies attribute. * @author Wolfgang Baer (WBaer@gmx.de) */ - final class CopiesAndSorted extends JPanel + final class CopiesAndSorted extends JPanel implements ChangeListener, ActionListener - { - private JCheckBox sort; + { + private JCheckBox sort; private JSpinner copies; private JLabel copies_lb; private SpinnerNumberModel copiesModel; - + CopiesAndSorted() { - copies_lb = new JLabel(getLocalizedString("lb.copies")); + copies_lb = new JLabel(getLocalizedString("lb.copies")); sort = new JCheckBox(getLocalizedString("cb.sort")); sort.addActionListener(this); - + copiesModel = new SpinnerNumberModel(1, 1, 9999, 1); copies = new JSpinner(copiesModel); copies.addChangeListener(this); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); c.fill = GridBagConstraints.BOTH; c.insets = new Insets(5, 5, 5, 5); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.copies"))); - + c.anchor = GridBagConstraints.WEST; - + c.gridx = 0; c.gridy = 0; add(copies_lb, c); - + c.gridx = 1; c.gridy = 0; add(copies, c); - + c.gridx = 0; c.gridy = 1; add(sort, c); } - + // copies jspinner state public void stateChanged(ChangeEvent event) { int value = ((Integer) copies.getValue()).intValue(); atts.add(new Copies(value)); - + if (value > 1 && categorySupported(SheetCollate.class)) sort.setEnabled(true); else - sort.setEnabled(false); + sort.setEnabled(false); } // sorted checkbox state @@ -180,30 +180,30 @@ public final class PrinterDialog extends JDialog implements ActionListener * selected attributes are supported. */ void updateForSelectedService() - { + { if (categorySupported(Copies.class)) { copies.setEnabled(true); copies_lb.setEnabled(true); - + Copies copies = (Copies) attribute(Copies.class); if (copies != null) copiesModel.setValue(new Integer(copies.getValue())); - - if (((Integer)copiesModel.getValue()).intValue() > 1 + + if (((Integer)copiesModel.getValue()).intValue() > 1 && categorySupported(SheetCollate.class)) { sort.setEnabled(true); Attribute collate = attribute(SheetCollate.class); if (collate != null && collate.equals(SheetCollate.COLLATED)) - sort.setSelected(true); + sort.setSelected(true); } else sort.setEnabled(false); } else { - copies.setEnabled(false); + copies.setEnabled(false); copies_lb.setEnabled(false); } } @@ -213,18 +213,18 @@ public final class PrinterDialog extends JDialog implements ActionListener * Handles the print ranges attribute. * @author Wolfgang Baer (WBaer@gmx.de) */ - final class PrintRange extends JPanel + final class PrintRange extends JPanel implements ActionListener, FocusListener - { - private JLabel to; - private JRadioButton all_rb, pages_rb; + { + private JLabel to; + private JRadioButton all_rb, pages_rb; private JTextField from_tf, to_tf; - + PrintRange() - { + { to = new JLabel(getLocalizedString("lb.to")); to.setEnabled(false); - + all_rb = new JRadioButton(getLocalizedString("rbt.all")); all_rb.setSelected(true); all_rb.setActionCommand("ALL"); @@ -233,86 +233,86 @@ public final class PrinterDialog extends JDialog implements ActionListener pages_rb.setActionCommand("PAGES"); pages_rb.setEnabled(false); pages_rb.addActionListener(this); - + ButtonGroup group = new ButtonGroup(); group.add(all_rb); group.add(pages_rb); - + from_tf = new JTextField("1", 4); from_tf.setEnabled(false); from_tf.addFocusListener(this); to_tf = new JTextField("1", 4); to_tf.setEnabled(false); to_tf.addFocusListener(this); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); c.fill = GridBagConstraints.BOTH; - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.printrange"))); - + c.insets = new Insets(15, 5, 5, 5); c.gridx = 0; c.gridy = 0; add(all_rb, c); - + c.insets = new Insets(5, 5, 15, 5); c.gridx = 0; c.gridy = 1; add(pages_rb, c); - + c.gridx = 1; c.gridy = 1; add(from_tf, c); - + c.gridx = 2; c.gridy = 1; add(to, c); - + c.insets = new Insets(5, 5, 15, 15); c.gridx = 3; c.gridy = 1; add(to_tf, c); } - + // focus pagerange public void focusGained(FocusEvent event) { updatePageRanges(); } - + public void focusLost(FocusEvent event) { updatePageRanges(); } - + // updates the range after user changed it private void updatePageRanges() { int lower = Integer.parseInt(from_tf.getText()); int upper = Integer.parseInt(to_tf.getText()); - + if (lower > upper) { upper = lower; - to_tf.setText("" + lower); + to_tf.setText("" + lower); } - + PageRanges range = new PageRanges(lower, upper); atts.add(range); } // page range change public void actionPerformed(ActionEvent e) - { + { // if ALL is selected we must use a full-range object if (e.getActionCommand().equals("ALL")) { from_tf.setEnabled(false); to.setEnabled(false); to_tf.setEnabled(false); - + atts.add(new PageRanges(1, Integer.MAX_VALUE)); } else @@ -321,9 +321,9 @@ public final class PrinterDialog extends JDialog implements ActionListener to.setEnabled(true); to_tf.setEnabled(true); all_rb.setSelected(false); - } + } } - + /** * Called to update for new selected * print service. Tests if currently @@ -339,12 +339,12 @@ public final class PrinterDialog extends JDialog implements ActionListener { from_tf.setEnabled(true); to.setEnabled(true); - to_tf.setEnabled(true); + to_tf.setEnabled(true); all_rb.setSelected(false); pages_rb.setSelected(true); - + int[][] members = range.getMembers(); - // Although passed in attributes may contain more than one + // Although passed in attributes may contain more than one // range we only take the first one from_tf.setText("" + members[0][0]); to_tf.setText("" + members[0][1]); @@ -365,15 +365,15 @@ public final class PrinterDialog extends JDialog implements ActionListener * and its location and description attributes. * @author Wolfgang Baer (WBaer@gmx.de) */ - final class PrintServices extends JPanel + final class PrintServices extends JPanel implements ActionListener - { + { private JLabel name, status, typ, info; - private JLabel statusValue, typValue, infoValue; - private JButton attributes; - private JComboBox services_cob; + private JLabel statusValue, typValue, infoValue; + private JButton attributes; + private JComboBox services_cob; private JCheckBox fileRedirection_cb; - + PrintServices() { name = new JLabel(getLocalizedString("lb.name")); @@ -383,79 +383,79 @@ public final class PrinterDialog extends JDialog implements ActionListener typValue = new JLabel(); infoValue = new JLabel(); statusValue = new JLabel(); - + attributes = new JButton(getLocalizedString("bt.attributes")); attributes.setEnabled(false); attributes.setActionCommand("ATTRIBUTES"); attributes.addActionListener(this); - + services_cob = new JComboBox(getPrintServices()); services_cob.setActionCommand("SERVICE"); services_cob.addActionListener(this); - + fileRedirection_cb = new JCheckBox(getLocalizedString("cb.output")); fileRedirection_cb.setEnabled(false); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.printservice"))); - + c.insets = new Insets(5, 5, 5, 5); c.anchor = GridBagConstraints.LINE_END; c.gridx = 0; c.gridy = 0; add(name, c); - + c.gridx = 0; c.gridy = 1; add(status, c); - + c.gridx = 0; c.gridy = 2; add(typ, c); - + c.gridx = 0; c.gridy = 3; add(info, c); - + c.gridx = 2; c.gridy = 3; c.weightx = 1; add(fileRedirection_cb, c); - + c.anchor = GridBagConstraints.LINE_START; c.fill = GridBagConstraints.HORIZONTAL; c.gridx = 1; c.gridy = 0; c.weightx = 1.5; add(services_cob, c); - + c.gridx = 1; c.gridy = 1; c.gridwidth = 2; c.weightx = 1; add(statusValue, c); - + c.gridx = 1; c.gridy = 2; c.gridwidth = 2; c.weightx = 1; add(typValue, c); - + c.gridx = 1; c.gridy = 3; c.gridwidth = 2; c.weightx = 1; add(infoValue, c); - + c.gridx = 2; c.gridy = 0; c.weightx = 1.5; add(attributes, c); } - + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("SERVICE")) @@ -465,13 +465,13 @@ public final class PrinterDialog extends JDialog implements ActionListener } else if (e.getActionCommand().equals("ATTRIBUTES")) { - // TODO LowPriority-Enhancement: As tests have shown this button + // TODO LowPriority-Enhancement: As tests have shown this button // is even gray and not enabled under Windows - Its a good place - // to provide a classpath specific browsing dialog for all - // attributes not in the default printing dialog. + // to provide a classpath specific browsing dialog for all + // attributes not in the default printing dialog. } - } - + } + /** * Called to update for new selected * print service. Tests if currently @@ -482,30 +482,30 @@ public final class PrinterDialog extends JDialog implements ActionListener PrinterMakeAndModel att1 = getSelectedPrintService().getAttribute(PrinterMakeAndModel.class); typValue.setText(att1 == null ? "" : att1.getValue()); - - PrinterInfo att2 = + + PrinterInfo att2 = getSelectedPrintService().getAttribute(PrinterInfo.class); infoValue.setText(att2 == null ? "" : att2.getValue()); - + PrinterIsAcceptingJobs att3 = getSelectedPrintService().getAttribute(PrinterIsAcceptingJobs.class); PrinterState att4 = getSelectedPrintService().getAttribute(PrinterState.class); - - String status = att4.toString(); + + String status = att4.toString(); if (att3 == PrinterIsAcceptingJobs.ACCEPTING_JOBS) status += " - " + getLocalizedString("lb.acceptingjobs"); else if (att3 == PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS) status += " - " + getLocalizedString("lb.notacceptingjobs"); - + statusValue.setText(status); - + if (categorySupported(Destination.class)) { fileRedirection_cb.setEnabled(false); } } - + } private PrintServices printserv_panel; @@ -516,7 +516,7 @@ public final class PrinterDialog extends JDialog implements ActionListener * Constructs the General Panel. */ public GeneralPanel() - { + { setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); printserv_panel = new PrintServices(); @@ -534,7 +534,7 @@ public final class PrinterDialog extends JDialog implements ActionListener add(Box.createRigidArea(new Dimension(0, 12))); add(layout_panel); } - + /** * Calls update on all internal panels to adjust * for a new selected print service. @@ -560,7 +560,7 @@ public final class PrinterDialog extends JDialog implements ActionListener final class Orientation extends JPanel implements ActionListener { private JRadioButton portrait, landscape, rev_portrait, rev_landscape; - + Orientation() { portrait = new JRadioButton(getLocalizedString("rbt.portrait")); @@ -571,38 +571,38 @@ public final class PrinterDialog extends JDialog implements ActionListener rev_portrait.addActionListener(this); rev_landscape = new JRadioButton(getLocalizedString("rbt.revlandscape")); rev_landscape.addActionListener(this); - + ButtonGroup group = new ButtonGroup(); group.add(portrait); group.add(landscape); group.add(rev_portrait); group.add(rev_landscape); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); c.fill = GridBagConstraints.BOTH; - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.orientation"))); - + c.insets = new Insets(5, 5, 5, 5); c.gridx = 0; c.gridy = 0; add(portrait, c); - + c.gridx = 0; c.gridy = 1; add(landscape, c); - + c.gridx = 0; c.gridy = 2; add(rev_portrait, c); - + c.gridx = 0; c.gridy = 3; add(rev_landscape, c); } - + // event handling orientation public void actionPerformed(ActionEvent e) { @@ -613,9 +613,9 @@ public final class PrinterDialog extends JDialog implements ActionListener else if (e.getSource() == rev_portrait) atts.add(OrientationRequested.REVERSE_PORTRAIT); else - atts.add(OrientationRequested.REVERSE_LANDSCAPE); + atts.add(OrientationRequested.REVERSE_LANDSCAPE); } - + /** * Called to update for new selected * print service. Tests if currently @@ -629,7 +629,7 @@ public final class PrinterDialog extends JDialog implements ActionListener landscape.setEnabled(true); rev_landscape.setEnabled(true); rev_portrait.setEnabled(true); - + Attribute orientation = attribute(OrientationRequested.class); if (orientation != null) { @@ -639,7 +639,7 @@ public final class PrinterDialog extends JDialog implements ActionListener portrait.setSelected(true); else if (orientation.equals(OrientationRequested.REVERSE_PORTRAIT)) rev_portrait.setSelected(true); - else + else rev_landscape.setSelected(true); } else @@ -651,7 +651,7 @@ public final class PrinterDialog extends JDialog implements ActionListener portrait.setSelected(true); else if (defaultValue.equals(OrientationRequested.REVERSE_PORTRAIT)) rev_portrait.setSelected(true); - else + else rev_landscape.setSelected(true); } } @@ -661,7 +661,7 @@ public final class PrinterDialog extends JDialog implements ActionListener landscape.setEnabled(false); rev_landscape.setEnabled(false); rev_portrait.setEnabled(false); - } + } } } @@ -673,84 +673,84 @@ public final class PrinterDialog extends JDialog implements ActionListener { private JLabel size_lb, source_lb; private JComboBox size, source; - + MediaTypes() { size_lb = new JLabel(getLocalizedString("lb.size")); source_lb = new JLabel(getLocalizedString("lb.source")); - + size = new JComboBox(); size.setEditable(false); size.addActionListener(this); source = new JComboBox(); source.setEditable(false); size.addActionListener(this); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.medias"))); - + c.insets = new Insets(5, 5, 5, 5); c.anchor = GridBagConstraints.LINE_END; c.gridx = 0; c.gridy = 0; add(size_lb, c); - + c.gridx = 0; c.gridy = 1; add(source_lb, c); - + c.anchor = GridBagConstraints.LINE_START; c.fill = GridBagConstraints.HORIZONTAL; c.gridx = 1; c.gridy = 0; c.weightx = 1.5; add(size, c); - + c.gridx = 1; c.gridy = 1; c.weightx = 1.5; add(source, c); } - + public void actionPerformed(ActionEvent event) - { + { if (event.getSource() == size) { Object obj = size.getSelectedItem(); if (obj instanceof Media) - atts.add((Media) obj); + atts.add((Media) obj); } - + // we ignore source events currently - // as only the automatic selection is used. + // as only the automatic selection is used. } - + /** * Called to update for new selected * print service. Tests if currently * selected attributes are supported. */ void updateForSelectedService() - { + { if (categorySupported(Media.class)) { Media[] medias = (Media[]) getSelectedPrintService() .getSupportedAttributeValues(Media.class, flavor, null); - + size.removeAllItems(); if (medias.length == 0) - size.addItem(getLocalizedString("lb.automatically")); + size.addItem(getLocalizedString("lb.automatically")); else for (int i=0; i < medias.length; i++) size.addItem(medias[i]); - + Media media = (Media) attribute(Media.class); if (media != null) size.setSelectedItem(media); - + // this is currently ignored source.removeAllItems(); source.addItem(getLocalizedString("lb.automatically")); @@ -759,7 +759,7 @@ public final class PrinterDialog extends JDialog implements ActionListener { size.removeAllItems(); source.removeAllItems(); - + size.addItem(getLocalizedString("lb.automatically")); source.addItem(getLocalizedString("lb.automatically")); } @@ -774,14 +774,14 @@ public final class PrinterDialog extends JDialog implements ActionListener { private JLabel left, right, top, bottom; private JTextField left_tf, right_tf, top_tf, bottom_tf; - + Margins() { left = new JLabel(getLocalizedString("lb.left")); right = new JLabel(getLocalizedString("lb.right")); top = new JLabel(getLocalizedString("lb.top")); bottom = new JLabel(getLocalizedString("lb.bottom")); - + left_tf = new JTextField(7); left_tf.addFocusListener(this); right_tf = new JTextField(7); @@ -790,67 +790,67 @@ public final class PrinterDialog extends JDialog implements ActionListener top_tf.addFocusListener(this); bottom_tf = new JTextField(7); bottom_tf.addFocusListener(this); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.margins"))); - + c.insets = new Insets(5, 5, 5, 5); c.gridx = 0; c.gridy = 0; add(left, c); - + c.gridx = 1; c.gridy = 0; add(right, c); - + c.insets = new Insets(5, 5, 5, 5); c.gridx = 0; c.gridy = 1; add(left_tf, c); - + c.gridx = 1; c.gridy = 1; add(right_tf, c); - + c.insets = new Insets(10, 5, 5, 5); c.gridx = 0; c.gridy = 2; add(top, c); - + c.gridx = 1; c.gridy = 2; add(bottom, c); - + c.insets = new Insets(0, 5, 5, 5); c.gridx = 0; c.gridy = 3; add(top_tf, c); - + c.gridx = 1; c.gridy = 3; add(bottom_tf, c); } - + public void focusGained(FocusEvent event) { updateMargins(); } - + public void focusLost(FocusEvent event) { updateMargins(); } - + // updates the margins after user changed it private void updateMargins() { // We currently do not support this attribute // as it is not in the IPP spec and therefore not in CUPS } - + /** * Called to update for new selected * print service. Tests if currently @@ -867,7 +867,7 @@ public final class PrinterDialog extends JDialog implements ActionListener left_tf.setEnabled(true); right_tf.setEnabled(true); top_tf.setEnabled(true); - bottom_tf.setEnabled(true); + bottom_tf.setEnabled(true); } else { @@ -878,8 +878,8 @@ public final class PrinterDialog extends JDialog implements ActionListener left_tf.setEnabled(false); right_tf.setEnabled(false); top_tf.setEnabled(false); - bottom_tf.setEnabled(false); - } + bottom_tf.setEnabled(false); + } } } @@ -887,8 +887,8 @@ public final class PrinterDialog extends JDialog implements ActionListener private Orientation orientation_panel; private Margins margins_panel; - /** - * Constructs the page setup user interface. + /** + * Constructs the page setup user interface. */ public PageSetupPanel() { @@ -909,7 +909,7 @@ public final class PrinterDialog extends JDialog implements ActionListener add(Box.createRigidArea(new Dimension(0, 12))); add(layout_panel); } - + /** * Calls update on all internal panels to adjust * for a new selected print service. @@ -936,7 +936,7 @@ public final class PrinterDialog extends JDialog implements ActionListener { private JRadioButton low, normal, high; private ButtonGroup group; - + Quality() { low = new JRadioButton(getLocalizedString("rbt.low")); @@ -945,33 +945,33 @@ public final class PrinterDialog extends JDialog implements ActionListener normal.addActionListener(this); high = new JRadioButton(getLocalizedString("rbt.high")); high.addActionListener(this); - + group = new ButtonGroup(); group.add(low); group.add(normal); group.add(high); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.quality"))); - + c.fill = GridBagConstraints.HORIZONTAL; c.insets = new Insets(5, 5, 5, 5); c.gridx = 0; c.gridy = 0; add(low, c); - + c.gridx = 0; c.gridy = 1; add(normal, c); - + c.gridx = 0; c.gridy = 2; add(high, c); } - + public void actionPerformed(ActionEvent e) { if (e.getSource() == low) @@ -979,9 +979,9 @@ public final class PrinterDialog extends JDialog implements ActionListener else if (e.getSource() == normal) atts.add(PrintQuality.NORMAL); else - atts.add(PrintQuality.HIGH); + atts.add(PrintQuality.HIGH); } - + /** * Called to update for new selected * print service. Tests if currently @@ -994,17 +994,17 @@ public final class PrinterDialog extends JDialog implements ActionListener low.setEnabled(true); normal.setEnabled(true); high.setEnabled(true); - - Object defaultValue = defaultValue(PrintQuality.class); + + Object defaultValue = defaultValue(PrintQuality.class); Attribute quality = attribute(PrintQuality.class); - + if (quality != null) { if (quality.equals(PrintQuality.DRAFT)) low.setSelected(true); else if (quality.equals(PrintQuality.NORMAL)) normal.setSelected(true); - else + else high.setSelected(true); } else @@ -1013,81 +1013,81 @@ public final class PrinterDialog extends JDialog implements ActionListener low.setSelected(true); else if (defaultValue.equals(PrintQuality.NORMAL)) normal.setSelected(true); - else + else high.setSelected(true); - } + } } else { low.setEnabled(false); normal.setEnabled(false); high.setEnabled(false); - } + } } } - + /** * Handles the job attributes as requesting username, jobname etc. * @author Wolfgang Baer (WBaer@gmx.de) */ final class JobAttributes extends JPanel implements ActionListener, ChangeListener, FocusListener - { - private JLabel jobname, username, priority_lb; - private JTextField jobname_tf, username_tf; - private JCheckBox cover; + { + private JLabel jobname, username, priority_lb; + private JTextField jobname_tf, username_tf; + private JCheckBox cover; private JSpinner priority; private SpinnerNumberModel model; - + JobAttributes() { jobname = new JLabel(getLocalizedString("lb.jobname")); username = new JLabel(getLocalizedString("lb.username")); priority_lb = new JLabel(getLocalizedString("lb.priority")); - + cover = new JCheckBox(getLocalizedString("cb.cover")); cover.addActionListener(this); - + model = new SpinnerNumberModel(1, 1, 100, 1); priority = new JSpinner(model); priority.addChangeListener(this); - + jobname_tf = new JTextField(); jobname_tf.addFocusListener(this); username_tf = new JTextField(); username_tf.addFocusListener(this); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.jobattributes"))); - + c.insets = new Insets(10, 5, 10, 5); c.gridx = 0; c.gridy = 0; add(cover, c); - + c.anchor = GridBagConstraints.LINE_END; c.gridx = 1; c.gridy = 0; c.weightx = 2; add(priority_lb, c); - + c.gridx = 2; c.gridy = 0; c.weightx = 0.5; add(priority, c); - + c.anchor = GridBagConstraints.LINE_END; c.gridx = 0; c.gridy = 1; add(jobname, c); - + c.gridx = 0; c.gridy = 2; add(username, c); - + c.anchor = GridBagConstraints.CENTER; c.fill = GridBagConstraints.HORIZONTAL; c.gridx = 1; @@ -1095,13 +1095,13 @@ public final class PrinterDialog extends JDialog implements ActionListener c.gridwidth = 2; c.weightx = 1.5; add(jobname_tf, c); - + c.insets = new Insets(10, 5, 15, 5); c.gridx = 1; c.gridy = 2; add(username_tf, c); } - + public void actionPerformed(ActionEvent event) { if (cover.isSelected()) @@ -1109,23 +1109,23 @@ public final class PrinterDialog extends JDialog implements ActionListener else atts.add(JobSheets.NONE); } - + public void stateChanged(ChangeEvent event) { int value = ((Integer) priority.getValue()).intValue(); - atts.add(new JobPriority(value)); + atts.add(new JobPriority(value)); } - + public void focusGained(FocusEvent event) - { + { updateTextfields(event); } - + public void focusLost(FocusEvent event) { updateTextfields(event); } - + private void updateTextfields(FocusEvent event) { if (event.getSource() == jobname_tf) @@ -1141,59 +1141,59 @@ public final class PrinterDialog extends JDialog implements ActionListener */ void updateForSelectedService() { - // JobPriority + // JobPriority if (categorySupported(JobPriority.class)) { JobPriority prio = (JobPriority) attribute(JobPriority.class); - JobPriority value = (JobPriority) defaultValue(JobPriority.class); + JobPriority value = (JobPriority) defaultValue(JobPriority.class); priority.setEnabled(true); if (prio != null) model.setValue(new Integer(prio.getValue())); else model.setValue(new Integer(value.getValue())); - } + } else - priority.setEnabled(false); - + priority.setEnabled(false); + // Requesting username if (categorySupported(RequestingUserName.class)) { Attribute user = attribute(RequestingUserName.class); Object value = defaultValue(RequestingUserName.class); - username.setEnabled(true); + username.setEnabled(true); if (user != null) username_tf.setText(user.toString()); else username_tf.setText(value.toString()); } else - username.setEnabled(false); - + username.setEnabled(false); + // Job Name if (categorySupported(JobName.class)) { Attribute job = attribute(JobName.class); Object value = defaultValue(JobName.class); - jobname.setEnabled(true); + jobname.setEnabled(true); if (job != null) jobname_tf.setText(job.toString()); else jobname_tf.setText(value.toString()); } else - jobname.setEnabled(false); - + jobname.setEnabled(false); + // Job sheets if (categorySupported(JobSheets.class)) { Attribute sheet = attribute(JobSheets.class); Object value = defaultValue(JobSheets.class); - cover.setEnabled(true); + cover.setEnabled(true); if (sheet != null) { if (sheet.equals(JobSheets.NONE)) cover.setSelected(false); - else + else cover.setSelected(true); } else @@ -1205,53 +1205,53 @@ public final class PrinterDialog extends JDialog implements ActionListener } } else - cover.setEnabled(false); + cover.setEnabled(false); } } - + /** * Handles the sides attributes. * @author Wolfgang Baer (WBaer@gmx.de) */ final class SidesPanel extends JPanel implements ActionListener - { + { private JRadioButton oneside, calendar, duplex; - + SidesPanel() - { + { oneside = new JRadioButton(getLocalizedString("rbt.onesided")); oneside.addActionListener(this); calendar = new JRadioButton(getLocalizedString("rbt.calendar")); calendar.addActionListener(this); duplex = new JRadioButton(getLocalizedString("rbt.duplex")); duplex.addActionListener(this); - + ButtonGroup group = new ButtonGroup(); group.add(oneside); group.add(calendar); group.add(duplex); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); c.fill = GridBagConstraints.BOTH; - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.sides"))); - + c.insets = new Insets(5, 5, 5, 5); c.gridx = 0; c.gridy = 0; add(oneside, c); - + c.gridx = 0; c.gridy = 1; add(calendar, c); - + c.gridx = 0; c.gridy = 2; add(duplex, c); } - + public void actionPerformed(ActionEvent e) { if (e.getSource() == calendar) @@ -1261,7 +1261,7 @@ public final class PrinterDialog extends JDialog implements ActionListener else atts.add(Sides.TWO_SIDED_LONG_EDGE); } - + /** * Called to update for new selected * print service. Tests if currently @@ -1274,8 +1274,8 @@ public final class PrinterDialog extends JDialog implements ActionListener oneside.setEnabled(true); calendar.setEnabled(true); duplex.setEnabled(true); - - Object defaultValue = defaultValue(Sides.class); + + Object defaultValue = defaultValue(Sides.class); Attribute sides = attribute(Sides.class); if (sides != null) { @@ -1297,14 +1297,14 @@ public final class PrinterDialog extends JDialog implements ActionListener } } else - { + { oneside.setEnabled(false); calendar.setEnabled(false); duplex.setEnabled(false); - } + } } } - + /** * Handles the chromaticity attributes. * @author Wolfgang Baer (WBaer@gmx.de) @@ -1312,43 +1312,43 @@ public final class PrinterDialog extends JDialog implements ActionListener final class Color extends JPanel implements ActionListener { private JRadioButton bw, color; - + Color() { bw = new JRadioButton(getLocalizedString("rbt.blackwhite")); bw.addActionListener(this); color = new JRadioButton(getLocalizedString("rbt.color")); color.addActionListener(this); - + ButtonGroup group = new ButtonGroup(); group.add(bw); group.add(color); - + GridBagLayout layout = new GridBagLayout(); GridBagConstraints c = new GridBagConstraints(); - + setLayout(layout); setBorder(new TitledBorder(getLocalizedString("title.color"))); - + c.fill = GridBagConstraints.HORIZONTAL; c.insets = new Insets(5, 5, 5, 5); c.gridx = 0; c.gridy = 0; add(bw, c); - + c.gridx = 0; c.gridy = 1; add(color, c); } - + public void actionPerformed(ActionEvent e) { if (e.getSource() == bw) - atts.add(Chromaticity.MONOCHROME); + atts.add(Chromaticity.MONOCHROME); else atts.add(Chromaticity.COLOR); } - + /** * Called to update for new selected * print service. Tests if currently @@ -1359,68 +1359,68 @@ public final class PrinterDialog extends JDialog implements ActionListener if (categorySupported(Chromaticity.class)) { bw.setEnabled(true); - color.setEnabled(true); - - Object defaultValue = defaultValue(Chromaticity.class); + color.setEnabled(true); + + Object defaultValue = defaultValue(Chromaticity.class); Attribute chromaticity = attribute(Chromaticity.class); if (chromaticity != null) { if (chromaticity.equals(Chromaticity.MONOCHROME)) bw.setSelected(true); - else + else color.setSelected(true); } else { if (defaultValue.equals(Chromaticity.MONOCHROME)) bw.setSelected(true); - else + else color.setSelected(true); } } else - { + { bw.setEnabled(false); color.setEnabled(false); } } } - + private Quality quality_panel; private JobAttributes jobAttr_panel; private SidesPanel sides_panel; private Color chromaticy_panel; - + /** * Creates the panel for appearance attributes. */ public AppearancePanel() { setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - + quality_panel = new Quality(); jobAttr_panel = new JobAttributes(); sides_panel = new SidesPanel(); chromaticy_panel = new Color(); - + JPanel layout_panel = new JPanel(); layout_panel.setLayout(new BoxLayout(layout_panel, BoxLayout.LINE_AXIS)); layout_panel.add(chromaticy_panel); layout_panel.add(Box.createRigidArea(new Dimension(10, 0))); layout_panel.add(quality_panel); - + JPanel layout2_panel = new JPanel(); layout2_panel.setLayout(new BoxLayout(layout2_panel, BoxLayout.LINE_AXIS)); layout2_panel.add(sides_panel); layout2_panel.add(Box.createRigidArea(new Dimension(10, 0))); layout2_panel.add(jobAttr_panel); - + setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); add(layout_panel); add(Box.createRigidArea(new Dimension(0, 12))); add(layout2_panel); } - + /** * Calls update on all internal panels to adjust * for a new selected print service. @@ -1442,47 +1442,47 @@ public final class PrinterDialog extends JDialog implements ActionListener private GeneralPanel general_panel; private PageSetupPanel pagesetup_panel; private AppearancePanel appearance_panel; - + private PrintService[] services; private PrintService defaultService; private PrintService selectedService; private DocFlavor flavor; private PrintRequestAttributeSet attributes; - - private boolean onlyPageDialog; - private PrintRequestAttributeSet atts; - + + private boolean onlyPageDialog; + private PrintRequestAttributeSet atts; + private final static ResourceBundle messages; static - { + { messages = ResourceBundle.getBundle("gnu/javax/print/PrinterDialog"); } - + // TODO LowPriority: Include checks so that if a specific value formerly // selected is no more supported by the new service changes to the default. - + /** * Class private constructs a printer dialog. - * + * * @param gc the screen to use. null is default screen. * @param services the print services to browse (not null). * @param defaultService the default service. If null * the first of the print services in the services array will be used. * @param flavor the flavours to be printed. - * @param attributes the attributes requested. Will be updated + * @param attributes the attributes requested. Will be updated * by selections done by the user in the dialog. * @param onlyPageDialog if true a page settings only dialog is constructed. - * + * * @throws HeadlessException if GraphicsEnvironment is headless */ - private PrinterDialog(GraphicsConfiguration gc, PrintService[] services, - PrintService defaultService, DocFlavor flavor, + private PrinterDialog(GraphicsConfiguration gc, PrintService[] services, + PrintService defaultService, DocFlavor flavor, PrintRequestAttributeSet attributes, boolean onlyPageDialog, String title) throws HeadlessException { super((Frame)null, title, true, gc); - + setResizable(false); setDefaultCloseOperation(DISPOSE_ON_CLOSE); @@ -1493,97 +1493,97 @@ public final class PrinterDialog extends JDialog implements ActionListener for(int i=0; i < services.length; i++) if (services[i].isDocFlavorSupported(flavor)) list.add(services[i]); - + if (defaultService != null && (! list.contains(defaultService))) defaultService = (PrintService) list.get(0); - + PrintService[] newServices = new PrintService[list.size()]; this.services = (PrintService[]) list.toArray(newServices); } else this.services = services; - + if (defaultService == null) this.defaultService = services[0]; else this.defaultService = defaultService; - + this.selectedService = this.defaultService; this.flavor = flavor; - + // the attributes given by the user this.attributes = attributes; // the one to work with during browsing this.atts = new HashPrintRequestAttributeSet(attributes); - + this.onlyPageDialog = onlyPageDialog; - - initUI(onlyPageDialog); + + initUI(onlyPageDialog); pack(); updateAll(); } - + /** * Constructs a page settings only dialog. - * + * * @param gc the screen to use. null is default screen. * @param service the print service for the page dialog. * the first of the print services in the services array will be used. * @param flavor the flavours to be printed. - * @param attributes the attributes requested. Will be updated - * by selections done by the user in the dialog. - * + * @param attributes the attributes requested. Will be updated + * by selections done by the user in the dialog. + * * @throws HeadlessException if GraphicsEnvironment is headless */ - public PrinterDialog(GraphicsConfiguration gc, PrintService service, + public PrinterDialog(GraphicsConfiguration gc, PrintService service, DocFlavor flavor, PrintRequestAttributeSet attributes) throws HeadlessException { - this(gc, new PrintService[] {service}, service, flavor, attributes, - true, getLocalizedString("title.pagedialog")); + this(gc, new PrintService[] {service}, service, flavor, attributes, + true, getLocalizedString("title.pagedialog")); } - + /** * Constructs a printer dialog. - * + * * @param gc the screen to use. null is default screen. * @param services the print services to browse (not null). * @param defaultService the default service. If null * the first of the print services in the services array will be used. * @param flavor the flavours to be printed. - * @param attributes the attributes requested. Will be updated - * by selections done by the user in the dialog. - * + * @param attributes the attributes requested. Will be updated + * by selections done by the user in the dialog. + * * @throws HeadlessException if GraphicsEnvironment is headless */ - public PrinterDialog(GraphicsConfiguration gc, PrintService[] services, - PrintService defaultService, DocFlavor flavor, + public PrinterDialog(GraphicsConfiguration gc, PrintService[] services, + PrintService defaultService, DocFlavor flavor, PrintRequestAttributeSet attributes) throws HeadlessException { - this(gc, services, defaultService, flavor, attributes, + this(gc, services, defaultService, flavor, attributes, false, getLocalizedString("title.printdialog")); } // initializes the gui parts private void initUI(boolean onlyPageDialog) - { + { JPanel buttonPane = new JPanel(); - + if (onlyPageDialog) { JPanel pane = new JPanel(); pane.setLayout(new BorderLayout()); pagesetup_panel = new PageSetupPanel(); pane.add(pagesetup_panel, BorderLayout.CENTER); - + ok_bt = new JButton(getLocalizedString("bt.OK")); ok_bt.addActionListener(this); cancel_bt = new JButton(getLocalizedString("bt.cancel")); - cancel_bt.addActionListener(this); - - getContentPane().add(pane, BorderLayout.CENTER); + cancel_bt.addActionListener(this); + + getContentPane().add(pane, BorderLayout.CENTER); } else { @@ -1607,14 +1607,14 @@ public final class PrinterDialog extends JDialog implements ActionListener // Put everything together getContentPane().add(pane, BorderLayout.CENTER); } - + buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS)); buttonPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); buttonPane.add(Box.createHorizontalGlue()); buttonPane.add(ok_bt); buttonPane.add(Box.createRigidArea(new Dimension(5, 0))); buttonPane.add(cancel_bt); - + getContentPane().add(buttonPane, BorderLayout.PAGE_END); } @@ -1635,17 +1635,17 @@ public final class PrinterDialog extends JDialog implements ActionListener { return selectedService; } - + /** * Sets the currently selected print service. - * + * * @param service the service selected. */ protected void setSelectedPrintService(PrintService service) { selectedService = service; } - + /** * Returns the print service array. * @return The print services. @@ -1654,7 +1654,7 @@ public final class PrinterDialog extends JDialog implements ActionListener { return services; } - + /** * Calls update on all panels to adjust * for a new selected print service. @@ -1662,57 +1662,57 @@ public final class PrinterDialog extends JDialog implements ActionListener void updateAll() { pagesetup_panel.update(); - + if (! onlyPageDialog) { general_panel.update(); appearance_panel.update(); - } + } } - + boolean categorySupported(Class category) { return getSelectedPrintService(). isAttributeCategorySupported(category); } - + Object defaultValue(Class category) { return getSelectedPrintService(). getDefaultAttributeValue(category); } - + Attribute attribute(Class category) { return atts.get(category); } - - /** + + /** * Action handler for Print/Cancel buttons. * If cancel is pressed we reset the attributes * and the selected service. - * + * * @param e the ActionEvent */ public void actionPerformed(ActionEvent e) { if (e.getSource() == ok_bt) { - setVisible(false); + setVisible(false); attributes.addAll(atts); dispose(); } else { - setVisible(false); + setVisible(false); selectedService = null; dispose(); } } - + /** * Retrieves localized messages from the resource bundle. - * + * * @param key the key * @return The localized value for the key. */ diff --git a/libjava/classpath/gnu/javax/print/ipp/DocPrintJobImpl.java b/libjava/classpath/gnu/javax/print/ipp/DocPrintJobImpl.java index d391afc7e1a..8cfd6880d50 100644 --- a/libjava/classpath/gnu/javax/print/ipp/DocPrintJobImpl.java +++ b/libjava/classpath/gnu/javax/print/ipp/DocPrintJobImpl.java @@ -76,52 +76,52 @@ import javax.print.event.PrintJobEvent; import javax.print.event.PrintJobListener; /** - * Implementation of the DocPrintJob interface. Implementation is + * Implementation of the DocPrintJob interface. Implementation is * specific to the IppPrintService implementation. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class DocPrintJobImpl implements CancelablePrintJob { /** The print service this job is bound to. */ private IppPrintService service; - + /** The set of print job listeners. */ private HashSet printJobListener = new HashSet(); - + /** The print job attributes listeners. */ private ArrayList attributesListener = new ArrayList(); /** The print job attributes listeners associated attribute set. */ private ArrayList attributesListenerAttributes = new ArrayList(); - + /** The username. */ private String username; /** The password of the user. */ private String password; - + /** Returned job uri. */ private JobUri jobUri = null; /** Returned job id. */ private JobId jobId = null; - + /** The requesting-username for later canceling */ private RequestingUserName requestingUser; - + /** The print job sets. */ private PrintJobAttributeSet oldSet = new HashPrintJobAttributeSet(); private PrintJobAttributeSet currentSet = new HashPrintJobAttributeSet(); - - /** + + /** * State variable if we already started printing. */ private boolean printing = false; - + // TODO Implement complete PrintJobListener notification // TODO Implement PrintJobAttributeListener notification /** * Constructs a DocPrintJobImpl instance bound to the given print service. - * + * * @param service the print service instance. * @param user the user of this print service. * @param passwd the password of the user. @@ -141,7 +141,7 @@ public class DocPrintJobImpl implements CancelablePrintJob { if (listener == null) return; - + attributesListener.add(listener); attributesListenerAttributes.add(attributes); } @@ -153,7 +153,7 @@ public class DocPrintJobImpl implements CancelablePrintJob { if (listener == null) return; - + printJobListener.add(listener); } @@ -181,30 +181,30 @@ public class DocPrintJobImpl implements CancelablePrintJob { if (printing) throw new PrintException("already printing"); - + printing = true; - + DocAttributeSet docAtts = doc.getAttributes(); DocFlavor flavor = doc.getDocFlavor(); - + if (flavor == null || (!service.isDocFlavorSupported(flavor))) { notifyPrintJobListeners(new PrintJobEvent(this, PrintJobEvent.JOB_FAILED)); throw new PrintFlavorException("Invalid flavor", new DocFlavor[] {flavor}); } - - // merge attributes as doc attributes take precendence + + // merge attributes as doc attributes take precendence // over the print request attributes HashAttributeSet mergedAtts = new HashAttributeSet(); - + if (attributes != null) mergedAtts.addAll(attributes); if (docAtts != null) mergedAtts.addAll(docAtts); - + // check for requesting-user-name -add the // executing username if no other is specified - // save user name so we can make a cancel operation under same user + // save user name so we can make a cancel operation under same user if (! mergedAtts.containsKey(RequestingUserName.class)) { mergedAtts.add(IppPrintService.REQUESTING_USER_NAME); @@ -212,53 +212,53 @@ public class DocPrintJobImpl implements CancelablePrintJob } else { - requestingUser = (RequestingUserName) + requestingUser = (RequestingUserName) mergedAtts.get(RequestingUserName.class); } - + // same for job-name if (! mergedAtts.containsKey(JobName.class)) mergedAtts.add(IppPrintService.JOB_NAME); - + IppResponse response = null; - + try { PrinterURI printerUri = service.getPrinterURI(); String printerUriStr = "http" + printerUri.toString().substring(3); - + URI uri = null; try { uri = new URI(printerUriStr); } - catch (URISyntaxException e) + catch (URISyntaxException e) { - // does not happen + // does not happen } - - IppRequest request = - new IppRequest(uri, username, password); - + + IppRequest request = + new IppRequest(uri, username, password); + request.setOperationID( (short) OperationsSupported.PRINT_JOB.getValue()); request.setOperationAttributeDefaults(); request.addOperationAttribute(printerUri); - + if (mergedAtts != null) { request.addAndFilterJobOperationAttributes(mergedAtts); request.addAndFilterJobTemplateAttributes(mergedAtts); - } - + } + // DocFlavor getMimeType returns charset quoted DocumentFormat format = DocumentFormat.createDocumentFormat(flavor); request.addOperationAttribute(format); - - // Get and set the printdata based on the + + // Get and set the printdata based on the // representation classname - String className = flavor.getRepresentationClassName(); - - if (className.equals("[B")) + String className = flavor.getRepresentationClassName(); + + if (className.equals("[B")) { request.setData((byte[]) doc.getPrintData()); response = request.send(); @@ -275,7 +275,7 @@ public class DocPrintJobImpl implements CancelablePrintJob try { // CUPS only supports UTF-8 currently so we convert - // We also assume that char[] is always utf-16 - correct ? + // We also assume that char[] is always utf-16 - correct ? String str = new String((char[]) doc.getPrintData()); request.setData(str.getBytes("utf-16")); response = request.send(); @@ -285,7 +285,7 @@ public class DocPrintJobImpl implements CancelablePrintJob notifyPrintJobListeners(new PrintJobEvent(this, PrintJobEvent.JOB_FAILED)); throw new PrintFlavorException("Invalid charset of flavor", e, new DocFlavor[] {flavor}); } - } + } else if (className.equals("java.io.Reader")) { try @@ -300,13 +300,13 @@ public class DocPrintJobImpl implements CancelablePrintJob notifyPrintJobListeners(new PrintJobEvent(this, PrintJobEvent.JOB_FAILED)); throw new PrintFlavorException("Invalid charset of flavor", e, new DocFlavor[] {flavor}); } - } + } else if (className.equals("java.lang.String")) { try { // CUPS only supports UTF-8 currently so we convert - // We also assume that String is always utf-16 - correct ? + // We also assume that String is always utf-16 - correct ? String str = (String) doc.getPrintData(); request.setData(str.getBytes("utf-16")); response = request.send(); @@ -316,7 +316,7 @@ public class DocPrintJobImpl implements CancelablePrintJob notifyPrintJobListeners(new PrintJobEvent(this, PrintJobEvent.JOB_FAILED)); throw new PrintFlavorException("Invalid charset of flavor", e, new DocFlavor[] {flavor}); } - } + } else if (className.equals("java.net.URL")) { URL url = (URL) doc.getPrintData(); @@ -332,22 +332,22 @@ public class DocPrintJobImpl implements CancelablePrintJob // For the future :-) throw new PrintException("Not yet supported."); } - else + else { // should not happen - however notifyPrintJobListeners(new PrintJobEvent(this, PrintJobEvent.JOB_FAILED)); throw new PrintFlavorException("Invalid flavor", new DocFlavor[] {flavor}); - } - + } + // at this point the data is transfered notifyPrintJobListeners(new PrintJobEvent( this, PrintJobEvent.DATA_TRANSFER_COMPLETE)); - } + } catch (IOException e) { throw new PrintException("IOException occured.", e); - } - + } + int status = response.getStatusCode(); if (! (status == IppStatusCode.SUCCESSFUL_OK || status == IppStatusCode.SUCCESSFUL_OK_IGNORED_OR_SUBSTITUED_ATTRIBUTES @@ -356,7 +356,7 @@ public class DocPrintJobImpl implements CancelablePrintJob notifyPrintJobListeners(new PrintJobEvent( this, PrintJobEvent.JOB_FAILED)); throw new PrintException("Printing failed - received statuscode " + Integer.toHexString(status)); - + // TODO maybe specific status codes may require to throw a specific // detailed attribute exception } @@ -364,18 +364,18 @@ public class DocPrintJobImpl implements CancelablePrintJob { // start print job progress monitoring thread // FIXME Implement - + // for now we just notify as finished notifyPrintJobListeners( new PrintJobEvent(this, PrintJobEvent.JOB_COMPLETE)); } - + List jobAtts = response.getJobAttributes(); - + // extract the uri and id of job for canceling and further monitoring Map jobAttributes = (Map) jobAtts.get(0); jobUri = (JobUri) ((HashSet)jobAttributes.get(JobUri.class)).toArray()[0]; - jobId = (JobId) ((HashSet)jobAttributes.get(JobId.class)).toArray()[0]; + jobId = (JobId) ((HashSet)jobAttributes.get(JobId.class)).toArray()[0]; } /** @@ -385,7 +385,7 @@ public class DocPrintJobImpl implements CancelablePrintJob { if (listener == null) return; - + int index = attributesListener.indexOf(listener); if (index != -1) { @@ -401,10 +401,10 @@ public class DocPrintJobImpl implements CancelablePrintJob { if (listener == null) return; - + printJobListener.remove(listener); } - + /** * @see CancelablePrintJob#cancel() */ @@ -414,23 +414,23 @@ public class DocPrintJobImpl implements CancelablePrintJob { throw new PrintException("print job is not yet send"); } - + IppResponse response = null; - + try { - IppRequest request = new IppRequest(jobUri.getURI(), username, password); + IppRequest request = new IppRequest(jobUri.getURI(), username, password); request.setOperationID( (short) OperationsSupported.CANCEL_JOB.getValue()); request.setOperationAttributeDefaults(); request.addOperationAttribute(jobUri); request.addOperationAttribute(requestingUser); - response = request.send(); - } + response = request.send(); + } catch (IOException e) - { + { throw new IppException("IOException occured during cancel request.", e); - } - + } + int status = response.getStatusCode(); if (! (status == IppStatusCode.SUCCESSFUL_OK || status == IppStatusCode.SUCCESSFUL_OK_IGNORED_OR_SUBSTITUED_ATTRIBUTES @@ -438,15 +438,15 @@ public class DocPrintJobImpl implements CancelablePrintJob { notifyPrintJobListeners(new PrintJobEvent( this, PrintJobEvent.JOB_FAILED)); - throw new PrintException("Canceling failed - received statuscode " + Integer.toHexString(status)); + throw new PrintException("Canceling failed - received statuscode " + Integer.toHexString(status)); } - else + else { notifyPrintJobListeners(new PrintJobEvent( this, PrintJobEvent.JOB_CANCELED)); } } - + private void notifyPrintJobListeners(PrintJobEvent e) { Iterator it = printJobListener.iterator(); @@ -463,9 +463,9 @@ public class DocPrintJobImpl implements CancelablePrintJob l.printJobFailed(e); else if (e.getPrintEventType() == PrintJobEvent.NO_MORE_EVENTS) l.printJobNoMoreEvents(e); - else + else l.printJobRequiresAttention(e); - } + } } - + } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppDelimiterTag.java b/libjava/classpath/gnu/javax/print/ipp/IppDelimiterTag.java index ce6bb4f7e64..1c074a8dd62 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppDelimiterTag.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppDelimiterTag.java @@ -1,4 +1,4 @@ -/* IppDelimiterTag.java -- +/* IppDelimiterTag.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,57 +42,57 @@ package gnu.javax.print.ipp; /** * IPP Delimiter Tags as described in RFC 2910 section 3.5.1. *

- * Every delimiter tag value can occur in the protocol field + * Every delimiter tag value can occur in the protocol field * begin-attribute-group-tag and indicates that the following * attributes will be part of the named group.
* The end-of-attributes-tag signals the end of the attributes * section in the IPP request/response and therefore the beginning - * of the data section (if any). + * of the data section (if any). *

- * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class IppDelimiterTag { /** Start of the operation attributes group section. */ public static final byte OPERATION_ATTRIBUTES_TAG = 0x01; - + /** Start of the job attributes group section. */ public static final byte JOB_ATTRIBUTES_TAG = 0x02; - + /** End of the attributes section and begin of data section. */ public static final byte END_OF_ATTRIBUTES_TAG = 0x03; - + /** Start of the printer attributes group section. */ public static final byte PRINTER_ATTRIBUTES_TAG = 0x04; - + /** Start of the unsupported attributes group section. */ public static final byte UNSUPPORTED_ATTRIBUTES_TAG = 0x05; - - + + // 0x00 reserved for definition in a future IETF // standards track document - + // 0x06-0x0f reserved for future delimiters in IETF // standards track documents - + private IppDelimiterTag() { // not to be instantiated } - + /** - * Tests if given value corresponds to a + * Tests if given value corresponds to a * delimiter tag value. - * + * * @param value the value to test for * @return true if, false otherwise. */ - public static boolean isDelimiterTag(byte value) + public static boolean isDelimiterTag(byte value) { if (value >= 0x01 && value <= 0x05) return true; - + return false; } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppException.java b/libjava/classpath/gnu/javax/print/ipp/IppException.java index 27b156fd857..c34a8f22740 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppException.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppException.java @@ -1,4 +1,4 @@ -/* IppException.java -- +/* IppException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ import javax.print.PrintException; * IppException signals exception thrown by * the IPP implementation for various things like a failed * ipp request or a wrapped io exception. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class IppException extends PrintException @@ -65,7 +65,7 @@ public class IppException extends PrintException { super(s); } - + /** * Creates an IppException. * @param e the exception cause this one. diff --git a/libjava/classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java b/libjava/classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java index df2a4793c72..59c3408d5ec 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppMultiDocPrintService.java @@ -1,4 +1,4 @@ -/* IppMultiDocPrintService.java -- +/* IppMultiDocPrintService.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,25 +47,25 @@ import javax.print.MultiDocPrintService; /** * Implementation of the MultiDocPrintService interface * for IPP based printers. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public class IppMultiDocPrintService extends IppPrintService +public class IppMultiDocPrintService extends IppPrintService implements MultiDocPrintService { /** The username. */ private transient String user; - + /** The password of the user. */ private transient String passwd; /** * Creates a IppMultiDocPrintService object. - * + * * @param uri the URI of the IPP printer. * @param username the user of this print service. * @param password the password of the user. - * + * * @throws IppException if an error during connection occurs. */ public IppMultiDocPrintService(URI uri, String username, String password) @@ -74,12 +74,12 @@ public class IppMultiDocPrintService extends IppPrintService super(uri, username, password); user = username; passwd = password; - } + } /** * @see MultiDocPrintService#createMultiDocPrintJob() */ - public MultiDocPrintJob createMultiDocPrintJob() + public MultiDocPrintJob createMultiDocPrintJob() { return new MultiDocPrintJobImpl(this, user, passwd); } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java b/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java index 56a41381fb6..9ce41c774c9 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java @@ -1,4 +1,4 @@ -/* IppPrintService.java -- +/* IppPrintService.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -130,175 +130,180 @@ import javax.print.event.PrintServiceAttributeListener; /** * Implementation of the PrintService interface * for IPP based printers. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class IppPrintService implements PrintService { - /** + /** * A Map with sets of attributes. * key: A attribute category * value: A set with values - * + * * IPP may return sets of attributes e.g. for supported * compression methods so we need to map to sets here. */ - private Map printerAttr; - + private Map, Set> printerAttr; + /** The set of listeners.*/ - private HashSet printServiceAttributeListener; - + private HashSet printServiceAttributeListener; + /** The username. */ private transient String user; - + /** The password of the user. */ private transient String passwd; - + /** The name of this print service. */ private String name; - + /** The list of supported document flavors. */ - private List flavors; - + private List flavors; + /** The standard printer URI. */ private PrinterURI printerUri; - + /** The list of all supported printer URIs. */ - private ArrayList printerUris; - + private ArrayList printerUris; + /** * Logger for tracing - enable by passing * -Dgnu.classpath.debug.components=ipp to the vm. */ static final Logger logger = SystemLogger.SYSTEM; - - /** + + /** * requesting-user-name defaults to the executing user. */ public static final RequestingUserName REQUESTING_USER_NAME; - - /** + + /** * job-name defaults to "Java Printing". */ public static final JobName JOB_NAME; - + static { JOB_NAME = new JobName("Java Printing", null); REQUESTING_USER_NAME = new RequestingUserName( - SystemProperties.getProperty("user.name", ""), null); + SystemProperties.getProperty("user.name", ""), null); } - + // TODO Implement service listener notification and change detection. - + /** * Creates a IppPrintService object. - * + * * @param uri the URI of the IPP printer. * @param username the user of this print service. * @param password the password of the user. - * + * * @throws IppException if an error during connection occurs. */ - public IppPrintService(URI uri, String username, String password) + public IppPrintService(URI uri, String username, String password) throws IppException { printerUri = new PrinterURI(uri); user = username; passwd = password; - - printServiceAttributeListener = new HashSet(); - + + printServiceAttributeListener = + new HashSet(); + printerAttr = getPrinterAttributes(); processResponse(); } - + /** * Fetches all printer attributes from the IPP printer. - * + * * @return The Map with the printer attributes. * @throws IppException if an error occurs. */ - private Map getPrinterAttributes() throws IppException + private Map, Set> getPrinterAttributes() + throws IppException { IppResponse response = null; - + try { - IppRequest request = new IppRequest(printerUri.getURI(), user, passwd); - + IppRequest request = new IppRequest(printerUri.getURI(), user, passwd); + int operation = OperationsSupported.GET_PRINTER_ATTRIBUTES.getValue(); - request.setOperationID((short) operation); - request.setOperationAttributeDefaults(); + request.setOperationID((short) operation); + request.setOperationAttributeDefaults(); request.addOperationAttribute(printerUri); - + response = request.send(); - } + } catch (IOException e) { throw new IppException("IOException in IPP request/response.", e); - } - - return (Map) response.getPrinterAttributes().get(0); + } + + return response.getPrinterAttributes().get(0); } - + /** - * Extracts the set of attribute values for a given + * Extracts the set of attribute values for a given * attribute category from the printer attributes map. - * + * * @param attributeClass the category * @return The set of attributes of the category. */ - private Set getPrinterAttributeSet(Class attributeClass) + private Set getPrinterAttributeSet(Class attributeClass) { - return (Set) printerAttr.get(attributeClass); + Set set = printerAttr.get(attributeClass); + Set attSet = new HashSet(); + for (Attribute att : set) + attSet.add(attributeClass.cast(att)); + return attSet; } - + /** - * Extracts the default attribute value for the given + * Extracts the default attribute value for the given * default attribute category from the printer attributes map. - * + * * @param attributeClass the category * @return The default attribute. - * + * * @throws ClassCastException if attributClass is not an * instance of DefaultValueAttribute. */ - private Attribute getPrinterDefaultAttribute(Class attributeClass) + private Attribute getPrinterDefaultAttribute(Class attributeClass) { - Set set = (Set) printerAttr.get(attributeClass); + Set set = printerAttr.get(attributeClass); return ((DefaultValueAttribute) set.toArray()[0]).getAssociatedAttribute(); } - + /** * Processes the response, sorts and splits the attributes. */ private void processResponse() { // printer name - PrinterName[] tmp = (PrinterName[]) getPrinterAttributeSet( - PrinterName.class).toArray(new PrinterName[1]); + PrinterName[] tmp = getPrinterAttributeSet(PrinterName.class).toArray(new PrinterName[1]); name = tmp[0].getValue(); - + // supported flavors // TODO Check if charsets-supported are charsets that are actually supported // 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 - flavors = new ArrayList(); - Set flavorAttributes = getPrinterAttributeSet(DocumentFormatSupported.class); + flavors = new ArrayList(); + Set flavorAttributes = getPrinterAttributeSet(DocumentFormatSupported.class); 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")) { flavors.add(DocFlavor.CHAR_ARRAY.TEXT_PLAIN); flavors.add(DocFlavor.READER.TEXT_PLAIN); flavors.add(DocFlavor.STRING.TEXT_PLAIN); - + // add utf-8 mimeType = mimeType + "; charset=utf-8"; } @@ -307,21 +312,22 @@ public class IppPrintService implements PrintService flavors.add(DocFlavor.CHAR_ARRAY.TEXT_HTML); flavors.add(DocFlavor.READER.TEXT_HTML); flavors.add(DocFlavor.STRING.TEXT_HTML); - + // add utf-8 mimeType = mimeType + "; charset=utf-8"; } - + // Process the predefined DocFlavors and if mimetype is // equal put them into the flavors array - otherwise // just build them as binarie class representation. boolean changed = false; try { - Class[] clazzes = new Class[] { DocFlavor.BYTE_ARRAY.class, - DocFlavor.INPUT_STREAM.class, - DocFlavor.URL.class }; - + Class[] clazzes = new Class[] { DocFlavor.BYTE_ARRAY.class, + DocFlavor.INPUT_STREAM.class, + DocFlavor.URL.class + }; + for (int j = 0; j < clazzes.length; j++) { Field[] fields = clazzes[j].getDeclaredFields(); @@ -336,7 +342,7 @@ public class IppPrintService implements PrintService } } if (!changed) // not in predefined constants of DocFlavor - { + { // everything should be supported as binary stuff flavors.add(new DocFlavor(mimeType, "[B")); flavors.add(new DocFlavor(mimeType, "java.io.InputStream")); @@ -357,54 +363,52 @@ public class IppPrintService implements PrintService } } - if (this.getClass() - .isAssignableFrom(gnu.javax.print.CupsPrintService.class)) - { -// CUPS always provides filters to convert from Postscript. -// This logic looks odd, but it's what OpenJDK does. - flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE); - flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE); - } + if (this.getClass() + .isAssignableFrom(gnu.javax.print.CupsPrintService.class)) + { +// CUPS always provides filters to convert from Postscript. +// This logic looks odd, but it's what OpenJDK does. + flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE); + flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE); + } } // printer uris - Set uris = getPrinterAttributeSet(PrinterUriSupported.class); - printerUris = new ArrayList(uris.size()); - Iterator it = uris.iterator(); - while (it.hasNext()) + Set uris = getPrinterAttributeSet(PrinterUriSupported.class); + printerUris = new ArrayList(uris.size()); + for (PrinterUriSupported uri : uris) { - PrinterUriSupported uri = (PrinterUriSupported) it.next(); printerUris.add( new PrinterURI(uri.getURI())); } } /** * We always return a implementation implementing CancelablePrintJob. - * + * * @see javax.print.PrintService#createPrintJob() */ public DocPrintJob createPrintJob() { return new DocPrintJobImpl(this, user, passwd); } - + /** * @see javax.print.PrintService#getAttribute(java.lang.Class) */ - public PrintServiceAttribute getAttribute(Class category) + public T getAttribute(Class category) { if (category == null) throw new NullPointerException("category may not be null"); - + if (! PrintServiceAttribute.class.isAssignableFrom(category)) throw new IllegalArgumentException( "category must be of type PrintServiceAttribute"); - - Set set = getPrinterAttributeSet(category); - if (set != null && set.size() > 0) - return (PrintServiceAttribute) set.toArray()[0]; - + + Set set = getPrinterAttributeSet(category); + if (set != null && set.size() > 0) + return set.iterator().next(); + return null; } @@ -414,81 +418,78 @@ public class IppPrintService implements PrintService public PrintServiceAttributeSet getAttributes() { PrintServiceAttributeSet set = new HashPrintServiceAttributeSet(); - - Iterator it = printerAttr.values().iterator(); - while (it.hasNext()) - { - Iterator it2 = ((Set) it.next()).iterator(); - while (it2.hasNext()) + + for (Set attrSet : printerAttr.values()) + { + for (Attribute attr : attrSet) { - Attribute attr = (Attribute) it2.next(); if (attr instanceof PrintServiceAttribute) set.add(attr); } } - + return AttributeSetUtilities.unmodifiableView(set); } /** * @see javax.print.PrintService#getDefaultAttributeValue(java.lang.Class) */ - public Object getDefaultAttributeValue(Class category) - { + public Object getDefaultAttributeValue(Class category) + { // required attributes if (category.equals(Fidelity.class)) - return Fidelity.FIDELITY_FALSE; + return Fidelity.FIDELITY_FALSE; if (category.equals(JobName.class)) return JOB_NAME; if (category.equals(RequestingUserName.class)) return REQUESTING_USER_NAME; - + // optional attributes - if (category.equals(JobPriority.class) + if (category.equals(JobPriority.class) && printerAttr.containsKey(JobPriorityDefault.class)) return getPrinterDefaultAttribute(JobPriorityDefault.class); - if (category.equals(JobHoldUntil.class) + if (category.equals(JobHoldUntil.class) && printerAttr.containsKey(JobHoldUntilDefault.class)) return getPrinterDefaultAttribute(JobHoldUntilDefault.class); - if (category.equals(JobSheets.class) + if (category.equals(JobSheets.class) && printerAttr.containsKey(JobSheetsDefault.class)) return getPrinterDefaultAttribute(JobSheetsDefault .class); - if (category.equals(MultipleDocumentHandling.class) + if (category.equals(MultipleDocumentHandling.class) && printerAttr.containsKey(MultipleDocumentHandlingDefault.class)) return getPrinterDefaultAttribute(MultipleDocumentHandlingDefault.class); - if (category.equals(Copies.class) + if (category.equals(Copies.class) && printerAttr.containsKey(CopiesDefault.class)) return getPrinterDefaultAttribute(CopiesDefault.class); - if (category.equals(Finishings.class) + if (category.equals(Finishings.class) && printerAttr.containsKey(FinishingsDefault.class)) return getPrinterDefaultAttribute(FinishingsDefault.class); - if (category.equals(Sides.class) + if (category.equals(Sides.class) && printerAttr.containsKey(SidesDefault.class)) return getPrinterDefaultAttribute(SidesDefault.class); - if (category.equals(NumberUp.class) + if (category.equals(NumberUp.class) && printerAttr.containsKey(NumberUpDefault.class)) return getPrinterDefaultAttribute(NumberUpDefault.class); - if (category.equals(OrientationRequested.class) + if (category.equals(OrientationRequested.class) && printerAttr.containsKey(OrientationRequestedDefault.class)) return getPrinterDefaultAttribute(OrientationRequestedDefault.class); - if (category.equals(Media.class) + if (category.equals(Media.class) && printerAttr.containsKey(MediaDefault.class)) return getPrinterDefaultAttribute(MediaDefault.class); - if (category.equals(PrinterResolution.class) + if (category.equals(PrinterResolution.class) && printerAttr.containsKey(PrinterResolutionDefault.class)) return getPrinterDefaultAttribute(PrinterResolutionDefault.class); - if (category.equals(PrintQuality.class) + if (category.equals(PrintQuality.class) && printerAttr.containsKey(PrintQualityDefault.class)) return getPrinterDefaultAttribute(PrintQualityDefault.class); - if (category.equals(Compression.class) + if (category.equals(Compression.class) && printerAttr.containsKey(CompressionSupported.class)) return Compression.NONE; if (category.equals(PageRanges.class)) return new PageRanges(1, Integer.MAX_VALUE); - return null; + return null; } - + /** * We return the value of PrinterName here. * @see javax.print.PrintService#getName() @@ -506,7 +507,7 @@ public class IppPrintService implements PrintService { // SUN does not provide any service factory for // print services (tested on linux/windows) - + // for the moment we do the same - just return null // later on we could provide at least the about UI dialog return null; @@ -515,11 +516,12 @@ public class IppPrintService implements PrintService /** * @see javax.print.PrintService#getSupportedAttributeCategories() */ - public Class[] getSupportedAttributeCategories() + public Class[] getSupportedAttributeCategories() { - Set categories = new HashSet(); - - // Should only be job template attributes as of section 4.2 + Set> categories = + new HashSet>(); + + // Should only be job template attributes as of section 4.2 if (printerAttr.containsKey(JobPrioritySupported.class)) categories.add(JobPriority.class); if (printerAttr.containsKey(JobHoldUntilSupported.class)) @@ -527,14 +529,14 @@ public class IppPrintService implements PrintService if (printerAttr.containsKey(JobSheetsSupported.class)) categories.add(JobSheets.class); if (printerAttr.containsKey(MultipleDocumentHandlingSupported.class)) - categories.add(MultipleDocumentHandling.class); + categories.add(MultipleDocumentHandling.class); if (printerAttr.containsKey(CopiesSupported.class)) categories.add(Copies.class); if (printerAttr.containsKey(FinishingsSupported.class)) { // if only none finishing is supported - it does not count as supported - Set set = getPrinterAttributeSet(FinishingsSupported.class); - if (! (set.size() == 1 && set.contains(FinishingsSupported.NONE))) + Set set = getPrinterAttributeSet(FinishingsSupported.class); + if (! (set.size() == 1 && set.contains(FinishingsSupported.NONE))) categories.add(Finishings.class); } if (printerAttr.containsKey(PageRangesSupported.class)) @@ -551,11 +553,11 @@ public class IppPrintService implements PrintService categories.add(PrinterResolution.class); if (printerAttr.containsKey(PrintQualitySupported.class)) categories.add(PrintQuality.class); - - // Chromaticity, Destination, MediaPrintableArea, + + // Chromaticity, Destination, MediaPrintableArea, // SheetCollate, PresentationDirection - not IPP attributes - - // attributes outside section 4.2 + + // attributes outside section 4.2 if (printerAttr.containsKey(CompressionSupported.class)) categories.add(Compression.class); if (printerAttr.containsKey(JobImpressionsSupported.class)) @@ -564,13 +566,13 @@ public class IppPrintService implements PrintService categories.add(JobKOctets.class); if (printerAttr.containsKey(JobMediaSheetsSupported.class)) categories.add(JobMediaSheets.class); - + // always supported as required by IPP specification categories.add(Fidelity.class); categories.add(JobName.class); categories.add(RequestingUserName.class); - return (Class[]) categories.toArray(new Class[categories.size()]); + return categories.toArray(new Class[categories.size()]); } /** @@ -578,12 +580,12 @@ public class IppPrintService implements PrintService * attribute values totally different may override this methods. Subclass only in * need of handling the response differently may override the method * handleSupportedAttributeValuesResponse(IppResponse, Class) only. - * + * * @see PrintService#getSupportedAttributeValues(Class, DocFlavor, AttributeSet) * @see #handleSupportedAttributeValuesResponse(IppResponse, Class) */ - public Object getSupportedAttributeValues(Class category, DocFlavor flavor, - AttributeSet attributes) + public Object getSupportedAttributeValues(Class category, + DocFlavor flavor, AttributeSet attributes) { // We currently ignore the attribute set - there is nothing in the IPP // specification which would come closer to what we do here. @@ -620,7 +622,7 @@ public class IppPrintService implements PrintService request.setOperationAttributeDefaults(); request.addOperationAttribute(new RequestedAttributes(categoryName)); request.addOperationAttribute(printerUri); - + if (flavor != null) { DocumentFormat f = DocumentFormat.createDocumentFormat(flavor); @@ -628,7 +630,7 @@ public class IppPrintService implements PrintService } response = request.send(); - + int status = response.getStatusCode(); if (! (status == IppStatusCode.SUCCESSFUL_OK || status == IppStatusCode.SUCCESSFUL_OK_IGNORED_OR_SUBSTITUED_ATTRIBUTES @@ -647,41 +649,42 @@ public class IppPrintService implements PrintService // method cannot throw exception - just log logger.log(Component.IPP, "IPPException", e); } - + return handleSupportedAttributeValuesResponse(response, category); } - + /** * Called to handle the supported attribute values response for the given * category. This might be overridden by subclasses with different requirements * for parsing/handling the response from the GetPrinterAttributes. - * + * * @param response the response of the GetPrinterAttributes IPP request * @param category the category for which the supported values are requested - * @return A object indicating the supported values for the given attribute - * category, or null if this print service doesn't support the + * @return A object indicating the supported values for the given attribute + * category, or null if this print service doesn't support the * given attribute category at all. - * + * * @see #getSupportedAttributeValues(Class, DocFlavor, AttributeSet) */ - protected Object handleSupportedAttributeValuesResponse(IppResponse response, - Class category) + protected Object handleSupportedAttributeValuesResponse(IppResponse response, + Class category) { - List printerAtts = response.getPrinterAttributes(); - + List, Set>> printerAtts = + response.getPrinterAttributes(); + // only one will be returned - Map printerAttribute = (Map) printerAtts.get(0); - Class suppCategory = IppUtilities.getSupportedCategory(category); - Set attr = (Set) printerAttribute.get(suppCategory); - - // We sometime assume its a single instance with arbritrary value just indicating + Map, Set> printerAttribute = printerAtts.get(0); + Class suppCategory = IppUtilities.getSupportedCategory(category); + Set attr = printerAttribute.get(suppCategory); + + // 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 - // what sounds right to me - as I have yet to find a printer which supports every + // what sounds right to me - as I have yet to find a printer which supports every // special category in the SUN implementation to see what they return :-) - + // Map whats in the JSP API if (suppCategory.equals(JobPrioritySupported.class)) - return (JobPrioritySupported) attr.toArray(new JobPrioritySupported[1])[0]; + return (JobPrioritySupported) attr.iterator().next(); if (suppCategory.equals(JobHoldUntilSupported.class)) return new JobHoldUntil(new Date()); if (suppCategory.equals(JobSheetsSupported.class)) @@ -689,11 +692,11 @@ public class IppPrintService implements PrintService if (suppCategory.equals(MultipleDocumentHandlingSupported.class)) return MultipleDocumentHandlingSupported.getAssociatedAttributeArray(attr); if (suppCategory.equals(CopiesSupported.class)) - return (CopiesSupported) attr.toArray(new CopiesSupported[1])[0]; + return (CopiesSupported) attr.iterator().next(); if (suppCategory.equals(FinishingsSupported.class)) return FinishingsSupported.getAssociatedAttributeArray(attr); if (suppCategory.equals(PageRangesSupported.class)) - return new PageRanges[] { new PageRanges(1, Integer.MAX_VALUE) }; + return new PageRanges[] { new PageRanges(1, Integer.MAX_VALUE) }; if (suppCategory.equals(OrientationRequestedSupported.class)) return OrientationRequestedSupported.getAssociatedAttributeArray(attr); if (suppCategory.equals(MediaSupported.class)) @@ -707,36 +710,34 @@ public class IppPrintService implements PrintService // Special handling as it might also be in range of integers if (suppCategory.equals(NumberUpSupported.class)) { - NumberUpSupported[] tmp = (NumberUpSupported[]) - attr.toArray(new NumberUpSupported[attr.size()]); - if (attr.size() == 1) // number-up maybe in rangeofintegers - return tmp[0]; + return attr.iterator().next(); int[][] members = new int[attr.size()][2]; + Iterator it = attr.iterator(); 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 }; } NumberUpSupported supported = new NumberUpSupported(members); return supported; } - + return null; - } - + } + /** * @see javax.print.PrintService#getSupportedDocFlavors() */ public DocFlavor[] getSupportedDocFlavors() { - return (DocFlavor[]) flavors.toArray(new DocFlavor[flavors.size()]); + return flavors.toArray(new DocFlavor[flavors.size()]); } /** - * This is done by a validate-job operation and actually implemented in + * This is done by a validate-job operation and actually implemented in * this generic IPP reference implementation. Subclasses which does * not correctly support Validate-Job operation might want to override this. * @@ -744,7 +745,7 @@ public class IppPrintService implements PrintService */ public AttributeSet getUnsupportedAttributes(DocFlavor flavor, AttributeSet attributes) - { + { if (flavor != null && !isDocFlavorSupported(flavor)) throw new IllegalArgumentException("flavor is not supported"); @@ -757,21 +758,21 @@ public class IppPrintService implements PrintService request.setOperationAttributeDefaults(); request.addOperationAttribute(printerUri); request.addOperationAttribute(Fidelity.FIDELITY_TRUE); - + if (attributes != null && attributes.size() > 0) { request.addAndFilterJobOperationAttributes(attributes); request.addAndFilterJobTemplateAttributes(attributes); } - + if (flavor != null) { DocumentFormat f = DocumentFormat.createDocumentFormat(flavor); request.addOperationAttribute(f); } - + response = request.send(); - + int status = response.getStatusCode(); if (! (status == IppStatusCode.SUCCESSFUL_OK || status == IppStatusCode.SUCCESSFUL_OK_IGNORED_OR_SUBSTITUED_ATTRIBUTES @@ -791,41 +792,39 @@ public class IppPrintService implements PrintService logger.log(Component.IPP, "IPPException", e); } - // Validate Jobs returns only Unsupported and Operation - List unsupportedMaps = response.getUnsupportedAttributes(); + // Validate Jobs returns only Unsupported and Operation + List, Set>> unsupportedMaps = + response.getUnsupportedAttributes(); if (unsupportedMaps.size() == 0) - return null; - - Map unsupportedAttr = (Map) unsupportedMaps.get(0); + return null; + + Map, Set> unsupportedAttr = unsupportedMaps.get(0); if (unsupportedAttr.size() == 0) return null; - - // Convert the return map with unsupported attributes + + // Convert the return map with unsupported attributes // into an AttribueSet instance HashAttributeSet set = new HashAttributeSet(); - Iterator it = unsupportedAttr.values().iterator(); - while (it.hasNext()) + for (Set unsupported : unsupportedAttr.values()) { - Set unsupported = (Set) it.next(); - Iterator it2 = unsupported.iterator(); - while (it2.hasNext()) - set.add((Attribute) it2.next()); + for (Attribute att : unsupported) + set.add(att); } - + return set; } /** * @see PrintService#isAttributeCategorySupported(Class) */ - public boolean isAttributeCategorySupported(Class category) + public boolean isAttributeCategorySupported(Class category) { if (category == null) throw new NullPointerException("category may not be null"); - + if (! Attribute.class.isAssignableFrom(category)) throw new IllegalArgumentException("category must be of type Attribute"); - + return Arrays.asList(getSupportedAttributeCategories()).contains(category); } @@ -835,28 +834,28 @@ public class IppPrintService implements PrintService public boolean isAttributeValueSupported(Attribute attrval, DocFlavor flavor, AttributeSet attributes) { - // just redirect to getSupportedAttributeValues - Object values = getSupportedAttributeValues(attrval.getCategory(), - flavor, attributes); + // just redirect to getSupportedAttributeValues + Object values = getSupportedAttributeValues(attrval.getCategory(), + flavor, attributes); // null means none supported if (values == null) return false; - + // object may be an array if (values.getClass().isArray()) return Arrays.asList((Object[]) values).contains(attrval); - + // may be a single instance of the category (value is irrelevant) if (values.getClass().equals(attrval.getCategory())) return true; - - // a single instance of another class to give the bounds + + // a single instance of another class to give the bounds // copies if (values.getClass().equals(CopiesSupported.class)) - return ((CopiesSupported) values).contains((IntegerSyntax) attrval); + return ((CopiesSupported) values).contains((IntegerSyntax) attrval); // number up if (values.getClass().equals(NumberUpSupported.class)) - return ((NumberUpSupported) values).contains((IntegerSyntax) attrval); + return ((NumberUpSupported) values).contains((IntegerSyntax) attrval); // job priority if (values.getClass().equals(JobPrioritySupported.class)) { @@ -865,15 +864,15 @@ public class IppPrintService implements PrintService if (priority.getValue() < maxSupported.getValue()) return true; } - - // I am unsure if these might also show up - not yet found a printer where - // Suns implementation supports them: + + // I am unsure if these might also show up - not yet found a printer where + // Suns implementation supports them: // JobImpressionsSupported, JobKOctetsSupported, JobMediaSheetsSupported - + return false; } - + /** * @see javax.print.PrintService#isDocFlavorSupported(DocFlavor) */ @@ -881,11 +880,11 @@ public class IppPrintService implements PrintService { if (flavor == null) throw new NullPointerException("DocFlavor may not be null."); - + return flavors.contains(flavor); } - + /** * @see PrintService#addPrintServiceAttributeListener(PrintServiceAttributeListener) */ @@ -894,7 +893,7 @@ public class IppPrintService implements PrintService { printServiceAttributeListener.add(listener); } - + /** * @see PrintService#removePrintServiceAttributeListener(PrintServiceAttributeListener) */ @@ -903,7 +902,7 @@ public class IppPrintService implements PrintService { printServiceAttributeListener.remove(listener); } - + /** * Returns "IppPrinter: " + getName() * @return The string representation. @@ -911,15 +910,15 @@ public class IppPrintService implements PrintService public String toString() { return "IppPrinter: " + getName(); - } - + } + /** * Returns the printer-uri of this print service. - * + * * @return The printer-uri attribute. */ public PrinterURI getPrinterURI() { return printerUri; - } + } } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java index 869f8224be9..a0de6592fea 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java @@ -1,4 +1,4 @@ -/* IppRequest.java -- +/* IppRequest.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -112,37 +112,37 @@ import javax.print.attribute.standard.Sides; *
  • data - q bytes - optional
    • * *

    - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class IppRequest { /** - * The printer-poll timeout. + * The printer-poll timeout. */ private static final int timeout = 1000; /** * Helper class used to write the attributes of a request * into the supplied data output stream in the correct way. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ class RequestWriter - { + { private DataOutputStream out; - + /** * Creates a RequestWriter. - * + * * @param stream the stream to write to. */ RequestWriter(DataOutputStream stream) { out = stream; } - + /** * Writes an attribute in IntegerSyntax into the stream. * @param attribute the attribute @@ -218,7 +218,7 @@ public class IppRequest out.write(name.getBytes()); } else - out.writeShort(0x0000); // only name-length + out.writeShort(0x0000); // only name-length out.writeShort(8); // range is 8 bytes out.writeInt(ranges[i][0]); @@ -283,7 +283,7 @@ public class IppRequest } out.writeByte(directionFromUTC); - out.writeByte(offsetInMillis / 3600000); // hours + out.writeByte(offsetInMillis / 3600000); // hours out.writeByte((offsetInMillis % 3600000) / 60000); // minutes } @@ -295,7 +295,7 @@ public class IppRequest * of NAME value-tag in IPP this method checks for these attributes and * writes them as NAME_WITHOUT_LANGUAGE value-tag into the stream. *

    - * + * * @param attribute the attribute * @param out the stream to write to * @throws IOException if thrown by the stream @@ -314,11 +314,11 @@ public class IppRequest out.writeByte(IppValueTag.MIME_MEDIA_TYPE); else out.writeByte(IppValueTag.TEXT_WITHOUT_LANGUAGE); - + out.writeShort(name.length()); out.write(name.getBytes()); out.writeShort(attribute.getValue().length()); - out.write(attribute.getValue().getBytes()); + out.write(attribute.getValue().getBytes()); } /** @@ -347,8 +347,8 @@ public class IppRequest * @throws IOException if thrown by the stream */ private void write(CharsetSyntax attribute) throws IOException - { - String name = ((Attribute) attribute).getName(); + { + String name = ((Attribute) attribute).getName(); out.writeByte(IppValueTag.CHARSET); out.writeShort(name.length()); out.write(name.getBytes()); @@ -371,7 +371,7 @@ public class IppRequest out.writeShort(attribute.getValue().length()); out.write(attribute.getValue().getBytes()); } - + /** * Writes an attribute in RequestedAttributes into the stream. * @param attribute the attribute @@ -380,32 +380,32 @@ public class IppRequest */ private void write(RequestedAttributes attribute) throws IOException { - List values = attribute.getValues(); - + String[] values = attribute.getValues(); + String name = ((Attribute) attribute).getName(); out.writeByte(IppValueTag.KEYWORD); out.writeShort(name.length()); - out.write(name.getBytes()); - out.writeShort(((String) values.get(0)).length()); - out.write(((String) values.get(0)).getBytes()); - - for (int i=1; i < values.size(); i++) + out.write(name.getBytes()); + out.writeShort(values[0].length()); + out.write(values[0].getBytes()); + + for (int i=1; i < values.length; i++) { out.writeByte(IppValueTag.KEYWORD); out.writeShort(0x0000); // length for additional value - out.writeShort(((String) values.get(i)).length()); - out.write(((String) values.get(i)).getBytes()); + out.writeShort(values[i].length()); + out.write(values[i].getBytes()); } - } + } + - /** * Writes the given operation attribute group of the given map instance * (key=group, values=set of attributes) into the supplied data * output stream. - * + * * @param attributes the set with the attributes. - * + * * @throws IOException if thrown by the used DataOutputStream. * @throws IppException if unknown attributes occur. */ @@ -413,23 +413,23 @@ public class IppRequest throws IOException, IppException { out.write(IppDelimiterTag.OPERATION_ATTRIBUTES_TAG); - + // its essential to write these two in this order and as first ones Attribute att = attributes.get(AttributesCharset.class); write((CharsetSyntax) att); - - logger.log(Component.IPP, "Attribute: Name: <" - + att.getCategory().getName() + "> Value: <" + att.toString() + ">"); - + + logger.log(Component.IPP, "Attribute: Name: <" + + att.getCategory().getName() + "> Value: <" + att.toString() + ">"); + attributes.remove(AttributesCharset.class); - + att = attributes.get(AttributesNaturalLanguage.class); write((NaturalLanguageSyntax) att); attributes.remove(AttributesNaturalLanguage.class); - - logger.log(Component.IPP, "Attribute: Name: <" + + logger.log(Component.IPP, "Attribute: Name: <" + att.getCategory().getName() + "> Value: <" + att.toString() + ">"); - + // furthermore its essential to now write out the target attribute PrinterURI printerUri = (PrinterURI) attributes.get(PrinterURI.class); JobUri jobUri = (JobUri) attributes.get(JobUri.class); @@ -470,26 +470,26 @@ public class IppRequest .getName() + "> Value: <" + jobUri.toString() + ">"); } else if (reqAttrs != null) - { - write(reqAttrs); - attributes.remove(RequestedAttributes.class); - logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">"); - } + { + write(reqAttrs); + attributes.remove(RequestedAttributes.class); + logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">"); + } else { throw new IppException("Unknown target operation attribute combination."); - } - + } + writeAttributes(attributes); } - + /** * Writes the given attribute groups of the given map instance * (key=group, values=set of attributes) into the supplied data * output stream. - * + * * @param attributes the set with the attributes. - * + * * @throws IOException if thrown by the used DataOutputStream. * @throws IppException if unknown attributes occur. */ @@ -500,9 +500,9 @@ public class IppRequest for (int i = 0; i < attributeArray.length; i++) { logger.log(Component.IPP, "Attribute: Name: <" + attributeArray[i] - .getCategory().getName() + "> Value: <" - + attributeArray[i].toString() + ">"); - + .getCategory().getName() + "> Value: <" + + attributeArray[i].toString() + ">"); + if (attributeArray[i] instanceof IntegerSyntax) write((IntegerSyntax) attributeArray[i]); else if (attributeArray[i] instanceof TextSyntax) @@ -551,8 +551,8 @@ public class IppRequest /** The operation type of this request. */ private short operation_id; - /** - * The request id of this request. This is + /** + * The request id of this request. This is * assigned automatically by the constructor. */ private final int request_id; @@ -564,48 +564,48 @@ public class IppRequest private AttributeSet jobAttributes; private Object data; - + private URI requestUri; /** The underlying connection - IPP is http based */ private HttpURLConnection connection; - + /** * Creates an IPPRequest instance. - * + * * @param uri the URI of the request * @param user the user if any * @param password the password of the supplied user */ public IppRequest(URI uri, String user, String password) - { + { request_id = incrementRequestIdCounter(); requestUri = uri; - + try { - URL url = new URL("http", - user == null - ? uri.getHost() : user + ":" - + password + "@" + uri.getHost(), + URL url = new URL("http", + user == null + ? uri.getHost() : user + ":" + + password + "@" + uri.getHost(), uri.getPort(), uri.getPath()); - + connection = (HttpURLConnection) url.openConnection(); connection.setRequestMethod("POST"); connection.setDoOutput(true); - + connection.setRequestProperty("Content-type", "application/ipp"); - connection.setRequestProperty("Accept", "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"); - } + connection.setRequestProperty("Accept", "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"); + } catch (IOException e) { // MalformedURLException - uri is already checked // ProtocolException - POST is correct method type - // IOException -HTTPURLConnection constructor actually + // IOException -HTTPURLConnection constructor actually // does never throw this exception. logger.log(Component.IPP, "Unexpected IOException", e); } - + logger.log(Component.IPP, "[IppConnection] Host: " + uri.getHost() + " Port: " + uri.getPort() + " Path: " + uri.getPath()); @@ -614,7 +614,7 @@ public class IppRequest /** * Synchronized method to be called by the constructor * to assign a unique request id to this request. - * + * * @return The unique request id. */ private synchronized int incrementRequestIdCounter() @@ -624,7 +624,7 @@ public class IppRequest /** * Returns the id of this request. - * + * * @return The request ID. */ public int getRequestID() @@ -632,11 +632,11 @@ public class IppRequest return request_id; } - /** - * Sets the data of the request. The data used in this + /** + * Sets the data of the request. The data used in this * request will be the one of the supplied inputstream * instead of the alternative byte array possibility. - * + * * @param stream the input stream to use for the data. */ public void setData(InputStream stream) @@ -644,11 +644,11 @@ public class IppRequest data = stream; } - /** - * Sets the data of the request. The data used in this + /** + * Sets the data of the request. The data used in this * request will be the one of the supplied byte[] * instead of the alternative input stream possibility. - * + * * @param bytes the byte[] to use for the data. */ public void setData(byte[] bytes) @@ -658,7 +658,7 @@ public class IppRequest /** * Sets the operation id for this request. - * + * * @param id the operation id. */ public void setOperationID(short id) @@ -668,7 +668,7 @@ public class IppRequest /** * Adds the default values for the operation - * attributes "attributes-charset" and + * attributes "attributes-charset" and * "attributes-natural-language" */ public void setOperationAttributeDefaults() @@ -679,64 +679,64 @@ public class IppRequest operationAttributes.add(AttributesCharset.UTF8); operationAttributes.add(AttributesNaturalLanguage.EN); } - + /** * Add the job attribute of this request to the given * attribute set. - * + * * @param attribute the job attribute. */ public void addJobAttribute(Attribute attribute) { if (jobAttributes == null) jobAttributes = new HashAttributeSet(); - + jobAttributes.add(attribute); } - + /** * Sets the printer attribute of this request to the given * attribute set. - * + * * @param attribute the printer attribute. */ public void addPrinterAttributes(Attribute attribute) { if (printerAttributes == null) printerAttributes = new HashAttributeSet(); - + printerAttributes.add(attribute); } /** * Adds the given attribute to the operation attributes set. - * + * * @param attribute the operation attribute to add. */ public void addOperationAttribute(Attribute attribute) { if (operationAttributes == null) operationAttributes = new HashAttributeSet(); - + operationAttributes.add(attribute); } - + /** * Filters from the given attribute set the job operation out * and adds them to the operation attributes set. - * + * * @param set the attributes to filter, may not be null. */ public void addAndFilterJobOperationAttributes(AttributeSet set) { if (operationAttributes == null) operationAttributes = new HashAttributeSet(); - + // document-natural-language - not defined in JPS attributes // document-format - specified outside, special treatment Attribute[] tmp = set.toArray(); - for (int i = 0; i < tmp.length; i++) - { + for (int i = 0; i < tmp.length; i++) + { if (tmp[i].getCategory().equals(JobName.class) || tmp[i].getCategory().equals(Fidelity.class) || tmp[i].getCategory().equals(JobImpressions.class) @@ -745,27 +745,27 @@ public class IppRequest || tmp[i].getCategory().equals(Compression.class) || tmp[i].getCategory().equals(DocumentName.class) || tmp[i].getCategory().equals(RequestingUserName.class)) - - operationAttributes.add(tmp[i]); - } + + operationAttributes.add(tmp[i]); + } } - + /** * Filters from the given attribute set the job template attributes * out and adds them to the job attributes set. - * + * * @param set the attributes to filter, may not be null. */ public void addAndFilterJobTemplateAttributes(AttributeSet set) { if (jobAttributes == null) jobAttributes = new HashAttributeSet(); - + // document-natural-language - not defined in JPS attributes // document-format - specified outside, special treatment Attribute[] tmp = set.toArray(); - for (int i = 0; i < tmp.length; i++) - { + for (int i = 0; i < tmp.length; i++) + { if (tmp[i].getCategory().equals(JobPriority.class) || tmp[i].getCategory().equals(JobHoldUntil.class) || tmp[i].getCategory().equals(JobSheets.class) @@ -780,67 +780,67 @@ public class IppRequest || tmp[i].getCategory().equals(PrintQuality.class) || tmp[i].getCategory().equals(SheetCollate.class) || tmp[i].getCategory().equals(Sides.class)) - - jobAttributes.add(tmp[i]); - } + + jobAttributes.add(tmp[i]); + } } /** * Does some validation of the supplied parameters and then * sends the request to the ipp server or service. - * + * * @return The response if any. - * + * * @throws IllegalStateException if request is already sent * @throws IppException if connection or request failed. - * @throws IOException if writing of the header, attributes or footer fails. + * @throws IOException if writing of the header, attributes or footer fails. */ public IppResponse send() throws IppException, IOException { if (alreadySent) throw new IllegalStateException("Request is already sent"); - + alreadySent = true; - - OutputStream stream = connection.getOutputStream(); + + OutputStream stream = connection.getOutputStream(); DataOutputStream out = new DataOutputStream(stream); - + // the header 8 bytes long out.writeShort(VERSION); out.writeShort(operation_id); out.writeInt(request_id); - - logger.log(Component.IPP, "OperationID: " + Integer.toHexString(operation_id) - + " RequestID: " + request_id); - + + logger.log(Component.IPP, "OperationID: " + Integer.toHexString(operation_id) + + " RequestID: " + request_id); + // Pass stuff the the attribute writer which knows how to // write the attributes in correct order logger.log(Component.IPP, "Operation Attributes"); - + RequestWriter writer = new RequestWriter(out); - writer.writeOperationAttributes(operationAttributes); - + writer.writeOperationAttributes(operationAttributes); + if (jobAttributes != null) { logger.log(Component.IPP, "Job Attributes"); out.write(IppDelimiterTag.JOB_ATTRIBUTES_TAG); writer.writeAttributes(jobAttributes); - } + } if (printerAttributes != null) { logger.log(Component.IPP, "Printer Attributes"); out.write(IppDelimiterTag.PRINTER_ATTRIBUTES_TAG); writer.writeAttributes(printerAttributes); - } + } // write the delimiter to the data - out.write(IppDelimiterTag.END_OF_ATTRIBUTES_TAG); + out.write(IppDelimiterTag.END_OF_ATTRIBUTES_TAG); // check if data is byte[] or inputstream if (data instanceof InputStream) { byte[] readbuf = new byte[2048]; - int len = 0; + int len = 0; while( (len = ((InputStream) data).read(readbuf)) > 0) out.write(readbuf, 0, len); } @@ -848,27 +848,27 @@ public class IppRequest { out.write((byte[]) data); } - + out.flush(); - stream.flush(); - + stream.flush(); + // Set the connection timeout, for if the printer is offline. // FIXME: The print services polling should probably be done in its // own thread. connection.setConnectTimeout( timeout ); int responseCode = connection.getResponseCode(); - + if (responseCode == HttpURLConnection.HTTP_OK) - { - IppResponse response = new IppResponse(requestUri, operation_id); - response.setResponseData(connection.getInputStream()); + { + IppResponse response = new IppResponse(requestUri, operation_id); + response.setResponseData(connection.getInputStream()); return response; } logger.log(Component.IPP, "HTTP-Statuscode: " + responseCode); - throw new IppException("Request failed got HTTP status code " + throw new IppException("Request failed got HTTP status code " + responseCode); } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppResponse.java b/libjava/classpath/gnu/javax/print/ipp/IppResponse.java index 81a1eb47b03..703bdc1eb90 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppResponse.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppResponse.java @@ -1,4 +1,4 @@ -/* IppResponse.java -- +/* IppResponse.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,9 +99,9 @@ import javax.print.attribute.standard.PrinterStateReasons; import javax.print.attribute.standard.Severity; /** - * IppResponse models a response received from an IPP + * IppResponse models a response received from an IPP * compatible server as described in RFC 2910 IPP 1.1 Encoding and Transport. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public class IppResponse @@ -112,7 +112,7 @@ public class IppResponse * response stream. It provides access to the attribute groups after parsing * via getter methods. *

    - * The enconding of a response is structured as follows (for an official + * The enconding of a response is structured as follows (for an official * description please have a look at the RFC document mentioned above): *

      *
    • version-number - 2 bytes - required
      • @@ -122,19 +122,19 @@ public class IppResponse *
    • end-of-attributes-tag - 1 byte - required
      • *
    • data - q bytes - optional
      • *
    - *

    + *

    * Where each attribute-group (if any) is encoded as follows: *

      *
    • begin-attribute-group-tag - 1 byte
      • *
    • attribute - p bytes - 0 or more
      • *
    - *

    + *

    * Encoding of attributes: *

      *
    • attribute-with-one-value - q bytes
      • *
    • additional-value - r bytes - 0 or more
      • *
    - *

    + *

    * Encoding of attribute-with-one-value: *

      *
    • value-tag - 1 byte
      • @@ -143,7 +143,7 @@ public class IppResponse *
    • value-length (value is v) - 2 bytes
      • *
    • value - v bytes
      • *
    - *

    + *

    * Encoding of additional value: *

      *
    • value-tag - 1 byte
      • @@ -152,21 +152,21 @@ public class IppResponse *
    • value - w bytes
      • *
    *

    - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ class ResponseReader { /** The IPP version defaults to 1.1 */ private static final short VERSION = 0x0101; - + /** * Parses the inputstream containing the response of the IPP request. * @param input the inputstream * @throws IppException if unexpected exceptions occur. * @throws IOException if IO problems with the underlying inputstream occur. */ - public void parseResponse(InputStream input) + public void parseResponse(InputStream input) throws IppException, IOException { DataInputStream stream = new DataInputStream(input); @@ -179,12 +179,12 @@ public class IppResponse throw new IppException("Version mismatch - " + "implementation does not support other versions than IPP 1.1"); - logger.log(Component.IPP, "Statuscode: " + logger.log(Component.IPP, "Statuscode: " + Integer.toHexString(status_code) + " Request-ID: " + request_id); byte tag = 0; boolean proceed = true; - HashMap tmp; + HashMap, Set> tmp; // iterate over attribute-groups until end-of-attributes-tag is found while (proceed) { @@ -200,23 +200,23 @@ public class IppResponse proceed = false; break; case IppDelimiterTag.OPERATION_ATTRIBUTES_TAG: - tmp = new HashMap(); + tmp = new HashMap, Set>(); tag = parseAttributes(tmp, stream); operationAttributes.add(tmp); break; case IppDelimiterTag.JOB_ATTRIBUTES_TAG: - tmp = new HashMap(); + tmp = new HashMap, Set>(); tag = parseAttributes(tmp, stream); jobAttributes.add(tmp); break; case IppDelimiterTag.PRINTER_ATTRIBUTES_TAG: - tmp = new HashMap(); + tmp = new HashMap, Set>(); tag = parseAttributes(tmp, stream); printerAttributes.add(tmp); break; case IppDelimiterTag.UNSUPPORTED_ATTRIBUTES_TAG: System.out.println("Called"); - tmp = new HashMap(); + tmp = new HashMap, Set>(); tag = parseAttributes(tmp, stream); unsupportedAttributes.add(tmp); break; @@ -247,7 +247,8 @@ public class IppResponse * @throws IppException if unexpected exceptions occur. * @throws IOException if IO problems with the underlying inputstream occur. */ - private byte parseAttributes(Map attributes, DataInputStream stream) + private byte parseAttributes(Map, Set> attributes, + DataInputStream stream) throws IppException, IOException { Attribute lastAttribute = null; @@ -294,7 +295,7 @@ public class IppResponse // (4) The value itself value = new byte[valueLength]; - stream.read(value); + stream.read(value); // the value itself switch (tag) @@ -304,12 +305,12 @@ public class IppResponse case IppValueTag.UNKNOWN: // TODO implement out-of-band handling // 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); case IppValueTag.NO_VALUE: - attribute = null; + attribute = null; - break; + break; case IppValueTag.INTEGER: int intValue = IppUtilities.convertToInt(value); attribute = IppUtilities.getIntegerAttribute(name, intValue); @@ -319,11 +320,11 @@ public class IppResponse // JPS API models boolean syntax type as enums // 0x01 = true, 0x00 = false - all are enums attribute = IppUtilities.getEnumAttribute(name, new Integer(value[0])); - + break; case IppValueTag.ENUM: - int intVal = IppUtilities.convertToInt(value); - attribute = IppUtilities.getEnumAttribute(name, new Integer(intVal)); + int intVal = IppUtilities.convertToInt(value); + attribute = IppUtilities.getEnumAttribute(name, new Integer(intVal)); break; case IppValueTag.OCTECTSTRING_UNSPECIFIED: @@ -347,7 +348,7 @@ public class IppResponse int crossFeed = IppUtilities.convertToInt(value[0], value[1], value[2], value[3]); int feed = IppUtilities.convertToInt(value[4], value[5], value[6], value[7]); int units = value[8]; - + if (name.equals("printer-resolution-default")) attribute = new PrinterResolutionDefault(crossFeed, feed, units); else if (name.equals("printer-resolution-supported")) // may be here also @@ -362,7 +363,7 @@ public class IppResponse attribute = new CopiesSupported(lower, upper); else if (name.equals("number-up-supported")) attribute = new NumberUpSupported(lower, upper); - else if (name.equals("job-k-octets-supported")) + else if (name.equals("job-k-octets-supported")) attribute = new JobKOctetsSupported(lower, upper); else if (name.equals("job-impressions-supported")) attribute = new JobImpressionsSupported(lower, upper); @@ -375,19 +376,19 @@ public class IppResponse case IppValueTag.NAME_WITH_LANGUAGE: case IppValueTag.NAME_WITHOUT_LANGUAGE: attribute = IppUtilities.getTextAttribute(name, tag, value); - + break; case IppValueTag.KEYWORD: str = new String(value); if (name.equals("job-hold-until-supported")) // may also be name type attribute = new JobHoldUntilSupported(str, null); else if (name.equals("job-hold-until-default")) - attribute = new JobHoldUntilDefault(str, null); + attribute = new JobHoldUntilDefault(str, null); else if (name.equals("media-supported")) attribute = new MediaSupported(str, null); else if (name.equals("media-default")) - attribute = new MediaDefault(str, null); - else if (name.equals("job-sheets-default")) + attribute = new MediaDefault(str, null); + else if (name.equals("job-sheets-default")) attribute = new JobSheetsDefault(str, null); else if (name.equals("job-sheets-supported")) attribute = new JobSheetsSupported(str, null); @@ -397,13 +398,13 @@ public class IppResponse attribute = parsePrinterStateReasons(value, lastAttribute); else attribute = IppUtilities.getEnumAttribute(name, str); - - // all other stuff is either an enum or needs to be mapped to an - // UnknownAttribute instance. Enums catched here are: + + // all other stuff is either an enum or needs to be mapped to an + // UnknownAttribute instance. Enums catched here are: // ipp-versions-supported, pdl-override-supported, compression-supported // uri-authentication-supported, uri-security-supported, sides-supported // sides-default, multiple-document-handling-supported, multiple-document-handling-default - + break; case IppValueTag.URI: try @@ -429,13 +430,13 @@ public class IppResponse attribute = new PrinterDriverInstaller(uri); else if (name.equals("printer-more-info-manufacturer")) attribute = new PrinterMoreInfoManufacturer(uri); - + break; case IppValueTag.URI_SCHEME: // only one uri-scheme exists - and its an enum if (name.equals("reference-uri-schemes-supported")) attribute = IppUtilities.getEnumAttribute(name, new String(value)); - + break; case IppValueTag.CHARSET: str = new String(value); @@ -445,7 +446,7 @@ public class IppResponse attribute = new CharsetConfigured(str); else if (name.equals("charset-supported")) // setOf attribute = new CharsetSupported(str); - + break; case IppValueTag.NATURAL_LANGUAGE: str = new String(value); @@ -455,7 +456,7 @@ public class IppResponse attribute = new NaturalLanguageConfigured(str); else if (name.equals("generated-natural-language-supported")) // setOf attribute = new GeneratedNaturalLanguageSupported(str); - + break; case IppValueTag.MIME_MEDIA_TYPE: str = new String(value); @@ -465,7 +466,7 @@ public class IppResponse attribute = new DocumentFormatSupported(str, null); else if (name.equals("document-format")) // setOf attribute = new DocumentFormat(str, null); - + break; default: throw new IppException("Unknown tag with value " @@ -473,11 +474,11 @@ public class IppResponse } if (attribute == null) - attribute = new UnknownAttribute(tag, name, value); - + attribute = new UnknownAttribute(tag, name, value); + addAttribute(attributes, attribute); lastAttribute = attribute; - + logger.log(Component.IPP, "Attribute: " + name + " Value: " + attribute.toString()); } @@ -492,20 +493,21 @@ public class IppResponse * @param attribute * the attribute to add */ - private void addAttribute(Map attributeGroup, Attribute attribute) + private void addAttribute(Map, Set> attributeGroup, + Attribute attribute) { - Class clazz = attribute.getCategory(); - Set attributeValues = (Set) attributeGroup.get(clazz); + Class clazz = attribute.getCategory(); + Set attributeValues = attributeGroup.get(clazz); if (attributeValues == null) // first attribute of this category { - attributeValues = new HashSet(); + attributeValues = new HashSet(); attributeGroup.put(clazz, attributeValues); } attributeValues.add(attribute); } - + /** * Parses a name with or without language attribute value from the byte[] * and returns the result as an object[]. @@ -516,39 +518,39 @@ public class IppResponse private PrinterStateReasons parsePrinterStateReasons(byte[] value, Attribute lastAttr) { String str = new String(value); - PrinterStateReasons attribute; - + PrinterStateReasons attribute; + if (lastAttr instanceof PrinterStateReasons) attribute = (PrinterStateReasons) lastAttr; else attribute = new PrinterStateReasons(); - + // special case indicating no reasons - if (str.equals("none")) + if (str.equals("none")) return attribute; - + Severity severity = null; PrinterStateReason reason = null; - + if (str.endsWith(Severity.WARNING.toString())) severity = Severity.WARNING; else if (str.endsWith(Severity.REPORT.toString())) severity = Severity.REPORT; else if (str.endsWith(Severity.ERROR.toString())) severity = Severity.ERROR; - + if (severity != null) - str = str.substring(0, str.lastIndexOf('-')); - else // we must associate a severity + str = str.substring(0, str.lastIndexOf('-')); + else // we must associate a severity severity = Severity.REPORT; - - reason = (PrinterStateReason) + + reason = (PrinterStateReason) IppUtilities.getEnumAttribute("printer-state-reason", str); - + attribute.put(reason , severity); return attribute; } - + /** * Parses a name with or without language attribute value from the byte[] * and returns the result as an object[]. @@ -559,24 +561,24 @@ public class IppResponse private JobStateReasons parseJobStateReasons(byte[] value, Attribute lastAttr) { String str = new String(value); - JobStateReasons attribute; - + JobStateReasons attribute; + if (lastAttr instanceof JobStateReasons) attribute = (JobStateReasons) lastAttr; else attribute = new JobStateReasons(); - + // special case indicating no reasons - if (str.equals("none")) + if (str.equals("none")) return attribute; - - JobStateReason reason = (JobStateReason) + + JobStateReason reason = (JobStateReason) IppUtilities.getEnumAttribute("job-state-reason", str); - + attribute.add(reason); return attribute; } - + /** * Parses a DateTime syntax attribute and returns the constructed Date * object. @@ -597,7 +599,7 @@ public class IppResponse *
  • 10 | 11 | minutes from UTC | 0..59
    • * *

    - * + * * @param value the byte[] * @return The date object. */ @@ -625,28 +627,28 @@ public class IppResponse return cal.getTime(); } } - + /** * Logger for tracing - enable by passing * -Dgnu.classpath.debug.components=ipp to the vm. */ static final Logger logger = SystemLogger.SYSTEM; - + URI uri; short operation_id; short status_code; int request_id; - List operationAttributes; - List printerAttributes; - List jobAttributes; - List unsupportedAttributes; + List, Set>> operationAttributes; + List, Set>> printerAttributes; + List, Set>> jobAttributes; + List, Set>> unsupportedAttributes; byte[] data; /** * Creates an IppResponse instance. - * + * * @param uri the uri the request was directy to. * @param operation_id the operation id of the request. */ @@ -654,15 +656,19 @@ public class IppResponse { this.uri = uri; this.operation_id = operation_id; - operationAttributes = new ArrayList(); - jobAttributes = new ArrayList(); - printerAttributes = new ArrayList(); - unsupportedAttributes = new ArrayList(); + operationAttributes = + new ArrayList, Set>>(); + jobAttributes = + new ArrayList, Set>>(); + printerAttributes = + new ArrayList, Set>>(); + unsupportedAttributes = + new ArrayList, Set>>(); } /** * Sets the data received from the request sent. - * + * * @param input the input stream received. * @throws IppException if parsing fails. */ @@ -703,10 +709,10 @@ public class IppResponse * Returns the set of job attributes group maps. * 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. - * - * @return The list of job attribute grou maps. + * + * @return The list of job attribute group maps. */ - public List getJobAttributes() + public List, Set>> getJobAttributes() { return jobAttributes; } @@ -715,10 +721,10 @@ public class IppResponse * Returns the set of operation attributes group maps. * 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. - * - * @return The list of operation attribute grou maps. + * + * @return The list of operation attribute group maps. */ - public List getOperationAttributes() + public List, Set>> getOperationAttributes() { return operationAttributes; } @@ -727,17 +733,17 @@ public class IppResponse * Returns the set of printer attributes group maps. * 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. - * - * @return The list of printer attribute grou maps. + * + * @return The list of printer attribute group maps. */ - public List getPrinterAttributes() + public List, Set>> getPrinterAttributes() { return printerAttributes; } /** * Returns the ID of the initial request. - * + * * @return The request ID. */ public int getRequestID() @@ -748,7 +754,7 @@ public class IppResponse /** * Returns the status code of the response. * Defined in {@link IppStatusCode}. - * + * * @return The status code. */ public short getStatusCode() @@ -760,17 +766,17 @@ public class IppResponse * Returns the set of unsupported attributes group maps. * 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. - * - * @return The list of unsupported attribute grou maps. + * + * @return The list of unsupported attribute group maps. */ - public List getUnsupportedAttributes() + public List, Set>> getUnsupportedAttributes() { return unsupportedAttributes; } /** * Returns the data of the response. - * + * * @return The data as byte[]. */ public byte[] getData() diff --git a/libjava/classpath/gnu/javax/print/ipp/IppStatusCode.java b/libjava/classpath/gnu/javax/print/ipp/IppStatusCode.java index d2cb8391f45..a3b245c43b8 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppStatusCode.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppStatusCode.java @@ -1,4 +1,4 @@ -/* IppStatusCode.java -- +/* IppStatusCode.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,20 +39,20 @@ package gnu.javax.print.ipp; /** - * IPP Status codes as described in RFC 2911 APPENDIX B + * IPP Status codes as described in RFC 2911 APPENDIX B * (Status Codes and Suggested Status Code Messages) * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class IppStatusCode -{ - /** - * Indicates a successful request with no attributes being - * ignored or substituted. +{ + /** + * Indicates a successful request with no attributes being + * ignored or substituted. */ public static final int SUCCESSFUL_OK = 0x0000; - /** + /** * Indicates a successful request, however some of the supplied * attributes are ignored or substituted. */ @@ -67,7 +67,7 @@ public final class IppStatusCode // Client Error Status Codes // Indicates that the client has done something wrong in its // requests send to the IPP server object - + /** Indicates a bad request e.g. malformed syntax. */ public static final int CLIENT_ERROR_BAD_REQUEST = 0x0400; @@ -80,9 +80,9 @@ public final class IppStatusCode /** Indicates that the client is not authorized. */ public static final int CLIENT_ERROR_NOT_AUTHORIZED = 0x0403; - /** + /** * Indicates a request which is not possible to process. - * For example if the request is directed at a job already finished. + * For example if the request is directed at a job already finished. */ public static final int CLIENT_ERROR_NOT_POSSIBLE = 0x0404; @@ -106,16 +106,16 @@ public final class IppStatusCode /** * Indicates that the supplied attributes or values of attributes are not - * supported by the printer object. Returning this code depends on the + * supported by the printer object. Returning this code depends on the * given "ipp-attribute-fidelity" operation attribute value. */ - public static final int CLIENT_ERROR_ATTRIBUTES_OR_VALUES_NOT_SUPPORTED + public static final int CLIENT_ERROR_ATTRIBUTES_OR_VALUES_NOT_SUPPORTED = 0x040B; - /** + /** * Indicates the the URI scheme in a supplied print-uri or send-uri attribute * is not supported. - */ + */ public static final int CLIENT_ERROR_URI_SCHEME_NOT_SUPPORTED = 0x040C; /** Indicates that a supplied attributes-charset is not supported. */ @@ -127,8 +127,8 @@ public final class IppStatusCode /** Indicates that the specified algorithm is not supported. */ public static final int CLIENT_ERROR_COMPRESSION_NOT_SUPPORTED = 0x040F; - /** - * Indicates that the document cannot be decompressed with the client + /** + * Indicates that the document cannot be decompressed with the client * compression algorithm specified by the client. */ public static final int CLIENT_ERROR_COMPRESSION_ERROR = 0x0410; @@ -136,13 +136,13 @@ public final class IppStatusCode /** Indicates an error in the document format of the document. */ public static final int CLIENT_ERROR_DOCUMENT_FORMAT_ERROR = 0x0411; - /** - * Indicates that the document supplied via print-uri or send-uri cannot be + /** + * Indicates that the document supplied via print-uri or send-uri cannot be * accessed by the printer object. */ public static final int CLIENT_ERROR_DOCUMENT_ACCESS_ERROR = 0x0412; - + /** Indicates an internal server error. */ public static final int SERVER_ERROR_INTERNAL_ERROR = 0x0500; @@ -164,7 +164,7 @@ public final class IppStatusCode /** Indicates that the server is currently not accepting jobs. */ public static final int SERVER_ERROR_NOT_ACCEPTING_JOBS = 0x0506; - /** + /** * Indicates that the server is currently busy with processing. * Requests may be tried later again. */ @@ -174,11 +174,11 @@ public final class IppStatusCode public static final int SERVER_ERROR_JOB_CANCELED = 0x0508; /** Indicates that the server does not support multidocument jobs. */ - public static final int SERVER_ERROR_MULTIPLE_DOCUMENT_JOBS_NOT_SUPPORTED + public static final int SERVER_ERROR_MULTIPLE_DOCUMENT_JOBS_NOT_SUPPORTED = 0x0509; private IppStatusCode() - { + { // not to be instantiated } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppUtilities.java b/libjava/classpath/gnu/javax/print/ipp/IppUtilities.java index 3038998879c..fa987ec3f43 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppUtilities.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppUtilities.java @@ -1,4 +1,4 @@ -/* IppUtilities.java -- +/* IppUtilities.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -140,28 +140,30 @@ import javax.print.attribute.standard.Sides; * Also provides mapping from the attribute name values to * the actual class object. Used to construct objects via reflection. *

    - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class IppUtilities { // These are reused in the reflection code to not instantiate an array everytime 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 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 - private static HashMap classesByName = new HashMap(); + private static HashMap> classesByName = + new HashMap>(); // The map -> StandardAttribute class to SupportedAttribute category name - private static HashMap instanceByClass = new HashMap(); + private static HashMap,SupportedValuesAttribute> instanceByClass = + new HashMap,SupportedValuesAttribute>(); /** * All the currently needed attributes */ static { - // enums + // enums classesByName.put(JobState.ABORTED.getName(), JobState.class); classesByName.put(Sides.DUPLEX.getName(), Sides.class); classesByName.put(SheetCollate.COLLATED.getName(), SheetCollate.class); @@ -174,113 +176,113 @@ public final class IppUtilities classesByName.put(PrintQuality.DRAFT.getName(), PrintQuality.class); classesByName.put(PrinterState.IDLE.getName(), PrinterState.class); classesByName.put(SidesDefault.ONE_SIDED.getName(), SidesDefault.class); - classesByName.put(ReferenceUriSchemesSupported.FILE.getName(), - ReferenceUriSchemesSupported.class); - classesByName.put(PrinterStateReason.DOOR_OPEN.getName(), - PrinterStateReason.class); - classesByName.put(PresentationDirection.TOLEFT_TOTOP.getName(), - PresentationDirection.class); - classesByName.put(PDLOverrideSupported.ATTEMPTED.getName(), - PDLOverrideSupported.class); - classesByName.put(OrientationRequested.PORTRAIT.getName(), - OrientationRequested.class); - classesByName.put(MultipleDocumentHandling.SINGLE_DOCUMENT.getName(), - MultipleDocumentHandling.class); - classesByName.put(JobStateReason.JOB_QUEUED.getName(), - JobStateReason.class); - classesByName.put(UriAuthenticationSupported.NONE.getName(), - UriAuthenticationSupported.class); - classesByName.put(OperationsSupported.GET_JOBS.getName(), - OperationsSupported.class); - classesByName.put(UriSecuritySupported.NONE.getName(), - UriSecuritySupported.class); - classesByName.put(FinishingsSupported.NONE.getName(), - FinishingsSupported.class); - classesByName.put(FinishingsDefault.NONE.getName(), - FinishingsDefault.class); - classesByName.put(IppVersionsSupported.V_1_0.getName(), - IppVersionsSupported.class); - classesByName.put(MultipleDocumentHandlingSupported.SINGLE_DOCUMENT.getName(), - MultipleDocumentHandlingSupported.class); - classesByName.put(MultipleDocumentHandlingDefault.SINGLE_DOCUMENT.getName(), - MultipleDocumentHandlingDefault.class); - classesByName.put(CompressionSupported.NONE.getName(), - CompressionSupported.class); - classesByName.put(OrientationRequestedSupported.PORTRAIT.getName(), - OrientationRequestedSupported.class); - classesByName.put(OrientationRequestedDefault.PORTRAIT.getName(), - OrientationRequestedDefault.class); - classesByName.put(SidesSupported.ONE_SIDED.getName(), - SidesSupported.class); - classesByName.put(PrintQualityDefault.DRAFT.getName(), - PrintQualityDefault.class); - classesByName.put(PrintQualitySupported.DRAFT.getName(), - PrintQualitySupported.class); - classesByName.put(ReferenceUriSchemesSupported.FTP.getName(), + classesByName.put(ReferenceUriSchemesSupported.FILE.getName(), ReferenceUriSchemesSupported.class); - - // the boolean types - classesByName.put(ColorSupported.SUPPORTED.getName(), ColorSupported.class); - classesByName.put(PrinterIsAcceptingJobs.ACCEPTING_JOBS.getName(), + classesByName.put(PrinterStateReason.DOOR_OPEN.getName(), + PrinterStateReason.class); + classesByName.put(PresentationDirection.TOLEFT_TOTOP.getName(), + PresentationDirection.class); + classesByName.put(PDLOverrideSupported.ATTEMPTED.getName(), + PDLOverrideSupported.class); + classesByName.put(OrientationRequested.PORTRAIT.getName(), + OrientationRequested.class); + classesByName.put(MultipleDocumentHandling.SINGLE_DOCUMENT.getName(), + MultipleDocumentHandling.class); + classesByName.put(JobStateReason.JOB_QUEUED.getName(), + JobStateReason.class); + classesByName.put(UriAuthenticationSupported.NONE.getName(), + UriAuthenticationSupported.class); + classesByName.put(OperationsSupported.GET_JOBS.getName(), + OperationsSupported.class); + classesByName.put(UriSecuritySupported.NONE.getName(), + UriSecuritySupported.class); + classesByName.put(FinishingsSupported.NONE.getName(), + FinishingsSupported.class); + classesByName.put(FinishingsDefault.NONE.getName(), + FinishingsDefault.class); + classesByName.put(IppVersionsSupported.V_1_0.getName(), + IppVersionsSupported.class); + classesByName.put(MultipleDocumentHandlingSupported.SINGLE_DOCUMENT.getName(), + MultipleDocumentHandlingSupported.class); + classesByName.put(MultipleDocumentHandlingDefault.SINGLE_DOCUMENT.getName(), + MultipleDocumentHandlingDefault.class); + classesByName.put(CompressionSupported.NONE.getName(), + CompressionSupported.class); + classesByName.put(OrientationRequestedSupported.PORTRAIT.getName(), + OrientationRequestedSupported.class); + classesByName.put(OrientationRequestedDefault.PORTRAIT.getName(), + OrientationRequestedDefault.class); + classesByName.put(SidesSupported.ONE_SIDED.getName(), + SidesSupported.class); + classesByName.put(PrintQualityDefault.DRAFT.getName(), + PrintQualityDefault.class); + classesByName.put(PrintQualitySupported.DRAFT.getName(), + PrintQualitySupported.class); + classesByName.put(ReferenceUriSchemesSupported.FTP.getName(), + ReferenceUriSchemesSupported.class); + + // the boolean types + classesByName.put(ColorSupported.SUPPORTED.getName(), ColorSupported.class); + classesByName.put(PrinterIsAcceptingJobs.ACCEPTING_JOBS.getName(), PrinterIsAcceptingJobs.class); - classesByName.put(MultipleDocumentJobsSupported.SUPPORTED.getName(), + classesByName.put(MultipleDocumentJobsSupported.SUPPORTED.getName(), MultipleDocumentJobsSupported.class); - classesByName.put(PageRangesSupported.SUPPORTED.getName(), + classesByName.put(PageRangesSupported.SUPPORTED.getName(), PageRangesSupported.class); - + // TextSyntax derived attributes - classesByName.put("media-default", MediaDefault.class); + classesByName.put("media-default", MediaDefault.class); classesByName.put("media-supported", MediaSupported.class); - classesByName.put("media", MediaSizeName.class); - classesByName.put("printer-location", PrinterLocation.class); - classesByName.put("printer-info", PrinterInfo.class); - classesByName.put("printer-make-and-model", PrinterMakeAndModel.class); + classesByName.put("media", MediaSizeName.class); + classesByName.put("printer-location", PrinterLocation.class); + classesByName.put("printer-info", PrinterInfo.class); + classesByName.put("printer-make-and-model", PrinterMakeAndModel.class); classesByName.put("printer-state-message", PrinterStateMessage.class); - classesByName.put("job-state-message", JobStateMessage.class); - classesByName.put("job-sheets-default", JobSheetsDefault.class); - classesByName.put("job-sheets-supported", JobSheetsSupported.class); - classesByName.put("job-name", JobName.class); - classesByName.put("printer-name", PrinterName.class); - classesByName.put("status-message", StatusMessage.class); - classesByName.put("detailed-status-message", DetailedStatusMessage.class); - classesByName.put("document-access-error", DocumentAccessError.class); - classesByName.put("output-device-assigned", OutputDeviceAssigned.class); - classesByName.put("job-hold-until-default", JobHoldUntilDefault.class); - classesByName.put("job-originating-user-name", - JobOriginatingUserName.class); - classesByName.put("job-hold-until-supported", + classesByName.put("job-state-message", JobStateMessage.class); + classesByName.put("job-sheets-default", JobSheetsDefault.class); + classesByName.put("job-sheets-supported", JobSheetsSupported.class); + classesByName.put("job-name", JobName.class); + classesByName.put("printer-name", PrinterName.class); + classesByName.put("status-message", StatusMessage.class); + classesByName.put("detailed-status-message", DetailedStatusMessage.class); + classesByName.put("document-access-error", DocumentAccessError.class); + classesByName.put("output-device-assigned", OutputDeviceAssigned.class); + classesByName.put("job-hold-until-default", JobHoldUntilDefault.class); + classesByName.put("job-originating-user-name", + JobOriginatingUserName.class); + classesByName.put("job-hold-until-supported", JobHoldUntilSupported.class); - classesByName.put("job-message-from-operator", - JobMessageFromOperator.class); - classesByName.put("printer-message-from-operator", - PrinterMessageFromOperator.class); - classesByName.put("job-detailed-status-messages", + classesByName.put("job-message-from-operator", + JobMessageFromOperator.class); + classesByName.put("printer-message-from-operator", + PrinterMessageFromOperator.class); + classesByName.put("job-detailed-status-messages", JobDetailedStatusMessages.class); - classesByName.put("job-document-access-errors", - JobDocumentAccessErrors.class); - + classesByName.put("job-document-access-errors", + JobDocumentAccessErrors.class); + // IntegerSyntax derived Attributes - classesByName.put("copies-default", CopiesDefault.class); - classesByName.put("job-id", JobId.class); + classesByName.put("copies-default", CopiesDefault.class); + classesByName.put("job-id", JobId.class); classesByName.put("job-priority-supported", JobPrioritySupported.class); classesByName.put("job-priority-default", JobPriorityDefault.class); classesByName.put("number-up-supported", NumberUpSupported.class); classesByName.put("number-up-default", NumberUpDefault.class); classesByName.put("queued-job-count", QueuedJobCount.class); - classesByName.put("printer-up-time", PrinterUpTime.class); + classesByName.put("printer-up-time", PrinterUpTime.class); classesByName.put("pages-per-minute", PagesPerMinute.class); - classesByName.put("pages-per-minute-color", PagesPerMinuteColor.class); + classesByName.put("pages-per-minute-color", PagesPerMinuteColor.class); classesByName.put("job-k-octets-processed", JobKOctetsProcessed.class); - classesByName.put("number-of-intervening-jobs", + classesByName.put("number-of-intervening-jobs", NumberOfInterveningJobs.class); - classesByName.put("job-impressions-completed", - JobImpressionsCompleted.class); - classesByName.put("job-media-sheets-completed", + classesByName.put("job-impressions-completed", + JobImpressionsCompleted.class); + classesByName.put("job-media-sheets-completed", JobMediaSheetsCompleted.class); - classesByName.put("multiple-operation-time-out", + classesByName.put("multiple-operation-time-out", MultipleOperationTimeOut.class); - - + + // 4.2 job template attributes instanceByClass.put(JobPriority.class, new JobPrioritySupported(1)); instanceByClass.put(JobHoldUntil.class, new JobHoldUntilSupported("", null)); @@ -299,7 +301,7 @@ public final class IppUtilities // 4.4 printer attributes instanceByClass.put(Compression.class, CompressionSupported.COMPRESS); } - + private IppUtilities() { // not to be instantiated @@ -308,38 +310,38 @@ public final class IppUtilities /** * Returns the implementing class object for given * attribute name objects. - * + * * @param name the attribute name * @return The Class object. */ - public static Class getClass(String name) + public static Class getClass(String name) { - return (Class) classesByName.get(name); + return classesByName.get(name); } - + /** - * Returns the name of the supported attribute + * Returns the name of the supported attribute * based on the given standard attribute category. - * + * * @param clazz the standard attribute category * @return The name of the supported attribute category. */ - public static String getSupportedAttrName(Class clazz) + public static String getSupportedAttrName(Class clazz) { - return ((SupportedValuesAttribute) instanceByClass.get(clazz)).getName(); + return instanceByClass.get(clazz).getName(); } - + /** - * Returns the category of the supported attribute + * Returns the category of the supported attribute * based on the given standard attribute category. - * + * * @param clazz the standard attribute category * @return The supported attribute category. */ - public static Class getSupportedCategory(Class clazz) + public static Class getSupportedCategory(Class clazz) { - return ((SupportedValuesAttribute) instanceByClass.get(clazz)).getCategory(); - } + return instanceByClass.get(clazz).getCategory(); + } /** * Helper method to convert to an int. @@ -351,7 +353,7 @@ public final class IppUtilities return (((b[0] & 0xff) << 24) | ((b[1] & 0xff) << 16) | ((b[2] & 0xff) << 8) | (b[3] & 0xff)); } - + /** * Helper method to convert to an int. * @param b1 the 1th byte @@ -376,22 +378,22 @@ public final class IppUtilities { return (short) ((b1 << 8) | (b2 & 0xff)); } - + /** * Instantiates an EnumSyntax based attribute with the given IPP * name and the given value (Enums maybe int or String based). - * + * * @param name the attribute name of the subclass. * @param value the integer value of the specific enum. * @return The Attribute (a subclass of EnumSyntax) */ 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 if (attrClass == null) - return null; + return null; try { @@ -423,33 +425,33 @@ public final class IppUtilities { // should not happen, all fields are public } - + return null; } - - - + + + /** - * Instantiates an IntegerSyntax based attribute with the + * Instantiates an IntegerSyntax based attribute with the * given IPP name for the given int value. - * + * * @param name the attribute name of the subclass. * @param value the integer value * @return The Attribute (a subclass of IntegerSyntax) */ 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 if (attrClass == null) return null; try { - INTEGER_ATT_VALUE[0] = new Integer(value); - Constructor c = attrClass.getDeclaredConstructor(INTEGER_CLASS_ARRAY); - return (Attribute) c.newInstance(INTEGER_ATT_VALUE); + INTEGER_ATT_VALUE[0] = Integer.valueOf(value); + Constructor c = attrClass.getDeclaredConstructor(INTEGER_CLASS_ARRAY); + return (Attribute) c.newInstance(INTEGER_ATT_VALUE); } catch (SecurityException e) { @@ -471,21 +473,21 @@ public final class IppUtilities { // should not happen, all fields are public } - + return null; - } - + } + /** * Instantiates an TextSyntax based attribute with the given * IPP name for the given text value (will be decoded). - * + * * @param name the attribute name of the subclass. * @param tag the tag defined in {@link IppValueTag} * @param value the byte[] value to be decoded based on the tag value. * @return The Attribute (a subclass of TextSyntax) */ public static Attribute getTextAttribute(String name, byte tag, byte[] value) - { + { // without language tag is rather easy - default locale if (tag == IppValueTag.NAME_WITHOUT_LANGUAGE || tag == IppValueTag.TEXT_WITHOUT_LANGUAGE) @@ -504,7 +506,7 @@ public final class IppUtilities String language = new String(tmp); String text = new String(tmp2); Locale locale = null; - + if (language.length() > 2) locale = new Locale(language.substring(0, 2), language.substring(3)); else @@ -512,18 +514,18 @@ public final class IppUtilities TEXT_ATT_VALUE[0] = text; TEXT_ATT_VALUE[1] = locale; - } - - Class attrClass = getClass(name); - + } + + Class attrClass = getClass(name); + // There might be unknown attributes we have no mapped class for if (attrClass == null) return null; try { - Constructor c = attrClass.getDeclaredConstructor(TEXT_CLASS_ARRAY); - return (Attribute) c.newInstance(TEXT_ATT_VALUE); + Constructor c = attrClass.getDeclaredConstructor(TEXT_CLASS_ARRAY); + return (Attribute) c.newInstance(TEXT_ATT_VALUE); } catch (SecurityException e) { @@ -545,7 +547,7 @@ public final class IppUtilities { // should not happen, all fields are public } - + return null; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/IppValueTag.java b/libjava/classpath/gnu/javax/print/ipp/IppValueTag.java index 0c81befca08..def9545a38b 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppValueTag.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppValueTag.java @@ -1,4 +1,4 @@ -/* IppValueTag.java -- +/* IppValueTag.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,96 +44,96 @@ package gnu.javax.print.ipp; * Attributes are always of a special type syntax (e.g. boolean or * interger attribute). These value types are specified by the tag * constants provided in this class. Beside the syntax types some - * out of band values for reporting requested attributes as + * out of band values for reporting requested attributes as * unsupported, unknown etc. back to the client. *

    - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class IppValueTag -{ - +{ + /** Out of band value for unsupported attributes. */ public static final byte UNSUPPORTED = 0x10; - + // 0x11 reserved for 'default' for definition in a future - // IETF standards track document - + // IETF standards track document + /** Out of band value for unknown attributes. */ public static final byte UNKNOWN = 0x12; - + /** Out of band value for attribute without a value. */ public static final byte NO_VALUE = 0x13; - + // 0x14-0x1F reserved for "out-of-band" values in future IETF // standards track documents. - + // 0x20 reserved for definition in a future IETF // standards track document - + /** Indicates a value of syntax type integer. */ public static final byte INTEGER = 0x21; - + /** Indicates a value of syntax type boolean. */ public static final byte BOOLEAN = 0x22; - + /** Indicates a value of syntax type enum (enumeration). */ public static final byte ENUM = 0x23; - + // 0x24-0x2F reserved for integer types for definition in // future IETF standards track documents /** Indicates a value of syntax type octect string. */ public static final byte OCTECTSTRING_UNSPECIFIED = 0x30; - + /** Indicates a value of syntax type datetime. */ public static final byte DATETIME = 0x31; - + /** Indicates a value of syntax type resolution. */ public static final byte RESOLUTION = 0x32; - + /** Indicates a value of syntax type range of integers. */ public static final byte RANGEOFINTEGER = 0x33; - + // 0x34 reserved for definition in a future IETF // standards track document - + /** Indicates a value of syntax type text with language. */ public static final byte TEXT_WITH_LANGUAGE = 0x35; - + /** Indicates a value of syntax type name with language. */ public static final byte NAME_WITH_LANGUAGE = 0x36; - + // 0x37-0x3F reserved for octetString type definitions in // future IETF standards track documents // 0x40 reserved for definition in a future IETF // standards track document - + /** Indicates a value of syntax type text without language. */ public static final byte TEXT_WITHOUT_LANGUAGE = 0x41; - + /** Indicates a value of syntax type name without language. */ public static final byte NAME_WITHOUT_LANGUAGE = 0x42; - + // 0x43 reserved for definition in a future IETF // standards track document - + /** Indicates a value of syntax type keyword. */ - public static final byte KEYWORD = 0x44; - + public static final byte KEYWORD = 0x44; + /** Indicates a value of syntax type URI. */ - public static final byte URI = 0x45; - + public static final byte URI = 0x45; + /** Indicates a value of syntax type URI scheme. */ public static final byte URI_SCHEME = 0x46; - + /** Indicates a value of syntax type charset. */ - public static final byte CHARSET = 0x47; - + public static final byte CHARSET = 0x47; + /** Indicates a value of syntax type language. */ - public static final byte NATURAL_LANGUAGE =0x48; - + public static final byte NATURAL_LANGUAGE =0x48; + /** Indicates a value of syntax type mime media. */ public static final byte MIME_MEDIA_TYPE = 0x49; @@ -145,15 +145,15 @@ public final class IppValueTag { // not to be instantiated; } - + /** - * Tests if given value corresponds to a + * Tests if given value corresponds to a * value tag value. - * + * * @param value the value to test for * @return true if, false otherwise. */ - public static boolean isValueTag(byte value) + public static boolean isValueTag(byte value) { if(value == 0x10 || value == 0x12 || value == 0x13 || value == 0x21 || value == 0x22 || value == 0x23 @@ -163,8 +163,8 @@ public final class IppValueTag || value == 0x45 || value == 0x46 || value == 0x47 || value == 0x48 || value == 0x49 ) return true; - + return false; } - + } diff --git a/libjava/classpath/gnu/javax/print/ipp/MultiDocPrintJobImpl.java b/libjava/classpath/gnu/javax/print/ipp/MultiDocPrintJobImpl.java index 1167f52c3b7..89163dc9933 100644 --- a/libjava/classpath/gnu/javax/print/ipp/MultiDocPrintJobImpl.java +++ b/libjava/classpath/gnu/javax/print/ipp/MultiDocPrintJobImpl.java @@ -45,18 +45,18 @@ import javax.print.PrintException; import javax.print.attribute.PrintRequestAttributeSet; /** - * Implementation of the MultiDocPrintJob interface. Implementation + * Implementation of the MultiDocPrintJob interface. Implementation * is specific to the IppPrintService implementation. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public class MultiDocPrintJobImpl extends DocPrintJobImpl +public class MultiDocPrintJobImpl extends DocPrintJobImpl implements MultiDocPrintJob { /** * Constructor forwarding arguments to the super constructor. - * + * * @param service the print service instance. * @param user the user of this print service. * @param passwd the password of the user. diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/CharsetSyntax.java b/libjava/classpath/gnu/javax/print/ipp/attribute/CharsetSyntax.java index 0db846cbab9..cd112f4594f 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/CharsetSyntax.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/CharsetSyntax.java @@ -1,4 +1,4 @@ -/* CharsetSyntax.java -- +/* CharsetSyntax.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,7 @@ package gnu.javax.print.ipp.attribute; import java.io.Serializable; /** - * CharsetSyntax is the abstract base class of all attribute + * CharsetSyntax is the abstract base class of all attribute * classes which provide a charset (US-ASCII) string as value. * * @author Wolfgang Baer (WBaer@gmx.de) @@ -62,7 +62,7 @@ public abstract class CharsetSyntax implements Cloneable, Serializable { if (value == null) throw new NullPointerException("value may not be null"); - + this.value = value; } @@ -98,14 +98,14 @@ public abstract class CharsetSyntax implements Cloneable, Serializable if (! (obj instanceof CharsetSyntax)) return false; - CharsetSyntax tmp = (CharsetSyntax) obj; + CharsetSyntax tmp = (CharsetSyntax) obj; return value.equals(tmp.getValue()); } /** * Returns a string representing the object. The returned * string is the underlying text value of this object. - * + * * @return The string representation. */ public String toString() diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/DefaultValueAttribute.java b/libjava/classpath/gnu/javax/print/ipp/attribute/DefaultValueAttribute.java index 0f1084f4958..cc40db22ef7 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/DefaultValueAttribute.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/DefaultValueAttribute.java @@ -1,4 +1,4 @@ -/* DefaultValueAttribute.java -- +/* DefaultValueAttribute.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,18 +41,18 @@ package gnu.javax.print.ipp.attribute; import javax.print.attribute.Attribute; /** - * Marker interface for all attribute classes describing attributes + * Marker interface for all attribute classes describing attributes * providing default values. Often there exist a sequence of an * attribute name like: Name - > Name-default -> Name-supported. * * @author Wolfgang Baer (WBaer@gmx.de) */ public interface DefaultValueAttribute extends Attribute -{ +{ /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ public Attribute getAssociatedAttribute(); diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java b/libjava/classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java index 433b6f35a38..2d005a82ec9 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/DetailedStatusMessage.java @@ -1,4 +1,4 @@ -/* DetailedStatusMessage.java -- +/* DetailedStatusMessage.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,12 +45,12 @@ import javax.print.attribute.TextSyntax; /** * DetailedStatusMessage attribute as described in RFC 2911 section - * 3.1.6 Operation Response Status Codes and Status Message + * 3.1.6 Operation Response Status Codes and Status Message * provides a short description of the status of the operation. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class DetailedStatusMessage extends TextSyntax +public final class DetailedStatusMessage extends TextSyntax implements Attribute { @@ -74,7 +74,7 @@ public final class DetailedStatusMessage extends TextSyntax * * @return The class DetailedStatusMessage itself. */ - public Class getCategory() + public Class getCategory() { return DetailedStatusMessage.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java b/libjava/classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java index 3433e3ed731..56b55ba760f 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/DocumentAccessError.java @@ -1,4 +1,4 @@ -/* DocumentAccessError.java -- +/* DocumentAccessError.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,12 +45,12 @@ import javax.print.attribute.TextSyntax; /** * DocumentAccessError attribute as described in RFC 2911 section - * 3.1.6 Operation Response Status Codes and Status Message + * 3.1.6 Operation Response Status Codes and Status Message * provides additional information for document access errors. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class DocumentAccessError extends TextSyntax +public final class DocumentAccessError extends TextSyntax implements Attribute { @@ -74,7 +74,7 @@ public final class DocumentAccessError extends TextSyntax * * @return The class DocumentAccessError itself. */ - public Class getCategory() + public Class getCategory() { return DocumentAccessError.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java b/libjava/classpath/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java index c90af3eb8e5..a648c8cece7 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java @@ -1,4 +1,4 @@ -/* NaturalLanguageSyntax.java -- +/* NaturalLanguageSyntax.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,13 +41,13 @@ package gnu.javax.print.ipp.attribute; import java.io.Serializable; /** - * NaturalLanguageSyntax is the abstract base class of all - * attribute classes which provide a natural language (US-ASCII) + * NaturalLanguageSyntax is the abstract base class of all + * attribute classes which provide a natural language (US-ASCII) * string as value. * * @author Wolfgang Baer (WBaer@gmx.de) */ -public abstract class NaturalLanguageSyntax +public abstract class NaturalLanguageSyntax implements Cloneable, Serializable { private final String value; @@ -64,7 +64,7 @@ public abstract class NaturalLanguageSyntax { if (value == null) throw new NullPointerException("value may not be null"); - + this.value = value; } @@ -100,14 +100,14 @@ public abstract class NaturalLanguageSyntax if (! (obj instanceof NaturalLanguageSyntax)) return false; - NaturalLanguageSyntax tmp = (NaturalLanguageSyntax) obj; + NaturalLanguageSyntax tmp = (NaturalLanguageSyntax) obj; return value.equals(tmp.getValue()); } /** * Returns a string representing the object. The returned * string is the underlying text value of this object. - * + * * @return The string representation. */ public String toString() diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java b/libjava/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java index 814fe2d0a74..4c129f6d574 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java @@ -1,4 +1,4 @@ -/* RequestedAttributes.java -- +/* RequestedAttributes.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,15 +48,15 @@ import javax.print.attribute.Attribute; /** * RequestedAttributes specifies the requested * attributes in an IPP request operation. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class RequestedAttributes implements Attribute { - private ArrayList attributes; + private ArrayList attributes; /** - * Creates a RequestedAttributes object with + * Creates a RequestedAttributes object with * the initial value. * * @param value the string for the ipp name @@ -67,29 +67,29 @@ public final class RequestedAttributes implements Attribute { if (value == null) throw new NullPointerException(); - - attributes = new ArrayList(); + + attributes = new ArrayList(); attributes.add(value); } - + /** * Adds the IPP name value to the set. - * + * * @param value the string for the ipp name */ public void addValue(String value) { attributes.add(value); } - + /** * Returns the values. - * + * * @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 DocumentFormat itself. */ - public Class getCategory() + public Class getCategory() { return RequestedAttributes.class; } @@ -120,13 +120,13 @@ public final class RequestedAttributes implements Attribute public String toString() { CPStringBuilder b = new CPStringBuilder(); - + if (attributes.size() > 0) b.append(attributes.get(0)); - + for (int i=1; i < attributes.size(); i++) b.append(", " + attributes.get(i)); - + return b.toString(); - } + } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/StatusMessage.java b/libjava/classpath/gnu/javax/print/ipp/attribute/StatusMessage.java index 692b26ed562..0701008ef33 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/StatusMessage.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/StatusMessage.java @@ -1,4 +1,4 @@ -/* StatusMessage.java -- +/* StatusMessage.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,9 +45,9 @@ import javax.print.attribute.TextSyntax; /** * StatusMessage attribute as described in RFC 2911 section - * 3.1.6 Operation Response Status Codes and Status Message + * 3.1.6 Operation Response Status Codes and Status Message * provides a short description of the status of the operation. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class StatusMessage extends TextSyntax implements Attribute @@ -73,7 +73,7 @@ public final class StatusMessage extends TextSyntax implements Attribute * * @return The class StatusMessage itself. */ - public Class getCategory() + public Class getCategory() { return StatusMessage.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java b/libjava/classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java index 233431ad39c..a03beccbe3b 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/UnknownAttribute.java @@ -1,4 +1,4 @@ -/* UnknownAttribute.java -- +/* UnknownAttribute.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import javax.print.attribute.Attribute; /** * UnknownAttribute holds all the parsed Attribute information. * It provides methods to get the value-tag, name and value. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class UnknownAttribute implements Attribute @@ -61,7 +61,7 @@ public final class UnknownAttribute implements Attribute /** * Creates a UnknownAttribute object with the given values. * - * @param tag the value tag + * @param tag the value tag * @param name the attribute name * @param value the byte[] with the value */ @@ -77,7 +77,7 @@ public final class UnknownAttribute implements Attribute * * @return The class UnknownAttribute itself. */ - public Class getCategory() + public Class getCategory() { return UnknownAttribute.class; } @@ -91,18 +91,18 @@ public final class UnknownAttribute implements Attribute { return name; } - + /** * Returns the value tag * @return The tag. - * + * * @see gnu.javax.print.ipp.IppValueTag */ public byte getValueTag() { return tag; } - + /** * Returns the name of the attribute. * @return The name. @@ -111,7 +111,7 @@ public final class UnknownAttribute implements Attribute { return name; } - + /** * Returns the attribute value origin byte array. * @return The value. @@ -120,7 +120,7 @@ public final class UnknownAttribute implements Attribute { return value; } - + /** * Returns the attribute value decoded as String. * @return The value as String. @@ -129,7 +129,7 @@ public final class UnknownAttribute implements Attribute { return new String(value); } - + /** * Returns the attribute value decoded as int. * @return The value as int. @@ -138,7 +138,7 @@ public final class UnknownAttribute implements Attribute { return IppUtilities.convertToInt(value); } - + /** * Returns the attribute value decoded as an URI. * @return The value as URI. @@ -159,7 +159,7 @@ public final class UnknownAttribute implements Attribute * Provides a string representation for some default * tag types (e.g. int, rangeofinteger, string, uri). * For other more complex types "No conversion found." - * is returned. + * is returned. */ public String toString() { @@ -168,9 +168,9 @@ public final class UnknownAttribute implements Attribute case IppValueTag.INTEGER: return "" + getAttributeValueAsInt(); case IppValueTag.RANGEOFINTEGER: - int lower = IppUtilities.convertToInt(value[0], value[1], + int lower = IppUtilities.convertToInt(value[0], value[1], value[2], value[3]); - int upper = IppUtilities.convertToInt(value[4], value[5], + int upper = IppUtilities.convertToInt(value[4], value[5], value[6], value[7]); return lower + "-" + upper; case IppValueTag.URI: @@ -186,5 +186,5 @@ public final class UnknownAttribute implements Attribute default: return "No conversion found."; } - } + } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java index 225a0895a0f..39d8fe1c097 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java @@ -1,4 +1,4 @@ -/* CopiesDefault.java -- +/* CopiesDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,13 +46,13 @@ import javax.print.attribute.standard.Copies; /** * CopiesDefault provides the default value * for the copies attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class CopiesDefault extends IntegerSyntax implements DefaultValueAttribute { - + /** * Creates a CopiesDefault object. * @@ -67,13 +67,13 @@ public final class CopiesDefault extends IntegerSyntax if (value < 1) throw new IllegalArgumentException("value may not be less than 1"); } - + /** * Tests if the given object is equal to this object. * * @param obj the object to test * - * @return true if both objects are equal, + * @return true if both objects are equal, * false otherwise. */ public boolean equals(Object obj) @@ -89,7 +89,7 @@ public final class CopiesDefault extends IntegerSyntax * * @return The class CopiesDefault itself. */ - public Class getCategory() + public Class getCategory() { return CopiesDefault.class; } @@ -103,15 +103,15 @@ public final class CopiesDefault extends IntegerSyntax { return "copies-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. *

    May return null if no value exists in JPS API.

    - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return new Copies(getValue()); } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java index fe40aee7222..5eff914982c 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java @@ -1,4 +1,4 @@ -/* DocumentFormatDefault.java -- +/* DocumentFormatDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,16 +49,16 @@ import javax.print.attribute.TextSyntax; /** * DocumentFormatDefault specifies the default document * format of a printer. - * + * * @author Wolfgang Baer (WBaer@gmx.de) * */ -public final class DocumentFormatDefault extends TextSyntax +public final class DocumentFormatDefault extends TextSyntax implements DefaultValueAttribute { /** - * Creates a DocumentFormatDefault object with the + * Creates a DocumentFormatDefault object with the * given value and locale. * * @param value the value for this syntax @@ -77,7 +77,7 @@ public final class DocumentFormatDefault extends TextSyntax * * @return The class DocumentFormatDefault itself. */ - public Class getCategory() + public Class getCategory() { return DocumentFormatDefault.class; } @@ -95,12 +95,12 @@ public final class DocumentFormatDefault extends TextSyntax /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return new DocumentFormat(getValue(), getLocale()); } - + } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java index d3dd99c06d2..9d4a060029b 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java @@ -48,7 +48,7 @@ import javax.print.attribute.EnumSyntax; /** * The FinishingsDefault attribute provides the supported * values for finishings of a job. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class FinishingsDefault extends EnumSyntax @@ -57,108 +57,108 @@ public final class FinishingsDefault extends EnumSyntax /** No finishing. */ public static final FinishingsDefault NONE = new FinishingsDefault(3); - + /** Staple the document(s) */ public static final FinishingsDefault STAPLE = new FinishingsDefault(4); - + /** Cover a document */ public static final FinishingsDefault COVER = new FinishingsDefault(6); - + /** * This value indicates that a binding is to be applied to the document. * The type and placement of the binding is site-defined. */ public static final FinishingsDefault BIND = new FinishingsDefault(7); - + /** - * Bind the document(s) with one or more staples (wire stitches) - * along the middle fold. + * Bind the document(s) with one or more staples (wire stitches) + * along the middle fold. */ public static final FinishingsDefault SADDLE_STITCH = new FinishingsDefault(8); - + /** - * Bind the document(s) with one or more staples (wire stitches) - * along one edge. + * Bind the document(s) with one or more staples (wire stitches) + * along one edge. */ public static final FinishingsDefault EDGE_STITCH = new FinishingsDefault(9); - - /** - * Bind the document(s) with one or more staples in the top left - * corner. + + /** + * Bind the document(s) with one or more staples in the top left + * corner. */ public static final FinishingsDefault STAPLE_TOP_LEFT = new FinishingsDefault(20); - - /** - * Bind the document(s) with one or more staples in the bottom - * left corner. + + /** + * Bind the document(s) with one or more staples in the bottom + * left corner. */ public static final FinishingsDefault STAPLE_BOTTOM_LEFT = new FinishingsDefault(21); - + /** * Bind the document(s) with one or more staples in the top right corner. */ public static final FinishingsDefault STAPLE_TOP_RIGHT = new FinishingsDefault(22); - + /** * Bind the document(s) with one or more staples in the bottom right corner. */ public static final FinishingsDefault STAPLE_BOTTOM_RIGHT = new FinishingsDefault(23); - + /** - * Bind the document(s) with one or more staples (wire stitches) + * Bind the document(s) with one or more staples (wire stitches) * along the left edge. */ public static final FinishingsDefault EDGE_STITCH_LEFT = new FinishingsDefault(24); - + /** - * Bind the document(s) with one or more staples (wire stitches) along + * Bind the document(s) with one or more staples (wire stitches) along * the top edge. */ public static final FinishingsDefault EDGE_STITCH_TOP = new FinishingsDefault(25); - + /** - * Bind the document(s) with one or more staples (wire stitches) along + * Bind the document(s) with one or more staples (wire stitches) along * the right edge. */ public static final FinishingsDefault EDGE_STITCH_RIGHT = new FinishingsDefault(26); - + /** * Bind the document(s) with one or more staples (wire stitches) along - * the bottom edge. + * the bottom edge. */ public static final FinishingsDefault EDGE_STITCH_BOTTOM = new FinishingsDefault(27); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * left edge assuming a portrait document. */ public static final FinishingsDefault STAPLE_DUAL_LEFT = new FinishingsDefault(28); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * top edge assuming a portrait document. */ public static final FinishingsDefault STAPLE_DUAL_TOP = new FinishingsDefault(29); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * right edge assuming a portrait document. */ public static final FinishingsDefault STAPLE_DUAL_RIGHT = new FinishingsDefault(30); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * bottom edge assuming a portrait document. */ public static final FinishingsDefault STAPLE_DUAL_BOTTOM = new FinishingsDefault(31); - private static final String[] stringTable = { "none", "staple", null, + private static final String[] stringTable = { "none", "staple", null, "cover", "bind", "saddle-stitch", "edge-stitch", null, null, null, null, null, null, null, null, null, null, "staple-top-left", - "staple-bottom-left", - "staple-top-right", + "staple-bottom-left", + "staple-top-right", "staple-bottom-right", "edge-stitch-left", "edge-stitch-top", @@ -168,14 +168,14 @@ public final class FinishingsDefault extends EnumSyntax "staple-dual-top", "staple-dual-right", "staple-dual-bottom" }; - - private static final FinishingsDefault[] enumValueTable = { NONE, STAPLE, null, - COVER, BIND, + + private static final FinishingsDefault[] enumValueTable = { NONE, STAPLE, null, + COVER, BIND, SADDLE_STITCH, - EDGE_STITCH, null, - null, null, null, - null, null, null, - null, null, null, + EDGE_STITCH, null, + null, null, null, + null, null, null, + null, null, null, STAPLE_TOP_LEFT, STAPLE_BOTTOM_LEFT, STAPLE_TOP_RIGHT, @@ -188,10 +188,10 @@ public final class FinishingsDefault extends EnumSyntax STAPLE_DUAL_TOP, STAPLE_DUAL_RIGHT, STAPLE_DUAL_BOTTOM }; - + /** * Constructs a FinishingsDefault object. - * + * * @param value the value */ protected FinishingsDefault(int value) @@ -204,7 +204,7 @@ public final class FinishingsDefault extends EnumSyntax * * @return the class FinishingsDefault itself */ - public Class getCategory() + public Class getCategory() { return FinishingsDefault.class; } @@ -218,7 +218,7 @@ public final class FinishingsDefault extends EnumSyntax { return "finishings-default"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -249,14 +249,14 @@ public final class FinishingsDefault extends EnumSyntax { return 3; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return IppUtilities.getEnumAttribute("finishings", new Integer(getValue())); } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java index a0baac7273a..7c29f231c4a 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java @@ -1,4 +1,4 @@ -/* JobHoldUntilDefault.java -- +/* JobHoldUntilDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,57 +50,57 @@ import javax.print.attribute.standard.JobHoldUntil; /** * JobHoldUntilDefault attribute provides the default value * for the attribute type job-hold-until. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobHoldUntilDefault extends TextSyntax +public final class JobHoldUntilDefault extends TextSyntax implements DefaultValueAttribute { - - // a keyword/name based attribute in IPP + + // a keyword/name based attribute in IPP // can be extended by administrators // standard values are predefined - + /** Job should be printed immediately. */ - public static final JobHoldUntilDefault NO_HOLD = + public static final JobHoldUntilDefault NO_HOLD = new JobHoldUntilDefault("no-hold", null); - + /** Job should be hold indefinitely. */ - public static final JobHoldUntilDefault INDEFINITE = + public static final JobHoldUntilDefault INDEFINITE = new JobHoldUntilDefault("indefinite", null); - + /** Job should be processed during the day. */ - public static final JobHoldUntilDefault DAY_TIME = + public static final JobHoldUntilDefault DAY_TIME = new JobHoldUntilDefault("day-time", null); - + /** Job should be processed in the evening. */ - public static final JobHoldUntilDefault EVENING = + public static final JobHoldUntilDefault EVENING = new JobHoldUntilDefault("evening", null); - + /** Job should be processed during night. */ - public static final JobHoldUntilDefault NIGHT = + public static final JobHoldUntilDefault NIGHT = new JobHoldUntilDefault("night", null); - + /** Job should be processed during the weekend. */ - public static final JobHoldUntilDefault WEEKEND = + public static final JobHoldUntilDefault WEEKEND = new JobHoldUntilDefault("weekend", null); - - /** - * Job should be processed as second-shift - * (after close of business). - */ - public static final JobHoldUntilDefault SECOND_SHIFT = - new JobHoldUntilDefault("second-shift", null); - - /** - * Job should be processed as third-shift - * (after midnight). - */ - public static final JobHoldUntilDefault THIRD_SHIFT = - new JobHoldUntilDefault("third-shift", null); /** - * Creates a JobHoldUntilDefault object with the + * Job should be processed as second-shift + * (after close of business). + */ + public static final JobHoldUntilDefault SECOND_SHIFT = + new JobHoldUntilDefault("second-shift", null); + + /** + * Job should be processed as third-shift + * (after midnight). + */ + public static final JobHoldUntilDefault THIRD_SHIFT = + new JobHoldUntilDefault("third-shift", null); + + /** + * Creates a JobHoldUntilDefault object with the * given value and locale. * * @param value the value for this syntax @@ -119,7 +119,7 @@ public final class JobHoldUntilDefault extends TextSyntax * * @return The class JobHoldUntilDefault itself. */ - public Class getCategory() + public Class getCategory() { return JobHoldUntilDefault.class; } @@ -133,14 +133,14 @@ public final class JobHoldUntilDefault extends TextSyntax { return "job-hold-until-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { // FIXME Same Mapping problem as in IppPrintService return new JobHoldUntil(new Date()); diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java index de6ad5a8af2..9430250ae79 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java @@ -1,4 +1,4 @@ -/* JobPriorityDefault.java -- +/* JobPriorityDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,13 +47,13 @@ import javax.print.attribute.standard.JobPriority; /** * JobPriorityDefault attribute provides the default value of * the printer object for the job-priority attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class JobPriorityDefault extends IntegerSyntax implements DefaultValueAttribute { - + /** * Creates a JobPriorityDefault object. * @@ -74,7 +74,7 @@ public final class JobPriorityDefault extends IntegerSyntax * * @param obj the object to test * - * @return true if both objects are equal, + * @return true if both objects are equal, * false otherwise. */ public boolean equals(Object obj) @@ -90,7 +90,7 @@ public final class JobPriorityDefault extends IntegerSyntax * * @return The class JobPriorityDefault itself. */ - public Class getCategory() + public Class getCategory() { return JobPriorityDefault.class; } @@ -104,14 +104,14 @@ public final class JobPriorityDefault extends IntegerSyntax { return "job-priority-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return new JobPriority(getValue()); } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java index 8f92891238b..6bf027edadd 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java @@ -1,4 +1,4 @@ -/* JobSheetsDefault.java -- +/* JobSheetsDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,26 +49,26 @@ import javax.print.attribute.standard.JobSheets; /** * JobSheetsDefault attribute provides the default value of * the printer object for the job-sheets attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobSheetsDefault extends TextSyntax +public final class JobSheetsDefault extends TextSyntax implements DefaultValueAttribute { - //a keyword/name based attribute in IPP + //a keyword/name based attribute in IPP // can be extended by administrators // standard values are predefined - + /** No job sheet is the default */ - public static final JobSheetsDefault NONE = + public static final JobSheetsDefault NONE = new JobSheetsDefault("none", Locale.getDefault()); - + /** A job sheet is the default */ - public static final JobSheetsDefault STANDARD = + public static final JobSheetsDefault STANDARD = new JobSheetsDefault("standard", Locale.getDefault()); - + /** - * Creates a JobSheetsDefault object with the + * Creates a JobSheetsDefault object with the * given value and locale. * * @param value the value for this syntax @@ -81,13 +81,13 @@ public final class JobSheetsDefault extends TextSyntax { super(value, locale); } - + /** * Returns category of this class. * * @return The class JobSheetsDefault itself. */ - public Class getCategory() + public Class getCategory() { return JobSheetsDefault.class; } @@ -101,21 +101,21 @@ public final class JobSheetsDefault extends TextSyntax { return "job-sheets-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. *

    May return null if no value exists in JPS API.

    - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { if (this.equals(JobSheetsDefault.NONE)) return JobSheets.NONE; if (this.equals(JobSheetsDefault.STANDARD)) return JobSheets.STANDARD; - + return null; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java index b4e626da6b0..5945d0b9b1f 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MediaDefault.java @@ -1,4 +1,4 @@ -/* MediaDefault.java -- +/* MediaDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,15 +49,15 @@ import javax.print.attribute.TextSyntax; /** * MediaDefault attribute provides the default value of * the printer object for the media attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class MediaDefault extends TextSyntax +public final class MediaDefault extends TextSyntax implements DefaultValueAttribute { - + /** - * Creates a MediaDefault object with the + * Creates a MediaDefault object with the * given value and locale. * * @param value the value for this syntax @@ -70,13 +70,13 @@ public final class MediaDefault extends TextSyntax { super(value, locale); } - + /** * Returns category of this class. * * @return The class MediaDefault itself. */ - public Class getCategory() + public Class getCategory() { return MediaDefault.class; } @@ -90,14 +90,14 @@ public final class MediaDefault extends TextSyntax { return "media-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return IppUtilities.getEnumAttribute("media" , getValue()); } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java index 0cc324352d8..1563db82c21 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java @@ -47,49 +47,49 @@ import javax.print.attribute.EnumSyntax; /** * MultipleDocumentHandlingDefault provides the * default value for the MultipleDocumentHandling attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class MultipleDocumentHandlingDefault extends EnumSyntax implements DefaultValueAttribute { - + //a keyword based attribute in IPP - int values just starting at 0 - - /** - * Supports only multiple documents treated as a single document. This + + /** + * Supports only multiple documents treated as a single document. This * applies to attributes which specify treatment of multiple document jobs. */ public static final MultipleDocumentHandlingDefault SINGLE_DOCUMENT = new MultipleDocumentHandlingDefault(0); - + /** Supports multiple documents as uncollated copies */ public static final MultipleDocumentHandlingDefault SEPARATE_DOCUMENTS_UNCOLLATED_COPIES = new MultipleDocumentHandlingDefault(1); - + /** Supports multiple documents as collated copies */ public static final MultipleDocumentHandlingDefault SEPARATE_DOCUMENTS_COLLATED_COPIES = new MultipleDocumentHandlingDefault(2); - - /** + + /** * Supports multiple documents where every single document starts - * with a new sheet. + * with a new sheet. */ public static final MultipleDocumentHandlingDefault SINGLE_DOCUMENT_NEW_SHEET = new MultipleDocumentHandlingDefault(3); - private static final String[] stringTable = { "single-document", + private static final String[] stringTable = { "single-document", "separate-documents-uncollated-copies", "separate-documents-collated-copies", "single-document-new-sheet" }; - - private static final MultipleDocumentHandlingDefault[] enumValueTable = + + private static final MultipleDocumentHandlingDefault[] enumValueTable = { SINGLE_DOCUMENT, SEPARATE_DOCUMENTS_UNCOLLATED_COPIES, SEPARATE_DOCUMENTS_COLLATED_COPIES, SINGLE_DOCUMENT_NEW_SHEET}; - + /** * Constructs a MultipleDocumentHandlingDefault object. - * + * * @param value the enum value */ protected MultipleDocumentHandlingDefault(int value) @@ -102,7 +102,7 @@ public final class MultipleDocumentHandlingDefault extends EnumSyntax * * @return The class MultipleDocumentHandlingDefault itself. */ - public Class getCategory() + public Class getCategory() { return MultipleDocumentHandlingDefault.class; } @@ -116,7 +116,7 @@ public final class MultipleDocumentHandlingDefault extends EnumSyntax { return "multiple-document-handling-default"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -137,16 +137,16 @@ public final class MultipleDocumentHandlingDefault extends EnumSyntax { return enumValueTable; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { - return IppUtilities.getEnumAttribute("multiple-document-handling", + return IppUtilities.getEnumAttribute("multiple-document-handling", new Integer(getValue())); } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java index 6689f2d1c98..8e2d076d5fb 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java @@ -1,4 +1,4 @@ -/* NumberUpDefault.java -- +/* NumberUpDefault.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,13 +46,13 @@ import javax.print.attribute.standard.NumberUp; /** * NumberUpDefault attribute provides the default value of * the numper up attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class NumberUpDefault extends IntegerSyntax implements DefaultValueAttribute { - + /** * Creates a NumberUpDefault object. * @@ -63,13 +63,13 @@ public final class NumberUpDefault extends IntegerSyntax { super(value); } - + /** * Tests if the given object is equal to this object. * * @param obj the object to test * - * @return true if both objects are equal, + * @return true if both objects are equal, * false otherwise. */ public boolean equals(Object obj) @@ -85,7 +85,7 @@ public final class NumberUpDefault extends IntegerSyntax * * @return The class NumberUpDefault itself. */ - public Class getCategory() + public Class getCategory() { return NumberUpDefault.class; } @@ -99,15 +99,15 @@ public final class NumberUpDefault extends IntegerSyntax { return "number-up-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. *

    May return null if no value exists in JPS API.

    - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return new NumberUp(getValue()); } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java index 14d26555984..4563ec525c6 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java @@ -45,27 +45,27 @@ import javax.print.attribute.EnumSyntax; /** - * The OrientationRequestedDefault attribute provides + * The OrientationRequestedDefault attribute provides * the default value for the job attribute orientation-requested. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class OrientationRequestedDefault extends EnumSyntax implements DefaultValueAttribute { - + /** Orientation as portrait. */ public static final OrientationRequestedDefault PORTRAIT = new OrientationRequestedDefault(3); - + /** Orientation as landscape. */ public static final OrientationRequestedDefault LANDSCAPE = new OrientationRequestedDefault(4); - + /** Orientation as reversed landscape. */ public static final OrientationRequestedDefault REVERSE_LANDSCAPE = new OrientationRequestedDefault(5); - + /** Orientation as reversed portrait. */ public static final OrientationRequestedDefault REVERSE_PORTRAIT = new OrientationRequestedDefault(6); @@ -74,14 +74,14 @@ public final class OrientationRequestedDefault extends EnumSyntax private static final String[] stringTable = { "portrait", "landscape", "reverse-landscape", "reverse-portrait" }; - - private static final OrientationRequestedDefault[] - enumValueTable = { PORTRAIT, LANDSCAPE, + + private static final OrientationRequestedDefault[] + enumValueTable = { PORTRAIT, LANDSCAPE, REVERSE_LANDSCAPE, REVERSE_PORTRAIT }; - + /** * Constructs a OrientationRequestedDefault object. - * + * * @param value the value */ protected OrientationRequestedDefault(int value) @@ -94,7 +94,7 @@ public final class OrientationRequestedDefault extends EnumSyntax * * @return The class OrientationRequestedDefault itself. */ - public Class getCategory() + public Class getCategory() { return OrientationRequestedDefault.class; } @@ -108,7 +108,7 @@ public final class OrientationRequestedDefault extends EnumSyntax { return "orientation-requested-default"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -129,7 +129,7 @@ public final class OrientationRequestedDefault extends EnumSyntax { return enumValueTable; } - + /** * Returns the lowest used value by the enumerations of this class. * . @@ -139,16 +139,16 @@ public final class OrientationRequestedDefault extends EnumSyntax { return 3; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { - return IppUtilities.getEnumAttribute("orientation-requested", + return IppUtilities.getEnumAttribute("orientation-requested", new Integer(getValue())); } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java index 707d11de0cd..7b123eeb431 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java @@ -47,7 +47,7 @@ import javax.print.attribute.EnumSyntax; /** * PrintQualityDefault provides the * default value for the print-quality attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class PrintQualityDefault extends EnumSyntax @@ -55,20 +55,20 @@ public final class PrintQualityDefault extends EnumSyntax { /** Draft quality of the printer. */ public static final PrintQualityDefault DRAFT = new PrintQualityDefault(3); - + /** Normal quality of the printer. */ public static final PrintQualityDefault NORMAL = new PrintQualityDefault(4); - + /** High quality of the printer. */ public static final PrintQualityDefault HIGH = new PrintQualityDefault(5); private static final String[] stringTable = { "draft", "normal", "high" }; - + private static final PrintQualityDefault[] enumValueTable = { DRAFT, NORMAL, HIGH }; - + /** * Constructs a PrintQualityDefault object. - * + * * @param value the value of the enum */ protected PrintQualityDefault(int value) @@ -81,7 +81,7 @@ public final class PrintQualityDefault extends EnumSyntax * * @return The class PrintQualityDefault itself. */ - public Class getCategory() + public Class getCategory() { return PrintQualityDefault.class; } @@ -95,7 +95,7 @@ public final class PrintQualityDefault extends EnumSyntax { return "print-quality-default"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -116,7 +116,7 @@ public final class PrintQualityDefault extends EnumSyntax { return enumValueTable; } - + /** * Returns the lowest used value by the enumerations of this class. * . @@ -126,14 +126,14 @@ public final class PrintQualityDefault extends EnumSyntax { return 3; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return IppUtilities.getEnumAttribute( "print-quality", new Integer(getValue())); diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java index baa00c6e9c7..2c84b99bae6 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java @@ -45,15 +45,15 @@ import javax.print.attribute.standard.PrinterResolution; /** - * The PrinterResolutionDefault attribute provides + * The PrinterResolutionDefault attribute provides * the default value for the job attribute printer-resolution. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class PrinterResolutionDefault extends ResolutionSyntax implements DefaultValueAttribute { - + /** * Creates a ResolutionSyntax object with the given arguments. * @@ -68,20 +68,20 @@ public final class PrinterResolutionDefault extends ResolutionSyntax { super(crossFeedResolution, feedResolution, units); } - + /** * Tests if the given object is equal to this object. * * @param obj the object to test * - * @return true if both objects are equal, + * @return true if both objects are equal, * false otherwise. */ public boolean equals(Object obj) { if(! (obj instanceof PrinterResolutionDefault)) return false; - + return super.equals(obj); } @@ -90,7 +90,7 @@ public final class PrinterResolutionDefault extends ResolutionSyntax * * @return The class PrinterResolutionDefault itself. */ - public Class getCategory() + public Class getCategory() { return PrinterResolutionDefault.class; } @@ -104,16 +104,16 @@ public final class PrinterResolutionDefault extends ResolutionSyntax { return "printer-resolution-default"; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { - return new PrinterResolution(getCrossFeedResolutionDphi(), + return new PrinterResolution(getCrossFeedResolutionDphi(), getFeedResolutionDphi(), 1); } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java index 3c5b0cb864c..a50560ae974 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/defaults/SidesDefault.java @@ -47,45 +47,45 @@ import javax.print.attribute.EnumSyntax; /** * SidesDefault provides the * default for the sides attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class SidesDefault extends EnumSyntax implements DefaultValueAttribute { - + /** Specifies that each page should be printed on one sheet. */ public static final SidesDefault ONE_SIDED = new SidesDefault(0); - - /** - * Specifies that two following pages should be printed on the + + /** + * Specifies that two following pages should be printed on the * front and back of one sheet for binding on the long edge. */ - public static final SidesDefault TWO_SIDED_LONG_EDGE = + public static final SidesDefault TWO_SIDED_LONG_EDGE = new SidesDefault(1); - - /** - * Specifies that two following pages should be printed on the + + /** + * Specifies that two following pages should be printed on the * front and back of one sheet for binding on the short edge. */ - public static final SidesDefault TWO_SIDED_SHORT_EDGE = + public static final SidesDefault TWO_SIDED_SHORT_EDGE = new SidesDefault(2); - + /** An alias constant for "two sided long edge". */ public static final SidesDefault DUPLEX = new SidesDefault(1); - + /** An alias constant for "two sided short edge". */ public static final SidesDefault TUMBLE = new SidesDefault(2); - private static final String[] stringTable = { "one-sided", + private static final String[] stringTable = { "one-sided", "two-sided-long-edge", "two-sided-short-edge" }; - - private static final SidesDefault[] enumValueTable = { ONE_SIDED, - TWO_SIDED_LONG_EDGE, + + private static final SidesDefault[] enumValueTable = { ONE_SIDED, + TWO_SIDED_LONG_EDGE, TWO_SIDED_SHORT_EDGE }; - - + + /** * Creates a SidesDefault object. * @@ -101,7 +101,7 @@ public final class SidesDefault extends EnumSyntax * * @return The class SidesDefault itself. */ - public Class getCategory() + public Class getCategory() { return SidesDefault.class; } @@ -115,7 +115,7 @@ public final class SidesDefault extends EnumSyntax { return "sides-default"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -136,14 +136,14 @@ public final class SidesDefault extends EnumSyntax { return enumValueTable; } - + /** * Returns the equally enum of the standard attribute class * of this DefaultValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Attribute getAssociatedAttribute() + public Attribute getAssociatedAttribute() { return IppUtilities.getEnumAttribute("sides", new Integer(getValue())); } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java index 057db9bf6a9..4fe2ce0d556 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesCharset.java @@ -46,24 +46,24 @@ import javax.print.attribute.Attribute; * AttributesCharset attribute as described in RFC 2911 chapter * 3.1.4 Character Set and Natural Language Operation Attributes. *

    - * This operation attribute identifies the charset used by any text + * This operation attribute identifies the charset used by any text * and name attribute supplied by the client in the request. This * charset must be used by the printer object in the response.
    * All clients and IPP objects must support the 'utf-8' charset. *

    - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class AttributesCharset extends CharsetSyntax +public final class AttributesCharset extends CharsetSyntax implements Attribute { - + /** Defines a default UTF-8 charset instance */ public static final AttributesCharset UTF8 = new AttributesCharset("utf-8"); /** * Creates a AttributesCharset object. - * + * * @param value the charset string value. */ public AttributesCharset(String value) @@ -76,7 +76,7 @@ public final class AttributesCharset extends CharsetSyntax * * @return The class AttributesCharset itself. */ - public Class getCategory() + public Class getCategory() { return AttributesCharset.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java index 8a41711ac8b..151cec43922 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java @@ -1,4 +1,4 @@ -/* AttributesNaturalLanguage.java -- +/* AttributesNaturalLanguage.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,23 +49,23 @@ import javax.print.attribute.Attribute; *

    * This operation attribute identifies the natural language used * by any text and name attribute supplied by the client in the request. - * The printer object should use this natural language for the response + * The printer object should use this natural language for the response * to this request. *

    - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class AttributesNaturalLanguage extends NaturalLanguageSyntax +public final class AttributesNaturalLanguage extends NaturalLanguageSyntax implements Attribute { - + /** Defines the default language EN */ - public static final AttributesNaturalLanguage EN = + public static final AttributesNaturalLanguage EN = new AttributesNaturalLanguage("en"); /** * Creates a AttributesNaturalLanguage object. - * + * * @param value the language string value. */ public AttributesNaturalLanguage(String value) @@ -78,7 +78,7 @@ public final class AttributesNaturalLanguage extends NaturalLanguageSyntax * * @return The class AttributesNaturalLanguage itself. */ - public Class getCategory() + public Class getCategory() { return AttributesNaturalLanguage.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java index 29f47b7fa95..5b83344a922 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java @@ -1,4 +1,4 @@ -/* JobDetailedStatusMessages.java -- +/* JobDetailedStatusMessages.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,10 +46,10 @@ import javax.print.attribute.TextSyntax; /** * JobDetailedStatusMessages provides additional detailed and * technical job informations. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobDetailedStatusMessages +public final class JobDetailedStatusMessages extends TextSyntax implements Attribute { @@ -73,7 +73,7 @@ public final class JobDetailedStatusMessages * * @return The class JobDetailedStatusMessages itself. */ - public Class getCategory() + public Class getCategory() { return JobDetailedStatusMessages.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java index 46083bed7dc..c3fff057c6f 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java @@ -1,4 +1,4 @@ -/* JobDocumentAccessErrors.java -- +/* JobDocumentAccessErrors.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,10 +47,10 @@ import javax.print.attribute.TextSyntax; * JobDocumentAccessErrors provides additional information * for each access error for print-uri or document-uri jobs. * technical job informations. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobDocumentAccessErrors +public final class JobDocumentAccessErrors extends TextSyntax implements Attribute { @@ -74,7 +74,7 @@ public final class JobDocumentAccessErrors * * @return The class JobDocumentAccessErrors itself. */ - public Class getCategory() + public Class getCategory() { return JobDocumentAccessErrors.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobId.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobId.java index f1d85fa50ba..78c866723e5 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobId.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobId.java @@ -1,4 +1,4 @@ -/* JobId.java -- +/* JobId.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ import javax.print.attribute.IntegerSyntax; /** * The JobId attribute contains the ID of a * print job created or currently being processed. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class JobId extends IntegerSyntax implements Attribute @@ -59,7 +59,7 @@ public final class JobId extends IntegerSyntax implements Attribute public JobId(int value) { super(value); - + if (value < 1) throw new IllegalArgumentException("job-id may not be less than 1"); } @@ -69,7 +69,7 @@ public final class JobId extends IntegerSyntax implements Attribute * * @return The class JobId itself. */ - public Class getCategory() + public Class getCategory() { return JobId.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java index a2fe322a887..569400f403a 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobMoreInfo.java @@ -1,4 +1,4 @@ -/* JobMoreInfo.java -- +/* JobMoreInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import javax.print.attribute.URISyntax; * JobMoreInfo attribute as described in RFC 2911 section * 4.3.4 contains the URI where more information about a job * (e.g. through a HTML page) can be found. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class JobMoreInfo extends URISyntax implements Attribute @@ -69,7 +69,7 @@ public final class JobMoreInfo extends URISyntax implements Attribute * * @return The class JobMoreInfo itself. */ - public Class getCategory() + public Class getCategory() { return JobMoreInfo.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java index dce552020f2..1375a241985 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobPrinterUri.java @@ -1,4 +1,4 @@ -/* JobPrinterUri.java -- +/* JobPrinterUri.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import javax.print.attribute.URISyntax; * JobPrinterUri attribute as described in RFC 2911 section * 4.3.3 contains the URI of the printer which created and * processes a job. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class JobPrinterUri extends URISyntax implements Attribute @@ -69,7 +69,7 @@ public final class JobPrinterUri extends URISyntax implements Attribute * * @return The class JobPrinterUri itself. */ - public Class getCategory() + public Class getCategory() { return JobPrinterUri.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java index 0cf652307b6..d65126621a3 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobStateMessage.java @@ -1,4 +1,4 @@ -/* JobStateMessage.java -- +/* JobStateMessage.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,10 +46,10 @@ import javax.print.attribute.TextSyntax; /** * JobStateMessage attribute describes information about the * job-state and job-state-reasons in human readable form. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobStateMessage +public final class JobStateMessage extends TextSyntax implements Attribute { @@ -73,7 +73,7 @@ public final class JobStateMessage * * @return The class JobStateMessage itself. */ - public Class getCategory() + public Class getCategory() { return JobStateMessage.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobUri.java b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobUri.java index fa7e3f7b5a5..4b545b956b1 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobUri.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobUri.java @@ -1,4 +1,4 @@ -/* JobUri.java -- +/* JobUri.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import javax.print.attribute.URISyntax; * JobUri attribute as described in RFC 2911 section * 4.3.1 contains the URI for a job generated by the printer * after a create request. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class JobUri extends URISyntax implements Attribute @@ -69,7 +69,7 @@ public final class JobUri extends URISyntax implements Attribute * * @return The class JobUri itself. */ - public Class getCategory() + public Class getCategory() { return JobUri.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java index 7c87545880c..42430377c35 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java @@ -1,4 +1,4 @@ -/* CharsetConfigured.java -- +/* CharsetConfigured.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,16 +46,16 @@ import javax.print.attribute.Attribute; * CharsetConfigured attribute as described in RFC 2911 section * 4.4.17 provides the charset which is configured by the * server to be used in the name and text syntax attribute types. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class CharsetConfigured extends CharsetSyntax +public final class CharsetConfigured extends CharsetSyntax implements Attribute { /** * Creates a CharsetConfigured object. - * + * * @param value the charset string value. */ public CharsetConfigured(String value) @@ -68,7 +68,7 @@ public final class CharsetConfigured extends CharsetSyntax * * @return The class CharsetConfigured itself. */ - public Class getCategory() + public Class getCategory() { return CharsetConfigured.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java index e9abab464f1..9a5e01e1d96 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/DocumentFormat.java @@ -1,4 +1,4 @@ -/* DocumentFormat.java -- +/* DocumentFormat.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,21 +41,22 @@ package gnu.javax.print.ipp.attribute.printer; import java.util.Locale; import javax.print.DocFlavor; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.TextSyntax; /** * DocumentFormatSupported specifies the supported document * formats of a printer. Printer are supplying a set of this attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class DocumentFormat extends TextSyntax +public final class DocumentFormat extends TextSyntax implements SupportedValuesAttribute { /** - * Creates a DocumentFormat object with the + * Creates a DocumentFormat object with the * given value and locale. * * @param value the value for this syntax @@ -68,12 +69,12 @@ public final class DocumentFormat extends TextSyntax { super(value, locale); } - + /** * Constructs a document format object for the given flavor. * The constructor reworkes the mimetype of the given flavor * to remove the quoted charset parameter if present. - * + * * @param flavor the flavor with the mimetype * @return The created document format. */ @@ -83,7 +84,7 @@ public final class DocumentFormat extends TextSyntax String mimetype = flavor.getMediaType() + "/" + flavor.getMediaSubtype(); if (charset != null) mimetype += "; charset=" + charset; - + return new DocumentFormat(mimetype, null); } @@ -92,7 +93,7 @@ public final class DocumentFormat extends TextSyntax * * @return The class DocumentFormat itself. */ - public Class getCategory() + public Class getCategory() { return DocumentFormat.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java index 8e54e05658a..bb00b8891f7 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java @@ -1,4 +1,4 @@ -/* MultipleOperationTimeOut.java -- +/* MultipleOperationTimeOut.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,10 +46,10 @@ import javax.print.attribute.IntegerSyntax; * 4.4.31 provides the minimum time ins second a printer object waits * before time out and recovery. The printer object waits e.g. for * additional SendDocument or SendUri operations. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class MultipleOperationTimeOut extends IntegerSyntax +public final class MultipleOperationTimeOut extends IntegerSyntax implements Attribute { @@ -68,7 +68,7 @@ public final class MultipleOperationTimeOut extends IntegerSyntax * * @return The class MultipleOperationTimeOut itself. */ - public Class getCategory() + public Class getCategory() { return MultipleOperationTimeOut.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java index 8032c3aa7f3..8dc05fe58d3 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java @@ -1,4 +1,4 @@ -/* NaturalLanguageConfigured.java -- +/* NaturalLanguageConfigured.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,19 +43,19 @@ import gnu.javax.print.ipp.attribute.NaturalLanguageSyntax; import javax.print.attribute.Attribute; /** - * NaturalLanguageConfigured attribute as described in RFC 2911 + * NaturalLanguageConfigured attribute as described in RFC 2911 * section 4.4.19 provides the natural language which is configured * by the server to be used in the name and text syntax attribute types. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class NaturalLanguageConfigured extends NaturalLanguageSyntax +public final class NaturalLanguageConfigured extends NaturalLanguageSyntax implements Attribute { /** * Creates a NaturalLanguageConfigured object. - * + * * @param value the charset string value. */ public NaturalLanguageConfigured(String value) @@ -68,7 +68,7 @@ public final class NaturalLanguageConfigured extends NaturalLanguageSyntax * * @return The class NaturalLanguageConfigured itself. */ - public Class getCategory() + public Class getCategory() { return NaturalLanguageConfigured.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java index fe64ab0f778..361916773a4 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java @@ -1,4 +1,4 @@ -/* PrinterCurrentTime.java -- +/* PrinterCurrentTime.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.printer; import java.util.Date; +import javax.print.attribute.Attribute; import javax.print.attribute.DateTimeSyntax; import javax.print.attribute.PrintServiceAttribute; @@ -48,10 +49,10 @@ import javax.print.attribute.PrintServiceAttribute; * 4.4.30 provides the current time of the print service. * Its to be used by other attributes like the date-time-at-xxx * attributes in the creation process. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrinterCurrentTime extends DateTimeSyntax +public final class PrinterCurrentTime extends DateTimeSyntax implements PrintServiceAttribute { @@ -72,7 +73,7 @@ public final class PrinterCurrentTime extends DateTimeSyntax * * @param obj the object to test * - * @return true if both objects are equal, + * @return true if both objects are equal, * false otherwise. */ public boolean equals(Object obj) @@ -82,13 +83,13 @@ public final class PrinterCurrentTime extends DateTimeSyntax return super.equals(obj); } - + /** * Returns category of this class. * * @return The class PrinterCurrentTime itself. */ - public Class getCategory() + public Class getCategory() { return PrinterCurrentTime.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java index 8a70edf349c..28a2f448570 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java @@ -1,4 +1,4 @@ -/* PrinterDriverInstaller.java -- +/* PrinterDriverInstaller.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,10 +47,10 @@ import javax.print.attribute.URISyntax; * PrinterDriverInstaller attribute as described in RFC 2911 section * 4.4.81 provides the URI where a printer driver installer * can be found. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrinterDriverInstaller extends URISyntax +public final class PrinterDriverInstaller extends URISyntax implements Attribute { @@ -70,7 +70,7 @@ public final class PrinterDriverInstaller extends URISyntax * * @return The class PrinterDriverInstaller itself. */ - public Class getCategory() + public Class getCategory() { return PrinterDriverInstaller.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java index da463c4c9fb..07c458889ff 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java @@ -1,4 +1,4 @@ -/* PrinterStateMessage.java -- +/* PrinterStateMessage.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.printer; import java.util.Locale; +import javax.print.attribute.Attribute; import javax.print.attribute.PrintServiceAttribute; import javax.print.attribute.TextSyntax; @@ -48,15 +49,15 @@ import javax.print.attribute.TextSyntax; * 4.4.13 provides a textual representation of the attributes * printer-state and printer-state-reasons for consumption by * humans. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrinterStateMessage extends TextSyntax +public final class PrinterStateMessage extends TextSyntax implements PrintServiceAttribute { /** - * Creates a PrinterStateMessage object with the + * Creates a PrinterStateMessage object with the * given value and locale. * * @param value the value for this syntax @@ -75,7 +76,7 @@ public final class PrinterStateMessage extends TextSyntax * * @return The class PrinterStateMessage itself. */ - public Class getCategory() + public Class getCategory() { return PrinterStateMessage.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java index 7f9b1113ff6..7bec92ed302 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java @@ -1,4 +1,4 @@ -/* PrinterUpTime.java -- +/* PrinterUpTime.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,12 +44,12 @@ import javax.print.attribute.IntegerSyntax; /** * PrinterUpTime attribute as described in RFC 2911 section * 4.4.29 provides the uptime of the printer object. This - * is a value in second starting at 1 after a initialization + * is a value in second starting at 1 after a initialization * or reboot of the printer object. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrinterUpTime extends IntegerSyntax +public final class PrinterUpTime extends IntegerSyntax implements Attribute { @@ -68,7 +68,7 @@ public final class PrinterUpTime extends IntegerSyntax * * @return The class PrinterUpTime itself. */ - public Class getCategory() + public Class getCategory() { return PrinterUpTime.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java index 75804b5a46b..22b484ef8dc 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CharsetSupported.java @@ -1,4 +1,4 @@ -/* CharsetSupported.java -- +/* CharsetSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,23 +40,24 @@ package gnu.javax.print.ipp.attribute.supported; import gnu.javax.print.ipp.attribute.CharsetSyntax; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; /** * CharsetSupported attribute as described in RFC 2911 section * 4.4.18 provides the charset which are supported by the - * IPP implementation to be used in the name and text syntax + * IPP implementation to be used in the name and text syntax * attribute types. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class CharsetSupported extends CharsetSyntax +public final class CharsetSupported extends CharsetSyntax implements SupportedValuesAttribute { /** * Creates a CharsetSupported object. - * + * * @param value the charset string value. */ public CharsetSupported(String value) @@ -69,7 +70,7 @@ public final class CharsetSupported extends CharsetSyntax * * @return The class CharsetSupported itself. */ - public Class getCategory() + public Class getCategory() { return CharsetSupported.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java index 648167a938d..768091cb29b 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/CompressionSupported.java @@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities; import java.util.Iterator; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.standard.Compression; @@ -50,34 +51,34 @@ import javax.print.attribute.standard.Compression; /** * CompressionSupported provides the values which are * supported for the compression attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class CompressionSupported extends EnumSyntax implements SupportedValuesAttribute { - + /** The print data is not compressed. */ public static final CompressionSupported NONE = new CompressionSupported(0); - + /** The print data is ZIP compressed. */ public static final CompressionSupported DEFLATE = new CompressionSupported(1); - + /** The print data is GNU Zip compressed. */ public static final CompressionSupported GZIP = new CompressionSupported(2); - + /** The print data is UNIX compressed. */ public static final CompressionSupported COMPRESS = new CompressionSupported(3); - - private static final String[] stringTable = { "none", "deflate", + + private static final String[] stringTable = { "none", "deflate", "gzip", "compress" }; - - private static final CompressionSupported[] enumValueTable = { NONE, DEFLATE, + + private static final CompressionSupported[] enumValueTable = { NONE, DEFLATE, GZIP, COMPRESS }; /** * Constructs a CompressionSupported object. - * + * * @param value the enum value */ protected CompressionSupported(int value) @@ -90,7 +91,7 @@ public final class CompressionSupported extends EnumSyntax * * @return The class CompressionSupported itself. */ - public Class getCategory() + public Class getCategory() { return CompressionSupported.class; } @@ -104,7 +105,7 @@ public final class CompressionSupported extends EnumSyntax { return "compression-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -125,38 +126,36 @@ public final class CompressionSupported extends EnumSyntax { return enumValueTable; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Compression getAssociatedAttribute() + public Compression getAssociatedAttribute() { return (Compression) IppUtilities.getEnumAttribute( "compression", new Integer(getValue())); } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static Compression[] getAssociatedAttributeArray(Set set) + public static Compression[] + getAssociatedAttributeArray(Set set) { - CompressionSupported tmp; - Compression[] result = new Compression[set.size()]; - Iterator it = set.iterator(); + Compression[] result = new Compression[set.size()]; int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (CompressionSupported) it.next(); - result[j] = tmp.getAssociatedAttribute(); + result[j] = ((CompressionSupported) tmp).getAssociatedAttribute(); j++; - } + } return result; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java index 6bd63dcfc72..03449fa4f56 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java @@ -1,4 +1,4 @@ -/* DocumentFormatSupported.java -- +/* DocumentFormatSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,21 +40,22 @@ package gnu.javax.print.ipp.attribute.supported; import java.util.Locale; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.TextSyntax; /** * DocumentFormatSupported specifies the supported document * formats of a printer. Printer are supplying a set of this attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class DocumentFormatSupported extends TextSyntax +public final class DocumentFormatSupported extends TextSyntax implements SupportedValuesAttribute { /** - * Creates a DocumentFormatSupported object with the + * Creates a DocumentFormatSupported object with the * given value and locale. * * @param value the value for this syntax @@ -73,7 +74,7 @@ public final class DocumentFormatSupported extends TextSyntax * * @return The class DocumentFormatSupported itself. */ - public Class getCategory() + public Class getCategory() { return DocumentFormatSupported.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java index 9f9c635d3fe..f271fa71b88 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java @@ -43,6 +43,7 @@ import gnu.javax.print.ipp.IppUtilities; import java.util.Iterator; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.standard.Finishings; @@ -51,7 +52,7 @@ import javax.print.attribute.standard.Finishings; /** * The FinishingsSupported attribute provides the supported * values for finishings of a job. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class FinishingsSupported extends EnumSyntax @@ -60,122 +61,122 @@ public final class FinishingsSupported extends EnumSyntax /** No finishing. */ public static final FinishingsSupported NONE = new FinishingsSupported(3); - + /** Staple the document(s) */ public static final FinishingsSupported STAPLE = new FinishingsSupported(4); - + /** Cover a document */ public static final FinishingsSupported COVER = new FinishingsSupported(6); - + /** * This value indicates that a binding is to be applied to the document. * The type and placement of the binding is site-defined. */ public static final FinishingsSupported BIND = new FinishingsSupported(7); - + /** - * Bind the document(s) with one or more staples (wire stitches) - * along the middle fold. + * Bind the document(s) with one or more staples (wire stitches) + * along the middle fold. */ - public static final FinishingsSupported SADDLE_STITCH = + public static final FinishingsSupported SADDLE_STITCH = new FinishingsSupported(8); - + /** - * Bind the document(s) with one or more staples (wire stitches) - * along one edge. + * Bind the document(s) with one or more staples (wire stitches) + * along one edge. */ - public static final FinishingsSupported EDGE_STITCH = + public static final FinishingsSupported EDGE_STITCH = new FinishingsSupported(9); - - /** - * Bind the document(s) with one or more staples in the top left - * corner. + + /** + * Bind the document(s) with one or more staples in the top left + * corner. */ - public static final FinishingsSupported STAPLE_TOP_LEFT = + public static final FinishingsSupported STAPLE_TOP_LEFT = new FinishingsSupported(20); - - /** - * Bind the document(s) with one or more staples in the bottom - * left corner. + + /** + * Bind the document(s) with one or more staples in the bottom + * left corner. */ - public static final FinishingsSupported STAPLE_BOTTOM_LEFT = + public static final FinishingsSupported STAPLE_BOTTOM_LEFT = new FinishingsSupported(21); - + /** * Bind the document(s) with one or more staples in the top right corner. */ - public static final FinishingsSupported STAPLE_TOP_RIGHT = + public static final FinishingsSupported STAPLE_TOP_RIGHT = new FinishingsSupported(22); - + /** * Bind the document(s) with one or more staples in the bottom right corner. */ - public static final FinishingsSupported STAPLE_BOTTOM_RIGHT = + public static final FinishingsSupported STAPLE_BOTTOM_RIGHT = new FinishingsSupported(23); - + /** - * Bind the document(s) with one or more staples (wire stitches) + * Bind the document(s) with one or more staples (wire stitches) * along the left edge. */ - public static final FinishingsSupported EDGE_STITCH_LEFT = + public static final FinishingsSupported EDGE_STITCH_LEFT = new FinishingsSupported(24); - - /** - * Bind the document(s) with one or more staples (wire stitches) along - * the top edge. - */ - public static final FinishingsSupported EDGE_STITCH_TOP = - new FinishingsSupported(25); - - /** - * Bind the document(s) with one or more staples (wire stitches) along - * the right edge. - */ - public static final FinishingsSupported EDGE_STITCH_RIGHT = - new FinishingsSupported(26); - + /** * Bind the document(s) with one or more staples (wire stitches) along - * the bottom edge. + * the top edge. */ - public static final FinishingsSupported EDGE_STITCH_BOTTOM = - new FinishingsSupported(27); - + public static final FinishingsSupported EDGE_STITCH_TOP = + new FinishingsSupported(25); + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with one or more staples (wire stitches) along + * the right edge. + */ + public static final FinishingsSupported EDGE_STITCH_RIGHT = + new FinishingsSupported(26); + + /** + * Bind the document(s) with one or more staples (wire stitches) along + * the bottom edge. + */ + public static final FinishingsSupported EDGE_STITCH_BOTTOM = + new FinishingsSupported(27); + + /** + * Bind the document(s) with two staples (wire stitches) along the * left edge assuming a portrait document. */ - public static final FinishingsSupported STAPLE_DUAL_LEFT = + public static final FinishingsSupported STAPLE_DUAL_LEFT = new FinishingsSupported(28); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * top edge assuming a portrait document. */ - public static final FinishingsSupported STAPLE_DUAL_TOP = + public static final FinishingsSupported STAPLE_DUAL_TOP = new FinishingsSupported(29); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * right edge assuming a portrait document. */ - public static final FinishingsSupported STAPLE_DUAL_RIGHT = + public static final FinishingsSupported STAPLE_DUAL_RIGHT = new FinishingsSupported(30); - + /** - * Bind the document(s) with two staples (wire stitches) along the + * Bind the document(s) with two staples (wire stitches) along the * bottom edge assuming a portrait document. */ - public static final FinishingsSupported STAPLE_DUAL_BOTTOM = + public static final FinishingsSupported STAPLE_DUAL_BOTTOM = new FinishingsSupported(31); - private static final String[] stringTable = { "none", "staple", null, + private static final String[] stringTable = { "none", "staple", null, "cover", "bind", "saddle-stitch", "edge-stitch", null, null, null, null, null, null, null, null, null, null, "staple-top-left", - "staple-bottom-left", - "staple-top-right", + "staple-bottom-left", + "staple-top-right", "staple-bottom-right", "edge-stitch-left", "edge-stitch-top", @@ -185,14 +186,14 @@ public final class FinishingsSupported extends EnumSyntax "staple-dual-top", "staple-dual-right", "staple-dual-bottom" }; - - private static final FinishingsSupported[] enumValueTable = { NONE, STAPLE, - null, COVER, BIND, + + private static final FinishingsSupported[] enumValueTable = { NONE, STAPLE, + null, COVER, BIND, SADDLE_STITCH, - EDGE_STITCH, null, - null, null, null, - null, null, null, - null, null, null, + EDGE_STITCH, null, + null, null, null, + null, null, null, + null, null, null, STAPLE_TOP_LEFT, STAPLE_BOTTOM_LEFT, STAPLE_TOP_RIGHT, @@ -205,10 +206,10 @@ public final class FinishingsSupported extends EnumSyntax STAPLE_DUAL_TOP, STAPLE_DUAL_RIGHT, STAPLE_DUAL_BOTTOM }; - + /** * Constructs a FinishingsSupported object. - * + * * @param value the value */ protected FinishingsSupported(int value) @@ -221,7 +222,7 @@ public final class FinishingsSupported extends EnumSyntax * * @return the class FinishingsSupported itself */ - public Class getCategory() + public Class getCategory() { return FinishingsSupported.class; } @@ -235,7 +236,7 @@ public final class FinishingsSupported extends EnumSyntax { return "finishings-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -266,38 +267,36 @@ public final class FinishingsSupported extends EnumSyntax { return 3; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public Finishings getAssociatedAttribute() + public Finishings getAssociatedAttribute() { return (Finishings) IppUtilities.getEnumAttribute( "finishings", new Integer(getValue())); } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static Finishings[] getAssociatedAttributeArray(Set set) + public static Finishings[] + getAssociatedAttributeArray(Set set) { - FinishingsSupported tmp; - Finishings[] result = new Finishings[set.size()]; - Iterator it = set.iterator(); + Finishings[] result = new Finishings[set.size()]; int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (FinishingsSupported) it.next(); - result[j] = tmp.getAssociatedAttribute(); + result[j] = ((FinishingsSupported) tmp).getAssociatedAttribute(); j++; - } + } return result; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java index 1dbb2939fc5..df1d330076c 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java @@ -1,4 +1,4 @@ -/* GeneratedNaturalLanguageSupported.java -- +/* GeneratedNaturalLanguageSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,24 +40,25 @@ package gnu.javax.print.ipp.attribute.supported; import gnu.javax.print.ipp.attribute.NaturalLanguageSyntax; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; /** - * GeneratedNaturalLanguageSupported attribute as described + * GeneratedNaturalLanguageSupported attribute as described * in RFC 2911 section 4.4.20 provides the natural languages - * which are supported by the IPP implementation to be used + * which are supported by the IPP implementation to be used * in the name and text syntax attribute types. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class GeneratedNaturalLanguageSupported - extends NaturalLanguageSyntax +public final class GeneratedNaturalLanguageSupported + extends NaturalLanguageSyntax implements SupportedValuesAttribute { /** * Creates a GeneratedNaturalLanguageSupported object. - * + * * @param value the charset string value. */ public GeneratedNaturalLanguageSupported(String value) @@ -70,7 +71,7 @@ public final class GeneratedNaturalLanguageSupported * * @return The class GeneratedNaturalLanguageSupported itself. */ - public Class getCategory() + public Class getCategory() { return GeneratedNaturalLanguageSupported.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java index 06365e6d11c..072d7499a5e 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java @@ -1,4 +1,4 @@ -/* IppVersionsSupported.java -- +/* IppVersionsSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,6 +38,7 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; @@ -45,31 +46,31 @@ import javax.print.attribute.SupportedValuesAttribute; * IppVersionsSupported attribute as described in RFC 2911 section * 4.4.14 provides the value(s) (implemented as EnumSyntax) * of the supported IPP versions. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class IppVersionsSupported extends EnumSyntax +public final class IppVersionsSupported extends EnumSyntax implements SupportedValuesAttribute { - + // a keyword based attribute in IPP - int values just starting at 0 - + /** IPP version 1.0 */ - public static final IppVersionsSupported V_1_0 = + public static final IppVersionsSupported V_1_0 = new IppVersionsSupported(0); - + /** IPP version 1.1 */ - public static final IppVersionsSupported V_1_1 = + public static final IppVersionsSupported V_1_1 = new IppVersionsSupported(1); - + private static final String[] stringTable = { "1.0", "1.1" }; - - private static final IppVersionsSupported[] enumValueTable = { V_1_0, + + private static final IppVersionsSupported[] enumValueTable = { V_1_0, V_1_1 }; /** * Constructs a IppVersionsSupported object. - * + * * @param value the enum value */ public IppVersionsSupported(int value) @@ -78,11 +79,11 @@ public final class IppVersionsSupported extends EnumSyntax } /** - * Returns category of this class. + * Returns the category of this class. * * @return The class IppVersionsSupported itself. */ - public Class getCategory() + public Class getCategory() { return IppVersionsSupported.class; } @@ -96,7 +97,7 @@ public final class IppVersionsSupported extends EnumSyntax { return "ipp-versions-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java index a15d0095f73..2add4a0cd55 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java @@ -1,4 +1,4 @@ -/* JobHoldUntilSupported.java -- +/* JobHoldUntilSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,63 +40,64 @@ package gnu.javax.print.ipp.attribute.supported; import java.util.Locale; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.TextSyntax; /** * JobHoldUntilSupported attribute provides the supported * values for the attribute type job-hold-until. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobHoldUntilSupported extends TextSyntax +public final class JobHoldUntilSupported extends TextSyntax implements SupportedValuesAttribute { - - // a keyword/name based attribute in IPP + + // a keyword/name based attribute in IPP // can be extended by administrators // standard values are predefined - + /** Job should be printed immediately. */ - public static final JobHoldUntilSupported NO_HOLD = + public static final JobHoldUntilSupported NO_HOLD = new JobHoldUntilSupported("no-hold", null); - + /** Job should be hold indefinitely. */ - public static final JobHoldUntilSupported INDEFINITE = + public static final JobHoldUntilSupported INDEFINITE = new JobHoldUntilSupported("indefinite", null); - + /** Job should be processed during the day. */ - public static final JobHoldUntilSupported DAY_TIME = + public static final JobHoldUntilSupported DAY_TIME = new JobHoldUntilSupported("day-time", null); - + /** Job should be processed in the evening. */ - public static final JobHoldUntilSupported EVENING = + public static final JobHoldUntilSupported EVENING = new JobHoldUntilSupported("evening", null); - + /** Job should be processed during night. */ - public static final JobHoldUntilSupported NIGHT = + public static final JobHoldUntilSupported NIGHT = new JobHoldUntilSupported("night", null); - + /** Job should be processed during the weekend. */ - public static final JobHoldUntilSupported WEEKEND = + public static final JobHoldUntilSupported WEEKEND = new JobHoldUntilSupported("weekend", null); - - /** - * Job should be processed as second-shift - * (after close of business). - */ - public static final JobHoldUntilSupported SECOND_SHIFT = - new JobHoldUntilSupported("second-shift", null); - - /** - * Job should be processed as third-shift - * (after midnight). - */ - public static final JobHoldUntilSupported THIRD_SHIFT = - new JobHoldUntilSupported("third-shift", null); /** - * Creates a JobHoldUntilSupported object with the + * Job should be processed as second-shift + * (after close of business). + */ + public static final JobHoldUntilSupported SECOND_SHIFT = + new JobHoldUntilSupported("second-shift", null); + + /** + * Job should be processed as third-shift + * (after midnight). + */ + public static final JobHoldUntilSupported THIRD_SHIFT = + new JobHoldUntilSupported("third-shift", null); + + /** + * Creates a JobHoldUntilSupported object with the * given value and locale. * * @param value the value for this syntax @@ -115,7 +116,7 @@ public final class JobHoldUntilSupported extends TextSyntax * * @return The class JobHoldUntilSupported itself. */ - public Class getCategory() + public Class getCategory() { return JobHoldUntilSupported.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java index 4051e24200c..aeb86ff1052 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java @@ -1,4 +1,4 @@ -/* JobSheetsSupported.java -- +/* JobSheetsSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,26 +53,26 @@ import javax.print.attribute.standard.JobSheets; /** * JobSheetsSupported attribute provides the supported values * of the job-sheets attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class JobSheetsSupported extends TextSyntax +public final class JobSheetsSupported extends TextSyntax implements SupportedValuesAttribute { - //a keyword/name based attribute in IPP + //a keyword/name based attribute in IPP // can be extended by administrators // standard values are predefined - + /** No job sheet is the default */ - public static final JobSheetsDefault NONE = + public static final JobSheetsDefault NONE = new JobSheetsDefault("none", Locale.getDefault()); - + /** A job sheet is the default */ - public static final JobSheetsDefault STANDARD = + public static final JobSheetsDefault STANDARD = new JobSheetsDefault("standard", Locale.getDefault()); - + /** - * Creates a JobSheetsSupported object with the + * Creates a JobSheetsSupported object with the * given value and locale. * * @param value the value for this syntax @@ -85,13 +85,13 @@ public final class JobSheetsSupported extends TextSyntax { super(value, locale); } - + /** * Returns category of this class. * * @return The class JobSheetsSupported itself. */ - public Class getCategory() + public Class getCategory() { return JobSheetsSupported.class; } @@ -105,46 +105,44 @@ public final class JobSheetsSupported extends TextSyntax { return "job-sheets-supported"; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. *

    May return null if no value exists in JPS API.

    - * + * * @return The enum of the standard attribute class. */ - public JobSheets getAssociatedAttribute() + public JobSheets getAssociatedAttribute() { if (this.equals(JobSheetsDefault.NONE)) return JobSheets.NONE; if (this.equals(JobSheetsDefault.STANDARD)) return JobSheets.STANDARD; - + return null; } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static JobSheets[] getAssociatedAttributeArray(Set set) + public static JobSheets[] + getAssociatedAttributeArray(Set set) { - JobSheetsSupported tmp; - ArrayList result = new ArrayList(); - Iterator it = set.iterator(); + ArrayList result = new ArrayList(); int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (JobSheetsSupported) it.next(); - Attribute att = tmp.getAssociatedAttribute(); + JobSheets att = ((JobSheetsSupported) tmp).getAssociatedAttribute(); if (att != null) result.add(att); j++; - } - return (JobSheets[]) result.toArray(new JobSheets[result.size()]); + } + return result.toArray(new JobSheets[result.size()]); } - + } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java index 3f10c06b5f7..2684ebbecd5 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MediaSupported.java @@ -1,4 +1,4 @@ -/* MediaSupported.java -- +/* MediaSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,6 +45,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.TextSyntax; import javax.print.attribute.standard.Media; @@ -52,15 +53,15 @@ import javax.print.attribute.standard.Media; /** * MediaSupported attribute provides the keyword values * of the media types supported by the printer object. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class MediaSupported extends TextSyntax +public final class MediaSupported extends TextSyntax implements SupportedValuesAttribute { /** - * Creates a MediaSupported object with the + * Creates a MediaSupported object with the * given value and locale. * * @param value the value for this syntax @@ -79,7 +80,7 @@ public final class MediaSupported extends TextSyntax * * @return The class MediaSupported itself. */ - public Class getCategory() + public Class getCategory() { return MediaSupported.class; } @@ -93,26 +94,23 @@ public final class MediaSupported extends TextSyntax { return "media-supported"; } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. */ - public static Media[] getAssociatedAttributeArray(Set set) + public static Media[] getAssociatedAttributeArray(Set set) { - MediaSupported tmp; Media tmp2; - ArrayList result = new ArrayList(); - Iterator it = set.iterator(); - while (it.hasNext()) + ArrayList result = new ArrayList(); + for (Attribute tmp : set) { - tmp = (MediaSupported) it.next(); tmp2 = (Media) IppUtilities.getEnumAttribute("media", tmp.toString()); if (tmp2 != null) result.add(tmp2); - } - return (Media[]) result.toArray(new Media[result.size()]); + } + return result.toArray(new Media[result.size()]); } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java index 891a99faedb..73e5921f1cd 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java @@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities; import java.util.Iterator; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.standard.MultipleDocumentHandling; @@ -50,49 +51,49 @@ import javax.print.attribute.standard.MultipleDocumentHandling; /** * MultipleDocumentHandlingSupported provides the * supported values for the MultipleDocumentHandling attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class MultipleDocumentHandlingSupported extends EnumSyntax implements SupportedValuesAttribute { - + //a keyword based attribute in IPP - int values just starting at 0 - - /** - * Supports only multiple documents treated as a single document. This + + /** + * Supports only multiple documents treated as a single document. This * applies to attributes which specify treatment of multiple document jobs. */ public static final MultipleDocumentHandlingSupported SINGLE_DOCUMENT = new MultipleDocumentHandlingSupported(0); - + /** Supports multiple documents as uncollated copies */ public static final MultipleDocumentHandlingSupported SEPARATE_DOCUMENTS_UNCOLLATED_COPIES = new MultipleDocumentHandlingSupported(1); - + /** Supports multiple documents as collated copies */ public static final MultipleDocumentHandlingSupported SEPARATE_DOCUMENTS_COLLATED_COPIES = new MultipleDocumentHandlingSupported(2); - - /** + + /** * Supports multiple documents where every single document starts - * with a new sheet. + * with a new sheet. */ public static final MultipleDocumentHandlingSupported SINGLE_DOCUMENT_NEW_SHEET = new MultipleDocumentHandlingSupported(3); - private static final String[] stringTable = { "single-document", + private static final String[] stringTable = { "single-document", "separate-documents-uncollated-copies", "separate-documents-collated-copies", "single-document-new-sheet" }; - - private static final MultipleDocumentHandlingSupported[] enumValueTable = + + private static final MultipleDocumentHandlingSupported[] enumValueTable = { SINGLE_DOCUMENT, SEPARATE_DOCUMENTS_UNCOLLATED_COPIES, SEPARATE_DOCUMENTS_COLLATED_COPIES, SINGLE_DOCUMENT_NEW_SHEET}; - + /** * Constructs a MultipleDocumentHandlingSupported object. - * + * * @param value the enum value */ protected MultipleDocumentHandlingSupported(int value) @@ -105,7 +106,7 @@ public final class MultipleDocumentHandlingSupported extends EnumSyntax * * @return The class MultipleDocumentHandlingSupported itself. */ - public Class getCategory() + public Class getCategory() { return MultipleDocumentHandlingSupported.class; } @@ -119,7 +120,7 @@ public final class MultipleDocumentHandlingSupported extends EnumSyntax { return "multiple-document-handling-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -140,38 +141,36 @@ public final class MultipleDocumentHandlingSupported extends EnumSyntax { return enumValueTable; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public MultipleDocumentHandling getAssociatedAttribute() + public MultipleDocumentHandling getAssociatedAttribute() { return (MultipleDocumentHandling) IppUtilities.getEnumAttribute( "multiple-document-handling", new Integer(getValue())); } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static MultipleDocumentHandling[] getAssociatedAttributeArray(Set set) + public static MultipleDocumentHandling[] + getAssociatedAttributeArray(Set set) { - MultipleDocumentHandlingSupported tmp; - MultipleDocumentHandling[] result = new MultipleDocumentHandling[set.size()]; - Iterator it = set.iterator(); + MultipleDocumentHandling[] result = new MultipleDocumentHandling[set.size()]; int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (MultipleDocumentHandlingSupported) it.next(); - result[j] = tmp.getAssociatedAttribute(); + result[j] = ((MultipleDocumentHandlingSupported) tmp).getAssociatedAttribute(); j++; - } + } return result; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java index 387e6b5131d..1b299845622 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java @@ -1,4 +1,4 @@ -/* MultipleDocumentJobsSupported.java -- +/* MultipleDocumentJobsSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,35 +38,36 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; /** * MultipleDocumentJobsSupported specifies if a printer * supported multiple documents in one job. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public class MultipleDocumentJobsSupported extends EnumSyntax +public class MultipleDocumentJobsSupported extends EnumSyntax implements SupportedValuesAttribute { - + /** Multiple documents per job are not supported. */ - public static final MultipleDocumentJobsSupported NOT_SUPPORTED = + public static final MultipleDocumentJobsSupported NOT_SUPPORTED = new MultipleDocumentJobsSupported(0); - + /** Multiple documents per job are supported. */ - public static final MultipleDocumentJobsSupported SUPPORTED = + public static final MultipleDocumentJobsSupported SUPPORTED = new MultipleDocumentJobsSupported(1); private static final String[] stringTable = { "not-supported", "supported" }; - - private static final MultipleDocumentJobsSupported[] enumValueTable = + + private static final MultipleDocumentJobsSupported[] enumValueTable = { NOT_SUPPORTED, SUPPORTED }; - + /** * Constructs a MultipleDocumentJobsSupported object. - * + * * @param value the enum value */ protected MultipleDocumentJobsSupported(int value) @@ -79,7 +80,7 @@ public class MultipleDocumentJobsSupported extends EnumSyntax * * @return The class MultipleDocumentJobsSupported itself. */ - public Class getCategory() + public Class getCategory() { return MultipleDocumentJobsSupported.class; } @@ -93,7 +94,7 @@ public class MultipleDocumentJobsSupported extends EnumSyntax { return "multiple-document-jobs-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java index 81e2e34cd05..a059c89a50b 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OperationsSupported.java @@ -1,4 +1,4 @@ -/* OperationsSupported.java -- +/* OperationsSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,6 +38,7 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; @@ -45,12 +46,12 @@ import javax.print.attribute.SupportedValuesAttribute; * OperationsSupported specifies the enums of the operations * supported by a given printer or job object. The attribute is further * specified in RFC 2911 section 4.4.15. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class OperationsSupported extends EnumSyntax +public final class OperationsSupported extends EnumSyntax implements SupportedValuesAttribute -{ +{ /* * Value Operation Name ----------------- ------------------------------------- @@ -76,104 +77,104 @@ public final class OperationsSupported extends EnumSyntax 0x0013-0x3FFF reserved for future IETF standards track operations 0x4000-0x8FFF reserved for vendor extensions */ - + // standard ipp 1.1 operations - /** + /** * Operation to print a job in one request/response. */ - public static final OperationsSupported PRINT_JOB = + public static final OperationsSupported PRINT_JOB = new OperationsSupported(0x02); - + /** Operation to print a document from an URI */ - public static final OperationsSupported PRINT_URI = + public static final OperationsSupported PRINT_URI = new OperationsSupported(0x03); - + /** Operation to validate a job before submission. */ - public static final OperationsSupported VALIDATE_JOB = + public static final OperationsSupported VALIDATE_JOB = new OperationsSupported(0x04); - - /** - * Operation to create an initial job for use with multiple document per job. + + /** + * Operation to create an initial job for use with multiple document per job. */ - public static final OperationsSupported CREATE_JOB = + public static final OperationsSupported CREATE_JOB = new OperationsSupported(0x05); - - /** - * Operation to send a document to a multidoc job created via CREATE_JOB + + /** + * Operation to send a document to a multidoc job created via CREATE_JOB */ - public static final OperationsSupported SEND_DOCUMENT = + public static final OperationsSupported SEND_DOCUMENT = new OperationsSupported(0x06); - - /** - * Operation to send a document uri to a multidoc job created - * via CREATE_JOB. The document accessible from this URI will be printed. + + /** + * Operation to send a document uri to a multidoc job created + * via CREATE_JOB. The document accessible from this URI will be printed. */ - public static final OperationsSupported SEND_URI = + public static final OperationsSupported SEND_URI = new OperationsSupported(0x07); - + /** Operation to cancel a job by its ID or name. */ - public static final OperationsSupported CANCEL_JOB = + public static final OperationsSupported CANCEL_JOB = new OperationsSupported(0x08); - + /** Operation to get job attributes of a current job. */ - public static final OperationsSupported GET_JOB_ATTRIBUTES = + public static final OperationsSupported GET_JOB_ATTRIBUTES = new OperationsSupported(0x09); - + /** Operation to pause a printer. */ - public static final OperationsSupported PAUSE_PRINTER = + public static final OperationsSupported PAUSE_PRINTER = new OperationsSupported(0x10); - + /** Operation to get all currently queued or processed jobs. */ - public static final OperationsSupported GET_JOBS = + public static final OperationsSupported GET_JOBS = new OperationsSupported(0x0A); - + /** Operation to get the attributes of a printer. */ - public static final OperationsSupported GET_PRINTER_ATTRIBUTES = + public static final OperationsSupported GET_PRINTER_ATTRIBUTES = new OperationsSupported(0x0B); - + /** Operation to put a job on hold by its ID or name. */ - public static final OperationsSupported HOLD_JOB = + public static final OperationsSupported HOLD_JOB = new OperationsSupported(0x0C); - + /** Operation to release a job by its ID or name. */ - public static final OperationsSupported RELEASE_JOB = + public static final OperationsSupported RELEASE_JOB = new OperationsSupported(0x0D); - + /** Operation to restart a job by its ID or name. */ - public static final OperationsSupported RESTART_JOB = + public static final OperationsSupported RESTART_JOB = new OperationsSupported(0x0E); - + /** Not yet an operation - reserved for futher use. */ - public static final OperationsSupported RESERVED = + public static final OperationsSupported RESERVED = new OperationsSupported(0x0F); - + /** Operation to resume a printer. */ - public static final OperationsSupported RESUME_PRINTER = + public static final OperationsSupported RESUME_PRINTER = new OperationsSupported(0x11); - + /** Operation to remove all jobs from a printer regardless of state. */ - public static final OperationsSupported PURGE_JOBS = + public static final OperationsSupported PURGE_JOBS = new OperationsSupported(0x12); - private static final String[] stringTable = { "print-job", "print-uri", + private static final String[] stringTable = { "print-job", "print-uri", "validate-job", "create-job", - "send-document", "send-uri", + "send-document", "send-uri", "cancel-job", "get-job-attributes", - "pause-printer", "get-jobs", + "pause-printer", "get-jobs", "get-printer-attributes", "hold-job", "release-job", "restart-job", "reserved", "resume-printer", "purge-job"}; - - private static final OperationsSupported[] enumValueTable = + + private static final OperationsSupported[] enumValueTable = { PRINT_JOB, PRINT_URI, VALIDATE_JOB, CREATE_JOB, SEND_DOCUMENT, SEND_URI, CANCEL_JOB, GET_JOB_ATTRIBUTES, PAUSE_PRINTER, GET_JOBS, GET_PRINTER_ATTRIBUTES, HOLD_JOB, RELEASE_JOB, RESTART_JOB, RESERVED, RESUME_PRINTER, PURGE_JOBS}; - - + + /** * Constructs a OperationsSupported object. - * + * * @param value the enum value */ protected OperationsSupported(int value) @@ -186,7 +187,7 @@ public final class OperationsSupported extends EnumSyntax * * @return The class OperationsSupported itself. */ - public Class getCategory() + public Class getCategory() { return OperationsSupported.class; } @@ -200,7 +201,7 @@ public final class OperationsSupported extends EnumSyntax { return "operations-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -226,5 +227,5 @@ public final class OperationsSupported extends EnumSyntax protected int getOffset() { return 2; - } + } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java index 528c758ac70..4b87c53a528 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java @@ -42,33 +42,34 @@ import gnu.javax.print.ipp.IppUtilities; import java.util.Iterator; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.standard.OrientationRequested; /** - * The OrientationRequestedSupported attribute provides + * The OrientationRequestedSupported attribute provides * the supported values for the job attribute orientation-requested. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class OrientationRequestedSupported extends EnumSyntax implements SupportedValuesAttribute { - + /** Orientation as portrait. */ public static final OrientationRequestedSupported PORTRAIT = new OrientationRequestedSupported(3); - + /** Orientation as landscape. */ public static final OrientationRequestedSupported LANDSCAPE = new OrientationRequestedSupported(4); - + /** Orientation as reversed landscape. */ public static final OrientationRequestedSupported REVERSE_LANDSCAPE = new OrientationRequestedSupported(5); - + /** Orientation as reversed portrait. */ public static final OrientationRequestedSupported REVERSE_PORTRAIT = new OrientationRequestedSupported(6); @@ -77,14 +78,14 @@ public final class OrientationRequestedSupported extends EnumSyntax private static final String[] stringTable = { "portrait", "landscape", "reverse-landscape", "reverse-portrait" }; - - private static final OrientationRequestedSupported[] - enumValueTable = { PORTRAIT, LANDSCAPE, + + private static final OrientationRequestedSupported[] + enumValueTable = { PORTRAIT, LANDSCAPE, REVERSE_LANDSCAPE, REVERSE_PORTRAIT }; - + /** * Constructs a OrientationRequestedSupported object. - * + * * @param value the value */ protected OrientationRequestedSupported(int value) @@ -97,7 +98,7 @@ public final class OrientationRequestedSupported extends EnumSyntax * * @return The class OrientationRequestedSupported itself. */ - public Class getCategory() + public Class getCategory() { return OrientationRequestedSupported.class; } @@ -111,7 +112,7 @@ public final class OrientationRequestedSupported extends EnumSyntax { return "orientation-requested-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -132,7 +133,7 @@ public final class OrientationRequestedSupported extends EnumSyntax { return enumValueTable; } - + /** * Returns the lowest used value by the enumerations of this class. * . @@ -142,38 +143,36 @@ public final class OrientationRequestedSupported extends EnumSyntax { return 3; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public OrientationRequested getAssociatedAttribute() + public OrientationRequested getAssociatedAttribute() { return (OrientationRequested) IppUtilities.getEnumAttribute( "orientation-requested", new Integer(getValue())); } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static OrientationRequested[] getAssociatedAttributeArray(Set set) + public static OrientationRequested[] + getAssociatedAttributeArray(Set set) { - OrientationRequestedSupported tmp; - OrientationRequested[] result = new OrientationRequested[set.size()]; - Iterator it = set.iterator(); + OrientationRequested[] result = new OrientationRequested[set.size()]; int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (OrientationRequestedSupported) it.next(); - result[j] = tmp.getAssociatedAttribute(); + result[j] = ((OrientationRequestedSupported) tmp).getAssociatedAttribute(); j++; - } + } return result; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java index d39a37fd708..c58f76748b3 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java @@ -37,36 +37,36 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; - /** * PageRangesSupported is a boolean typed * attribute indicating (as EnumSyntax) if page ranges * are supported. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class PageRangesSupported extends EnumSyntax implements SupportedValuesAttribute { /** Page ranges are not supported. */ - public static final PageRangesSupported NOT_SUPPORTED = + public static final PageRangesSupported NOT_SUPPORTED = new PageRangesSupported(0); - + /** Page ranges are supported. */ - public static final PageRangesSupported SUPPORTED = + public static final PageRangesSupported SUPPORTED = new PageRangesSupported(1); private static final String[] stringTable = { "not-supported", "supported" }; - + private static final PageRangesSupported[] enumValueTable = { NOT_SUPPORTED, SUPPORTED }; - + /** * Constructs a PageRangesSupported object. - * + * * @param value the enum value */ protected PageRangesSupported(int value) @@ -79,7 +79,7 @@ public final class PageRangesSupported extends EnumSyntax * * @return The class PageRangesSupported itself. */ - public Class getCategory() + public Class getCategory() { return PageRangesSupported.class; } @@ -93,7 +93,7 @@ public final class PageRangesSupported extends EnumSyntax { return "page-ranges-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java index b0f7e86735b..25cbf9f0bea 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java @@ -42,6 +42,7 @@ import gnu.javax.print.ipp.IppUtilities; import java.util.Iterator; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.standard.PrintQuality; @@ -50,33 +51,33 @@ import javax.print.attribute.standard.PrintQuality; /** * PrintQualitySupported provides the * supported values for the print-quality attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class PrintQualitySupported extends EnumSyntax implements SupportedValuesAttribute { /** Draft quality of the printer. */ - public static final PrintQualitySupported DRAFT = + public static final PrintQualitySupported DRAFT = new PrintQualitySupported(3); - + /** Normal quality of the printer. */ - public static final PrintQualitySupported NORMAL = + public static final PrintQualitySupported NORMAL = new PrintQualitySupported(4); - + /** High quality of the printer. */ - public static final PrintQualitySupported HIGH = + public static final PrintQualitySupported HIGH = new PrintQualitySupported(5); private static final String[] stringTable = { "draft", "normal", "high" }; - - private static final PrintQualitySupported[] enumValueTable = { DRAFT, - NORMAL, + + private static final PrintQualitySupported[] enumValueTable = { DRAFT, + NORMAL, HIGH }; - + /** * Constructs a PrintQualitySupported object. - * + * * @param value the value of the enum */ protected PrintQualitySupported(int value) @@ -89,7 +90,7 @@ public final class PrintQualitySupported extends EnumSyntax * * @return The class PrintQualitySupported itself. */ - public Class getCategory() + public Class getCategory() { return PrintQualitySupported.class; } @@ -103,7 +104,7 @@ public final class PrintQualitySupported extends EnumSyntax { return "print-quality-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. @@ -124,7 +125,7 @@ public final class PrintQualitySupported extends EnumSyntax { return enumValueTable; } - + /** * Returns the lowest used value by the enumerations of this class. * . @@ -134,38 +135,35 @@ public final class PrintQualitySupported extends EnumSyntax { return 3; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public PrintQuality getAssociatedAttribute() + public PrintQuality getAssociatedAttribute() { return (PrintQuality) IppUtilities.getEnumAttribute( "print-quality", new Integer(getValue())); } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static PrintQuality[] getAssociatedAttributeArray(Set set) + public static PrintQuality[] getAssociatedAttributeArray(Set set) { - PrintQualitySupported tmp; - PrintQuality[] result = new PrintQuality[set.size()]; - Iterator it = set.iterator(); + PrintQuality[] result = new PrintQuality[set.size()]; int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (PrintQualitySupported) it.next(); - result[j] = tmp.getAssociatedAttribute(); + result[j] = ((PrintQualitySupported) tmp).getAssociatedAttribute(); j++; - } + } return result; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java index e3266c4221e..eb50aaac530 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java @@ -40,23 +40,24 @@ package gnu.javax.print.ipp.attribute.supported; import java.util.Iterator; import java.util.Set; +import javax.print.attribute.Attribute; import javax.print.attribute.ResolutionSyntax; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.standard.PrinterResolution; /** - * The PrinterResolutionSupported attribute provides + * The PrinterResolutionSupported attribute provides * the supported values for the job attribute printer-resolution. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class PrinterResolutionSupported extends ResolutionSyntax implements SupportedValuesAttribute { - + /** - * Creates a PrinterResolutionSupported object with the + * Creates a PrinterResolutionSupported object with the * given arguments. * * @param crossFeedResolution the cross feed resolution @@ -65,25 +66,25 @@ public final class PrinterResolutionSupported extends ResolutionSyntax * * @exception IllegalArgumentException if preconditions fail */ - public PrinterResolutionSupported(int crossFeedResolution, + public PrinterResolutionSupported(int crossFeedResolution, int feedResolution, int units) { super(crossFeedResolution, feedResolution, units); } - + /** * Tests if the given object is equal to this object. * * @param obj the object to test * - * @return true if both objects are equal, + * @return true if both objects are equal, * false otherwise. */ public boolean equals(Object obj) { if(! (obj instanceof PrinterResolutionSupported)) return false; - + return super.equals(obj); } @@ -92,7 +93,7 @@ public final class PrinterResolutionSupported extends ResolutionSyntax * * @return The class PrinterResolutionSupported itself. */ - public Class getCategory() + public Class getCategory() { return PrinterResolutionSupported.class; } @@ -106,38 +107,36 @@ public final class PrinterResolutionSupported extends ResolutionSyntax { return "printer-resolution-supported"; } - + /** * Returns the equally enum of the standard attribute class * of this SupportedValuesAttribute enum. - * + * * @return The enum of the standard attribute class. */ - public PrinterResolution getAssociatedAttribute() + public PrinterResolution getAssociatedAttribute() { - return new PrinterResolution(getCrossFeedResolutionDphi(), + return new PrinterResolution(getCrossFeedResolutionDphi(), getFeedResolutionDphi(), 1); } - + /** * Constructs an array from a set of -supported attributes. * @param set set to process * @return The constructed array. - * + * * @see #getAssociatedAttribute() */ - public static PrinterResolution[] getAssociatedAttributeArray(Set set) + public static PrinterResolution[] + getAssociatedAttributeArray(Set set) { - PrinterResolutionSupported tmp; - PrinterResolution[] result = new PrinterResolution[set.size()]; - Iterator it = set.iterator(); + PrinterResolution[] result = new PrinterResolution[set.size()]; int j = 0; - while (it.hasNext()) + for (Attribute tmp : set) { - tmp = (PrinterResolutionSupported) it.next(); - result[j] = tmp.getAssociatedAttribute(); + result[j] = ((PrinterResolutionSupported) tmp).getAssociatedAttribute(); j++; - } + } return result; } } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java index ce3e2a7d6c4..0eed39c6c2a 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java @@ -1,4 +1,4 @@ -/* PrinterUriSupported.java -- +/* PrinterUriSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,6 +40,7 @@ package gnu.javax.print.ipp.attribute.supported; import java.net.URI; +import javax.print.attribute.Attribute; import javax.print.attribute.SupportedValuesAttribute; import javax.print.attribute.URISyntax; @@ -47,10 +48,10 @@ import javax.print.attribute.URISyntax; * PrinterUriSupported attribute as described in RFC 2911 section * 4.4.1 contains one of the URIs the printer supported for * job processing (e.g. one with authentication). - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class PrinterUriSupported extends URISyntax +public final class PrinterUriSupported extends URISyntax implements SupportedValuesAttribute { @@ -70,7 +71,7 @@ public final class PrinterUriSupported extends URISyntax * * @return The class PrinterUriSupported itself. */ - public Class getCategory() + public Class getCategory() { return PrinterUriSupported.class; } diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java index 5110e95934b..eff82c143c5 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/SidesSupported.java @@ -37,6 +37,7 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; @@ -44,45 +45,45 @@ import javax.print.attribute.SupportedValuesAttribute; /** * SidesSupported provides the * supported values for the sides attribute. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ public final class SidesSupported extends EnumSyntax implements SupportedValuesAttribute { - + /** Specifies that each page should be printed on one sheet. */ public static final SidesSupported ONE_SIDED = new SidesSupported(0); - - /** - * Specifies that two following pages should be printed on the + + /** + * Specifies that two following pages should be printed on the * front and back of one sheet for binding on the long edge. */ - public static final SidesSupported TWO_SIDED_LONG_EDGE = + public static final SidesSupported TWO_SIDED_LONG_EDGE = new SidesSupported(1); - - /** - * Specifies that two following pages should be printed on the + + /** + * Specifies that two following pages should be printed on the * front and back of one sheet for binding on the short edge. */ - public static final SidesSupported TWO_SIDED_SHORT_EDGE = + public static final SidesSupported TWO_SIDED_SHORT_EDGE = new SidesSupported(2); - + /** An alias constant for "two sided long edge". */ public static final SidesSupported DUPLEX = new SidesSupported(1); - + /** An alias constant for "two sided short edge". */ public static final SidesSupported TUMBLE = new SidesSupported(2); - private static final String[] stringTable = { "one-sided", + private static final String[] stringTable = { "one-sided", "two-sided-long-edge", "two-sided-short-edge" }; - - private static final SidesSupported[] - enumValueTable = { ONE_SIDED, TWO_SIDED_LONG_EDGE, + + private static final SidesSupported[] + enumValueTable = { ONE_SIDED, TWO_SIDED_LONG_EDGE, TWO_SIDED_SHORT_EDGE }; - - + + /** * Creates a SidesSupported object. * @@ -98,7 +99,7 @@ public final class SidesSupported extends EnumSyntax * * @return The class SidesSupported itself. */ - public Class getCategory() + public Class getCategory() { return SidesSupported.class; } @@ -112,7 +113,7 @@ public final class SidesSupported extends EnumSyntax { return "sides-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java index 8deac7a2f63..dc1a29f5cc3 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java @@ -1,4 +1,4 @@ -/* UriAuthenticationSupported.java -- +/* UriAuthenticationSupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,58 +38,59 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; /** * UriAuthenticationSupported attribute as described in RFC 2911 section - * 4.4.2 provides the keywords (implemented as EnumSyntax) which + * 4.4.2 provides the keywords (implemented as EnumSyntax) which * authentication methods are supported by the printer object. This * includes a value of none. - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class UriAuthenticationSupported extends EnumSyntax +public final class UriAuthenticationSupported extends EnumSyntax implements SupportedValuesAttribute { - + // a keyword based attribute in IPP - int values just starting at 0 - + /** Supports no authentication - assumes anonymous process */ - public static final UriAuthenticationSupported NONE = + public static final UriAuthenticationSupported NONE = new UriAuthenticationSupported(0); - - /** + + /** * The authenticated user assumed is the value of the * "requesting-user-name" operation attribute supplied * with the operation. */ - public static final UriAuthenticationSupported REQUESTING_USER_NAME = + public static final UriAuthenticationSupported REQUESTING_USER_NAME = new UriAuthenticationSupported(1); - + /** Supports HTTP basic authentication (RFC 2617) */ - public static final UriAuthenticationSupported BASIC = + public static final UriAuthenticationSupported BASIC = new UriAuthenticationSupported(2); - + /** Supports HTTP digest authentication (RFC 2617) */ - public static final UriAuthenticationSupported DIGEST = + public static final UriAuthenticationSupported DIGEST = new UriAuthenticationSupported(3); - + /** Supports authentication through a client provided certificate */ - public static final UriAuthenticationSupported CERTIFICATE = + public static final UriAuthenticationSupported CERTIFICATE = new UriAuthenticationSupported(4); - - private static final String[] stringTable = { "none", - "requesting-user-name", - "basic", "digest", + + private static final String[] stringTable = { "none", + "requesting-user-name", + "basic", "digest", "certificate" }; - - private static final UriAuthenticationSupported[] enumValueTable = + + private static final UriAuthenticationSupported[] enumValueTable = { NONE, REQUESTING_USER_NAME, BASIC, DIGEST, CERTIFICATE }; /** * Constructs a UriAuthenticationSupported object. - * + * * @param value the enum value */ public UriAuthenticationSupported(int value) @@ -102,7 +103,7 @@ public final class UriAuthenticationSupported extends EnumSyntax * * @return The class UriAuthenticationSupported itself. */ - public Class getCategory() + public Class getCategory() { return UriAuthenticationSupported.class; } @@ -116,7 +117,7 @@ public final class UriAuthenticationSupported extends EnumSyntax { return "uri-authentication-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. diff --git a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java index 1d995184d2d..03396978f65 100644 --- a/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java +++ b/libjava/classpath/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java @@ -1,4 +1,4 @@ -/* UriSecuritySupported.java -- +/* UriSecuritySupported.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,6 +38,7 @@ exception statement from your version. */ package gnu.javax.print.ipp.attribute.supported; +import javax.print.attribute.Attribute; import javax.print.attribute.EnumSyntax; import javax.print.attribute.SupportedValuesAttribute; @@ -46,35 +47,35 @@ import javax.print.attribute.SupportedValuesAttribute; * 4.4.3 provides the keywords (implemented as EnumSyntax) for * the security mechanisms supported by the corresponding uri's * supported (same place in setOf). - * + * * @author Wolfgang Baer (WBaer@gmx.de) */ -public final class UriSecuritySupported extends EnumSyntax +public final class UriSecuritySupported extends EnumSyntax implements SupportedValuesAttribute { - + // a keyword based attribute in IPP - int values just starting at 0 - + /** The URI has no secure communication */ - public static final UriSecuritySupported NONE = + public static final UriSecuritySupported NONE = new UriSecuritySupported(0); - + /** The URI has SSL3 communication */ - public static final UriSecuritySupported SSL3 = + public static final UriSecuritySupported SSL3 = new UriSecuritySupported(1); - + /** The URI has TLS (RFC 2246) communication */ - public static final UriSecuritySupported TLS = + public static final UriSecuritySupported TLS = new UriSecuritySupported(2); - + private static final String[] stringTable = { "none", "ssl3", "tls" }; - - private static final UriSecuritySupported[] enumValueTable = { NONE, + + private static final UriSecuritySupported[] enumValueTable = { NONE, SSL3, TLS }; /** * Constructs a UriSecuritySupported object. - * + * * @param value the enum value */ public UriSecuritySupported(int value) @@ -87,7 +88,7 @@ public final class UriSecuritySupported extends EnumSyntax * * @return The class UriSecuritySupported itself. */ - public Class getCategory() + public Class getCategory() { return UriSecuritySupported.class; } @@ -101,7 +102,7 @@ public final class UriSecuritySupported extends EnumSyntax { return "uri-security-supported"; } - + /** * Returns a table with the enumeration values represented as strings * for this object. diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java b/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java index 6e182a53623..06d515c620f 100644 --- a/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java +++ b/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java @@ -38,6 +38,9 @@ exception statement from your version. */ package gnu.javax.swing.text.html.css; +import gnu.java.lang.CPStringBuilder; + +import java.util.List; import java.util.Map; import java.util.StringTokenizer; @@ -97,7 +100,7 @@ public class Selector * @return true when this selector matches the element path, * false otherwise */ - public boolean matches(String[] tags, Map[] attributes) + public boolean matches(String[] tags, List> attributes) { // TODO: This implements class, id and descendent matching. These are // the most commonly used selector matchers in CSS together with HTML. @@ -118,11 +121,11 @@ public class Selector boolean tagMatch = false; for (; tagIndex < numTags && tagMatch == false; tagIndex++) { - Object pathClass = attributes[tagIndex].get("class"); + Object pathClass = attributes.get(tagIndex).get("class"); // Try pseudo class too. - Object pseudoClass = attributes[tagIndex].get("_pseudo"); - Object dynClass = attributes[tagIndex].get("_dynamic"); - Object pathId = attributes[tagIndex].get("id"); + Object pseudoClass = attributes.get(tagIndex).get("_pseudo"); + Object dynClass = attributes.get(tagIndex).get("_dynamic"); + Object pathId = attributes.get(tagIndex).get("id"); String tag = elements[j]; String clazz = classes[j]; String id = ids[j]; @@ -167,7 +170,7 @@ public class Selector */ public String toString() { - StringBuilder b = new StringBuilder(); + CPStringBuilder b = new CPStringBuilder(); for (int i = selector.length - 1; i >= 0; i--) { b.append(selector[i]); diff --git a/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java b/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java index 1db02f6e30a..90ebb330d0b 100644 --- a/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java +++ b/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java @@ -40,10 +40,10 @@ package gnu.xml.stream; import javax.xml.stream.StreamFilter; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.util.ReaderDelegate; +import javax.xml.stream.util.StreamReaderDelegate; class FilteredStreamReader - extends ReaderDelegate + extends StreamReaderDelegate { final XMLStreamReader reader; diff --git a/libjava/classpath/gnu/xml/stream/NamespaceImpl.java b/libjava/classpath/gnu/xml/stream/NamespaceImpl.java index eeb57be6cac..1a595ee83d4 100644 --- a/libjava/classpath/gnu/xml/stream/NamespaceImpl.java +++ b/libjava/classpath/gnu/xml/stream/NamespaceImpl.java @@ -39,6 +39,7 @@ package gnu.xml.stream; import java.io.IOException; import java.io.Writer; +import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.Namespace; @@ -55,12 +56,15 @@ public class NamespaceImpl protected final String prefix; 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); this.prefix = prefix; this.uri = uri; + this.specified = specified; } public int getEventType() @@ -78,6 +82,29 @@ public class NamespaceImpl 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() { return (prefix == null || "".equals(prefix)); diff --git a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java index d5c4af12c5e..aed9d9a0f00 100644 --- a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java +++ b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java @@ -54,7 +54,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; 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.Document; @@ -81,7 +81,7 @@ import org.xml.sax.SAXException; * @author Chris Burdess */ class XIncludeFilter - extends ReaderDelegate + extends StreamReaderDelegate { static final String XINCLUDE_NS_URI = "http://www.w3.org/2001/XInclude"; diff --git a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java index fb1e4c28c58..dd2b18c943f 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java @@ -110,7 +110,8 @@ public class XMLEventAllocatorImpl for (int i = 0; i < len; i++) namespaces.add(new NamespaceImpl(location, reader.getNamespacePrefix(i), - reader.getNamespaceURI(i))); + reader.getNamespaceURI(i), + false)); return new EndElementImpl(location, reader.getName(), namespaces); @@ -158,7 +159,8 @@ public class XMLEventAllocatorImpl for (int i = 0; i < len; i++) namespaces.add(new NamespaceImpl(location, reader.getNamespacePrefix(i), - reader.getNamespaceURI(i))); + reader.getNamespaceURI(i), + false)); len = reader.getAttributeCount(); List attributes = new LinkedList(); for (int i = 0; i < len; i++) diff --git a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java index f694753c4b4..5ca1aab7ce8 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java @@ -98,12 +98,14 @@ public class XMLEventFactoryImpl public Namespace createNamespace(String namespaceURI) { return new NamespaceImpl(location, - XMLConstants.DEFAULT_NS_PREFIX, namespaceURI); + XMLConstants.DEFAULT_NS_PREFIX, + namespaceURI, + true); } 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, diff --git a/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java b/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java index 4be9992a73d..1549420c9df 100644 --- a/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java @@ -242,7 +242,7 @@ public class XMLStreamWriterImpl { if (namespaceURI != null && !isURI(namespaceURI)) throw new IllegalArgumentException("illegal URI: " + namespaceURI); - if (prefix != null && !isNCName(prefix)) + if (prefix != null && !isPrefix(prefix)) throw new IllegalArgumentException("illegal NCName: " + prefix); if (!isNCName(localName)) throw new IllegalArgumentException("illegal NCName: " + localName); @@ -394,7 +394,7 @@ public class XMLStreamWriterImpl { if (namespaceURI != null && !isURI(namespaceURI)) throw new IllegalArgumentException("illegal URI: " + namespaceURI); - if (prefix != null && !isNCName(prefix)) + if (prefix != null && !isPrefix(prefix)) throw new IllegalArgumentException("illegal NCName: " + prefix); if (!isNCName(localName)) throw new IllegalArgumentException("illegal NCName: " + localName); @@ -490,13 +490,18 @@ public class XMLStreamWriterImpl public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException { + if (prefix == null || "".equals(prefix) || "xmlns".equals(prefix)) + { + writeDefaultNamespace(namespaceURI); + return; + } if (!inStartElement) throw new IllegalStateException(); try { if (!isURI(namespaceURI)) throw new IllegalArgumentException("illegal URI: " + namespaceURI); - if (!isNCName(prefix)) + if (!isPrefix(prefix)) throw new IllegalArgumentException("illegal NCName: " + prefix); } catch (IOException e) @@ -790,7 +795,7 @@ public class XMLStreamWriterImpl { if (!isURI(uri)) throw new IllegalArgumentException("illegal URI: " + uri); - if (!isNCName(prefix)) + if (!isPrefix(prefix)) throw new IllegalArgumentException("illegal NCName: " + prefix); } catch (IOException e) @@ -938,6 +943,15 @@ public class XMLStreamWriterImpl 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) throws IOException { @@ -1001,3 +1015,4 @@ public class XMLStreamWriterImpl } + diff --git a/libjava/classpath/include/Makefile.in b/libjava/classpath/include/Makefile.in index dbba3f32ef2..63b020e3dd0 100644 --- a/libjava/classpath/include/Makefile.in +++ b/libjava/classpath/include/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/install-sh b/libjava/classpath/install-sh index a5897de6ea7..3f83ce9b555 100755 --- a/libjava/classpath/install-sh +++ b/libjava/classpath/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # 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 # later released in X11R6 (xc/config/util/install.sh) with the @@ -200,7 +200,11 @@ if test $# -eq 0; then fi 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. # However, 'strip' requires both read and write access to temps. @@ -515,5 +519,6 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/libjava/classpath/java/util/Scanner.java b/libjava/classpath/java/util/Scanner.java index cc39f191de9..59c4cc0ff11 100644 --- a/libjava/classpath/java/util/Scanner.java +++ b/libjava/classpath/java/util/Scanner.java @@ -64,30 +64,30 @@ import java.util.regex.Pattern; /** * @author E0327023 Hernadi Laszlo - */ -public class Scanner +*/ +public class Scanner implements Iterator { - private static final String NOT_LONG = "\" is not a long"; //$NON-NLS-1$ + private static final String NOT_LONG = "\" is not a long"; //$NON-NLS-1$ - private static final String ERR_PREFIX = "\""; //$NON-NLS-1$ + private static final String ERR_PREFIX = "\""; //$NON-NLS-1$ - private static final String NOT_INT = "\" is not an integer"; //$NON-NLS-1$ + private static final String NOT_INT = "\" is not an integer"; //$NON-NLS-1$ - private static final String NOT_DOUBLE = "\" is not a double"; //$NON-NLS-1$ + private static final String NOT_DOUBLE = "\" is not a double"; //$NON-NLS-1$ - private static final String NOT_BYTE = "\" is not a byte"; //$NON-NLS-1$ + private static final String NOT_BYTE = "\" is not a byte"; //$NON-NLS-1$ - private static final String NOT_BOOLEAN = "\" is not a boolean"; //$NON-NLS-1$ + private static final String NOT_BOOLEAN = "\" is not a boolean"; //$NON-NLS-1$ - private static final String IS_NOT = "\" is not "; //$NON-NLS-1$ + private static final String IS_NOT = "\" is not "; //$NON-NLS-1$ - private static final String DEFAULT_PATTERN_S = "\\p{javaWhitespace}+"; //$NON-NLS-1$ + private static final String DEFAULT_PATTERN_S = "\\p{javaWhitespace}+"; //$NON-NLS-1$ private static final Pattern DEFAULT_PATTERN = Pattern.compile (DEFAULT_PATTERN_S); - private static final String BIG_INTEGER = "BigInteger"; //$NON-NLS-1$ + private static final String BIG_INTEGER = "BigInteger"; //$NON-NLS-1$ private final static String NEW_LINE = System.getProperty ("line.separator"); @@ -131,7 +131,7 @@ public class Scanner /** * The current locale. - * + * * @see #useLocale(Locale) * @see #locale() */ @@ -172,7 +172,7 @@ public class Scanner * null . */ private Readable readableSource = null; - + /** * A ReadableByteChannel source if a Constructor with a ReadableByteChannel source is called, * otherwise it stays null . @@ -183,7 +183,7 @@ public class Scanner * Indicates if the close() method was called. */ private boolean isClosed = false; - + /** * For performance reasons the last Found is saved, if a hasNextXXX method was called. */ @@ -247,21 +247,21 @@ public class Scanner /** * Constructs a new Scanner with the given File as source. * {@link #Scanner(InputStream, String)} is called with null as charsetName. - * + * * @param source * The File to use as source. * @throws FileNotFoundException * If the file is not found an Exception is thrown. */ - public Scanner (final File source) throws FileNotFoundException // TESTED + public Scanner (final File source) throws FileNotFoundException // TESTED { this (source, null); } - + /** * Constructs a new Scanner with the given File as source.
    * {@link #Scanner(InputStream, String)} is called with the given charsetName. - * + * * @param source * The File to use as source. * @param charsetName @@ -271,7 +271,7 @@ public class Scanner * If the file is not found an Exception is thrown. */ public Scanner (final File source, - final String charsetName) throws FileNotFoundException + final String charsetName) throws FileNotFoundException { this (new FileInputStream (source), charsetName); } @@ -279,11 +279,11 @@ public class Scanner /** * Constructs a new Scanner with the given inputStream.
    * {@link #Scanner(InputStream, String)} is called with null as charsetName. - * + * * @param source * The InputStream to use as source. */ - public Scanner (final InputStream source) // TESTED + public Scanner (final InputStream source) // TESTED { this (source, null); } @@ -291,7 +291,7 @@ public class Scanner /** * Constructs a new Scanner with the InputSream and a charsetName. Afterwards the Buffer is * filled. - * + * * @param source * The InputStream to use as source. * @param charsetName @@ -303,10 +303,10 @@ public class Scanner this.charsetName = charsetName; myFillBuffer (); } - + /** * Constructs a new Scanner with a Readable input as source. - * + * * @param source * The Readable to use as source. */ @@ -320,7 +320,7 @@ public class Scanner * Constructs a new Scanner with a ReadableByteChannel as * source. Therfore the {@link #Scanner(ReadableByteChannel, * String)} is called with null as charsetName. - * + * * @param source * The ReadableByteChannel to use as source. */ @@ -333,7 +333,7 @@ public class Scanner * Constructs a new Scanner with a ReadableByteChannel as source and * a given charsetName, which is to be applied on it.
    It also * initiates the main Buffer. - * + * * @param source * The ReadableByteChannel to use as source. * @param charsetName @@ -348,11 +348,11 @@ public class Scanner /** * Constructs a new Scanner using the given String as input only. - * + * * @param source * The whole String to be used as source. */ - public Scanner (final String source) // TESTED + public Scanner (final String source) // TESTED { this.actBuffer = new String (source); this.myMatcher.reset (this.actBuffer); @@ -364,14 +364,14 @@ public class Scanner * the Scanner is closed, all searches will lead to a {@link * IllegalStateException}. */ - public void close () + public void close () { try { if (this.bIS != null) - this.bIS.close (); + this.bIS.close (); if (this.rbcSource != null) - this.rbcSource.close (); + this.rbcSource.close (); this.isClosed = true; } catch (IOException ioe) @@ -382,17 +382,17 @@ public class Scanner /** * Returns the current delimiter. - * + * * @return the current delimiter. */ - public Pattern delimiter () // TESTED + public Pattern delimiter () // TESTED { return this.p; } /** * Tries to find the pattern in the current line. - * + * * @param pattern The pattern which should be searched in the * current line of the input. * @throws NoSuchElementException @@ -400,31 +400,31 @@ public class Scanner * @return If the search was successful, the result or otherwise a * {@link NoSuchElementException} is thrown. */ - public String findInLine (final Pattern pattern) throws NoSuchElementException // TESTED + public String findInLine (final Pattern pattern) throws NoSuchElementException // TESTED { String tmpStr = myNextLine (false); return myFindPInStr (pattern, tmpStr, 0); } - + /** * Compiles the given pattern into a {@link Pattern} and calls * {@link #findInLine(Pattern)} with the compiled pattern and * returns whatever it returns. - * + * * @param pattern * The pattern which should be matched in the input. * @throws NoSuchElementException * If the pattern was not found. * @return The match in the current line. */ - public String findInLine (final String pattern) // TESTED + public String findInLine (final String pattern) // TESTED { return findInLine (Pattern.compile (pattern)); } /** * Trys to match the pattern within the given horizon. - * + * * @param pattern * Pattern to search. * @param horizon @@ -439,12 +439,12 @@ public class Scanner { if (horizon < 0) { - throw new IllegalArgumentException (horizon + " is negative"); + throw new IllegalArgumentException (horizon + " is negative"); } if (this.isClosed) { - throw new IllegalStateException ("Scanner is closed"); + throw new IllegalStateException ("Scanner is closed"); } // doSkipp is set true to get the matching patern together with the found String @@ -453,7 +453,7 @@ public class Scanner if (rc != null) { - this.actPos += rc.length (); + this.actPos += rc.length (); } return rc; @@ -462,7 +462,7 @@ public class Scanner /** * Compile the pattern and call {@link #findWithinHorizon(Pattern, * int)}. - * + * * @param pattern * Pattern to search. * @param horizon @@ -484,16 +484,16 @@ public class Scanner * and the length must be greater then 0. If a {@link * NoSuchElementException} is thrown by the search method, it is * catched and false is returned. - * + * * @return true if there is any result using the current delimiter. This wouldn't * lead to a {@link NoSuchElementException}. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNext () throws IllegalStateException // TESTED + public boolean hasNext () throws IllegalStateException // TESTED { String tmpStr = null; - + try { tmpStr = myCoreNext (false, this.p); @@ -504,7 +504,7 @@ public class Scanner if (tmpStr == null || tmpStr.length () <= 0) { - return false; + return false; } return true; } @@ -512,14 +512,14 @@ public class Scanner /** * Searches the pattern in the next subString before the next * current delimiter. - * + * * @param pattern * The pattern to search for. * @return true if the pattern is found before the current delimiter. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNext (final Pattern pattern) throws IllegalStateException // TESTED + public boolean hasNext (final Pattern pattern) throws IllegalStateException // TESTED { String tmpStr; @@ -527,7 +527,7 @@ public class Scanner if (tmpStr == null || tmpStr.length () <= 0) { - return false; + return false; } return true; } @@ -535,7 +535,7 @@ public class Scanner /** * Compiles the pattern to a {@link Pattern} and calls {@link * #hasNext(Pattern)}. - * + * * @see #hasNext(Pattern) * @param pattern * The pattern as string to search for. @@ -543,7 +543,7 @@ public class Scanner * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNext (final String pattern) throws IllegalStateException // TESTED + public boolean hasNext (final String pattern) throws IllegalStateException // TESTED { return hasNext (Pattern.compile (pattern)); } @@ -552,13 +552,13 @@ public class Scanner * Checks if the string to the next delimiter can be interpreted as * a BigDecimal number.
    BigDecimal numbers are always tryed * with radix 10. - * + * * @see #nextBigDecimal() * @return true if the next string is a BigDecimal number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextBigDecimal () throws IllegalStateException // TESTED + public boolean hasNextBigDecimal () throws IllegalStateException // TESTED { try { @@ -575,13 +575,13 @@ public class Scanner * Checks if the string to the next delimiter can be interpreted as * a BigInteger number.
    Call {@link #hasNextBigInteger(int)} * with the current radix. - * + * * @see #nextBigInteger() * @return true if the next string is a BigInteger number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextBigInteger () throws IllegalStateException // TESTED + public boolean hasNextBigInteger () throws IllegalStateException // TESTED { return hasNextBigInteger (this.currentRadix); } @@ -589,7 +589,7 @@ public class Scanner /** * Checks if the string to the next delimiter can be interpreted as * a BigInteger number.
    - * + * * @param radix * The radix to use for this check. The global radix of the Scanner will not be * changed. @@ -615,13 +615,13 @@ public class Scanner * Checks if the next string could be a boolean. The method handles * the input not case sensitiv, so "true" and "TRUE" and even "tRuE" * are true . - * + * * @see #nextBoolean() * @return Return true if the next string is a boolean. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextBoolean () throws IllegalStateException // TESTED + public boolean hasNextBoolean () throws IllegalStateException // TESTED { try { @@ -638,13 +638,13 @@ public class Scanner * Checks if the string to the next delimiter can be interpreted as * a byte number.
    Calls {@link #hasNextByte(int)} with the * current radix. - * + * * @see #nextByte() * @return true if the next string is a byte number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextByte () throws IllegalStateException // TESTED + public boolean hasNextByte () throws IllegalStateException // TESTED { return hasNextByte (this.currentRadix); } @@ -654,7 +654,7 @@ public class Scanner * a byte number with the given radix.
    To check, the private * method {@link #myNextByte(int, boolean)} is called, and if no * error occurs the next string could be a byte. - * + * * @see #nextByte(int) * @param radix The radix to use for this check. The global radix of * the Scanner will not be changed. @@ -680,13 +680,13 @@ public class Scanner * a double number.
    To check, the private method {@link * #myNextDouble(boolean)} is called, and if no error occurs the * next string could be a double. - * + * * @see #nextDouble() * @return true if the next string is a double number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextDouble () throws IllegalStateException // TESTED + public boolean hasNextDouble () throws IllegalStateException // TESTED { try { @@ -705,13 +705,13 @@ public class Scanner * checked.
    To check, the private method {@link * #myNextDouble(boolean)} is called, and if no error occurs the * next string could be a double. - * + * * @see #nextFloat() * @return true if the next string is a double number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextFloat () throws IllegalStateException // TESTED + public boolean hasNextFloat () throws IllegalStateException // TESTED { try { @@ -730,13 +730,13 @@ public class Scanner * an int number.
    To check, the private method {@link * #myNextInt(int, boolean)} is called, and if no error occurs the * next string could be an int. - * + * * @see #nextInt(int) * @return true if the next string is an int number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextInt () throws IllegalStateException // TESTED + public boolean hasNextInt () throws IllegalStateException // TESTED { return hasNextInt (this.currentRadix); } @@ -746,7 +746,7 @@ public class Scanner * an int number with the given radix.
    To check, the private * method {@link #myNextInt(int, boolean)} is called, and if no * error occurs the next string could be an int. - * + * * @see #nextInt(int) * @param radix * The radix to use for this check. The global radix of the Scanner will not be @@ -771,12 +771,12 @@ public class Scanner /** * Checks if there is a current line, which ends at the next line * break or the end of the input. - * + * * @return true if there is a current line. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextLine () throws IllegalStateException // TESTED + public boolean hasNextLine () throws IllegalStateException // TESTED { return (myNextLine (false) != null); } @@ -786,13 +786,13 @@ public class Scanner * a long number.
    To check, the private method {@link * #myNextLong(int, boolean)} is called, and if no error occurs the * next string could be a long. - * + * * @see #nextLong() * @return true if the next string is a long number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextLong () throws IllegalStateException // TESTED + public boolean hasNextLong () throws IllegalStateException // TESTED { return hasNextLong (this.currentRadix); } @@ -802,7 +802,7 @@ public class Scanner * a long number with the given radix.
    To check, the private * method {@link #myNextLong(int, boolean)} is called, and if no * error occurs the next string could be a long. - * + * * @see #nextLong(int) * @param radix * The radix to use for this check. The global radix of the Scanner will not be @@ -829,13 +829,13 @@ public class Scanner * a short number with the given radix.
    To check, the private * method {@link #myNextShort(int, boolean)} is called, and if no * error occurs the next string could be a short. - * + * * @see #nextShort(int) * @return true if the next string is a short number. * @throws IllegalStateException * if the Scanner is closed. */ - public boolean hasNextShort () throws IllegalStateException // TESTED + public boolean hasNextShort () throws IllegalStateException // TESTED { return hasNextShort (this.currentRadix); } @@ -845,7 +845,7 @@ public class Scanner * a short number.
    To check, the private method {@link * #myNextShort(int, boolean)} is called, and if no error occurs the * next string could be a short. - * + * * @see #nextShort(int) * @param radix * The radix to use for this check. The global radix of the Scanner will not be @@ -869,7 +869,7 @@ public class Scanner /** * Returns the last {@link IOException} occured. - * + * * @return Returns the last {@link IOException}. */ public IOException ioException () @@ -881,11 +881,11 @@ public class Scanner * Returns the current value of {@link #useLocale}. This is used to * tell the Scanner if it should use the Locale format or just * handle numbers of the default format. - * + * * @see #setUseLocale(boolean) * @return the useLoclae. */ - public boolean isUseLocale () // TESTED + public boolean isUseLocale () // TESTED { return this.useLocale; } @@ -893,11 +893,11 @@ public class Scanner /** * Returns the current Locale. It is initialized with {@link * Locale#getDefault()}. - * + * * @see #useLocale(Locale) * @return Returns the current Locale. */ - public Locale locale () // TESTED + public Locale locale () // TESTED { return this.actLocale; } @@ -905,10 +905,10 @@ public class Scanner /** * Returns the last MatchResult found. This is updated after every * successfully search. - * + * * @return Returns the last {@link MatchResult} found. */ - public MatchResult match () // TESTED + public MatchResult match () // TESTED { return this.actResult; } @@ -918,7 +918,7 @@ public class Scanner * buffer. If a string is found the current position is set after * the delimiter, otherwise a {@link NoSuchElementException} is * thrown. A successful match sets the matchResult. - * + * * @see #match() * @return Returns the next string of the buffer. * @throws NoSuchElementException @@ -926,7 +926,7 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public String next () throws NoSuchElementException, IllegalStateException // TESTED + public String next () throws NoSuchElementException, IllegalStateException // TESTED { return myCoreNext (true, this.p); } @@ -934,7 +934,7 @@ public class Scanner /** * Tries to match the buffer with the given pattern. The current * delimiter will not be changed. - * + * * @param pattern * The pattern to match. * @return Returns the next string matching the pattern. @@ -943,7 +943,7 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public String next (final Pattern pattern) throws NoSuchElementException, IllegalStateException // TESTED + public String next (final Pattern pattern) throws NoSuchElementException, IllegalStateException // TESTED { return myNext (pattern, true); } @@ -952,7 +952,7 @@ public class Scanner * Tries to match the buffer with the given pattern. The current * delimiter will not be changed. Calls the {@link #next(Pattern)} * with the compiled pattern. - * + * * @see #next(Pattern) * @param pattern * The pattern to match. @@ -962,21 +962,21 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public String next (final String pattern) throws NoSuchElementException, IllegalStateException // TESTED + public String next (final String pattern) throws NoSuchElementException, IllegalStateException // TESTED { return next (Pattern.compile (pattern)); } /** * Tries to interpret the next string as a BigDecimal value. - * + * * @return Returns the BigDecimal value of the next string. * @throws NoSuchElementException * If no string is found or the string is not a BigDecimal. * @throws IllegalStateException * If the Scanner is closed. */ - public BigDecimal nextBigDecimal () throws NoSuchElementException, IllegalStateException // TESTED + public BigDecimal nextBigDecimal () throws NoSuchElementException, IllegalStateException // TESTED { return myBigDecimal (true); } @@ -985,7 +985,7 @@ public class Scanner * Tries to interpret the next string as a BigInteger value. Call * {@link #nextBigInteger(int)} with the current radix as parameter, * and return the value. - * + * * @see #nextBigInteger(int) * @return Returns the BigInteger value of the next string. * @throws NoSuchElementException @@ -993,7 +993,7 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public BigInteger nextBigInteger () throws NoSuchElementException, IllegalStateException // TESTED + public BigInteger nextBigInteger () throws NoSuchElementException, IllegalStateException // TESTED { return nextBigInteger (this.currentRadix); } @@ -1001,7 +1001,7 @@ public class Scanner /** * Tries to interpret the next string as a BigInteger value with the * given radix. - * + * * @param radix * The radix to be used for this BigInteger. The current radix of the Scanner is not * changed. @@ -1020,14 +1020,14 @@ public class Scanner /** * Tries to interpret the next string to the delimiter as a boolean * value, ignoring case. - * + * * @return Returns the boolean value of the next matching string or throws an exception. * @throws NoSuchElementException * If no string is found or the string is not a boolean. * @throws IllegalStateException * If the Scanner is closed. */ - public boolean nextBoolean () throws NoSuchElementException, IllegalStateException // TESTED + public boolean nextBoolean () throws NoSuchElementException, IllegalStateException // TESTED { return myNextBoolean (true); } @@ -1036,7 +1036,7 @@ public class Scanner * Tries to interpret the next string as a byte value. Call {@link * #nextByte(int)} with the current radix as parameter, and return * the value. - * + * * @see #nextByte(int) * @return Returns the byte value of the next string. * @throws NoSuchElementException @@ -1044,7 +1044,7 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public byte nextByte () throws NoSuchElementException, IllegalStateException // TESTED + public byte nextByte () throws NoSuchElementException, IllegalStateException // TESTED { return nextByte (this.currentRadix); } @@ -1052,7 +1052,7 @@ public class Scanner /** * Tries to interpret the next string as a byte value with the given * radix. - * + * * @param radix * The radix to be used for this byte. The current radix of the Scanner is not * changed. @@ -1070,14 +1070,14 @@ public class Scanner /** * Tries to interpret the next string as a double value. - * + * * @return Returns the int value of the next string. * @throws NoSuchElementException * If no string is found or the string is not a double. * @throws IllegalStateException * If the Scanner is closed. */ - public double nextDouble () throws NoSuchElementException, IllegalStateException // TESTED + public double nextDouble () throws NoSuchElementException, IllegalStateException // TESTED { return myNextDouble (true); } @@ -1085,14 +1085,14 @@ public class Scanner /** * Tries to interpret the next string as a double value, and then * casts down to float. - * + * * @return Returns the int value of the next string. * @throws NoSuchElementException * If no string is found or the string is not a double. * @throws IllegalStateException * If the Scanner is closed. */ - public float nextFloat () throws NoSuchElementException, IllegalStateException // TESTED + public float nextFloat () throws NoSuchElementException, IllegalStateException // TESTED { return (float) myNextDouble (true); // return myNextFloat(true); @@ -1102,7 +1102,7 @@ public class Scanner * Tries to interpret the next string as an int value. Calls {@link * #nextInt(int)} with the current radix as parameter, and return * the value. - * + * * @see #nextInt(int) * @return Returns the int value of the next string. * @throws NoSuchElementException @@ -1110,7 +1110,7 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public int nextInt () throws NoSuchElementException, IllegalStateException // TESTED + public int nextInt () throws NoSuchElementException, IllegalStateException // TESTED { return nextInt (this.currentRadix); } @@ -1118,7 +1118,7 @@ public class Scanner /** * Tries to interpret the next string as an int value with the given * radix. - * + * * @param radix * The radix to be used for this int. The current radix of the Scanner is not changed * @return Returns the int value of the next string. @@ -1136,14 +1136,14 @@ public class Scanner /** * Tries to match the system line seperator, and returns the current * line. - * + * * @return Returns the current line. * @throws NoSuchElementException * If the current delimiter is not found. * @throws IllegalStateException * If the Scanner is closed. */ - public String nextLine () throws NoSuchElementException, IllegalStateException // TESTED + public String nextLine () throws NoSuchElementException, IllegalStateException // TESTED { return myNextLine (true); } @@ -1152,7 +1152,7 @@ public class Scanner * Tries to interpret the next string as a long value. Calls {@link * #nextLong(int)} with the current radix as parameter, and return * the value. - * + * * @see #nextLong(int) * @return Returns the long value of the next string. * @throws NoSuchElementException @@ -1160,7 +1160,7 @@ public class Scanner * @throws IllegalStateException * If the Scanner is closed. */ - public long nextLong () throws NoSuchElementException, IllegalStateException // TESTED + public long nextLong () throws NoSuchElementException, IllegalStateException // TESTED { return nextLong (this.currentRadix); } @@ -1168,7 +1168,7 @@ public class Scanner /** * Tries to interpret the next string as a long value with the given * radix. - * + * * @param radix * The radix to be used for this long. The current radix of the Scanner is not * changed @@ -1188,13 +1188,13 @@ public class Scanner * Tries to interpret the next string as a short value. Calls {@link * #nextShort(int)} with the current radix as parameter, and return * the value. - * + * * @see #nextShort(int) * @return Returns the short value of the next string. * @throws NoSuchElementException * If no string is found or the string is not a short. */ - public short nextShort () throws NoSuchElementException // TESTED + public short nextShort () throws NoSuchElementException // TESTED { return nextShort (this.currentRadix); } @@ -1202,7 +1202,7 @@ public class Scanner /** * Tries to interpret the next string as a short value with the * given radix. - * + * * @param radix * The radix to be used for this short. The current radix of the Scanner is not * changed. @@ -1234,14 +1234,14 @@ public class Scanner /** * @param useLocale the useLocale to set. */ - public void setUseLocale (final boolean useLocale) // TESTED + public void setUseLocale (final boolean useLocale) // TESTED { this.useLocale = useLocale; } /** * Skips the given pattern. Sets skipped true. - * + * * @param pattern * Pattern which should be skipped. * @return this with the skipped buffer. @@ -1269,7 +1269,7 @@ public class Scanner if (!found) { - throw new NoSuchElementException (); + throw new NoSuchElementException (); } return this; } @@ -1277,7 +1277,7 @@ public class Scanner /** * Skips a given pattern. Calls {@link #skip(Pattern)} with the * compiled pattern. - * + * * @see #skip(Pattern) * @param pattern * Pattern which should be skipped. @@ -1291,7 +1291,7 @@ public class Scanner /** * Returns the string representation of this Scanner. */ - @Override + @Override public String toString () { String tmpStr2; @@ -1335,17 +1335,17 @@ public class Scanner /** * Sets the current pattern to the given parameter, and updates the * {@link Matcher} with the new pattern. - * + * * @param pattern * The new pattern to use. * @return Returns the Scanner (this) with the new pattern. */ - public Scanner useDelimiter (final Pattern pattern) // TESTED + public Scanner useDelimiter (final Pattern pattern) // TESTED { if (pattern != null) { - this.p = pattern; - this.myMatcher = this.p.matcher (this.actBuffer); + this.p = pattern; + this.myMatcher = this.p.matcher (this.actBuffer); } return this; } @@ -1353,13 +1353,13 @@ public class Scanner /** * Sets the current pattern to the given parameter. Compiles the * pattern and calls {@link #useDelimiter(Pattern)} - * + * * @see #useDelimiter(Pattern) * @param pattern * The new pattern to use. * @return Returns the Scanner (this) with the new pattern. */ - public Scanner useDelimiter (final String pattern) // TESTED + public Scanner useDelimiter (final String pattern) // TESTED { return useDelimiter (Pattern.compile (pattern)); } @@ -1367,19 +1367,19 @@ public class Scanner /** * Sets the current Locale to the given parameter. Formats and * Symbols are also set using the new Locale. - * + * * @param locale The new Locale to use. If it is null * nothing happens. * @return Returns the Scanner (this) with the new Locale. */ - public Scanner useLocale (final Locale locale) // TESTED + public Scanner useLocale (final Locale locale) // TESTED { if (locale != null) { - this.actLocale = locale; - this.actFormat = NumberFormat.getInstance (this.actLocale); - this.dfs = new DecimalFormatSymbols (this.actLocale); - this.df = (DecimalFormat) this.actFormat; + this.actLocale = locale; + this.actFormat = NumberFormat.getInstance (this.actLocale); + this.dfs = new DecimalFormatSymbols (this.actLocale); + this.df = (DecimalFormat) this.actFormat; } return this; } @@ -1388,7 +1388,7 @@ public class Scanner * Sets the current radix to the current value if the given radix is * >= 2 and <= 36 otherwise an {@link IllegalArgumentException} is * thrown. - * + * * @param radix * the new radix to use as default. * @return this with the new radix value. @@ -1399,7 +1399,7 @@ public class Scanner { if (radix < 2 || radix > 36) { - throw new IllegalArgumentException (); + throw new IllegalArgumentException (); } this.currentRadix = radix; return this; @@ -1410,7 +1410,7 @@ public class Scanner * String. If so the String is converted using the {@link * NumberFormat#parse(String)} into a Number and then back to a * default stringrepresentation of that Number. - * + * * @see #setUseLocale(boolean) * @param str * String to convert into another string. @@ -1422,14 +1422,14 @@ public class Scanner * if {@link NumberFormat#parse(String)} fails to parse. */ private String myApplyLocale (final String str, - final int radix) throws ParseException + final int radix) throws ParseException { String rc; if (this.useLocale && radix == 10) { - rc = this.actFormat.parse (str).toString (); - return rc; + rc = this.actFormat.parse (str).toString (); + return rc; } return str; @@ -1444,7 +1444,7 @@ public class Scanner * integer part which is converted to a long, and the fraction part * is appended afterwards. Between the integer and the fraction part * comes a ".". Finally the resulting string is returned. - * + * * @see #setUseLocale(boolean) * @param str String representation of a BigDecimal number. * @return The default String representation (without Locale) of the @@ -1456,7 +1456,7 @@ public class Scanner { if (!this.useLocale || this.currentRadix != 10) { - return str; + return str; } String negPrefix = this.df.getNegativePrefix (); @@ -1476,43 +1476,43 @@ public class Scanner if (begin2 > 0) { - throw new ParseException ("more than one Decimal seperators", begin2); + throw new ParseException ("more than one Decimal seperators", begin2); } parts = str.substring (0, begin1); if ((negPrefix.length () > 0 - && str.substring (0, negPrefix.length ()).equals (negPrefix)) - || (negSuffix.length () > 0 - && str.substring (str.length () - - negSuffix.length ()).equals (negSuffix))) + && str.substring (0, negPrefix.length ()).equals (negPrefix)) + || (negSuffix.length () > 0 + && str.substring (str.length () - + negSuffix.length ()).equals (negSuffix))) { - parts += negSuffix; - isNegativ = true; + parts += negSuffix; + isNegativ = true; } else if ((posPrefix.length () > 0 - && str.substring (0, posPrefix.length ()).equals (posPrefix)) - || (posSuffix.length () > 0 - && str.substring (str.length () - - posSuffix.length ()).equals (posSuffix))) + && str.substring (0, posPrefix.length ()).equals (posPrefix)) + || (posSuffix.length () > 0 + && str.substring (str.length () - + posSuffix.length ()).equals (posSuffix))) { - parts += posSuffix; + parts += posSuffix; } tmpStr1 = this.actFormat.parse (parts).toString (); if (isNegativ) { - tmpStr1 += - "." + str.substring (str.indexOf (d) + 1, - str.length () - negSuffix.length ()); + tmpStr1 += + "." + str.substring (str.indexOf (d) + 1, + str.length () - negSuffix.length ()); } else { - tmpStr1 += - "." + str.substring (str.indexOf (d) + 1, - str.length () - posSuffix.length ()); + tmpStr1 += + "." + str.substring (str.indexOf (d) + 1, + str.length () - posSuffix.length ()); } return tmpStr1; @@ -1523,7 +1523,7 @@ public class Scanner * next String is get with {@link #myCoreNext(boolean, Pattern)} and * then {@link #myApplyLocaleBD(String)} is called to convert the * String into a BigDecimal. - * + * * @param delete * Should the found string be deleted or not. * @return Returns the BigDecimal value of the next string. @@ -1542,7 +1542,7 @@ public class Scanner catch (ParseException e) { throw new InputMismatchException (ERR_PREFIX + tmp + IS_NOT + - "BigDecimal!!"); + "BigDecimal!!"); } rc = new BigDecimal (tmp); @@ -1552,7 +1552,7 @@ public class Scanner /** * Applies suffix ("\E") and prefix ("\Q") if str.length != 0 Used * by the toString method. - * + * * @param str * the string on which the suffix and prefix should be applied. * @return The new new string with the suffix and prefix. @@ -1561,7 +1561,7 @@ public class Scanner { if (str != null && str.length () > 0) { - return "\\Q" + str + "\\E"; + return "\\Q" + str + "\\E"; } return str; } @@ -1572,7 +1572,7 @@ public class Scanner * source. The search results are always saved in {@link #actResult} * which is returned when match() is called. If doSkip is true the * pattern is also taken. - * + * * @param delete * if true the aktPos is set. * @param pattern @@ -1586,24 +1586,24 @@ public class Scanner { if (this.isClosed) { - throw new IllegalStateException ("Scanner closed"); + throw new IllegalStateException ("Scanner closed"); } if (shallUseLastFound (pattern != null ? pattern : this.p)) { - if (this.last_RegionEnd != this.myMatcher.regionEnd ()) - { - System.out.println (this.last_RegionEnd + " != " + - this.myMatcher.regionEnd () + " (" + - (this.last_RegionEnd - - this.myMatcher.regionEnd ()) + ")"); - } - if (delete) - { - this.actPos = this.lastNextPos; - this.lastFoundPresent = false; - this.actResult = this.lastResult; - } - return this.lastFound; + if (this.last_RegionEnd != this.myMatcher.regionEnd ()) + { + System.out.println (this.last_RegionEnd + " != " + + this.myMatcher.regionEnd () + " (" + + (this.last_RegionEnd - + this.myMatcher.regionEnd ()) + ")"); + } + if (delete) + { + this.actPos = this.lastNextPos; + this.lastFoundPresent = false; + this.actResult = this.lastResult; + } + return this.lastFound; } boolean found = false; @@ -1614,18 +1614,18 @@ public class Scanner if (this.actPos > this.MAX_PREFIX) { - // skipp the processed chars so that the size of the buffer don't grow to much even with - // huge files - this.procesedChars += this.actPos; - this.actBuffer = this.actBuffer.substring (this.actPos); - this.actPos = 0; - this.myMatcher = pattern.matcher (this.actBuffer); + // skipp the processed chars so that the size of the buffer don't grow to much even with + // huge files + this.procesedChars += this.actPos; + this.actBuffer = this.actBuffer.substring (this.actPos); + this.actPos = 0; + this.myMatcher = pattern.matcher (this.actBuffer); } left = this.actBuffer.length () - this.actPos; if (left < this.MIN_BUF_LEN) { - myFillBuffer (); + myFillBuffer (); } found = this.myMatcher.find (this.actPos); @@ -1635,61 +1635,63 @@ public class Scanner if (found) { - if (this.doSkipp) - { - endIndex = this.myMatcher.end (); - } - else - { - endIndex = this.myMatcher.start (); - } - tmp2 = this.actBuffer.substring (this.actPos, endIndex); - this.lastNextPos = this.myMatcher.end (); - /* - * if the delete flag is set, just set the current position after the end of the matched - * pattern. - */ - if (delete) - { - this.actPos = this.lastNextPos; - } - else - { - this.lastFound = tmp2; - this.lastFoundPresent = true; - this.lastPatternHash = pattern.hashCode (); - } - this.last_RegionStart = this.myMatcher.regionStart (); - this.last_RegionEnd = this.myMatcher.regionEnd (); - this.last_anchor = this.myMatcher.hasAnchoringBounds (); - this.last_transparent = this.myMatcher.hasTransparentBounds (); + if (this.doSkipp) + { + endIndex = this.myMatcher.end (); + } + else + { + endIndex = this.myMatcher.start (); + } + tmp2 = this.actBuffer.substring (this.actPos, endIndex); + this.lastNextPos = this.myMatcher.end (); + /* + * if the delete flag is set, just set the current position after the end of the matched + * pattern. + */ + if (delete) + { + this.actPos = this.lastNextPos; + } + else + { + this.lastFound = tmp2; + this.lastFoundPresent = true; + this.lastPatternHash = pattern.hashCode (); + } + this.last_RegionStart = this.myMatcher.regionStart (); + this.last_RegionEnd = this.myMatcher.regionEnd (); + this.last_anchor = this.myMatcher.hasAnchoringBounds (); + this.last_transparent = this.myMatcher.hasTransparentBounds (); } else if (this.myMatcher.hitEnd ()) // the end of input is matched { - tmp2 = this.actBuffer.substring (this.actPos); - this.lastNextPos = this.actBuffer.length (); - if (delete) - { - this.actPos = this.lastNextPos; - } - else - { - this.lastFound = tmp2; - this.lastFoundPresent = true; - this.lastPatternHash = pattern.hashCode (); - } - this.last_RegionStart = this.myMatcher.regionStart (); - this.last_RegionEnd = this.myMatcher.regionEnd (); - this.last_anchor = this.myMatcher.hasAnchoringBounds (); - this.last_transparent = this.myMatcher.hasTransparentBounds (); + tmp2 = this.actBuffer.substring (this.actPos); + if (tmp2.length() == 0) + tmp2 = null; + this.lastNextPos = this.actBuffer.length (); + if (delete) + { + this.actPos = this.lastNextPos; + } + else + { + this.lastFound = tmp2; + this.lastFoundPresent = true; + this.lastPatternHash = pattern.hashCode (); + } + this.last_RegionStart = this.myMatcher.regionStart (); + this.last_RegionEnd = this.myMatcher.regionEnd (); + this.last_anchor = this.myMatcher.hasAnchoringBounds (); + this.last_transparent = this.myMatcher.hasTransparentBounds (); } else { - /* - * if no match found an Exception is throwed - */ - throw new NoSuchElementException (); + /* + * if no match found an Exception is throwed + */ + throw new NoSuchElementException (); } /* * change the Result only when a nextXXX() method was called, not if a hasNextXXX() method @@ -1697,13 +1699,13 @@ public class Scanner */ if (delete) { - this.actResult = this.myMatcher.toMatchResult (); + this.actResult = this.myMatcher.toMatchResult (); - this.matchValid = this.actResult != null; + this.matchValid = this.actResult != null; } else { - this.lastResult = this.myMatcher.toMatchResult (); + this.lastResult = this.myMatcher.toMatchResult (); } this.skipped = this.doSkipp; @@ -1728,74 +1730,74 @@ public class Scanner if (this.bIS != null) { - try - { - len = this.bIS.read (this.tmpBuffer); - if (len < 0) - { - return; - } - if (this.charsetName != null) - { - tmpStr = new String (this.tmpBuffer, 0, len, this.charsetName); - } - else - { - tmpStr = new String (this.tmpBuffer, 0, len); - } - this.actBuffer += tmpStr; - } - catch (IOException e) - { - this.lastIOException = e; - } + try + { + len = this.bIS.read (this.tmpBuffer); + if (len < 0) + { + return; + } + if (this.charsetName != null) + { + tmpStr = new String (this.tmpBuffer, 0, len, this.charsetName); + } + else + { + tmpStr = new String (this.tmpBuffer, 0, len); + } + this.actBuffer += tmpStr; + } + catch (IOException e) + { + this.lastIOException = e; + } } else if (this.readableSource != null) { - try - { - cb = CharBuffer.allocate (1000); - this.needInput = true; - len = this.readableSource.read (cb); - if (len < 0) - { - return; - } - this.needInput = false; - tmpStr = new String (cb.array ()); - this.actBuffer += tmpStr; - } - catch (IOException e) - { - this.lastIOException = e; - } + try + { + cb = CharBuffer.allocate (1000); + this.needInput = true; + len = this.readableSource.read (cb); + if (len < 0) + { + return; + } + this.needInput = false; + tmpStr = new String (cb.array ()); + this.actBuffer += tmpStr; + } + catch (IOException e) + { + this.lastIOException = e; + } } else if (this.rbcSource != null) { - try - { - bb = ByteBuffer.allocate (1000); - this.needInput = true; - len = this.rbcSource.read (bb); - this.needInput = false; - if (len < 0) - { - return; - } - if (this.charsetName != null) - { - tmpStr = new String (bb.array (), 0, len, this.charsetName); - } - else - { - tmpStr = new String (bb.array (), 0, len); - } - this.actBuffer += tmpStr; - } - catch (IOException e) - { - this.lastIOException = e; - } + try + { + bb = ByteBuffer.allocate (1000); + this.needInput = true; + len = this.rbcSource.read (bb); + this.needInput = false; + if (len < 0) + { + return; + } + if (this.charsetName != null) + { + tmpStr = new String (bb.array (), 0, len, this.charsetName); + } + else + { + tmpStr = new String (bb.array (), 0, len); + } + this.actBuffer += tmpStr; + } + catch (IOException e) + { + this.lastIOException = e; + } } this.myMatcher.reset (this.actBuffer); @@ -1805,7 +1807,7 @@ public class Scanner * A loop in which the {@link #myFillBuffer()} is called and checked * if the pattern is found in the matcher and if the buffersize * changes after the read. - * + * * @param aktM * The current Matcher. * @param pos @@ -1815,22 +1817,22 @@ public class Scanner * @return true if the matcher has found a match. */ private boolean myFillBuffer_loop (final Matcher aktM, final int pos, - boolean found) + boolean found) { int tmp; tmp = this.actBuffer.length (); while (aktM.hitEnd () - && ((this.bIS != null) || (this.readableSource != null) - || (this.rbcSource != null))) + && ((this.bIS != null) || (this.readableSource != null) + || (this.rbcSource != null))) { - myFillBuffer (); - if (tmp == this.actBuffer.length ()) - { - break; - } - found = aktM.find (pos); - this.needInput = true; + myFillBuffer (); + if (tmp == this.actBuffer.length ()) + { + break; + } + found = aktM.find (pos); + this.needInput = true; } return found; } @@ -1841,7 +1843,7 @@ public class Scanner * overwritten using the given pattern and the given Sting.
    * After the search the original values are restored, and skipped is * set true . - * + * * @param pattern * Pattern which should be matched. * @param str @@ -1851,7 +1853,7 @@ public class Scanner * @return Returns the String in the given String that matches the pattern. */ private String myFindPInStr (final Pattern pattern, final String str, - final int horizon) + final int horizon) { String rc = null; int curPos = this.actPos; @@ -1860,9 +1862,9 @@ public class Scanner this.myMatcher = pattern.matcher (str); if (horizon > 0) { - this.myMatcher.useAnchoringBounds (true); - this.myMatcher.useTransparentBounds (true); - this.myMatcher.region (this.actPos, this.actPos + horizon); + this.myMatcher.useAnchoringBounds (true); + this.myMatcher.useTransparentBounds (true); + this.myMatcher.region (this.actPos, this.actPos + horizon); } rc = myCoreNext (true, pattern); this.myMatcher = aktMatcher; @@ -1880,7 +1882,7 @@ public class Scanner * subsring.
    Finally the current Buffer and matcher (which have * been temporarily changed) are set back.

    The {@link * #skipped} is set true . - * + * * @param pattern * Pattern to find until the current delimiter. * @param delete @@ -1917,7 +1919,7 @@ public class Scanner * and useLocale is true . Afterwards it is tried to * call the Constructor of a {@link BigInteger} with the given * radix. - * + * * @param radix The radix to use. * @param delete If the found String should be removed from input or * not. @@ -1927,7 +1929,7 @@ public class Scanner * If there is a {@link ParseException} or a {@link NumberFormatException}. */ private BigInteger myNextBigInteger (final int radix, final boolean delete, - final String name) + final String name) { BigInteger rc; String tmp = myPrepareForNext (this.p, delete); @@ -1952,7 +1954,7 @@ public class Scanner * an {@link InputMismatchException} is thrown. It ignores the case * of the string so that "true" and "TRUE" and even "TrUe" are * accepted. - * + * * @param delete Should the found value be removed from the input or * not. * @return Returns the boolean value (if it is a boolean). @@ -1965,15 +1967,15 @@ public class Scanner String tmp = myPrepareForNext (this.p, delete); if (tmp.equalsIgnoreCase ("true")) { - return true; + return true; } else if (tmp.equalsIgnoreCase ("false")) { - return false; + return false; } else { - throw new InputMismatchException (ERR_PREFIX + tmp + NOT_BOOLEAN); + throw new InputMismatchException (ERR_PREFIX + tmp + NOT_BOOLEAN); } } @@ -1983,14 +1985,14 @@ public class Scanner * String matching the current delimier. Afterwards it is tryed to * convert the String into a byte. Any Error will lead into a {@link * InputMismatchException}. - * + * * @param radix The radix to use. * @param delete Should the found String be removed from the input. * @return Returns the byte value of the String. * @throws InputMismatchException if the next String is not a byte. */ private byte myNextByte (final int radix, - final boolean delete) throws InputMismatchException + final boolean delete) throws InputMismatchException { byte rc; String tmp = myPrepareForNext (this.p, delete); @@ -2018,7 +2020,7 @@ public class Scanner * don't match, an {@link InputMismatchException} is thrown.
    *
    The radix used is always 10 even if the global radix is * changed. - * + * * @param delete Should the String be removed, if true it will be * also removed if the String is not a double value. * @return Returns the double value of the next String. @@ -2036,9 +2038,9 @@ public class Scanner tmp = myApplyLocale (tmp, 10); rc = Double.parseDouble (tmp); if (("" + rc).equals (tmp)) - { - return rc; - } + { + return rc; + } } catch (ParseException e) { @@ -2052,7 +2054,7 @@ public class Scanner * should be applied or not and then the result is parsed using * {@link Integer#parseInt(String, int)}. Any Error will lead to an * {@link InputMismatchException}. - * + * * @param radix The radix to use. * @param delete true if the String should be deleted * from the input. @@ -2060,15 +2062,15 @@ public class Scanner * @throws InputMismatchException if the next String is not an int. */ private int myNextInt (final int radix, - final boolean delete) throws InputMismatchException + final boolean delete) throws InputMismatchException { int rc; String tmp = myPrepareForNext (this.p, delete); try { - tmp = myApplyLocale (tmp, radix); - rc = Integer.parseInt (tmp, radix); - return rc; + tmp = myApplyLocale (tmp, radix); + rc = Integer.parseInt (tmp, radix); + return rc; } catch (NumberFormatException nfe) { @@ -2082,38 +2084,36 @@ public class Scanner /** * Finds the next line using the {@link #NEW_LINE} constant which is * set to the system specific line seperator. - * - * @param delete Should the found line be deleted from the input. - * @return Returns the current line. + * + * @param delete should the found line be deleted from the input. + * @return the current line. */ private String myNextLine (final boolean delete) { - String rc = null; - rc = myPrepareForNext (Pattern.compile (NEW_LINE), delete); - return rc; + return myPrepareForNext (Pattern.compile (NEW_LINE), delete); } /** * Tries to interpret the next String as a long value with the given * radix. Therfore the {@link Long#parseLong(String, int)} is called * and every Error will lead into a {@link InputMismatchException}. - * + * * @param radix The radix to be used. * @param delete Should the found String be deleted from the input. * @return the long value of the next String. * @throws InputMismatchException if the next String is not a long. */ private long myNextLong (final int radix, - final boolean delete) throws InputMismatchException + final boolean delete) throws InputMismatchException { long rc; String tmp = myPrepareForNext (this.p, delete); try { - tmp = myApplyLocale (tmp, radix); - rc = Long.parseLong (tmp, radix); - return rc; + tmp = myApplyLocale (tmp, radix); + rc = Long.parseLong (tmp, radix); + return rc; } catch (NumberFormatException nfe) { @@ -2129,7 +2129,7 @@ public class Scanner * given radix. Therfore the {@link Short#parseShort(String, int)} * is called and every Error will lead into a {@link * InputMismatchException} . - * + * * @param radix * The radix to be used. * @param delete @@ -2139,17 +2139,17 @@ public class Scanner * if the next String is not a short. */ private short myNextShort (final int radix, - final boolean delete) throws + final boolean delete) throws InputMismatchException { short rc; String tmp = myPrepareForNext (this.p, delete); - + try { - tmp = myApplyLocale (tmp, radix); - rc = Short.parseShort (tmp, radix); - return rc; + tmp = myApplyLocale (tmp, radix); + rc = Short.parseShort (tmp, radix); + return rc; } catch (NumberFormatException nfe) { @@ -2158,21 +2158,21 @@ public class Scanner { } throw new InputMismatchException (ERR_PREFIX + tmp + - "\" is not a short"); + "\" is not a short"); } /** * Sets the current pattern to the given pattern and calls the * {@link #myCoreNext(boolean, Pattern)}. Finally sets the pattern * back to its old value. - * + * * @param aktPattern Pattern to be used for the next match. * @param delete Should the found String be deleted or not. * @return Return the String returned from {@link * #myCoreNext(boolean, Pattern)}. */ private String myPrepareForNext (final Pattern aktPattern, - final boolean delete) + final boolean delete) { String rc; @@ -2190,32 +2190,32 @@ public class Scanner * Determinates if the last found can be used, so that after a * hasNextXXX the nextXXX has not to search if nothing has * changed.
    Used in {@link #myCoreNext(boolean, Pattern)}. - * + * * @param aktP The pattern which should be checked. * @return true if the searchresult is already ready. */ private boolean shallUseLastFound (final Pattern aktP) { if (this.lastFoundPresent && - this.lastPatternHash == aktP.hashCode () && - this.last_RegionStart == this.myMatcher.regionStart () && - this.last_anchor == this.myMatcher.hasAnchoringBounds () && - this.last_transparent == this.myMatcher.hasTransparentBounds ()) + this.lastPatternHash == aktP.hashCode () && + this.last_RegionStart == this.myMatcher.regionStart () && + this.last_anchor == this.myMatcher.hasAnchoringBounds () && + this.last_transparent == this.myMatcher.hasTransparentBounds ()) { - if (this.last_RegionEnd != this.myMatcher.regionEnd ()) - { - int tmpVal = - this.myMatcher.regionEnd () - - this.last_RegionEnd - this.MAX_PREFIX; - if (tmpVal > 0 && tmpVal < 20) - { - this.last_RegionEnd = - this.myMatcher.regionEnd (); - return true; - } - } - else - return true; + if (this.last_RegionEnd != this.myMatcher.regionEnd ()) + { + int tmpVal = + this.myMatcher.regionEnd () - + this.last_RegionEnd - this.MAX_PREFIX; + if (tmpVal > 0 && tmpVal < 20) + { + this.last_RegionEnd = + this.myMatcher.regionEnd (); + return true; + } + } + else + return true; } return false; } diff --git a/libjava/classpath/java/util/TreeMap.java b/libjava/classpath/java/util/TreeMap.java index 1068100d562..99a42cbfb50 100644 --- a/libjava/classpath/java/util/TreeMap.java +++ b/libjava/classpath/java/util/TreeMap.java @@ -2745,7 +2745,7 @@ public class TreeMap extends AbstractMap { public int size() { - return size(); + return DescendingMap.this.size(); } public Iterator iterator() @@ -2786,7 +2786,7 @@ public class TreeMap extends AbstractMap public void clear() { - clear(); + DescendingMap.this.clear(); } }; return values; diff --git a/libjava/classpath/java/util/regex/Matcher.java b/libjava/classpath/java/util/regex/Matcher.java index 50cb065f287..be57471de61 100644 --- a/libjava/classpath/java/util/regex/Matcher.java +++ b/libjava/classpath/java/util/regex/Matcher.java @@ -70,9 +70,9 @@ public final class Matcher implements MatchResult * The end of the region of the input on which to match. */ private int regionEnd; - + /** - * True if the match process should look beyond the + * True if the match process should look beyond the * region marked by regionStart to regionEnd when * performing lookAhead, lookBehind and boundary * matching. @@ -101,7 +101,7 @@ public final class Matcher implements MatchResult transparentBounds = false; anchoringBounds = 0; } - + /** * @param sb The target string buffer * @param replacement The replacement string @@ -116,9 +116,9 @@ public final class Matcher implements MatchResult { assertMatchOp(); sb.append(input.subSequence(appendPosition, - match.getStartIndex()).toString()); + match.getStartIndex()).toString()); sb.append(RE.getReplacement(replacement, match, - RE.REG_REPLACE_USE_BACKSLASHESCAPE)); + RE.REG_REPLACE_USE_BACKSLASHESCAPE)); appendPosition = match.getEndIndex(); return this; } @@ -131,7 +131,7 @@ public final class Matcher implements MatchResult sb.append(input.subSequence(appendPosition, input.length()).toString()); return sb; } - + /** * @exception IllegalStateException If no match has yet been attempted, * or if the previous match operation failed @@ -142,7 +142,7 @@ public final class Matcher implements MatchResult assertMatchOp(); return match.getEndIndex(); } - + /** * @param group The index of a capturing group in this matcher's pattern * @@ -157,7 +157,7 @@ public final class Matcher implements MatchResult assertMatchOp(); return match.getEndIndex(group); } - + public boolean find () { boolean first = (match == null); @@ -165,28 +165,28 @@ public final class Matcher implements MatchResult match = pattern.getRE().getMatch(inputCharIndexed, position, anchoringBounds); else match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), - position, anchoringBounds); + position, anchoringBounds); if (match != null) { - int endIndex = match.getEndIndex(); - // Are we stuck at the same position? - if (!first && endIndex == position) - { - match = null; - // Not at the end of the input yet? - if (position < input.length() - 1) - { - position++; - return find(position); - } - else - return false; - } - position = endIndex; - return true; + int endIndex = match.getEndIndex(); + // Are we stuck at the same position? + if (!first && endIndex == position) + { + match = null; + // Not at the end of the input yet? + if (position < input.length() - 1) + { + position++; + return find(position); + } + else + return false; + } + position = endIndex; + return true; } return false; - } + } /** * @param start The index to start the new pattern matching @@ -200,15 +200,15 @@ public final class Matcher implements MatchResult match = pattern.getRE().getMatch(inputCharIndexed, start, anchoringBounds); else match = pattern.getRE().getMatch(input.subSequence(regionStart, regionEnd), - start, anchoringBounds); + start, anchoringBounds); if (match != null) { - position = match.getEndIndex(); - return true; + position = match.getEndIndex(); + return true; } return false; } - + /** * @exception IllegalStateException If no match has yet been attempted, * or if the previous match operation failed @@ -218,7 +218,7 @@ public final class Matcher implements MatchResult assertMatchOp(); return match.toString(); } - + /** * @param group The index of a capturing group in this matcher's pattern * @@ -242,7 +242,7 @@ public final class Matcher implements MatchResult reset(); // Semantics might not quite match return pattern.getRE().substitute(input, replacement, position, - RE.REG_REPLACE_USE_BACKSLASHESCAPE); + RE.REG_REPLACE_USE_BACKSLASHESCAPE); } /** @@ -252,36 +252,36 @@ public final class Matcher implements MatchResult { reset(); return pattern.getRE().substituteAll(input, replacement, position, - RE.REG_REPLACE_USE_BACKSLASHESCAPE); + RE.REG_REPLACE_USE_BACKSLASHESCAPE); } - + public int groupCount () { return pattern.getRE().getNumSubs(); } - + public boolean lookingAt () { if (transparentBounds || (regionStart == 0 && regionEnd == input.length())) 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 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.getStartIndex() == 0) - { - position = match.getEndIndex(); - return true; - } - match = null; + if (match.getStartIndex() == 0) + { + position = match.getEndIndex(); + return true; + } + match = null; } return false; } - + /** - * Attempts to match the entire input sequence against the pattern. + * Attempts to match the entire input sequence against the pattern. * * If the match succeeds then more information can be obtained via the * start, end, and group methods. @@ -294,23 +294,23 @@ public final class Matcher implements MatchResult { if (transparentBounds || (regionStart == 0 && regionEnd == input.length())) 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 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.getStartIndex() == 0) - { - position = match.getEndIndex(); - if (position == input.length()) - return true; - } - match = null; + if (match.getStartIndex() == 0) + { + position = match.getEndIndex(); + if (position == input.length()) + return true; + } + match = null; } return false; } - + /** * Returns the Pattern that is interpreted by this Matcher */ @@ -318,7 +318,7 @@ public final class Matcher implements MatchResult { return pattern; } - + /** * Resets the internal state of the matcher, including * resetting the region to its default state of encompassing @@ -340,7 +340,7 @@ public final class Matcher implements MatchResult appendPosition = 0; return this; } - + /** * Resets the internal state of the matcher, including * resetting the region to its default state of encompassing @@ -360,7 +360,7 @@ public final class Matcher implements MatchResult this.inputCharIndexed = RE.makeCharIndexed(input, 0); return reset(); } - + /** * @return the index of a capturing group in this matcher's pattern * @@ -493,7 +493,7 @@ public final class Matcher implements MatchResult { return regionStart; } - + /** * The end of the region on which to perform matches (exclusive). * @@ -603,7 +603,8 @@ public final class Matcher implements MatchResult public MatchResult toMatchResult() { Matcher snapshot = new Matcher(pattern, input); - snapshot.match = (REMatch) match.clone(); + if (match != null) + snapshot.match = (REMatch) match.clone(); return snapshot; } diff --git a/libjava/classpath/java/util/zip/Inflater.java b/libjava/classpath/java/util/zip/Inflater.java index e3e555ab995..f529dc691c6 100644 --- a/libjava/classpath/java/util/zip/Inflater.java +++ b/libjava/classpath/java/util/zip/Inflater.java @@ -311,37 +311,29 @@ public class Inflater */ 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 */ if (0 > off || off > off + len || off + len > buf.length) throw new ArrayIndexOutOfBoundsException(); int count = 0; - int more; - do + for (;;) { - if (mode != DECODE_CHKSUM) - { - /* Don't give away any output, if we are waiting for the - * checksum in the input stream. - * - * With this trick we have always: - * needsInput() and not finished() - * implies more output can be produced. - */ - more = outputWindow.copyOutput(buf, off, len); - adler.update(buf, off, more); - off += more; - count += more; - totalOut += more; - len -= more; - if (len == 0) - return count; - } + if (outputWindow.getAvailable() == 0) + { + if (!decode()) + break; + } + else if (len > 0) + { + int more = outputWindow.copyOutput(buf, off, len); + adler.update(buf, off, more); + off += more; + count += more; + totalOut += more; + len -= more; + } + else + break; } - while (decode() || (outputWindow.getAvailable() > 0 - && mode != DECODE_CHKSUM)); return count; } diff --git a/libjava/classpath/javax/security/auth/kerberos/KerberosTicket.java b/libjava/classpath/javax/security/auth/kerberos/KerberosTicket.java index 85e25374987..ff70b9f4e37 100644 --- a/libjava/classpath/javax/security/auth/kerberos/KerberosTicket.java +++ b/libjava/classpath/javax/security/auth/kerberos/KerberosTicket.java @@ -54,7 +54,7 @@ import javax.security.auth.Refreshable; * This class represents a Kerberos ticket. See the Kerberos * authentication RFC for more information: * RFC 1510. - * + * * @since 1.4 */ public class KerberosTicket @@ -86,16 +86,16 @@ public class KerberosTicket /** * Create a new ticket given all the facts about it. - * + * * Note that flags may be null or "short"; any flags not specified * will be taken to be false. - * + * * If the key is not renewable, then renewTill may be null. - * + * * If authTime is null, then it is taken to be the same as startTime. - * + * * If clientAddresses is null, then the ticket can be used anywhere. - * + * * @param asn1Encoding the contents of the ticket, as ASN1 * @param client the client principal * @param server the server principal @@ -279,7 +279,7 @@ public class KerberosTicket { return (Date) startTime.clone(); } - + /** * Return the end time for this ticket. */ @@ -287,7 +287,7 @@ public class KerberosTicket { return (Date) endTime.clone(); } - + /** * Return the renewal time for this ticket. For a non-renewable * ticket, this will return null. @@ -334,6 +334,39 @@ public class KerberosTicket 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 + + "]"; } + + /** + *

    + * 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: + *

    + *
      + *
    • 0 — null
      • + *
    • 1 — DES (in CBC mode with either MD4 or MD5 checksums)
      • + *
    + * + * @return the type of session key used by this ticket. + */ + public final int getSessionKeyType() + { + return sessionKey.type; + } + } diff --git a/libjava/classpath/javax/security/auth/kerberos/KeyImpl.java b/libjava/classpath/javax/security/auth/kerberos/KeyImpl.java index 6773dfa3e87..a7cf3d212c9 100644 --- a/libjava/classpath/javax/security/auth/kerberos/KeyImpl.java +++ b/libjava/classpath/javax/security/auth/kerberos/KeyImpl.java @@ -90,4 +90,13 @@ final class KeyImpl implements Serializable, SecretKey // FIXME. return null; } + + public String toString() + { + return getClass().getName() + + "[type=" + type + + ",algorithm=" + algorithm + + "]"; + } + } diff --git a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java index cc61889d76f..45381d60e87 100644 --- a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java +++ b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java @@ -1454,7 +1454,7 @@ public class HTMLEditorKit try { styleSheet = new StyleSheet(); - Class c = HTMLEditorKit.class; + Class c = HTMLEditorKit.class; InputStream in = c.getResourceAsStream(DEFAULT_CSS); InputStreamReader r = new InputStreamReader(in); styleSheet.loadRules(r, null); diff --git a/libjava/classpath/javax/swing/text/html/HTMLWriter.java b/libjava/classpath/javax/swing/text/html/HTMLWriter.java index 6cc23df9aab..6a5e6ed58fe 100644 --- a/libjava/classpath/javax/swing/text/html/HTMLWriter.java +++ b/libjava/classpath/javax/swing/text/html/HTMLWriter.java @@ -79,9 +79,9 @@ public class HTMLWriter 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 openEmbeddedTagHashSet = null; private String new_line_str = "" + NEWLINE; @@ -95,7 +95,7 @@ public class HTMLWriter private int doc_len = -1; private int doc_offset_remaining = -1; private int doc_len_remaining = -1; - private HashSet htmlFragmentParentHashSet = null; + private HashSet htmlFragmentParentHashSet = null; private Element startElem = null; private Element endElem = null; private boolean fg_pass_start_elem = false; @@ -112,7 +112,7 @@ public class HTMLWriter super(writer, doc); outWriter = writer; htmlDoc = doc; - openEmbededTagHashSet = new HashSet(); + openEmbeddedTagHashSet = new HashSet(); } // public HTMLWriter(Writer writer, HTMLDocument doc) /** @@ -129,13 +129,13 @@ public class HTMLWriter super(writer, doc, pos, len); outWriter = writer; htmlDoc = doc; - openEmbededTagHashSet = new HashSet(); + openEmbeddedTagHashSet = new HashSet(); doc_pos = pos; doc_offset_remaining = pos; doc_len = len; doc_len_remaining = len; - htmlFragmentParentHashSet = new HashSet(); + htmlFragmentParentHashSet = new HashSet(); } // public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len) /** @@ -197,7 +197,8 @@ public class HTMLWriter } // else // 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++) { @@ -219,8 +220,8 @@ public class HTMLWriter protected void writeAttributes(AttributeSet attrSet) throws IOException { - Enumeration attrNameEnum = attrSet.getAttributeNames(); - + Enumeration attrNameEnum = attrSet.getAttributeNames(); + while (attrNameEnum.hasMoreElements()) { Object key = attrNameEnum.nextElement(); @@ -502,7 +503,7 @@ public class HTMLWriter protected void writeEmbeddedTags(AttributeSet attrSet) throws IOException { - Enumeration attrNameEnum = attrSet.getAttributeNames(); + Enumeration attrNameEnum = attrSet.getAttributeNames(); while (attrNameEnum.hasMoreElements()) { @@ -511,12 +512,12 @@ public class HTMLWriter if (key instanceof HTML.Tag) { - if (!openEmbededTagHashSet.contains(key)) + if (!openEmbeddedTagHashSet.contains(key)) { writeRaw("<" + key); writeAttributes((AttributeSet) value); writeRaw(">"); - openEmbededTagHashSet.add(key); + openEmbeddedTagHashSet.add((HTML.Tag) key); } // if(!openEmbededTagHashSet.contains(key)) } // if(key instanceof HTML.Tag) } // while(attrNameEnum.hasMoreElements()) @@ -535,16 +536,17 @@ public class HTMLWriter protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet) 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++) { - HTML.Tag key = (HTML.Tag) tag_arr[i]; + HTML.Tag key = tag_arr[i]; if (!attrSet.isDefined(key)) { writeRaw(""); - openEmbededTagHashSet.remove(key); + openEmbeddedTagHashSet.remove(key); } // if(!attrSet.isDefined(key)) } // for(int i = 0; i < tag_arr.length; i++) @@ -645,7 +647,7 @@ public class HTMLWriter if (matchNameAttribute(attrSet, HTML.Tag.TITLE)) { boolean fg_is_end_tag = false; - Enumeration attrNameEnum = attrSet.getAttributeNames(); + Enumeration attrNameEnum = attrSet.getAttributeNames(); while (attrNameEnum.hasMoreElements()) { @@ -860,7 +862,7 @@ public class HTMLWriter if (matchNameAttribute(attrSet, HTML.Tag.TITLE)) { boolean fg_is_end_tag = false; - Enumeration attrNameEnum = attrSet.getAttributeNames(); + Enumeration attrNameEnum = attrSet.getAttributeNames(); while (attrNameEnum.hasMoreElements()) { @@ -996,7 +998,7 @@ public class HTMLWriter private void writeAllAttributes(AttributeSet attrSet) throws IOException { - Enumeration attrNameEnum = attrSet.getAttributeNames(); + Enumeration attrNameEnum = attrSet.getAttributeNames(); while (attrNameEnum.hasMoreElements()) { diff --git a/libjava/classpath/javax/swing/text/html/ImageView.java b/libjava/classpath/javax/swing/text/html/ImageView.java index bf906e4500e..bb6af4f451f 100644 --- a/libjava/classpath/javax/swing/text/html/ImageView.java +++ b/libjava/classpath/javax/swing/text/html/ImageView.java @@ -323,8 +323,6 @@ public class ImageView extends View */ public float getPreferredSpan(int axis) { - AttributeSet attrs = getAttributes(); - Image image = getImage(); if (axis == View.X_AXIS) @@ -522,7 +520,6 @@ public class ImageView extends View Image newIm = getImage(); if (newIm != null) { - AttributeSet atts = getAttributes(); // Fetch width. Length l = spans[X_AXIS]; if (l != null) diff --git a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java index acb2c04acc2..9f5f019fa37 100644 --- a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java +++ b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java @@ -48,8 +48,9 @@ import javax.swing.text.Style; import javax.swing.text.StyledDocument; import java.io.Writer; import java.io.IOException; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.Enumeration; -import java.util.Stack; import java.awt.Color; /** @@ -61,7 +62,7 @@ import java.awt.Color; public class MinimalHTMLWriter extends AbstractWriter { private StyledDocument doc; - private Stack tagStack; + private Deque tagStack; private boolean inFontTag = false; /** @@ -73,7 +74,7 @@ public class MinimalHTMLWriter extends AbstractWriter { super(w, doc); this.doc = doc; - tagStack = new Stack(); + tagStack = new ArrayDeque(); } /** @@ -87,7 +88,7 @@ public class MinimalHTMLWriter extends AbstractWriter { super(w, doc, pos, len); this.doc = doc; - tagStack = new Stack(); + tagStack = new ArrayDeque(); } /** @@ -315,7 +316,7 @@ public class MinimalHTMLWriter extends AbstractWriter { if(doc instanceof DefaultStyledDocument) { - Enumeration styles = ((DefaultStyledDocument)doc).getStyleNames(); + Enumeration styles = ((DefaultStyledDocument)doc).getStyleNames(); while(styles.hasMoreElements()) writeStyle(doc.getStyle((String)styles.nextElement())); } @@ -332,7 +333,7 @@ public class MinimalHTMLWriter extends AbstractWriter */ protected void writeAttributes(AttributeSet attr) throws IOException { - Enumeration attribs = attr.getAttributeNames(); + Enumeration attribs = attr.getAttributeNames(); while(attribs.hasMoreElements()) { Object attribName = attribs.nextElement(); @@ -422,8 +423,8 @@ public class MinimalHTMLWriter extends AbstractWriter */ private void endOpenTags() throws IOException { - while(!tagStack.empty()) - write((String)tagStack.pop()); + while(tagStack.size() > 0) + write(tagStack.pop()); if( inFontTag() ) { diff --git a/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java b/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java index 0f1145084e1..296144460ac 100644 --- a/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java +++ b/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java @@ -57,7 +57,7 @@ class MultiAttributeSet * The Enumeration for the multiplexed names. */ private class MultiNameEnumeration - implements Enumeration + implements Enumeration { /** * The index of the current AttributeSet. @@ -67,7 +67,7 @@ class MultiAttributeSet /** * The names Enumeration of the current AttributeSet. */ - private Enumeration current; + private Enumeration current; /** * Creates a new instance. @@ -147,7 +147,7 @@ class MultiAttributeSet public boolean containsAttributes(AttributeSet attributes) { boolean ret = true; - Enumeration e = attributes.getAttributeNames(); + Enumeration e = attributes.getAttributeNames(); while (ret && e.hasMoreElements()) { Object key = e.nextElement(); @@ -186,7 +186,7 @@ class MultiAttributeSet return n; } - public Enumeration getAttributeNames() + public Enumeration getAttributeNames() { return new MultiNameEnumeration(); } diff --git a/libjava/classpath/javax/swing/text/html/MultiStyle.java b/libjava/classpath/javax/swing/text/html/MultiStyle.java index 3937bff75a9..2f43a19c282 100644 --- a/libjava/classpath/javax/swing/text/html/MultiStyle.java +++ b/libjava/classpath/javax/swing/text/html/MultiStyle.java @@ -51,7 +51,7 @@ import javax.swing.text.Style; * * @author Roman Kennke (kennke@aicas.com) */ -public class MultiStyle +class MultiStyle extends MultiAttributeSet implements Style { @@ -118,7 +118,7 @@ public class MultiStyle attributes.removeAttribute(name); } - public void removeAttributes(Enumeration names) + public void removeAttributes(Enumeration names) { attributes.removeAttribute(names); } diff --git a/libjava/classpath/javax/swing/text/html/ObjectView.java b/libjava/classpath/javax/swing/text/html/ObjectView.java index d6a77c06aad..9d900441bb1 100644 --- a/libjava/classpath/javax/swing/text/html/ObjectView.java +++ b/libjava/classpath/javax/swing/text/html/ObjectView.java @@ -88,7 +88,7 @@ public class ObjectView extends ComponentView String classId = (String) atts.getAttribute("classid"); try { - Class objectClass = Class.forName(classId); + Class objectClass = Class.forName(classId); Object instance = objectClass.newInstance(); comp = (Component) instance; } diff --git a/libjava/classpath/javax/swing/text/html/StyleSheet.java b/libjava/classpath/javax/swing/text/html/StyleSheet.java index 08578c80fad..c4ddddb7395 100644 --- a/libjava/classpath/javax/swing/text/html/StyleSheet.java +++ b/libjava/classpath/javax/swing/text/html/StyleSheet.java @@ -369,7 +369,7 @@ public class StyleSheet extends StyleContext * * @return the resolved style */ - private Style getResolvedStyle(String selector, List path, HTML.Tag tag) + private Style getResolvedStyle(String selector, List path, HTML.Tag tag) { Style style = resolvedStyles.get(selector); if (style == null) @@ -380,7 +380,7 @@ public class StyleSheet extends StyleContext /** * Resolves a style. This creates arrays that hold the tag names, * class and id attributes and delegates the work to - * {@link #resolveStyle(String, String[], Map[])}. + * {@link #resolveStyle(String, String[], List>)}. * * @param selector the selector * @param path the Element path @@ -388,14 +388,15 @@ public class StyleSheet extends StyleContext * * @return the resolved style */ - private Style resolveStyle(String selector, List path, HTML.Tag tag) + private Style resolveStyle(String selector, List path, HTML.Tag tag) { int count = path.size(); String[] tags = new String[count]; - Map[] attributes = new Map[count]; + List> attributes = + new ArrayList>(count); for (int i = 0; i < count; i++) { - Element el = (Element) path.get(i); + Element el = path.get(i); AttributeSet atts = el.getAttributes(); if (i == 0 && el.isLeaf()) { @@ -413,12 +414,11 @@ public class StyleSheet extends StyleContext tags[i] = t.toString(); else tags[i] = null; - attributes[i] = attributeSetToMap(atts); + attributes.set(i, attributeSetToMap(atts)); } else { tags[i] = null; - attributes[i] = null; } } tags[0] = tag.toString(); @@ -434,7 +434,8 @@ public class StyleSheet extends StyleContext * * @return the resolved style */ - private Style resolveStyle(String selector, String[] tags, Map[] attributes) + private Style resolveStyle(String selector, String[] tags, + List> attributes) { // FIXME: This style resolver is not correct. But it works good enough for // the default.css. @@ -462,10 +463,8 @@ public class StyleSheet extends StyleContext // Sort selectors. Collections.sort(styles); - Style[] styleArray = new Style[styles.size()]; - styleArray = (Style[]) styles.toArray(styleArray); - Style resolved = new MultiStyle(selector, - (Style[]) styles.toArray(styleArray)); + Style[] styleArray = styles.toArray(new Style[styles.size()]); + Style resolved = new MultiStyle(selector, styleArray); resolvedStyles.put(selector, resolved); return resolved; } @@ -481,9 +480,9 @@ public class StyleSheet extends StyleContext public Style getRule(String selector) { CSSStyle best = null; - for (Iterator i = css.iterator(); i.hasNext();) + for (Iterator i = css.iterator(); i.hasNext();) { - CSSStyle style = (CSSStyle) i.next(); + CSSStyle style = i.next(); if (style.compareTo(best) < 0) best = style; } @@ -584,7 +583,7 @@ public class StyleSheet extends StyleContext public void addStyleSheet(StyleSheet ss) { if (linked == null) - linked = new ArrayList(); + linked = new ArrayList(); linked.add(ss); } @@ -1441,7 +1440,7 @@ public class StyleSheet extends StyleContext * * @return the converted map */ - private Map attributeSetToMap(AttributeSet atts) + private Map attributeSetToMap(AttributeSet atts) { HashMap map = new HashMap(); Enumeration keys = atts.getAttributeNames(); diff --git a/libjava/classpath/javax/swing/text/html/TableView.java b/libjava/classpath/javax/swing/text/html/TableView.java index f87d7b35fc5..912240c28c4 100644 --- a/libjava/classpath/javax/swing/text/html/TableView.java +++ b/libjava/classpath/javax/swing/text/html/TableView.java @@ -181,7 +181,6 @@ class TableView int spans[]) { updateGrid(); - int numCols = offsets.length; int realColumn = 0; int colCount = getViewCount(); for (int i = 0; i < numColumns;) diff --git a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java index 34a70c19b59..e4cc97838a9 100644 --- a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java +++ b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java @@ -293,6 +293,7 @@ public class DefaultMutableTreeNode * * @return an enumeration of tree nodes */ + @SuppressWarnings("unchecked") // Required for API compatibility public Enumeration children() { if (children.size() == 0) @@ -320,7 +321,7 @@ public class DefaultMutableTreeNode */ public TreeNode getChildAt(int index) { - return (TreeNode) children.elementAt(index); + return children.elementAt(index); } /** @@ -717,6 +718,7 @@ public class DefaultMutableTreeNode * * @return Enumeration */ + @SuppressWarnings("unchecked") // Required for API compatibility public Enumeration preorderEnumeration() { return new PreorderEnumeration(this); @@ -727,6 +729,7 @@ public class DefaultMutableTreeNode * * @return Enumeration */ + @SuppressWarnings("unchecked") // Required for API compatibility public Enumeration postorderEnumeration() { return new PostorderEnumeration(this); @@ -737,6 +740,7 @@ public class DefaultMutableTreeNode * * @return Enumeration */ + @SuppressWarnings("unchecked") // Required for API compatibility public Enumeration breadthFirstEnumeration() { return new BreadthFirstEnumeration(this); @@ -747,6 +751,7 @@ public class DefaultMutableTreeNode * * @return Enumeration */ + @SuppressWarnings("unchecked") // Required for API compatibility public Enumeration depthFirstEnumeration() { return postorderEnumeration(); @@ -759,6 +764,7 @@ public class DefaultMutableTreeNode * * @return Enumeration */ + @SuppressWarnings("unchecked") // Required for API compatibility public Enumeration pathFromAncestorEnumeration(TreeNode node) { if (node == null) @@ -806,7 +812,7 @@ public class DefaultMutableTreeNode */ public TreeNode getFirstChild() { - return (TreeNode) children.firstElement(); + return children.firstElement(); } /** @@ -818,7 +824,7 @@ public class DefaultMutableTreeNode */ public TreeNode getLastChild() { - return (TreeNode) children.lastElement(); + return children.lastElement(); } /** @@ -1036,7 +1042,7 @@ public class DefaultMutableTreeNode public int getLeafCount() { int count = 0; - Enumeration e = depthFirstEnumeration(); + Enumeration e = depthFirstEnumeration(); while (e.hasMoreElements()) { diff --git a/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java b/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java index 488809e0232..89f05d31c01 100644 --- a/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java +++ b/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java @@ -484,7 +484,7 @@ public class FixedHeightLayoutCache { if (dirty) update(); - Vector p = new Vector(parentPath.getPathCount()); + Vector p = new Vector(parentPath.getPathCount()); Object node; NodeRecord nr; @@ -493,7 +493,7 @@ public class FixedHeightLayoutCache node = parentPath.getPathComponent(i); nr = nodes.get(node); if (nr.row >= 0) - p.add(node); + p.add((TreePath) node); } return p.elements(); } diff --git a/libjava/classpath/javax/swing/tree/TreeNode.java b/libjava/classpath/javax/swing/tree/TreeNode.java index ae7380c703b..53d52f0a7cb 100644 --- a/libjava/classpath/javax/swing/tree/TreeNode.java +++ b/libjava/classpath/javax/swing/tree/TreeNode.java @@ -107,6 +107,7 @@ public interface TreeNode * * @return An enumeration of the children of this node. */ + @SuppressWarnings("unchecked") // Required for API compatibility Enumeration children(); } diff --git a/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java b/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java index 50e8e5ce92e..aac68692edc 100644 --- a/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java +++ b/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java @@ -381,10 +381,10 @@ public class VariableHeightLayoutCache TreePath path = null; // Search row in the nodes map. TODO: This is inefficient, optimize this. - Enumeration nodesEnum = nodes.elements(); + Enumeration nodesEnum = nodes.elements(); while (nodesEnum.hasMoreElements() && path == null) { - NodeRecord record = (NodeRecord) nodesEnum.nextElement(); + NodeRecord record = nodesEnum.nextElement(); if (record.row == row) path = record.getPath(); } @@ -498,7 +498,7 @@ public class VariableHeightLayoutCache { if (dirty) update(); - Vector p = new Vector(parentPath.getPathCount()); + Vector p = new Vector(parentPath.getPathCount()); Object node; NodeRecord nr; @@ -507,7 +507,7 @@ public class VariableHeightLayoutCache node = parentPath.getPathComponent(i); nr = nodes.get(node); if (nr != null && nr.row >= 0) - p.add(node); + p.add((TreePath) node); } return p.elements(); } diff --git a/libjava/classpath/javax/swing/undo/StateEdit.java b/libjava/classpath/javax/swing/undo/StateEdit.java index 55282ab37c8..a032d02cdb8 100644 --- a/libjava/classpath/javax/swing/undo/StateEdit.java +++ b/libjava/classpath/javax/swing/undo/StateEdit.java @@ -248,7 +248,7 @@ public class StateEdit */ protected void removeRedundantState() { - Iterator i = preState.keySet().iterator(); + Iterator i = preState.keySet().iterator(); while (i.hasNext()) { Object key = i.next(); diff --git a/libjava/classpath/javax/swing/undo/UndoableEditSupport.java b/libjava/classpath/javax/swing/undo/UndoableEditSupport.java index b5a93341954..2e5d909543a 100644 --- a/libjava/classpath/javax/swing/undo/UndoableEditSupport.java +++ b/libjava/classpath/javax/swing/undo/UndoableEditSupport.java @@ -167,7 +167,7 @@ public class UndoableEditSupport protected void _postEdit(UndoableEdit edit) { UndoableEditEvent event; - Iterator iter; + Iterator iter; // Do nothing if we have no listeners. if (listeners.isEmpty()) @@ -181,9 +181,9 @@ public class UndoableEditSupport // Iterator, a java.util.ConcurrentModificationException; in the // case of a direct loop over the Vector elements, some // index-out-of-bounds exception). - iter = ((Vector) listeners.clone()).iterator(); + iter = new Vector(listeners).iterator(); while (iter.hasNext()) - ((UndoableEditListener) iter.next()).undoableEditHappened(event); + iter.next().undoableEditHappened(event); } diff --git a/libjava/classpath/javax/xml/stream/XMLEventFactory.java b/libjava/classpath/javax/xml/stream/XMLEventFactory.java index 30e160793b9..7e7a98140a7 100644 --- a/libjava/classpath/javax/xml/stream/XMLEventFactory.java +++ b/libjava/classpath/javax/xml/stream/XMLEventFactory.java @@ -1,5 +1,5 @@ /* XMLEventFactory.java -- - Copyright (C) 2005,2006 Free Software Foundation, Inc. + Copyright (C) 2005,2006,2009 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,8 +94,14 @@ public abstract class XMLEventFactory * system resource *
  • the default factory class
    • * + * @param factoryId name of the factory to find, same as a property name + * @param classLoader the class loader to use + * @return the factory implementation + * @exception FactoryConfigurationError if an instance of this factory + * cannot be loaded */ - static XMLEventFactory newInstance(String factoryId, ClassLoader classLoader) + public static XMLEventFactory newInstance(String factoryId, + ClassLoader classLoader) throws FactoryConfigurationError { ClassLoader loader = classLoader; diff --git a/libjava/classpath/javax/xml/stream/XMLInputFactory.java b/libjava/classpath/javax/xml/stream/XMLInputFactory.java index 437bf83b5ec..e57449d7716 100644 --- a/libjava/classpath/javax/xml/stream/XMLInputFactory.java +++ b/libjava/classpath/javax/xml/stream/XMLInputFactory.java @@ -1,5 +1,5 @@ /* XMLInputFactory.java -- - Copyright (C) 2005,2006 Free Software Foundation, Inc. + Copyright (C) 2005,2006,2009 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -206,6 +206,11 @@ public abstract class XMLInputFactory * system resource *
  • the default factory class
    • * + * @param factoryId name of the factory, same as a property name + * @param classLoader the class loader to use + * @return the factory implementation + * @exception FactoryConfigurationError if an instance of this factory + * cannot be loaded */ public static XMLInputFactory newInstance(String factoryId, ClassLoader classLoader) diff --git a/libjava/classpath/javax/xml/stream/XMLOutputFactory.java b/libjava/classpath/javax/xml/stream/XMLOutputFactory.java index 908f84f262a..ef89b6497bd 100644 --- a/libjava/classpath/javax/xml/stream/XMLOutputFactory.java +++ b/libjava/classpath/javax/xml/stream/XMLOutputFactory.java @@ -1,5 +1,5 @@ /* XMLOutputFactory.java -- - Copyright (C) 2005,2006 Free Software Foundation, Inc. + Copyright (C) 2005,2006,2009 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -84,6 +84,16 @@ public abstract class XMLOutputFactory { } + /** + * Creates a new output factory. + * @see #newInstance(String,ClassLoader) + */ + public static XMLOutputFactory newInstance() + throws FactoryConfigurationError + { + return newInstance(null, null); + } + /** * Creates a new output factory. * The implementation class to load is the first found in the following @@ -98,25 +108,35 @@ public abstract class XMLOutputFactory * system resource *
  • the default factory class
    • * + * @param factoryId the name of the factory, same as the property + * @param classLoader the class loader to use + * @return a new factory instance + * @exception FactoryConfigurationError if an instance of this factory + * could not be loaded */ - public static XMLOutputFactory newInstance() + public static XMLOutputFactory newInstance(String factoryId, + ClassLoader classLoader) throws FactoryConfigurationError { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - if (loader == null) + if (classLoader == null) { - loader = XMLOutputFactory.class.getClassLoader(); + classLoader = Thread.currentThread().getContextClassLoader(); + } + if (classLoader == null) + { + classLoader = XMLOutputFactory.class.getClassLoader(); } String className = null; int count = 0; do { - className = getFactoryClassName(loader, count++); + className = getFactoryClassName(classLoader, count++); if (className != null) { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class t = (classLoader != null) ? + classLoader.loadClass(className) : Class.forName(className); return (XMLOutputFactory) t.newInstance(); } @@ -183,18 +203,6 @@ public abstract class XMLOutputFactory } } - /** - * Creates a new input factory. - * This appears to be an API design bug. - * @see javax.xml.stream.XMLInputFactory.newInstance(String,ClassLoader) - */ - public static XMLInputFactory newInstance(String factoryId, - ClassLoader classLoader) - throws FactoryConfigurationError - { - return XMLInputFactory.newInstance(factoryId, classLoader); - } - /** * Creates a new stream writer. */ diff --git a/libjava/classpath/javax/xml/stream/events/Namespace.java b/libjava/classpath/javax/xml/stream/events/Namespace.java index 2275432159a..13dd92fdaf7 100644 --- a/libjava/classpath/javax/xml/stream/events/Namespace.java +++ b/libjava/classpath/javax/xml/stream/events/Namespace.java @@ -41,7 +41,7 @@ package javax.xml.stream.events; * A namespace declaration event. */ public interface Namespace - extends XMLEvent + extends Attribute { /** diff --git a/libjava/classpath/javax/xml/stream/util/ReaderDelegate.java b/libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java similarity index 97% rename from libjava/classpath/javax/xml/stream/util/ReaderDelegate.java rename to libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java index d502866fbcc..1c407a2454b 100644 --- a/libjava/classpath/javax/xml/stream/util/ReaderDelegate.java +++ b/libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java @@ -1,5 +1,5 @@ -/* ReaderDelegate.java -- - Copyright (C) 2005,2006 Free Software Foundation, Inc. +/* StreamReaderDelegate.java -- + Copyright (C) 2005,2006,2009 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import javax.xml.stream.XMLStreamReader; /** * Base class for XML stream reader filters. */ -public class ReaderDelegate +public class StreamReaderDelegate implements XMLStreamReader, XMLStreamConstants { @@ -56,14 +56,14 @@ public class ReaderDelegate /** * Constructs an empty filter with no parent set. */ - public ReaderDelegate() + public StreamReaderDelegate() { } /** * Constructs an empty filter with the specfied parent. */ - public ReaderDelegate(XMLStreamReader reader) + public StreamReaderDelegate(XMLStreamReader reader) { parent = reader; } diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 2248ce995a7..ccfd8a1e505 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -42,6 +42,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.m4 \ $(top_srcdir)/../../config/override.m4 \ @@ -60,9 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleData.class b/libjava/classpath/lib/gnu/java/locale/LocaleData.class index 64d83fd1a9dc4994b50fadd68669120352d0a0f7..ccee011a4959d08ffa1a00eb4a1eaa39e92fe63e 100644 GIT binary patch delta 2648 zcmX|@ZD^BM6vyvj4{R-V+;`y5fPCw{NN`UV~7*k|Nq>$Pxt@)&bjBDd+tl} zeCzYAr@yHB5(yLR7PVL_%21!EC0aFl()9cNUA>}~)@=i#mTBcA5~7-k#!SpFY6a1l zsFfBC1GNxkM70u4nh++gBAOJ{MpQ7tVNt6gKY;E=iZvET0;1Mh8AY6RoK&dw>g}kr zXu>g3+lY#ywre#vQ8Dc^g{-I@gcVUcF?A$q0=q>8fJTy{f z6XirjIOavgI3jvnt2rYxIj3 zj2}xpUYAI9!b(7>vBLgscTmAEMBimRCL42IOg4~OQgHSb>?c% zW^G#Dh$093O}w{1yi3$=>oeG2+c0~5)t4+9KicvOY0(65LVvZgJtFG2x&-~bF5!E} z${^@nD?{y~?$sq4df&=UY{~;GyRg)URz^|7BP(O!7EzC_j$=_z>Jlw_%JPe~e`j~1 zMAw9XUJ#+vf6=St9nQarN}~P&8cP^|hp3lUhEeA$SjTVzUlXNG2Ts)+9PzPqRL}k%yaTdqXfkI+L^g6(CZOdd~~a76TG`XxngAxe8G zJ|RM1wsFLAw(B@-CDVnq?jS?@ophfu{;24HRtr37`a(nD{!mbKkX|#QJ20kEL>Ii% zqb3YfH_>Qq(cGr0FO63Y)$|b+MGw%+HSF$?m0>hy7p<=7VUEcB8B7xi(;XMR2WSG} z_hOBi#DwS(PfUs)g(U;a7{R`j=y3|}>;$G~GNxx(sya)rjOZL$)^wsBQ$%QafoRh7 zpca=1G0Q~WOR5hL{le=BGz&GVtpq#ecIdDlSJ6MQykIG(-^aGJp-3)-bDPO&k`ZSIU?6Y(6IAFXxIg! zvWX0dzDR@hE{-|LTI%X(Mr2fAfV4E_I+W>oVN zQO=wBGf}PG3^ z!||9XYvM@zga~P$65%!M5d8-cmiH%-YXaELInT)4+KYMN9loLs_7bRwV6Wg-O!9%z zuZgh4H#i+d9DDpDa1>4ev^Wlp>DqL|M^#@j&wnG%LQc(lZi}tN!ki^^%!{+sqW)fS zmQn6E{)jluwC)#Yg;otkJXC)B=fGL{|F?IloEG!|cJH5q(`rAgWmS`PjfRW`Z46nc zZE0M;&Q~mRCC&z-vN#)=xNQ1S)@I6Sw%*x7>vZjOP9QfSP5@pm9+;Ro zL84^sL1XKBpPS~p=fr4*L|@|Qk(*9=xDP#o7H5D{(zUkvsid#u?WvOk!qe(Zq3BWt z8)Wa0Q^1n=%{R|+?T1}XnKLTl9Kcvkic{g37Uv)`PABldBKsj^gs#1q|88?bW!$vK mOjjaT6bF}aF23>M)>;=dy+dQP*ZUUd6e3l|zm6{We9?b*@hz+X delta 2664 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 WFg%yxIULXZ@XWz;8lJh7_5T1$4k3B~ literal 20439 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 I&p8{w51JEI9>-*4*vEHv@2cXK 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 CPeP*r diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class index a7697f9415a210e041dd0f1d8f00683fefd5fb72..982f6d1d4c620cb6f4467bfdbe83dacf854c5471 100644 GIT binary patch delta 2194 zcma)7dr*{B6#xCceZjK8?&5;0E+QDRyF3CEbty+joNx?Bts(8c)oXuH)DZ!(cFwjN{i<$nwv{xm%nV2TO%Cu zdnQv%Oz$IdwJBe_he#+l$I0=Lk*2*S^hb&T`^8QNJIKCikDZOKJ7Dm8<3nsMU zE4eKyIq?z_47f~0-%Z2#1>TYp#nIO$wBZ{$BRY53w}f#_LZNp-S?4PnObf$xf@73} z(~P)@9}W0HE{}F-e!|c4j_A?p_4w6<-|#!3FD_cRcu5h_uRA66om}VR2HYZYyV5qu zh`*Gyd}P3Fd6qeykk^{iD9JVE^qE@4@~#o>xS%ZJ*$zePP&Cr0SnWnqU}90RC0w2$Xc9NJoY!yj+&h{mPCftGugyp zOp)8HBQjlz+f~YuR7G2;Xz7YJThZ=Uv_eJ8QnU$S9KN$4CdU{a4h?jo{+7#Y9GO$I z0&oV9;i`lsRUc-KY_^0pf;U$bqOu1faPr?im1Sv%=P=4WQ0#-B*QAB^0<)>##M5gB3Vj zf#cOUJ;VBW5a&{>@Ffwz#Q?5YuZkr#fNP5Womc|+K7bpli(e!>=C=NE*VpzS{!{_Q z(x+43e|T+IozuN`I24RfGLW@NokFE$Ys~64h5G!9NM)38oD`D_F+9erVEB| z*mVt9Eg1T+LZ#@k>w*jq5$%kxj~4{Re`nky%XVFW5#1Syy{Q``k^dWhY*2zMR5(rT z5#T=(`9Gmzf?eN$5iYwv$Vl}^x;LU2MkkB%vg-r1bgLylqN-6lBZmEgjNRjM2N)+W z9g^;QiXWng+pvfq<3(=A1|c`H0^7I~RjfoK18C+aXkic+MR~Mw7jCjzOugN72${rM zX0nbWxtC+Pk5jpyi-jy>J(shQD|vvg^B~{mA#UPf?qCy-3VEDIc!fuO5_m+?^O$62 zvlPn{(qOhoPM(w=Bz?fkY9Hr!_T8O6mNs($ z2Z}zmh?9fp5Iwq$w;0dCqK~V1oe3Nw`nZu7n8+mfbRx254i&Ah7qd!Cy57yrYofWe z0JGgyypJf*jPWz6M@^(UvU)YNLyV>#EiI1ih36fZT|%pa$1V!gj}{eP7lPLX>6FJN z*?ew4wy3r_A={iF)BJc-MW=_*=|N`ru~bD1LTEvdnSMN@qU%HGdeLltOi|ITAygSr zet1-Ldl%}ggEDRW7^=dRp~ID;_CghvEheKW$EF4nM~ZfmZ=q9&nE(I) delta 2263 zcma)8Yiv|i5dOZqcX!+E-FDk$p$n{(R-oO!ERQN%1Q9Tx6s05}AsUM<1Oyb@`U8m@ zqw#^L!AoK^5hErnL7}1Gu5Gavl$M9}!Ak^Gv?wb0z$f?s=iG&DDHu$Xb7sDoGv}Lg zXJ-5D#66QdyUsSX04U)&Cp4nKoa*Ui&SK`qQTtNv$jHr`JiqdR%Hq1(c?*gs&#S2| zOF&AcVm#IO|)`^=*$ z0dtmNcsxC>F_#z<^>!l5qI1ab7&{GQBG-xCa#Fx-Gt=#Lbl?Lg-Zx9!dHm3vGUv7flgI^XOzY#-yGxyzmFID{ik95zq8vu&T^Gc%AH)Q=K<%&hc2uRe*SyL(($~wx0&vDE^GQLvz#i?4^O%u;WbIbCkryzji2EM_!=9<*O z*(Z?Y#7QE}dLqkp+=9xQ8WrdV13%&?^M};3AwLtY(OJ_g7u3aXv7sUfzY!d*94lNn zjX#|@W8Rh)u>FO<&HK_uCUxMffpdhpF>Roo^2N%m*Eo~b-$h+zzurlQIlxoIBy)!z05Bo}1>}MvW4`skCOCRoT!!Z>x%iut4-?TJ6n@JrkGFZ%O%rzM!N`|Vi z%aqG-B`s7^sgh6nbWPzhb^?_#^y`pOB1?ETP&6u@>;&N+q029-@%k77rD#;!)Zr=dJp z(28|2eAIxw4fv!PpU=$rB8E=k|1}ZCcTs$waY~kgD1K4$ud+n(dlY|IA^y=YBi~DQ z1*?zI7DtrrGGW74itDA_3fD^e6p7?KuQ)@xXvycbus2-B2F%B$Hbstk4F?XmqbLTUym}a zTSTRMdWO74IIi&9!);iuNIq_n4EpUcrgu?|r+AqwuE@E^Q~T{vdb?8+y_cdC?)rog ztWs&t@Y~x^(KE&WWb%KK#RR{j4I_enM~pt}LnTrwvZ~C>K2m0WN0k0Gumc) z*+0gs-VWwRIl%M|EDGPr*D!~#<34VXR;kC!vaebXgNLN?2ckKzE|z(K~OZX0oe zO)?gnY3CMZ%bv>?ma>(jxRp0?8)xtx*2(@LxARH1^BL~oO77$;?&4bR=9_$v`(;1K z4xZ%uVa>@7&CL(BKHQ@PxK|s(eOd|kYZG`tyG!;tJgD8nL)u~<)|T*y_7ab3YuTx- z=P|3FC&v5lLO*L8gjSC9Yr1$|%|X(u^*qPH93uVv7EcM`Jn84%>|~Jn2-_vI11yjc z;E)L?^YPLq=LuSO`0=V*DRWO+$79c}W@ V${3l88gJlO+2yA~{`T=k;9plni?09x diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class index 89113302b6839d6ffe8c910a80d8a57f67983e1c..b94e6ca804eafa37a69e6774a95f9eb00f9ba1a3 100644 GIT binary patch delta 5902 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 delta 5381 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 E0kFa=;Q#;t diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class index 995c0e1441fb500f6b06adf7219cfde0cc433693..f92f1907f71ef6f4e28c4eb90a1227a8d71eb4b7 100644 GIT binary patch literal 2868 zcmc&#TW=dh6#i!8+OfNh6Spa8X;Y`9)N#^oODTog7}6#M7pEz48VCi-+8*3Z-Sx5; z)QWc=5E9~kdqxOBQ4543B7t~C;s@{pc;=l4#F^RkwX5WjNb#9DGv}K#-#PQ`@BjY% z3xMNj#Go)7sGFX)roXP=&@9_9UCpp8t!PwR3x|Bw79LiM$^1v)EHQqVY}n% zuIF5-Hfx+AVe{8K?zsMPkzr>$V%BwSqvE;Tp}e}zE*XwX(DAZSHwnoml(+hp^Ih`= z-3q4iT4x)&m;pxX0DLy!YFgs$JjigKv4`Ml3s4Nu_*r?Yt2gceAF`? z&$61f%WK{KNKJQj2IcY@hQWNbVVH(nAa*lTD-4mdL|Gj7V}A_$7}BDkRdF3lcdu$S zUh(Q$`KIIY>wZ~OjN80++Nlz4WcM1tx;clzp=Ooo* zLDoi7E1H()mR+0c*K>mJ#Qcpaw?y+gF+3g+9)jQA7Q+(^N4I!qldbcYxL)IS0tL(p zim2j~nJup%I4xjK#XL?^TUom8@D|`8o?H)+<>cJRQ{VzY2mb$`zWJ2GU~=I+|IGI7Oiua)Q3bPGu7LXBv7=r*pj5;oP1egC%Mn}zR*-FSn6G% zId9+N{9l!3clT|&Wn>pETofYTt3oQdmwde~&WTs`vI-SDsE=r&EM-|pjAW%O)+;Ku zBf&66>zBe6D@IHHONwNsE}s!mbrqx7P4B1N^z14>X9(>W?)uam6_1EM4n@=CwiINc z@k6aX_8$f&2x@>nUvp%Qr<^W`2f4g z?omF(UgaZ9keyUM#v$bs%#hWTPjO8745!GRRz8nGVN4^MMB`;Zclg1J9jBlW@N*8)^VP^VAoc$8X3meFH6RL;K^T*&}!+ zAZeWNp?pC(e}xg{YowH0l=HWg^DXRGZp)mqK5{#!aV+41L>k2+E)r6T`tVsSQSJ<7 zEYq*3j7C;uzAgI$GPh~q*Ci^P%1;tn^*032441G%p8nwMH+{jsg$6%|=jjN)yH@W3 zIo_YaAE6*GYzm_FgZvo^a(Ppb6a656g@U{o%Ee3lT>KpxdhKG-TUBQyHwjIaIyKKt&om0+`W5kT-IcCxKxJ$fR-p-q@N3Q#26x?Yw>)xpqTfYZ<%k^!$=6Jl^ zs*jZo&tOnCXBj%PrK)L}-Yp6uHNMUen7*R>6ATQBpXU(pMD zuE%$S=rvr#CCXD_qp-TL$S|5e4Uy>r)k8x&Iv9HMrp1^1-6D5ZjbfE@lE~LeMs?kA zOz~Y;c4X@$6RDF)E{w0MXv1X=RA+70^qgh; zUcqy?v6~V3Ru}G-xGj3bjf224;Sv6i&Ej~GIG@taV~zJ$xKZYgiY#6dDSDYw)ky6OLrX=?$MCbY^KIfb|mcqx?65cer{e)maruCos$!qXn^HfsgL$xE4+1X z&(XzQvAj->y+-PlV2|YHMH_Ew(9lhVqlN3RGFcS)8MWE!2Fc#BZBoSo>O5=rz%`wDfY8#hp2^GQ{rcX*5pIi5MYQZM2wG z42cauCy0TSlEzg^Vkad|JN%~buLfNCIKOizf3o;$WlXc(&q9+Ju(uWvJPaNP%`r-jn=_8~!4srDWlg*>v zJWe%_*PD-xipZ2t5K}%ym+~2Ul+STq`2u6gedx-Um{uN063O66JcsA$X?k4dL`0Ag zON>aya053OH} za{b7WhorD4|4_anPG6&6`34DPAA`!b#BCp!l`bl~}z(=c8`UV0k9B9_Qgg8FC~ zcZoa0>sX;*k$Ih@VBVho30HogL-1sWP%4k4Yb`LSyJje0l{8^+>iZD*C=$Ge^$4&Y ze);!E@Eeif$uRiONbsAH;Hfb9uSoDlWXx}cWBxl5{5IZ+i22Ac)1h?s}W!YTo&|wR7k4iCQJX@z<&Uk{m1|S diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class index 9117509f8164b002fadda6004f39e394d41e796c..92608e39bacef99a980e03d2634eae7e2d56ea5d 100644 GIT binary patch literal 16465 zcmbVT34B!5)j#LXOx`4n5azLkMK*yD62hV)38EnjjAkPX7!}h=@<>J|nK%m)QH!lh ztCnhAQCn=)qE@X29Z+1*y49s>U20pk+SYDrU8}9F^8N3dH#aX3@`g`;+DGspB~&8+*I5f4fVu}L%qGlf!^Nccqkl-hm4p; zZl+v0qBtDv=`5~mJKboHGmQ?^HdU^yY-lZOYHD3mR^435q@Pl~|G-l8rbm`nmo+xF zmNhh#wJ`bZW6Q(ASPVn68$+Ev!FVESFpWK6z_Nnn7&Ee|@}wp^)m*b<5c0#?B|;;% zqOUgC4P1JPuLKrVyeb&$stNW2)2RpcF0(D5F%E%rmfCtuHkZvad(!d>#xbld5jTp< z(odz!@juh3P){r#>}fYv^qCWx&KjOz=I9T?L1Ut~Hxi8-9czN&gb}kd#N=Jp9uD<{ z;>(#_`E%DWxyvIRMm8~x^O1+LG@1aO2lQuhlT8z8vPP4j?}0agp19FzM13@c4hNd1 zmU`%Z^!{=xm8hrrNF%R&n&G1nlE@K*tSKd9jb^8NO%+u~+Jj+}wR|7>$g5F7ngP2C zb7(FV`lyI>rmSV=+9ai7A00*`<iGE%S@3LInuOE2kBLkbRDhM zsNPwTjmAbJ8jAP%sDT=pJe3U%bqyJ)F+C6T>Lk52bdpAEnerW$Dh)@n3(2<7$=DOM zb+r(1fzuk*JP=$X39h47jZOon4g{-U?XfPnCs6zb1wnB|pcaODFyEvMbzmY$u9GA? zXuU@8kxrYV3YLQ-0W$5RF1X>UKt*MBpsA&`s;s&Zi*?*1X#^nLAqj7wZjHi_lEYfd zBi+4GBNhuqdVJJF5iEA)$pKhFp_6!RGeLBNBpRi-MlomOE$@m(x`XjhySd^7ZG;uU zc%>CNTCROA=td>oKH99&Srh@DiN%kW8u14QsT0B&EF>qvd80&+Ha6DFQI+%(S zF8%T~Hfqwh17I@no*vEGOpIIo+dp~m(uquYq7 z1Jy^D(+?n$s(=*9u}+3J94fH2RkC#zU8B*}IHVldvWvID2*%_txR$m-Koxa$4Xt(c zm9>zw6GsPP0UuXMK5n2NY4k&;BOUoLVnz>+N9@CjP!vI+xgodHjZD6#y6VcRrq-sq zraElQqn)`K0v8y%K{9j`-J;RWSd$Y&71ecc^HKOEo1T73J0KbarIj`H=0S6mBQrzb z0WUX6UT&v5H2Rq{FLlvSS~d;F8Hl|Qg!$-Bx(jDsJ%WgavH*6lBP&Cp0V}slR_>vl z8uc?RaS%%lHdLrLY*a+r6Ww5H6@nWCew{wLm+nJ^*BGc>SzXy$QCHqvQ&|hHmO2UO zU>L#KJ(9EC^ngb9!&5kLmJYAdR=kHEWXd_AZbj?r=E`Qd&x@T{8H@r9?3N5XLXT>+ zmubcDULuwbkBhOx%M$S}NGH^88nn%TTIeyR3I~Ui2`X^+h~(}GdP<`w;eRsauCCXJ znq1la&(riv*wV_%rd9|HG0m|Vb2tP#u=a#x?K%3DM$a=X%ak?g8jbdZjI9QV>;}gw#PcfJ&Wa zE%bY)5(nuV9053aU2^gky{*w74nbGA#ji1s?lGV0>jH_V9y-Pq1ZHdFa3?_L(Z`abFX%rS{hO(Bc)1N| zWT>Oe#@e0qCDTd=v1N!2Jbod0{EGHz^tIzLpp-Ebi%PF|G7<<*$3P~iz};8ij$Q20 z*p1*QQwf?eu}x$ba~Awi#v&U$y)=hil8bB}p>YoU(ePZTh1u^EN;YS+54P#R$#5vZ zO}6A_6pz+87p{7EZU*eY&W=qqXS1K_I0uFtuz;sg(u%h7SRap*(Y~vysXm)0@I;OC zoTD3LIwH{lo_G>ZmI=+~dKv#^6x_02G7K8y{x>vvc3tSpA|kVaf-BtMhB**N~UIWzQ%J7!5!@HMLfybPHY2U|UamquJB^_` zxWOpG^{1#CneMR0tC$vL#!(Gsmi2Vh$a!8q0be81IFU(<8%4+s#9%ENBdNJ`c;{tJ zEVj5bGb}Z!>0ZXwee~&(wxa#8;tsuVc&wPD($xxE13s&m*vwqyfSKWvw`6#9%2{Jy zrZSnz)bOQXj18&H-jF$VI7ZZ9lUI`~o6R9n>Xn##U_=_9iafM~a=={5;E*9zW|Ery zjf~ACg`o{TQ3^c~8_;D3(qzMnNh&W9Q}SNVG`_=#2SZ__!&IRi8*-!$*{=#~>V8;H zhqZNBm-nI|oOvu(gfvGasxh*q4t9~g^~*yb7ORxgyxfC55lO`HjR7{XG1QJtfpltT zkI|uVZwAQ?b83Y-v&@?4s$Kax>_ggi%*z)uO*BaiW#AxisiQwl6R;523?1mVVq3RIdhy+Qz!)z> zZgco;t&FkUoT|(aF<_QtHiUh0CBBdhkHumv(BWmIbKv4>HYZ`x<#LLbZ%5n&`I(Ul z)*27VljjacPi;*}pW)5DO_=EAyJXyhFd$Zh{aw@@>OmQR#&dAf|fz(%xi>~la>u`D2lYl@oBQCHyV*=f^_=3opC~DC)Sx0>(leR z`~Y^ZrP|2)B2$bTjUMTpp%(1k2chGP45n^#K?L2%WFwcZ z@m^=tz!MmlEVCKrTrWRnIUOrvPDMvH+>d93I~DYrlWn-4WSZ1%rQ9t)k4VOAxEOH7o*oB3sl=N0%qduhU;${1V4M(Nx&IlPu%*7!F}vm6W|Rdzs9{yp0M7&eHgg&Y!*0z9@&cOQK)!yFUJlOkQPI zm(^A@mY3C6YWz3n!VA-Sa(Ic9&U?;&6}prgq``KiH>@r7Yjb*RTkEx#$)7DkDH-z>~o6O4u= zY@ABhCQf~2M04yDG|%MD;aHK57=?17GqzYwU72&pE)k0 z#SDQ<6Iln{Pm00)%ELwo4=u(0zdam03-R%|!CLO?O=&v)`7*Wg%$eLzIOVuLcSfRp z*fGNkCnYYX@BzaPSvHw73sHzsK9MU%GmVgTs<_n$m2jn*^R-8M@C`cN6v2505$2z= zVlGOfxQ$7ivH~Sw`77|B>=JDY(T^_Cwn+Y2EdLy7hN~8a#xB(ENgSAf?UxJkl{jow z6(160c2Nv+!nV@P(t{P^C`8CevzYGV|L~VNG+xZ~i6g`;1Z^N#VYG*XQKO?OWQ04g zp(p3hwU=Q=jrC!C_%AkJm*$8$Vy-6gaSI;U5`%{LM1ho~EQD)<9l=?MLZ2uS^Wl5& znLHQ-z|CK20y3L6^f@9$)7Xc4giSeOfmrMlM~b6TzQwd|v&b=!Lleak zpE$;R1&3fsq_@P7}9nz7^!VUs$N_Au_j|v+@}3Ob*`57SHN?c1P`pwRWqT| znW7uPi$F%p^tEepXqM>pi8BOrnPV#1tSEyyrv0@&K9!Cy?h}*6lpL{9Y|_M;@UsIt zZ0tkbPPb3=2^@pj!Duwt*B9XZyrC(&c1@jh@bUm+bnc zPizsW!^@5(+F*USGMRQe$Z#!5$l>3X!_Sw_ap)1V#D!7}7Y!Gfn`eTBQ}Q)Sd{@pv z24;}URU_as<3X^MBPUjyoWl@s61n2t$P&8o7blljzD?l5DSMz+xk|HKTRAAZz=5qX zl8Ck&RmhRzh_Q!)X4Fp$2?X$ige=ODRp@xiktO5k&Bn6;lp_nr&3=@E59&vmw}MAu z9E!aaJQ}mS z0>77}EBsp(cx95V^IxUF>yz|j{|yTKNs?~$-=x6XlJs-`?Fzg*NlE`b3fz^Xhy1%0 z_;8Yb;eSMdk0E>*y> zIv=NiGM&p6P^mM_%(Oq913I6mfEu0C#-{UXog3AgW}Vk6phf3X6tGU`Rs{rgh80?< z4V^m`5Yjnqi#m7f98qu1&^e}ngwAIwpik$`3OGmSZz|wCoxiPs3v^DKs?Oil`4aW! zdpdt#0hjB1g#xb9`5Fam(-}5was5M`w=3YsI^U##TXf!`fZKHbnF8+A`R59_N9Uai zxKHO@3b(smU+&>+THL$%S=IBaJ-itjc#(IpW&8{L zYxeM3tM657p#PqJg3-%W0nKZB_;rcqcj>q5`uX?j?VJ5PFa4sdpZ}mbmm^#M>|oxav%FB$s^JFX%|nT-8=>DbQGQz&;$6wem^gu zJ-ie(rKM<(qlb7EJQ|7o4ES`AoE%=?Oj`Rhk!~ zy_lZjE9hyy3hg$OUH*ig;hWLkO3(5=^c?R*y9;HLd+AsF7}_W41%82EvM$qeGBw9cHR!pMbiNn#(px=vm^oE#^ zb`iZPO6e_JK;9H(^p03fe-tOvpTs(}LHe^eo!%AQXwRU(h_mRg;vBT+(LcmidQV(W z?~7aM192byQ#?i=iWlf3@dkY?{!X8W&*@W_i#~JZ(!X3&=yO*Aec@U{|8`Z-e_X5S zOV?@iUsnhH&((=`1AXN>gT8jf(QcxBE_~W@orm@UX4fSwTwBrpfL*R@+3mU>?RNIK zZs9D~t!VGyY}fsq<9d=uxL#(T>uo;F^#PA`eaWNTDEV=Z;nD8t?03&+-CfFK++{r0 zU4eELk8{`Zc=u|w%{;+<3g@{`L)*p^-CaD%y#Z~6r@GJMY3{3ey8CvX;ZE{Q_tSiY z`xTz$eurnfKj1m;eVp$Z!E-&+xWIEH&+{D5^F7rl>iL(nSo0r#HkJwvV55k0(B~=G z#h)vaMm&Lmyb!;CJkp%zOAX>L_}>_uEw9fQVMZzZUm0W2QGg|)5eNzjlKj8DH2!XY z<_RNziMkZn*=4Q$iYt7?3zfW4Vo{qMe3z4hL;4%oStASaV5!F%D#;-1|V#jduD( zi`*o$1+mHI14vDg4+jv6&}i0%)m9su;q$@rKR-0*`zQoHBM3RSroFx;bLkE8-E95WXQUu zV7Hi7Q}`5l`0m1_m{IFG+P#BLDjMrvRN~3=B*kp>&f7-ic^*!R;=N))N!GkaY2r4T zke8Jdi{|a6iAizvjg+02wO1^?8}DXrqp|W`>Aa*^zAgRYd^h%B(ZfI9w_^wS*6tuL z{<+uk-7xVHR7(kQ9K3g@*>>SaO%j&L^R?9&@Is$INW8S~LKcG__AKUz%EpO)LF0)-`FjXlyL(r>RM?wzdd8NpXsl zHe{HKe}m-dfqZ7u98-R?X&(H!go_~`*)A6CX1hcfmb?~WHxoYyc|8Jo?S;G^r!o8l zWc4IA$I~>ApQB=a5i)y)mhkIz48Li!;}Rv463FC4Qzl1QGMP*xM5pLNT2A^5X_X$x zVWqk1)VmPYn=MWk8&c~R8b-*m&rix-v7NFf<(Az@llp18YY)wADcmK(jR4%cMWk^D z^%c4n7rGbk7O~}19`u&D3m?`xrgY%RQ|QTayQb_G2{|jzjcFxW=A%bGYFy%#=DFE( zGfmz@vs&`9T(I+V^Rm$StzF`R67LQgnR>BHe5b@K>E~%CZ&Kx}P3^N@V*mR3h8Qpc2_W36;q98KsgQ1USU+Qx*<*9}f6D{s_Np{*2~B z@Qe9#I+nknDx43iaWb5WgTECAe;4ng^Wg9=g|oi`ZvHw5b35GgO$Y{V5u@lXkqZv| zpgsWO9J~sld zb>jPY^3ZAuh|54fi%zBG;&MD`)Jmn|2jU9cl(*A-(%n zrM1>t7qC@pRkSX}Xa_Wv;!^dqRqImQYFo9{PwUp!rBz$?``!^Xu9%@(8kc_%6K9iO;v{D@yb9v-jNDN!l|&4 z)X2?LEJsvELebvJmi1>C-6^I?f#&x5)%9&%)$Q$F>#7?&>Y4PD8^1VkIeK#=Ya6SB z!LI7Iw(3qMpM7j?B$P~I=!EwA6Wi?+i_MM^hzE4b!A7!XpgGiUfP9u`8Uk0Y2_^fQ zLUB-<7>*`Wp=h^JGhh;D@~r5NgrniqDkfLif^|&p+E|ZKKoG@Cd6ciwWS|YpZ=w~@ zRGOyIftc^`n?N*W^co2-mC$sMY42>s+$Y(lo}G>)J;O^HdF0bUUMi4GW{=QjFa@Re zYBV?3Yfhsv)*XtNq8;L;Lh@*IXifn8Gz)1Sm3e6aO=QYnVa`o*TIi)B^2#T_mky9m zm9$u+!nY^j%ypd*3bYoxL^np~EpkaeN#q%m|J9qpxM1arCKY53GpWi};d9c}rSd+emF zK?Ssuj?oCFJ;Y&(!Eld}^wP0Z4V~3>v^LhC$aJXF^h_)Wypom{P#raB1dA_pV%29D zsoGd1Vrq0Xt$`2Lwlp?Yn=17?^0c9Yb)95=JT+<5=xoTKvC&9`Qv+UVrWU5W`nI-~ zwsDv-hX;PgOMY$Cu2GPw%wek1aiqA=YzN7u)!fny4V631QQ?7Mn`GEYCu?*PBz0ie z0B=wBVd;S5DRe40)&!d2s0*Dq4kLnPr(}6Lt=A~ztkVW~4niVy+D$zORSki<`o=(e zXIDdYV-S;dTq8LGV0^k{+)H7N`k*C;xz@(|;|U{~49B8gI)l!{WLKXQXl1H!nyd{I zOnW8MD8)63IXiD{Un15YN`<@48J|T7coCdedXb~&+Ht`*D*2{qlSUhz`L@bUXl*)_ z)%0c>0N=W{>W21l@U`QDZ(8y_m(JJdym9h15?1*83T=Uw19gqCtK)P{wiYVbo-5g2 zNMF&8VPMPbNQ8skeMY~L45s7pSR!Tgc>Ln zSeMb|8hwvxv4dE4^|l$Iq+A8xrz@bKx|Wu>j2 z=9@kRSwYH4v0q570vzJ&5=-Ug=umM#7ZJ9)BLDU&5DG*SB{;VMs|hICr}jfx!wJm@ zfu7zU4UIwr@;oW!d5)gf=(kAC$JUVA$c9O&-K>Lt$F$5rJNqU8NuHCEyg+}{=*9i8 z6;841jD$>^?0)no`ZH3BbzO_Qa3C7L%|;^z$zG6>y+VK0=r2rxv2`@OX7&|OY!=)} zuQDC)ptSv<2w7i|vc67#)94MRhOuQ;=Gd30%DOx0O{O&tf{vFQq=|-n+}qUMPhj&=SgXb_yCQ)2-RatGwcU;acrvD z%oCW7aS+IX3S=shcG}95yzGj!Jo^#xsySI%HQ?h95{)cXu1{6f!;}OGz&u#ItZ(udc1FZ*52FXQdBE zI%Qg;lY>yDQmDCnh{gx+M>zOm9F?+-P}aQt2?t|RgN$>fjAdM|@q+zGC0awhMjL9p z_H!T1xNv_`iBV`ko-$hM;YCab^cy|lkl$Jw8e5gcO6ULJ9Nz??) z>S#}s#Pe_i)07-d6pK@aAGLubyhURaHIE)Ucv*;*mXv0Nr74T<;p1doJGS2c1*#}< zE*_gIkW{%^QENsm-=t>NB8S}!NAe@bCZ~cm)@8Pmsay>eugNx|Hh;s}(P0}=gH2gY zscb%nLa9emj>3sFmUUm{0p&%m09rBnFE0H4?x?#7}(Ikh)x^k^IzM{&bMturyJEkqATK~!3=FBa+X zr*V>w3_D!h(KGB0w+0kCBmw1f38oTBJC+FdhNFlL(O!Q#iRh9wcFK7-gsULE%OQ6F zH*0s4V5faSYUQLFZ{Cko1RRv$Hm5$@65War{tc)j`(x&bURv95Z$UJ2SVLAA8kNIW@xe|iXCFSD)c7LD?G*TOv5)H8Ne^GlG~Hw|nuCME zHyq<>j)6tM=I9{570bFi7RPtnVQ2g{YMWy(Yvqi!CaQ8nzu{FNhQE6(1HqvUE+wl=O zn(kkZ^_7m>Mg0NOVGi!pY~ppqZE{|VJ#Cnr67qV->_iEfBdR340SN}Gs%eB-X^-w0 z;*G{PIw$38O(aaZR-$xKpP8v(uBouxd2Vrx)D}u^5ATS#1JT1jk$Df&fTSPm z+ut9K;%lyg^v&3Ypk!UheJbb52TE0LCv&4Zy%`kC2yvGVUR>qvoj%>8|j*E6S z={1pUv>#+D?YBzqR-8vBYkHO+d#=V0qXaW{;K+Gb?o^`+w$jU5B#lR$vl~pl)ruK~ zd^tacdl8JvuDdL-V4cRO&pLgs2LZL8dH4w?D&$T4l%(?;#6J7g1nUBWd4#OA-Pl;Z zU|k^x`6-Q`Wt!*U2-#SxF^a2B$As)q6=DkcIerYKV*b7S`2DoTFF1cNA3m4KO3WW| z1A>Lde|G-tor^__oiARP-c!g`Qai6Z$5q%; zE|4}O8H+%}@;vo7$I6!4WpaUP7~Q74H~1}S)VHy@l?4KD57Zm^T`&J#Rts@Mqp7v6 zK8P<26C1-(BRl=}(E5mh!-aVXao2B}~Nv64@mSF7Hsc_fDgKII? zouqlAc$NKnOZFlWF3RvnUjCRrK}`n8I4IchtUEAvJgWSAf?n& zjoUynLxkVjX=eqnleTc^DtluI zeC|JFZ2nn^KuY9$g(f^qMN*#%T_17PC_5UbrS4c1-%3;MF~nVnPADz^TQ-UU7&(Q7Rvwb3+lZm|~w) z&gV`7ZT?6TSOT+0k9Sfv!2x_X-&`o>i*m16C@QjR!1NCDGG3sNriw*gQE9%y!Z%-O z0+yIHI#s13Nwmr<4wv`MJgHb#*@ZMq9IOd+l@3oh_ua03vsoTQL=i`0#SRY$L?T9S zC{ms1HNP9%#$nN#v&$}^+_>xsGe->$u~EAF$i=1>VnGP2!1P9_bc1EJ>HD@Bd@zhZ zIAoqV8p(le4UaG$q;pH^GW?9LtzjErtPUf~RsqTsG&d#h15KBHf*eLAI(g`((50(jHfGQ?en!aa+V%O|;_RH*BU+26{!Cz)CEN z8k+)ODX)FX9ox<@=dd;Qqz%k3U!={{had9Di^vJ^4u6)_nO@*_sHH`OP*&hm-IvE59mu*cA?H z!B{%cZ8V_HhVXAsC(O)|7Gp1V;Zk=#E(_x(GoA|NwPUlzrDLh7($(LppaWz|cA8 ziaLjNK2yEv*Eyzuvvf`>Ag%Kz1q|qXjsnip`6~*zKijjGzpmbVQ|E6f;1ZoL zRlsFBU#@^FbcPFCQg74w8U_4N=j#;kBb|S&fSYvQp@3U;zD)sl==@U!+@U-K@ue80liHpD@z?`dnG z?~Xx&&&yeX%ris$oFwyn?rrBF|4zOA!ywPky;wQOFRB-R8scjt+Do~&HxKeK(Z3FH zmBsZnh4Q~c{6?qS4Wu`7Na;Z?%suxGvboIeLO>P#5Bzs6?ZERDh_P4FWV(tA+(a$7=Xe^%^wTZ4M0_iKi+)1e={7vwPP=i_@KL&xo~NJEYq-ex0o_HP z(je|M+{G@so4s@oPeAL#J;YMV@JzIGXcw2`ieUxX!{}Z}x6z|~13kt! zqP+#T=tMoL#L(kyM{WQN% z&+>oiIsS~E6@q>%is*T90NP3PJ29PpFJ_{hLw^wE^n&oCT}&^EW%Ng}0`0N%l4zxu zMJK%?PCpamtn~U9kp5$J}KKHS#yKB*|=E?3Rp5ksr+s;$nC-H&q zQ_+Tan!A@v+-IPT@=W&@KFECq&vM_&v)%9l_oF=5{VX5sewhz(zs>X9pYfr2g*-oR z7MJB!@q)Z#xFYX(+{FH;^i=Z?zbMLP1XP63}t1v6H`NIC%bV*0JgnKMHd0(c}F)Ez`fy7s4N%;APOUg|P%3W2H z==1Z7r)@5GXP=5UZz<2qK6>z&Z$56hT?slB=^1esP2tmN7TVcp=W~~h;Q~=4WMWnz z3a|*W3pC)mXO1K}tQ;ULOzsaaPOH51<6G0SY zMKPY_jOK_*c#=LaNBHpMf*8p2EisM-EZ=#j7kf6FB5b*QcxqW&4wxLKX2&TGUW-G4 zm?EZTsqsdPk=f>!^4;RVriw=?k9SsNL`k#j2=@*;(Lcq#WLaKGUPjDB@7!%vTaw2a zap+z#e_8&*2WaXxnpTpZ5epXXrKuU=zn%(8^7o3vcH-TvZ8Sx`Te2`CmTt?vxX6vQ zPH)@1b1yeX2qPUB*{ZfUm+2w64Z) zrnb>~-j1IGT}o-b7C(Er0l!+gna=0iOpUI|>dIOj(3)5wRzj0`bdFdBPZ#h^LmVTd zjdbb~)uIMgocM#^a+G$-3i(QdX?(1?VO6zj}(xj50%&=Ps};QOGV z`=Oyd(9nZ4jUU2tc$gMq_bp`j<~NPY%C4t$MUU z)qWG*OZP$TvfTr<%l1L2UAB)v?XrDbsXdC6gZNF#=eNj+ zf$I!#oK3$%?NDwgahM*8S0;NxoQJ?7gUu5#o)?b0h$7;A@fDb?ih9Ks^tovzohmNC yQy#6QfcPrp$j6tCRpLTCY1Bo_#YN(4IJ#a(i%i42kQ#YS!z0*>i$Pt8um2yy)6eh# diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class index a673700138bdbf7cf4b98b068f828b2d82d565e4..b4db2b06420453e1c2318ef85a70a68a56a0eb33 100644 GIT binary patch delta 118 zcmaFDx`~bJ)W2Q(7#J7~8RRx{^)o7Q24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!S`%KK2XR@}NJdII>QF`)j#tocI3}Qe7m>9$-=P;RxN-#(=FfwogMRb8QBamhm PlA64oNsV0wtV$LD#9SI# delta 69 zcmdnQ_Joz|)W2Q(7#J7~8Dutc^)pVs^KIhm1Z10&<)T})=8VhrL8j0~JW6}mv0 U5lAx&Nla#CR%4d}vY8m90c_t4rT_o{ diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class index 810d80dfde7c05d558b4cc026383327928bbf4c4..c2f0f0aab3aadb3b9aa612c3f9e6bb914733ee5e 100644 GIT binary patch delta 118 zcmcb^x{8hK)W2Q(7#J7~8RRx{bu%h)24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!S`%KK0XR@}NJc&_-QF`)r#x9$-r!bj`N-#(=FfwogMRb8QBamhm PlA64pNsV0wtV$LDw+0#~ delta 69 zcmZ3*c88Vg)W2Q(7#J7~8Dutcbu&)B&8WyIIr%T+8b-#+o0!Z*#TdjH7#TQ$Ds+J~ VBamhml9>FLNsV0!$Yx@Y1^}7|4s-wj diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class index 95b93f0f92d426718898d5eb9853f93cb60c3624..c6edcb670040d453d53597dd09eb910ece2797a2 100644 GIT binary patch literal 1861 zcmb7EVQ<@16g@A=>eMx)OWSpft}Co#Nwdx?g$$OdKyTSr!_lo)OE(YL^luGx0X>QZ;Btso&VEJO6V(WvR`m3!u% zqhLVbTt83`B#aeM!`-&PSjj_i9jmS{*|zbpWVM~Vz~GiuYZ#7en*!M=p9O!@OTR^` zjaq(@aRUoh!*Ui0oH_20Eej+H&8n#)j+BNW3=70F*|LJPz+|tUHMd^hXi^H(UU{%* zwj8V3P;n9|1!Dpu5tLPoA~gts(;5^c<>wgSWY)gIzn+fN0i*n7E{&%k^%8C0%-Sv=rB?g)aBuTIA+Xri=<1J-l zGTBd#D=6!_s3C(am26v&2ul5m3UbfPgAXp9XEj`gE}%F~ue}19Oh0Z{iHJP~bJV)u z5ON+O(SqTawWj@$KAB)bykRKRjdq(wUpv0Lkn<|)j(IqTdN`fl3@JokGxk~A=rb5W z`Xt_=#qOSp*${@RC7q`4rGOO9cAMp&lEQ{>TXwB_)wESyM@nk6sNp8wqms-kg)jD( z69^=omo*e{i!*MtT4sYYH6JzO;eITMQ}&xMm6be~CN$^o#L*VdelY=l;adAx`cdVC0XPLyU59>Nkwf{EG2h z2e0h>;z69{{~5vn%ShlB!B;Sh+dS5HFpVN6X*uPC;vA;f1*O^k_e3*KfJ~Fi$ zfv(H)GG2-Kfnr!BsL_zv<6K{H6~Oah^EH) z2bzfw`e5Rd@l6ul8XNIRP5cLj=r1wioo!PTeVMs;=ALuUxig=-e(KuSU+=d7jAN;$ zJ*{o0{5~CCbTRNm@~Ru%qKC!2e)!x7Fa&CwfdLH$d|oj0>2Sj%(|#QTI3UXGona)B zxwXQ*f_1l2DqFeIdPQt0aS`TGmJ~C5SRG{ui61;PqQQhuqAeYVG0vc_mo`?N#`E&{ zsE%VeE}rm+$HWO8Cvi%A;Qbv-#kJMz6|v1@?6lb7L2Hsh8I5SjU`lG&WHck|XBpCo zrkZl$_D!pWTu?(s23Z{`#HEPyvi5@b%qMi2W*JzKAuPW0uz04!X*h`6ALM#RoVisIXt=( zyIMR9!=$WfH{C>o8*DH1#vf4LhK?Zq4>Up0>R)Z|{1;14(!#!iN^=I58!&08>73MV zW9&J)O&M|w)ybC_G8@RO7-#A@E3bmi)wGQ{8|U(m6&7@`MU1`J`9`mDao5Kn yePLh&9^9ud_kf01CF>6{P5UAqIT|BP9W8$zT*5pSNM#ghigVpSNp z78l!S`%H8cn^?=qWNkOOjZuYBdh%+<`J7A)Vn8#P7{n)gGnt7>Fi0{mGH?P#bb&M@ SkY*N=nmmn3ja>$;N)`b9tr~Oy delta 69 zcmbQpc9@mx)W2Q(7#J7~8Dutc)iX{$^KIr$^wd`8B}Gnvdp#TdjH7#TQ$Ds+J~ VBamhml9>F2NsV0!$Yx@Y1^|CL4c`C& diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class index 61158195de3d243ca5ff61b62f0c66f91b50bd0d..14a4906f95e0dcedf34f88573a70c57070b93fd1 100644 GIT binary patch delta 619 zcmZ8d!EO>!6g_XIGr(ljf)y%i+aN`T5wQhng|;HK)wZa$wAQIw9W5ak#Dr4UhPZLr z+>MD}V4}&Gn1M**2e{K8FkSlrCdL@wOlmZ~#eMg^bI&>V-sk==e&y4z4<7-HVe6gJ zW)WYxR&AKAoo0n$BCeGlnNQ7B-E34-vvqTOdrB|uZVU_g8G6CmLkWidzXj!1v(~68 z&~RGC0VGKiG~XD~9*i@L?Dh}P6XBqk!8v*+%!SW0s4llrX{FXy78Fb(@9?JRs}N>0 z^h3}y7a2nT8x(hH^{q-%K>>aR43|`#LCSf~tGJ9SWQd7a0gEawAfoWWN-8qA%HW9? z`O&zOhU+Spaf4oq(SZW;UaT^(q@!`u(O9QFF*9hW$YR3jYtiw!qau!o7n_vq`|cAk z%(o_Bghr(-y_ACVP4ZJ)3W_HYrB_l;97TjSr6~R6e=(e*BXVwt3vi`FoSB8lGeGS@ zGZOC+>OiN*axBbe*)JLAw^QPE;4aS6TRE2I9qq%*kX$&}!=&+#N(VV>omnmxz+p_2 z?9oNO3(9z!dco+Rn6NQxW6s8c4hl(=8rR>~!!x4K$$6XrZd3KL>c~7T{xCw@Ff$O+o!o@>@ z2~5&Qp3AtH78pg!go7D@0%jTX?6`ck>|^1Pz&sw)51#IDF>GLwfkhtG&|{gb*kISH zz#xXgsiwm|&jd0^8F)blv7e05fm-5yNYRm6rq61UeybM07UgN0(ULrke%jQ^y;3CA z7v%v<;1U6%10rwPkBLDyZ diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class index 70d93f6022e4d2203dd73467ff10eccb57e1a581..aea1a990afbfbfc9032a2006909ed36d978fa673 100644 GIT binary patch delta 189 zcmey*ah8+o)W2Q(7#J7~8H_e^aWE-z24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!SPfli1WVD;i&!obrHra$Jh*4{DJClx-4iAGagB~LTM|x^WSYl2oP&>1RrY9GJ z=H#;_uCCvZ; delta 141 zcmX@h`JaR9)W2Q(7#J7~84NaZaWGAeU{YjMnOwyb#Hca(ER&9u77v3qgAOADM|x^W zSYl3TDkB54hNdSMgZgA)=C6#5lLcAKL=_p77#JBifyU?pX+|K;ETlX+hDA+Il|c3ysCMz=9Z1gE+ROAfKOwUU!DJ@E6WH8sz^vOyr zOVrOv%uCmI&PgmTw$Yv}$)w0=H+c`E3ZwMohm6rI@{9~7K<#pq3ysCMz=9Z1gE+oXpCk$S65kohh0{mXW~(C@eR5 z36qqxJP(5cgE%7tM|x^WSYl3TDi;GIgAxyeGK0$Gn@p;VGL!!^&0u7lynxwERE$9! zD9H&lUKdC+0%>L;iOH{-)s&+EV-_`bHJ}zI G26X^wrydyq diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class index 31904750b1d0cc28360ab71bb449d25ab83cd5e5..9b401b789e8f379b50e53e24add9cc80b133ae66 100644 GIT binary patch delta 281 zcmew?aZr-$)W2Q(7#J7~8D?(e@?urw49-l?ODriZN@Zj)*UTn*LTiI zEH1Xuo~*#8$Y?h?kX41TVR9MkS+6ce2ClTsyv*W^%)Insc7`5C20?@_&%Bb<^wc6Q z21bTH9)^B~Hbw@H^wg5D#GKMpE{1LfB`$_Z3{%({CNnZ9OcW3i^eiX{Ey>KuEXhnQ z=3$u1Fm3ZDHeVJ_CWdODBbgX#CUKjI)-u!qjZ**$=mKd*Ak8dPKiQjGjk%GbX>tj- zC37=F%j69}x|N}A@*8e*<#vV+s19oe7O)OMq0Ze5-H}?`7<#ueOxVFNak3ka8vAsx GB{Kl(m`Ozd delta 218 zcmX>o`B{SN)W2Q(7#J7~8K!UK@?xDli&c@aZt@=1v+f;?3|wiMd6~r-nR)5O>8V9r42%ptJPf@IEsP8t>8T}Qi8-aITnwEIN?Z&R7$&hZ zOq_gyO_g~v!<5ZG*nC+S87KR3n~7F4)ByD<0Ik&p(u_cwS*UjMOl~#idWMF{hqx^# z@8=esEWo2a`8PM$WJewY diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class index 4c24ab0bae487f8c9d1f62783145c22ffcc668dd..5129f4d86c2247b776a2c7f04da43063c1f1b316 100644 GIT binary patch delta 215 zcmX@iGm)3;)W2Q(7#J7~8A3L4J!Mkj49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu_L&$UHaVV|i_vcK8zvP-x5I!2>E|$-n}Z;or^R8M&LmJ90aN?{)_N$zp73>_K3&f&r!KFNOdB delta 164 zcmbQpdzgpo)W2Q(7#J7~8G<%)J!P6~%B;xfGC7<%ip7JGL3^?wv)JU*%;IWZj0}8P ziDilUr6rj;`Ywqjsay=63_d&z;tYaZ4DJkmAeR4T4wi$AjEs{nv6_iGGB`0XG6(^U z)&pSNp z78l!S`%Ip|BsRH$iHp&0GCz|FquOK>rU*u@$-PX5QaU^gx(s@Z3>@jHC1Hsr`w fGX`d`49{)`%}A|n4BFcn^e1PqsIeP>4Kf4(=Hn)U delta 148 zcmaFNIhB*^)W2Q(7#J7~84NaZaWGAeU{YjMnOwyb!J@&)pfz~|li1`pOcGLBJPg_l zI*be)>8T}Qi8-aIj10^gnx0$?>Wk%=85tQTtFxGiDl#ZBFfwogP16O^j6j-MNO^J* oi<+D&gBn!EjDZ;}!?T+~JyL5MgXVSy-O1Zn)Y$ca%9$AS0S0Lr2><{9 diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class index 175d9df5ed94d807b25dcf303c8f049aee9bbbc2..7510767365ecf19509046f8373afdb7a9a3b7eba 100644 GIT binary patch delta 236 zcmdnR)xj-r>ff$?3=9m040h}cOpFZX6E~V~bZ297<_ykE&r2*RElLFnYH0doC6*=X z=OpH(>pSNp78l!SgGDOz3yL!HO7s&;N{TX*N=s7p9bqhMyUAWmDvWxQ^O+*pjCdG~ z8B8XhWm4ueW3XUnFlS`Yn5@OD!OFwH&R{uNjai?=jKP|RffLAyW&X#>#Gnau6cdBi zff$?3=9m03^wcxOpFZX6E~V~bZ29lJef(6QD^d2rU*6z9-yqzWMO7y zP7?+*b_P>M293!D%o?mb4D1Z%lXIB$IZPNVc^Ei>oW;!l7#Sz8VlfldWYA(@WZ(fB ztqY_Xfi$y__T;ZDYRtL}dXwc?#YFXIGO%xAFy5fGi9vQ71B7QW*^||R-3q9hiNP8G Dsm33N diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class index 1b569744f37b3f236b2189de1dfa5b7916c1b86a..8b0fe5caa7fb2788bd49c2a0bc00ba7bfc98406c 100644 GIT binary patch delta 207 zcmbQt@sNY-)W2Q(7#J7~8MHTYEoM~Y49-l?ODriZN@Zj)*UTn*LTiI zEH1Xup8S_lkB;9A12yFt8CY{uQ!*2|7#JB8c^H%!BpDev(o;*q5_3vZ zxfoO!)YutR85tBN3W!XOW#VI2XV93O$MlMmi9rl#F%yIMSQ3(b~pnguEh%S(3 s1k%hxQj?c3tI5bP$Upr$M%18Z(-N@gM#10#bx4}$`O zI3oi`dTL2nVoqr)7lRUm3Oj=`BZI<30TDsZf`ZVJ%$&@U%+z8Y22}>N$y=CSF)~hG z&TJ+s#vl$fffHznE|6vf(#%2pSNp z78l!SPnKX+WVD-{&aA>{HMxiRG>a1>gVf}HW+^9j1{X#KL4*d+ypq)P)FLhhMg}(? z26qMzMh1@b)RM5ooKm3S%o>`WTnx?(B3umK48H6PK8y?s69q&jpJw4>_G9qhe23*f zBPSDsDbQ_93}%z>u$hUPGgtu45(0|o0%=Ad%`9X&S)E;Nawog!GD0JBXj AWB>pF diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class index 85ab6b4a025172406256bd3da681ffe2dd58c449..9bab05f2dab9bf9642a12434a367828b8238ce54 100644 GIT binary patch delta 196 zcmZqYxXQtG>ff$?3=9m04B8vH7BDJu24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!SPyWZK$Y?itIim`r{Nyu?p)AUb4C<5rGm1^NW)hWBE1>B+^QG&zgu0VflK6wodv2Iff$?3=9m044NCc7BEi!z^KS5J6VV+lu>bV29utYG7p0agDN8fM|x^W zSYl3TDkB54hNdSMgTmwuOb-|tC(mRy6P03+W?*FC1RA3Yq#1!UvyjZ>C(LScat!iN i88ZfEunf;`28BqiZ464=8Pq0gu&A-C1C=u|XaE4VOBwV4 diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class index 06ea2a66c825fe81e0340181a00d66ecfc35aacd..d979441895045a1482a8bd134748518b2e536c4e 100644 GIT binary patch delta 242 zcmX@dKSzM;)W2Q(7#J7~8G<)*-CTn*LTiI zEH1Xup1hY?k%n!>q_?G1-s#28$CTgXrWyW>Fh<1{X#K!K}ox zME#t^ymWofypq)P)FLhhMg}(?26qNKMh1@b)RM5ooYGV-24@BlE(R|KA9eXcVEMtw$T)c+o0+I7gBeh_5YS#-Ak7G*nT5YKWiu&p24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!S`%DZFo2$JnRz9;g{6r(nI)C%433Npf(Xr? zc_pdosYP52j10~^3@!}Tj0_yA8o!NrHaO`dosd3R delta 208 zcmX@W_lcM5)W2Q(7#J7~8GJT!Wiw6Q&7{a^Jozru1rb|D2Ht|A%)Aoa!qUW?%#uoW z2K&henI#k*c^I4+EEyR%(o;*q5_3vZxftvigt-`88Qj?!+!z@YCJKm5=40Vw_F(Yb zEYGr#k&$uoNmesa1E3|041z$*bb&M@kY*M#nk>Sm#%#i1I@y-Zaff$?3=9m03g{4w?|=aiOY=I6N-WMpzNs7!vx^q-T7K?Z0)6NBvJcg$v@at!he zj0~JW5nUk72&9>X6ee4;s3|KkC_`nO8CbzGg1Z@1BDJff$?3=9m040`MgOpFZn6C33=>g{5jtjDCtC_g!XDUMNj@_Ht7HdP)5 zH3s#`ZMj~b4p7x^YdH^GBUXslqQ=n|7T>JY{OzE zD#IYlz{tP}v_Th0GXiO5A-T!zENaRM42n=0X9iZVjNontrAV!93@SjZ!Lpq}d-4Sq MJ$4ff$?3=9m048a?@_Ax1P24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!SPp)NFWVD-nlu3ordh#o#Z9LA546MbODXGQm46c*cFiWVr^DuZYcrr3@q^FjI zCFYa@O=8y2^yFf2VG!kF@L}*{XYgfYP?#tnGWkC!QefamtBoL5Nvu70J5hvb^rhX delta 224 zcmeC+-^C|z>ff$?3=9m041w$nOpFZ1lMPu!CLWXD=-kRQnU7hK(Q>i@^EMAhMh4d6 z%#_q(b_Qog2EnYvvPAuy#JqHU&%Bb<^wc6Q21W)~9tJlCcSZ(|^wg5D#GKMpMh0dL zO;0WcCk9b21}_F5b_VasdMv8Uz6^ew!&p8rGBQr~XEPHuV=xEm76v*(7f3S#X=Wjd z$+Othn5`JBCm&|BoP2;ybh043y0RUEJyfMN0}EKCppe6E2B%1^Z455k89a6{cutOH NS7Y}Fn!&^n005J5E<6AL diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class index 2bb5b6f6e15966cc6d5b74b5369909f88fc6532d..1fdc24b615900cada8e85b9314e6269ecdd8bce8 100644 GIT binary patch delta 118 zcmZ3&_KA(_)W2Q(7#J7~8B{iM&0$pH49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu_L*2E&tz>kc`>63qvGTfjE^~)7-WD3FfqtZUc+Q2D#swtz{tQ26ww9Jj6j-M PNMZ7KCN*{?uqtH$??4-O delta 69 zcmeywwuFuA)W2Q(7#J7~8I(41&0(DUhEb7Gelj1^V@AfwznIKKWf)``7#X;MDs+J~ VBamhmlAG+xtj4YYWHT`+0sxJu4XpqG diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class index bfe2a71b35d0cadefc56e929fb5bde638d92e2f5..9f6aa0d765538941953794b0dea887653b283a97 100644 GIT binary patch delta 130 zcmX@ZHj7>0)W2Q(7#J7~8C2LAm>3zXCkDz*ydb;LJC9L`GdMFnFR`SwD3y`HTtm|* zE3qt5KPNFSUEet;vAEbq+h<~zJd?HE5~y`3jSns2qbl b10w@BP(&93zXCkDz*ydb;LJCAYle?~<{`N@h*KNuM&D>0ji h$}q?>FfwohRqFz2Mj*{BBsV#iS&dx*$Yx?t1OQN459R;> diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class index cb8fb466771bf146068b0eb0755fdf7304c03ff4..eb4d398f66fdeddb20f869b29d621d3ae4361120 100644 GIT binary patch delta 121 zcmey%dYX;v)W2Q(7#J7~8RRx{&1Y2N49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu_L&$cHnEqJ$=Yu6GDa0f>B*-VcXBc@hyl%DVi2F)%48-g!63=N$iN8{(FM|s SK$=-dYVrjpHFg=WDp>$#h8y+( delta 69 zcmX@j_Lr6G)W2Q(7#J7~8Dutc&1anao>7reaTn*LTiI zEH1Xu_L=A}HnE$N$=Yu6B1RQP>B+|#w{kKuhyl%DVi2EP%VZ`h!63=N$iN8{(FM|s SK$=-dYVrvtHFg=WDp>$na2vt^ delta 69 zcmX@i_LY_E)W2Q(7#J7~8Dutc&1RhZno*HaaxyQ|Rz}9jrTn*LTiI zEH1Xu_L-O_&tz>kc@Corqr&8ajI%kJ7^Hy)FfqtXj%6|vm1U4)U}WF~is%AqMj*{B PBtLltlN!4sSd|h0xZWB* delta 69 zcmZ3?c9oUu)W2Q(7#J7~85B2iO=XpSNp z78l!S`%KJ`XR@}N?9ZseC^@-=aUv%Zg9y+7CI->TY)odNVhrL8j0~JW5nUk72&9>X PBqj$ksj*9eRY?N?gY6iy delta 69 zcmX@Z`j3U{)W2Q(7#J7~8KgFHc`#0%!Klb6K6w}8L`KHRAxvhXA`GGoj0~JW6}mv0 V5lAx&iA|o*q{c1*WHT{H0swA&4F~`L diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class index f05531cccb961f2d1c1e25b876e13522abcc067f..05667181a9887b17cbbc35ebbd867bb98a37ca23 100644 GIT binary patch delta 118 zcmZo;y~4_M>ff$?3=9m03^E(Jd>EBDgEQ0f5=%;pQW+V{H8g#)63Y_xa}x8?^__DP zi;HcveI{nfGg;eB4rWwgl$>0_IF*x$K?G<36NBhvJ|;6!F$Qr4Mg~rxh%S(31k%hx O5|bmD)YzrKs-yu{xEN&s delta 69 zcmcb@+Q!Ot>ff$?3=9m03{o4pd>ALsVN_%kpS+K8DkJ0M7$!4O5e88PMg~rx3SA)0 U2&9>X#3nCiQe&3@vY8kp0afA*xc~qF diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class index 26c28a9f3207a3bf822f7610bfdd2ad0ea29eebb..9ad9fa1548c02da518962608089c7d1e14418cb2 100644 GIT binary patch delta 118 zcmcb@x`>VI)W2Q(7#J7~8RRx{bu%h)24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!S`%KK0XR@}NJc&_-QF`)r#wDCg3}Qe7m>9$-$1s_RN-#(=FfwogMRb8QBamhm PlA64nNsV0wtV$LDtgadV delta 69 zcmZ3)c7>Je)W2Q(7#J7~8Dutcbu&)B&8WyIIr%T+5=O?!tC-A0#TdjH7#TQ$Ds+J~ VBamhml9>FJNsV0!$Yx@Y1^|-(4om<5 diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class index bcb38baf7787f5d35b4e03528e5dd117ca6adce0..0d89cb0e21ac8caa821557e6ab12edad2455a09f 100644 GIT binary patch delta 127 zcmaFKvYnOd)W2Q(7#J7~8Dutc*)b|{24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!S`%JVG<8~}5DauSLElIVuo9xP{!YDa8i?NN9i9rNt5)*^yff$?3=9m03^MEtOpFZXlNlM!H@cfLDscv9rspM=loq7|MKv^ivJ%S@ z^>Y&Q()FEl5{rv%w0$Pl$un8oO|E2AVU(Oak8uts6N3oQC?*Ec$<|C}qGAl<42%q% YKoMOa%?PBKg(N1oF{!ajfmKNZ02k95IsgCw delta 79 zcmZo<+srC(>ff$?3=9m03{vb2OpFZXlNlM!H@cfLPCmq_$S6Mf3F90_#>t&bW}+et fq6~}-oItg@K$;OqGYg4LzQUx&E&*gSF-QUc*@O;y diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class index 164c6fef2a23e9c4d27029f71118006cd4a51993..6bc358a9bf559ebf44e34cc504a84b4d08553d5c 100644 GIT binary patch delta 222 zcmX@fJ)MW^)W2Q(7#J7~89X*}eP&kT49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu_L*29Ch1sGQk0ogT9RsQXU)jKo}OCbmzbN%!QeWXgC(EUje(89eR2)UG{Im7 zc7_lJRfbRoO@=TAM}~;W%B;GaOh6U`0~3SO$uqt-|cbO)j delta 130 zcmbQvbCR3u)W2Q(7#J7~8QeBU~r!7$CA(L%D~3pHu(_CG{GPS zc7|XERfZ4-O@>egM~3jpnXI~ujFacHDljHaKENuf=E$JTz{tP}G))&sGXiO5A*T&M Uiiv>-NV0*2vO!AOUBIHQ007$<%m4rY diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class index d3fec69ffcbdb6f0a0c653463a2c570fe0d3141f..b06f69373ff373d960692ef0c1028a78b12901ff 100644 GIT binary patch delta 118 zcmZ3^`jwUI)W2Q(7#J7~8Dutcg)u5|24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!S`%J8rXR@}N9LuP}C^@-_aSbOEg9y+7CI->T`b=h`VhrL8j0~JW5nUk72&9>X PBqmoesj*9eRY?N?j8GXd delta 69 zcmey$x}25k)W2Q(7#J7~8KgFHg)vTE#;C|BKKTUW8b-#+wM=HBA`GGoj0~JW6}mv0 V5lAx&iA_Giq{c1*WHT{H0swaD4RQbg diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class index 421196e8ce839c6ffa2ee2e141543147ae5f5d88..a3a89be33c78ea44f796d8dbbd775fe4a8330348 100644 GIT binary patch delta 128 zcmcb^x{6KU)W2Q(7#J7~8D!WQm>3!CCkry#Z}fL%RN@TIOwUU!DJ@E6WH8sz^vOyr zOVrOv%uCmI&PgmTw$b*P*eB0qZ8v!$qY9(s3!CCkry#Z}fL%oP3K>kx_i|AI7zejFUGpnTd)p fh%zuTa01op0%=Ad%`7A~`7e_iy9AKU#2^U(5ugv3 diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class index 95d28bd460346cde8505a2dce0631ed484e42d6a..c9d4bb5c08e0708f7bf339b09ffa12e050507a75 100644 GIT binary patch delta 174 zcmcb?wv3(Y)W2Q(7#J7~8I(41?PgTs49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu_L=A>#_d>AQk0ogT9RsQH~A2w3Zwkw=Zxj7E)1*;u9K6Q0yqO1*cpNtI2l4F z?_pBrWMYs4+Q7shJ^2BX0%P1{MrKhp83tJfMxY7?23;V{2&9>XCSuuuj_ KDZ2t#R1p9;uq1^5 delta 116 zcmZ3+euItc)W2Q(7#J7~85A~h?Pi?J&7{aEJ6V^hoYk3umBD55N~QqL00wr3Kn6~R z;K@wP%8ZPY^_UeHV<-DFi>gU6NHZ`3Wf&NAfixqKW)_m!0Hl~0cz`4uSSTH&lwA%i GDh~jDsS*qT diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class index db550ba8905a1d5f9fc9248c53f107f74bbd2fd4..1ecde0e106050cfff6a94b7a7b3016529051e5ce 100644 GIT binary patch delta 118 zcmdnQ+Q7zj>ff$?3=9m03^E(J(ioLEgEQ0f5=%;pQW+V{H8g#)63Y_xa}x8?^__DP zi;HcveI}O6Gg;eB&Sg|#l$<TR!nB1VhrL8j0~JW5nUk72&9>X PBqp~qsj*9eRY?N?X@VI8 delta 69 zcmZo*+r-Ls>ff$?3=9m03{o4p(ikUiV^m}mpL~OHIV0ob4kj~E5e88PMg~rx3SA)0 U2&9>X#3o;6Qe&3@vY8kp0c6MxN&o-= diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class index 3c01302eaf728e177574038e8e1271aad5e7ce07..be4f40c281644482251ac99468a8b7a0a240e2f5 100644 GIT binary patch delta 160 zcmeytdW?Tn*LTiI zEH1Xu_L=A}#_d>AQk0ogT9RsQH+dbS3ZwMo%Zyd5?hI@U9+QKZbUB$A#DHcpF^ErY wU{YWVoV<`pR84|Gl7W$d6DY0=q#1!UvyjvVureMX$p#jR1}SBi0gK840QLMLdH?_b delta 102 zcmX@c_Jft{)W2Q(7#J7~8DutcEoYqkol%idapSNp z78l!SgGDOz3yL!HO7s&;N{TX*N=s7p9bqhMyUFg1DvXkoa~P*`GBJn%&1PZ{oy^2! gCMw1t&cMjP2^7%<(u_cwSx92CFOwR(6j+rs0K-co@c;k- delta 69 zcmX@X`iq6@)W2Q(7#J7~8KgFHIWSJ1z^KS5K6w-4R7S?h0ZeA1A`GGoj0~JW6}mv0 V5lAx&iA|o(q{c1*WHT{H0sv>g4CDX+ diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class index 1c79ec97fe30320b251dbc664172a480a6f6630a..91f62fbcee15cdcd6a2fd0488e981ddcacd8046e 100644 GIT binary patch delta 202 zcmX@aI)P2#)W2Q(7#J7~8D!WQm>3x>CJQoJZ1iwtRN@TIOwUU!DJ@E6WH8sz^vOyr zOVrOv%uCmI&PgmTw$b*PSTDxySW;4ynN(VmYHc^Ui&2G9a`Jk{B34HRRtBfZYD~(U zObjAG)0r4VCwnm|M0hjs0(m?Pj6jl^fscV7NHa2sF^B_6P9R$sNQ32sBsKuKOhBa! P3~XSbP^?;|z^bGH_fQ~W delta 144 zcmbQhc8FEr)W2Q(7#J7~8Kl@5m>3x>CJQoJZ1iwtoP3#4kx_i|SH>b%2L@IK$H_TN z%8ZPYXD}&5crow-b?`7S0!d~DJ_ddu&B!3aAPOWofoxqM4VDuU+W_P;0hKZ^uz`g_ Luxgb6tC9o&7lRPt diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class index eb72871d84bb9aad81579f93e824bfe50becbd37..3a8667304daf19468d8af18507c90efc7b219c68 100644 GIT binary patch delta 912 zcmZuw%}*0i5dXdX=$3Xd0tG`fV8s|{#R^8Sv{az@QCtu#76B2Ky42RCt^L60g^MTT zLSAB&NIZHnkqe5bA@QXDg-1^wym?S(TMTG8yqS6PX6E;snY^W%PqhcX{Cf8hKpXBW z5Ez0h>%nzxP;gg7lZmumDCP`?&gK>^r7!3{Q%@&+VN=iNgI?Ytxmk!m5stGiz9oDf z>0@xlGxOP;kb+1`Q$^xikVb#6I0wJpRi3sS1`kSBXy1pp z5DM@b+mE&ooajXz`r)SOoJ0iebb=TlPlP-g2I-8GjFX;&pLZ%}yo>bq^;zd!6~xU@-t4uPB+>y&XN2#)&GBLihoyXd5^u8*W0V= zi+c)5JB1{4BgDh@rp3j5UYRw*9hg2yB?_+U-Yta3JsY_229dWI*v9ZKu7f%P9-|UV zd+ND%&?;~ZQHm&cK3byx3L?z}iwJl&ah>4lf=J`$Mazr(Ql`>WT&7ioq-0~C@^;lMK**(#3VIqhZ*KC=CIQR3vGPJjSR%#(J| lUrHm>PR*$lmZdcclvas*$WhTeg_LJ+B^2n!P$Vf};SZF(qx1j( delta 775 zcmZ9J%TJS05XFDD{Ysx0C`DNj2ubBtD#}X%PP zCMr?G&bX5eibg`>O8*8ELsYX6`v>&dhu+UMVX0`uoE+P|qDFHbvX& zM%zXtYSZ6s<*G$1`xk$Q!W+-b%`cdXi-}CyNtga+FFD%d<1D=j*Q{xc#ZpVA!d_X` z@1c``hkgc}oL7{sZUl7LIAo6y)g8u^8q({=<2o-Rj5@ib$WO-Z#==WhA{8DnEgxf9 zO=B@}-^^mJ_!#G^-gX3sC%NwAn!>+N=(o&;n3Y-ZF~tpGrOkVmB2ZZs$zf8l^lW%& zI%&qORu774AMKp>GRaLJCNp{>ue!i)&CM(Fq`9S(kVAUc2$$LtS)DzVoV9Wm{kB+awj5>mM=CLygVA%{qETkIDSB*mP# R3s6B?R+Vi$BWN4*e*n?0j)DLH diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class index f61ae2a2c9bdf99eb7f70608f20785100a7f5d45..90c4039046087d721ae04e59bbe4cb9f84abe33e 100644 GIT binary patch delta 210 zcmeBYyUWIP>ff$?3=9m0400Q}wlO+$24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!SgGDOz3yL!HO7s&;N{TX*N=s7p9bqhMyUBYQRT!lwKVocRb!A{~ zAO^IBi9vkwbS8xee+FJ4kB5N~NHR0$VzbIA! delta 102 zcmcc1*3ZUu>ff$?3=9m03^E(JwlPj-V^U<4oUFmr#OlJp#^5@6J(DgY76~BpX;L0;H5(3M?uO0D2V=a{vGU diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class index ae13c0ebad48afff7f6ad2b29a2adcf70fb76b06..aeb3c2241028cc42462126b8611db709f6ef4906 100644 GIT binary patch delta 1175 zcmZvcX>3$g6vuyOX4)C1Z@?B>Bw(3VMY>s)7^G#1C74v28YmEm3FV=Waq2KMGq1!} zrG+SqXth3}ip8ziYO&Cbu23pQ(7GljDkR1jKlnxCNB!b*W(w4(c{%rz$i+ zuWiS|+v{wrbfvQ~;3p;Cc27 zzK~^aG9z`CpTp$(d6AdAI6|=HhB@iwwY3}Va3pMpt+>Gvjye}ot359Zc`fU*oE53F zol5W4*}}HPQy}Zqxwy)*m;VRh9`7B6$9dh$YeFCi=$fy=8wnhqc(}nz<2Y{_v~$9_ z;$0N%;2kfWLdJAJxoyQvdsochUAmm0FFV!Cd%{A+bJO*XB>0^&IKaU)I_NRzrO#RK z%Xjwq?n#px!ENuX6><_N@4g;YDr8mcddQ4yGGk$Ld&JsMUu$hhD8gO;!_SzGTv^)x zt?z=XaTRHlk;NKvSm7S_Zs3ERjjNLTQNIm=5 ztFvgLnS-<{i(@*ec0F})l+!weKJC&NZH#k*OL{ZONxq_suN&#+JC&a}#c%5R2fgB^ zPiD|Bvlx&}&d7WQC5IuojbSNbM3yir%NUbYoRu=VWewv}p|Y9t@-P$fDDO**52c=q z(!?b>z(>-|$8v;8Y2y=V=Tqt8GwJ1XnKjH8a-J{c15I#|5~tHxl5&|8t~lQtH(M?q z*H`Z134*#8>5xQscZT#N&2e2*lcpcBRX3)twJkn92~V;|*P!atp^g6z{l%#cWI8=6 zhXU#HyYo$8p)(p-Fwgaml%A_8Jv_~R=hr}v7*6`k%u;7h delta 974 zcmZ9LSxnSd6vlsN7G_}>0uEp_!2xs($P!~)qb8baHyhk)Qf-=OCUKk&Qmn&Yqpdnb zt+-UwUZ}0&Qfal|0>};#NVQVYwhtyoA2dyqrZ2wx(yC{a1k#6_v)q&KeD^!&J_&Z_ zdPkr24+694ZTBvBnlsKk*=>fM58pi?csItXV%49-s-o2{4hb0*;celv%5YV*Y-yDh ziALgHgs*%YVV~fRMywCRm0KfT4wCQX7+wpw`;xQ8=>&{s%-PvHObVw z)|IAml13M>V8?Tdi1S+3JYp<8%_yQ62j{lB_xF;~d|cz3xy-6F<86!L+(_>=(Fb zZo6{>NfOOIzGQzYO-d0;d`v{WN}_C{f;iP|VH-P0u$?{B za9F)MYB|Av5x3M>F>m%KDL>f4IU^uJRvkVy9g^ zT$6Mtn5_)A0eKL=JS;T-W=CZuabt%`gmO>)SEBX6*WIm|N7xcS7Pi4a?L$BP_SS;kd};l0ME0!$^5?mSa{o zKds*95KXoSC!haaJl->eM|)1kD>KND5CI)sjuet7MHI>`iZy;+N12rBwO2iL^sO4@ l={B~hX!;35Ds#Ioj*SdLbkM2v0u<1t>y~_Yx0c)Jc>z~F*>(T` diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class index e699d06b143ac0455dce979912cdaefa1918f004..6d883739be75eb03a3011142464a372b2dd2f0a2 100644 GIT binary patch delta 210 zcmbQhc8`tg)W2Q(7#J7~8Dutctz~rP49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu28&ea7ZhdYmFOpyloVwqm6oLHJHlAjc9XX-sxV4UzR5U^)roTGnf=2d>D9vJRSx{Aj!Xe6l>#G*(9jRtBfZyO@+287DtuQi$+o z;03DVVPFK3%nW=C{6LzKL4-jRNOA(%x^b6 B5F7vi diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class index 1d5c711ec481944ba54fa60dee948a033ddcf544..a151b39f8a0de7b9d8929851e0279366a8a6a1f8 100644 GIT binary patch delta 285 zcmbQs^_olI)W2Q(7#J7~8O+%km>3ysCL1!^Z1mw|a^?)qOwUU!DJ@E6WH8sz^vOyr zOVrOv%uCmI&PgmTw$TQQROlBJW#*OWCzg~HWhRxDr0P4uSk`uvgP2qp4K|lEnKG){ zFmNzfGjKCFFbFf)Gl(%bF{m@RFz5oYF@r0EIgqwuFqwRj*_hRjftA63GAD~NCliA< z&}mEzI+Jx-6g(mrRDe7l21X#s%%BD|j{(TmWzYkX0zkGdkOs>M>2CmXnHZFTBpX;L p30dppi!5@JH?s&b=1yj06=r1tI>2P|T^41=av)!n-4v|X3;_MgHAesd delta 231 zcmaFOHJ3}^)W2Q(7#J7~8BEz3m>3ysCL1!^Z1mw|nmn6Hkx_5+UM5pURci(g1}g?` z273l!20I2Z21f>U24@CcAU0-jVK4{MRt(0I#aWD5eHmC8{3iReC^Irnu4YjP31?6N z8qUMO2qc*q)PUwN0NL6MIzUnY$kqkYU^yY(4L~jvgEEk00}CZ$(aOT0&tNe5J&Uqr e4w5Vj)L<5%FN`K@vnn%|P4;IMWj6+!XaWGV*Bk=? diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class index beff50151c977885e987d38475c3dfe41ac72cda..ace45a7daca83d792846744e866a55d30f1277af 100644 GIT binary patch delta 281 zcmcc2wUC?Z)W2Q(7#J7~89X;~J!5j_49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu28&ea7ZhdYmFOpyloVwqm6oLHJHlAjc9Y*SsW7^27GhRpbhKySVz6W2WpHK? zXK-SWVsK|rVQ^zmXYdAE=*3{d;187bV{l{$28sj$Sy2oT43P}c42cY>3<(Sw45pJy zSWH;+8Q2&KCa-1DHA^co-OgBr}5*0|$_11e)RmB!z%%T_6pX6LQ`FEbVT^I(M%}tLapezCPpPOIH}~9gzDLeE_kPd&SfIZD@$xl*I$U|C zZaOO5y@{zg(_XaVgr-WLF=H;7{-ilK}uR=W#@?ouf#-Z=JCo%rgQb~S2f zLQo7!`&=P}6*P;RlAj`CO$y|Ma8!dE5%EnLEg+0lW<3|}MAF|Ix5NJ!?v?#?Oc-*} zfp&Cg@E|uAF`QCxlCW#LlO2@?1E@Dj;kAiMO{$D(1$1T&Iw=|qVulOLBxD@mg zO0%82`&AGIHPqvfigpZZ7(tLAnUj;b=)yS-qc~4crp;7m{Ho1JrEes|yr99vI6+P& zuJL-f9Ltm^HNdH zrj;kD#pM@ET{)o$QGCqy%rYpp~gv z`?hVPvG^)8|Wl#p|7)g3zWt{$mwyug{pg;X$%eC zc2I_LmhkxJXI)QYY!jh0CblrOmgyAbe0urg0C$js>nl)k7iG8yAMT?D572;z2y(3z ztEgaF08T!8kiZPb9R4|%kmTW1bYK>9+-(_(FpmW`_hC0KBf<)cxrK~nm8m~Uo0Wt` I&K+3#1v{Cld;kCd delta 643 zcmYL_yHC?m6vscezgKC0qyj|(16YUzOQC{TDhN`=2U-wCM3Fz?m0Q<`?%kGzXyL7`M&)6@Cj(*);r&ZM;96) z71dE=%5HJlPfWiyY6{}CIUG>bt@Q8IJIrFQi$l92tc#p7SyXuAbh;GKuA9yAE{DU4 zlIhg#RCF<$nTaOm=Tmo+nT4#61l=y>`28H?gu`(~;eXyhI_uKIN!?`C+DZBxdiA(f zW}K#9-?1tOeJIYl?4>Dhbk1dvn8HX+O!!GMT^s-%Jdotn_)CntCq)^jxdh&N> zWg8Mj=*^O&l+q8pvC;?)lF*gk%y%W-C~nkWy|s-Jc^etVvxQWK*J#eM?&Jv5cT=M}Gh|A<6#jBXImadDF?tK#P&B()L0)JJ%EOn@g8^ORDSC#m8YyLnES z7m|L376CfYR13ZHZy+W}%Ty(TN#QCn>E;?!VjU1}hG`5jY~wmJn8FA!%MC1H-V~jO Fxj&%)bua(` diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class index 3732dcb9ee09a77dec64d016637b31d989085bf0..e6eda7037751cb35a48ef9317bc333d769855b31 100644 GIT binary patch delta 827 zcmZuvOHUI~6#mZ4l%ZuR2nhurE!6@o(>j78^00^~ij*RjhdcxaoM538Xa|FCi18=f zopEDg;=-8driw<>6(+3Qx%VIV2h=ldh#NNdJnnbC`<-*{FYoUf&%vM1-vG4Z!3WQ4 z3c6G2m8@xR=PW{3IFeX3ADc$T%&r)N88e^n)5Vq?q_}uXAv!63&{`c~E?kCf+v$vv zvg|$wqr`h7bL{v;QK^N#>pa*b9gNm~RIUJd)LNi)bv=F?dcMb_Ogb@+Xq?QUD zF%?nqPV&j;V2JOMe_2I4A>iP5jLlp+Ya6C*=h92twq*<)dX>09aIISp)20WV=u&Zs zQ1ic;v87dO+179wjf6^jBgG8a6%TsQr=nMQLhCy5x z`*Ksajv);%eYn7(s%dgpMQTT@mjkTuF!lsg9fl zl;+Nhs&Xy3Mo@u-$hu-~3H7{e2|n@C)wDYaFGm`PPZ`Hh&6d!BMn2u_$JmzcYEQi9 zP+};U%1JFAQR>DioMu${34e*=fMXZqlV1>+`H0|X+a5xM9_0<1cN>*Gv=NFppRDbO z6>#wrx{K&f==*R-^#TT_9mEa7i@!gk(E^6QqQ8LABE}s#a!HP#zZ0;EO02<;b?C^# zzy>dU4gJ_E$!vq-NI(h`Y;|}ri78MI7Y$(=_gJGJKFna2N#__+&zW+;JlitrKIaGv I97|aI2jMcI+yDRo delta 652 zcmZvYOHUI~7>1wInRd!Jg$jgP#99B@yGckcBUn7Bqyt4TL*&Uemx-tWuvem{fX1Ll{#_n&|hEWa^d2>DBN zi?HnQtfdSN3EEckkMhZfuCtz;DwXn&Gfvqx>Ef`3K~$i{`gP&=#2P=#(*DMo)=fA(%c7+Qc8Lg12GTp$4)d^Sevqq40+Snw*772LWr$uqJiEoTy*jKt^80%RT4^00z;=2UFc>oB@}f~P8X=RQ0ELu=zv|qSwxHoGt?~XwDWJ`4xtCV z{JR(v&k=-$SSA0YckuiAbU8z&t^}x{Cexm%qWU+{2mzmye=&F)EEvSF5km}RMJSt@ zR*Yx}#C-CmqUBt$;vz2b2E(CX46+ed7;IYwAyvuAYBp!Z7~)iwQEsRV_P_M#9ZM;3 z)n^2;sn%dd^k!nikg(zuS}lknX+;W?{IS8s*A1N(mLlHj)HH)*6Ste8GMtUe=|MS{ zl*iIa|LnBVuQ?2j|KX|&_#SzUEEI%^1hk+V4xtyzcT^g-xwf`2yEuuG1S3%2H0#jJX=hT_#M8pyYn!ZMzcI%#9=wzgGtjJTF@`VB&Fab^vDTR0>_4J@Jz54QEQ|DI+hRiczpV%J~n`vL;- z#vFXE6$~)EM_*WIA%B#?D=uMgmAHb-3~Lzgaqp{N16#&KbY91_`>PC#KR4Xke1U`k z>2D;v1PM<_ho?AzXY>xw;UT{nFN>I5!~~>D8dJ1O^y6iaZ6tD5N}Hx9(@|L&t|3QF S^ORB&R4Y*F#84os!^|)A!MT|L delta 726 zcmZvZ$xl>45XOJad&6TMgK>t3pa+CtP$nQ$j&AU9A~N@Zh1UtE#K&`}*q#S>H13ufN}Y0`_ou(H=7N zDNnd(P>v<>?#P_RO8qLX|`xm zOfg&KVnO;N#GQm7%72GXf#3(aKHL@sRN5+JXs~n z%=9T%P@&=svuKHM`z=#Rbx?8t&uZ}oWpSNp z78l!S`%G*U<8~}5DauSLElIVuo7~By!f3F09g_#6tR({ng9QUOgDrzFgAIcigFS;f zgA;=}gCm0#gYjfx7GqX#237{2$=)o=oJ&8bSCGsC@_Xjp1>k%r^}$nz{nr~ z6xRjPj6j-MNPh!ZnKF=M0}I77r~uhK5NQTApp^^^EI{`gO@7RxESZHQ%L11*W-ys7 R&#Ek2f<=~*!4zzR8356kD#-u< delta 199 zcmZ3>eV>c#)W2Q(7#J7~8B8~FH8D-T#H7fmxA_Z`2cxV70|$dS12=;WgD`_NgBXJy zgF1sFP{e`3ios}dB#SYt7XvGU_vDEz%8ZPY_p&I2gfOT8jpAWo1d_}QYC!!AK(;o6 z4v-W8vUPzpSWZZH1CYzapbRA0z(R3Yw6ZYhGZ;)ZWL0L&oIH_Ln3VF_M7ZCJ8da=D6@@l%(0@xpb?D1lffbs6bpXVu#K_W_S>{SYibJ$ z6trJKLBjmgL@QVXMiJ7XVC>QdrgO5wI6Wa579gV|W;)lPetNGCf?w&sF+J&`+Gxq=|5o^W?aINt9bcPcu$| z70qn zeb#8QuG)C1+*Fj04HcxUjPOUPE3J1No0calxVkS4noLx%zUbbr@7xgYK+Dr)LZ@^Z g_b5JgdAl0_HD{Q$!mge}d;hq$zeg2wtqbq}0Z}Mq_W%F@ delta 384 zcmYk2%PYij6vaQ6nQ7*Sh4EM@gIExXi*rydVpQfMNBMzUxnpB9SfppBOh(BqK~{ zHq8uE%;{TZmQ@zmW}ZEkIL2_Il}lE*E@z!P)(Eo6qs9wcys7kq9YXAigFSJxFKPHC zn@!0fAcY!U4#mfj_&JaOd8XKvXFtczh3RsoikJ;ovfP?mS6oT2t|=s``)ox~40rdR zD1_0bzvHKLuihZ?msTfE&1?)ZWZYJ2)YCuKW*nBsG+5E{Y6`3*vuGtGzW?LH{<=kP I@I7Pf3&S>1D*ylh diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class index b5e02a44882182fc402f98d50abc4f0a160d7fe7..15c6ba18647dbcfb33b9fc61553e5a8de61d6333 100644 GIT binary patch delta 1016 zcmaiz%TE(g6vn?hoxX=CrGO~%(ikjY6@m!mWwFpgtzZj^iZH-fTT7o)e8hy9sB6uQ z8+GB%Ck8es8VzgXKjB6b65YB&JyR+)Zd}a0=iWKz+~4=znV)?{^hj@aal<&}$b{f&oP`q90i>pdlNn60+mEc1!gDI@2V{$C3Sm1%(0zU#q zoMfmW5__>PnH*Ikv4|Q`G7?T^CGT~*tT=;lBhE4u<*5GFNI0j#h?&R@Ma#J$VFDNV6a9gjDNGw7GuXBZe5#U` z)kIpt3}*RPeU-t8OAOU~S*#`r43{MwhuexNL?v87jPEiyxYyvevM7U2ol7#*YLu

    P8tpbGt{#Sk1AL=ysN zp{I*XbYqyj4#0~bjX{zg!Ys{UwDWaii+%!n(q3oUXBN;(ABTXWyx&yg4dW24B+>`y zaG1^m#ceo7qmAMwnse`L?Mt*2Xag|hwo-+qeBD&VKbwl#O}^V)%{NSy3wI0Ni}}_f zdeED1-I#AJ7+(F;`CdV#umwf#=PTV1a|Cu<-+Oq*9V-}kgTc2LTEoZ|< z9u+jS=Np>Ioe*Vgx-ptlyGS1BsmA44#Tdf}jQDk36rX445T9aCg}91IhBYXGhRUWj zuoZ-Zw*{u{M;IRd{?eeGuhU$L(Ons7@tinbki#!gheb5vHJlW;V=2evASrYn<`AdZ mLO*Q+NfIYfRtn9;S4aG5WT>f18Jjnyd+}O5bX4Go)$&Hc-9%pOf6(B+OaJz(BtKzqC)0v zy=)#Z;`HhbbHq$2qWXtBsuS*s>Ouw>@-nC>n#|nG)GRo;shVWg@pE|_)x4X#pWW^m z_H&hMI_U{{(u{byt`|LJ#tkz1nWtRn6u11G86S}QTdwbm5x5SiPJ^D zWc{Kn$*7#;H0ppa>Q3P%trNaVrSwBz#lRTVvQfW?1cO@PLE<{<~t+xdJflgSZMiXar#Hv(}^I0=3dcq1WKG`?v`bR1&+9hqn%rn>} ztsiM04zCe=PuB;!H|g6`VTl@eP7zD{@a$bYAD6`Tj)`Tl=9b=u@H$Dw;wSpz5?)dC z8ujK20#)mz6q~4?NU3>jjho3wrjp{QV(HJf$R1}1pWwX2VwqxIVe^_Y-pEtDff$?3=9m04CWiTQkaxDgEQ0f5=%;pQW+V{H8g#)63Y_xa}x8?^__DP zi;HcveI^EqaXXfj6lErrmZVzSP0nUgVKmr0foU@%CliA<&?qJboyjgNW}>UOa`4o#fvoV9off$?3=9m045k~oQkW)hVNzt&+kA~_Gb1D8}ZMZlkjht3L6XTmj8w%L-RkX(_Mt`1voTia9*$Y2X1* zechdsxKwN{p$8Ej_XO7Ol|+R-V%lMmco0&7#aA8ufd0AQ76#v9_#H-epzlwj(nP=` zRDhTC^A-DfF@>{~u`77GAm}B@l!0|bg4;O9@DaK$_7RRV^hldHTqkYg62lIzO@->) zcEGl<7`rPl_x?J=<3B$_F27jVgdYmwCs6T}miP=!c#c-QK$vhhHVZQaNeK|aO;~iQ m^qG>l)j{GkO0#Lh0+m%@87XR-rj*^+a0@czF|3dkko^lm38uIJ delta 745 zcmZvZ$xjqf5XOJ6r)O&hBQS{ZfDn?20wW+GDvN9`!>%j>D%ff}3=WG!qtV20G4Wtx zg70GV;u0m?)B}n}#0pXVSi5S0wG}ctvd5b>dFSLeUbUl_QEk z+;NBO|)!qTT4C-W{L@E6!P&6>ce(^FSg1|$WU?O>?xGT;{9+hwAU+%%z zQX1@&=*wJ9{AbjphFTp8mZ&*h8O+x~IitZGbw{eb`hIZF!o6)%#y>)_Vw12HGlL$^ zZTLvjNa+gA?`V5Z`x+fv3M^3qnrt3!!wYZX1?iHdHx^iywY<_>SGr1%V&M}V-IDez zdOU~BC3Z(wIjdMhb(QCvWh-3hziTSF99KO4^Rs-5GeS^so?`J#ta(nD7ZmVPEPo{$ zmME9HmgS6|nhj1ab46x~<(V9@R$)cN(W}Hoehv{PNQk^JB}~eFdhu)0Zjk&7HROO1 diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class index 93ea94f318adde7439b56e5ecf22fefd18d22be2..7ba27438a712e0bbc7d10544ade9cc4b7d9dd5cf 100644 GIT binary patch delta 816 zcmZuvO-~b16g_u7sBH%jq9jHrP%8ApT0jM13Wy+5t*8`<#?@3Nb;#IaI~6oBxKN44 z-CLL#_O48Hg8`#q?O!m)xbbJGccus|SiE=dd+(fk&VBE#H+(-F`1WV(D}X-aJ_deL z*q^fsMZ>90R{E$O+K8zFE-R|0Ubps$wXb7V#2ptzSOyQDfRN`Vx8PjNyAUpS$ z2%VnYfnAzTXvvoD8uq+Vwv4=O&OKT(=iG$Qe^95|9(7a~>&l`!4IeThs4n<#ayAb? zZiyAO%P*moUrR!pSXVn%^Qh;Q#x4OF4QS*@2%(*4Kj%q~-dS_U2VP1H1?s#l`#>sp zxfxF`BXT>wfo>jgnTn{p|B8L!P z5AYlTyx{KE_^n>@pL@lsYZ$_7&r=+VtA}Z1I0pE$U&a;gPGeLSP3$ksxT~1qqSqKv QyHFQ@omYe#JWH7U2UlsFAOHXW delta 583 zcmZXR%}-N76vcnjH}BQHzE(?$8ltry+Dd6@Q7kBa0ZNM&6NARMY+_?tH7Y(aal-~B zYS=hC`@%sOdOej>_e6ibhl^``!aju0f$>}m7 zu9#O&Mk({nNvekV?eu5&uve@?(uks<614gfZv_H)vOC? diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class index 561eaffb2400f28cada34e805e4f6e2dbde8356b..f18d74852c8b8c8c507f5d80a1ea8e4503a67add 100644 GIT binary patch delta 192 zcmdnV+Rnyx>ff$?3=9m03^E(JiW!wSgEQ0f5=%;pQW+V{H8g#)63Y_xa}x8?^__DP zi;HcveI^EqaXXfj6lErrmZVzSO|D{8VU(OapRtnFiGh{Dd9o~%GA9#*2+&L>2GPlm zObQV`47@-d4+A5RWM<%F;0Mx-3}Ou8K#~*4)&xFw delta 102 zcmZo?+sVpx>ff$?3=9m03{o4piWw&#W>jPppZt`ulGTxcmBDFpGLteRNRF7#TQ$I&^_FBamhm659Zzm>76~BpX;L6r_}00xT*C0I#AEhX4Qo diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class index ac100801793f0d7745dfa3cf826bc8451b6b6204..bf1bf2118e637791ec7f7ba8a53f548ddcb5478a 100644 GIT binary patch delta 317 zcmaFPy_JXS)W2Q(7#J7~8Jsq99b$6k49-l?ODriZN@Zj)*UTn*LTiI zEH1Xu28&ea7ZhdYmFOpyloVwqm6oLHJHlAjc9TyssW4h^e#ex<=xD*f&0xff$?3=9m03~n2_9x*9$24|+{C6<&Hr7|*@YiRmpC6*=X=OpH(>pSNp z78l!SPcC2<=XNY9DauSLElIVuoBWbVh0%U9AMe2!FsYEs{&)rff$?3=9m03@#hF9x+WeVpe3d-5kO^o6*yTfrG)Cft$gFL72grL5#tJ zL5{(lL6O0SL6gCoL5CrL!Gyt|!JHw8!4`;}7=nSaAq;^Gp+GW-A)FzCp%O^eFqllX zU^QkQAj!;N3bcy>$hHF7$OyELfk78YgXM&5 zHUPOy3`Rhb4J=fOMJo$~9fSR30XAjH1|(S)sKG1@4h)Wyeb|&4yCxT~iLyI^O>_nT D;0+=N diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class index fcaa2fffddd2874d83fdd48dad270ea376104717..0e088e215f826580af7cd61a2206e7670ea76443 100644 GIT binary patch delta 319 zcmcb^wTfHd)W2Q(7#J7~8En`Ym>3ysCT_IZ=%d8s%o&`So|jlsT9nGjV6LI*la*MO zsGpOVm#*)elUQ7AqYW0R&@U*;%q!7PEGa35dbD?`X+ z4;E!kCI$nb3z--UC+Dyzc*HVj0(m?Pj6jl^K^tf;1CVXRU<@P$foxqM4VDu!*#P7+ xF=zluHn31SvewB0ta4f^=t_!^l(0ZeXJN2lu$(Nzs?1n3*@0D*-3n~1H2}zTHS7QY delta 254 zcmZ3*eTPfn)W2Q(7#J7~8LZeDm>3ysCT_IZ=%d6mc?**wqw(fzOu>x0HVhmL)(qSX z4h+H!_6%YSE(~%E&J2nSZVcuO9t^fX?9AZF;0vS!7)&OIu^6)kF|aZOPwrz;W@Mba zi$x(MhCvf(2M+@ykYr}i2AanJWE%i&Wn>TpvUPzpSWd`j1CYzapaCS=z(Q$Qw6ZXm lFqlr(V^x+cM3QBJ8qC6A#$Y}|T;fH@nO3 zT_CZoZAgoKXsh*6G7c)$$#h1Uww7Q;vA!7Jug++#9i8z}wK&Gn{^cKy-?{fLEG08C z!sMRsoO^!1^Lu>Xx%c50-ben1K&>?S*s}EHPd{m zsZ6q1G>F2*ypb~ZnJLqn5)i%IY)3gm>xh7_Czm!t@S;XT z6>51zymdr{E)cUrDOqMF;e;}ryVJ;;(?%hHRrKBzLLFk#YPG<1%eY_eKxxyUp%H5s zd@5JUTDDi2TD-MaMbjlEa?TAxphbfpinP8)!?jo^5X`d5wy{86y!GovSZCS8|GW>Te0(lUlB3tHW0W{rW;^fttP?w~izW zrkuNrK5N2c2JyZtBLZ9MWzVIvWx8Eerb9W_dS};iji4uCk`I$fD>Whcur9s~gDUL% z%%auRN?rtq%<*i}DixU19amtqwZch%GVe}p9=klfJeTgSZk`p!R&=Y_CQx;eP%;h; zZ^t`WigANn)#JUDEp)WerQ&Ax?xGn_4&W96zb$|;Zo;k7%WX38it}CTWgG@TiKu(> zMWd9?1@La_Wlwr4o18RL0rU%a%(P_N4h*UpAiI%qOjh9(gHTN-8%BO3lgG-4bBRE>xstZ<=kObEmM=(*i3m zrTJ98O!eE|6!HJd3$lTIuMnFoc3xv;!!om+Ln;+asIjan=i2NUbl%-uGBatT5JCYp z@^MhZA+R(`GM_iH%xF_3C0vrWUXbXr&bp+dY3b;LymI0_SF-(X4F}|XB*p~R{tx#u z$@?^Dh)4z<(J+hq*=kcZb;mw(gevHjua0W?u)HFbjFBC;CPH`!kEnRKtRY)>?EQp> zkKm(h-lUmj^Wwd(`C}SBhL4jM#nM>O{*17t@@<7k+=?*pB>z(UW6eSo*7USXGSy7G zC^VES6;j5nrn~|pB%}R7+aQIBX6EGO*HD2+UeQDzDIR;IVC<0+vPX8;9$5g6ep*(c zn$IX_C*b3Mpu6ofR-8fI?)I9Mr*Tz(+xi96e*(yl8TZLE6d;q!F_^uRGBVpZ;r=2%rMY`BMd*s|I{|62r09X}Sykw&?mq#w zaqf-9#xJpuUdVPmKq3Komh}M1QXoN!{C=0P5(g2ZAlG7wjhJQ&?_&AyK|el(B<|&o z`#77yQ5?Zz)YBJmKTdHxO^@fe`g02DWju(#aekgM`VUnU#6u!X-9+)IsKvBs!Q(Z}A`;k3a`+GtaYhs-tz%*}#)uR& zh*d}tsb~>iq-hag^e@A}K7LpF8R0llh<49nf+);9Ch zLaR+AXNJ|%F2pp+m;|y|!>1Hef+ORFpKQpDdeGwk5A{6Th-hdyTq(c~QD1`*(ov3uB8nM0E;IaXT!Kyw1~Jjrl*afs~< z;@&bFw|cjEsj{;0+H}8tSqzlH&N3LJ6z6eXCO{2zsxdXXVF5Fe&7RLeNh^?6){y0`1b0-jEe_Bj)l^i8dkMH0be3uRQ z9-DEFzvI4-?f3x(@FU)#Kc*CZLZbeRRQv^n`%8-RSGXI$CPiN&b$^37;?Lq0d=bCH zQ}{i;fKSeXn ziFW*3+=AC_;yl4fNd%WT5pg3Pr+9d4iw;sKOxmmvH{cUQUet-}8IP1`y=ZeKx&{BT z38pZkSL_>KWnM4x0tl0^`)~%ICJHjIkS)CsGnsMGQ(TiG3^V#(7cJ6<6suI#6Sf47 F{TIQ7I&=U4 delta 1900 zcmZ8iYitx%6#nk+c4l^Fwp$8A9ohl~(UuAY)HQ6SyunIK(ekjMmZja6h3&SsTc8Lm z&;lYpAQOLp3Iu}r2Kz*y`!r0#c3T2!$tv?5f}9*;yzDnl)$MGF-K1v2WQp|&;+528%Q z1OeY|UOFaXl7PE09JhA3i>syx$h9qP;r9Aw1=9qS+WL-Is3}sXV1|GzQtySpLpo$g zHhNfxH-##6D3BD)7J!N&n4{wnJZfp4;bN{;;>q>*p=Z^2wk9%pZFNhyF47RGi^MzZ zjEy?OHC`NVu8y}xVvRDE3FJ7WqoG)1NosdWdn8&PZdDOMw*6_+5ks?p6l!S+$La+} z6{gDZznIdZK3j=cV>(Z%o#QDxN2@?y;ncpKw>!plEX7>{Vu^s+C+96s`!%a{=O@eH;e?v^|vzY-o)!H+o@#QKjwHA=XS$2?5HeCxFQKtdo3aMi$V zuflYf754-@BafhBfb73~5~U_zzI(LeT3NlT(K3 z7*kV*<`~mchR&2T4S8J9M^J8qOoCZPg2-?BvMZCQ+J$_gY6tZ9#23q zl$|IsGt(XgW~Qk*=Q%{GgM36@qMeXEj3HY)CfD?*V|=FH)Nebt3cLdo!wjXYOBRM~ zWbA{Szw3sU{}w07h0*+OMghM~v|^CZ3?EuB0Ie8^HkgRBUn?*SD_PtQjAK(LVht*= z7ByIhC2Zt!tf$uo_GBY=a(x+{c!Qlgf=%dQ_Aim>#5rui4|KW8wHMp)7oNl4SSciI z7hc3g4lH&K*q7=O#&FE}CroxyqOfc<9}7s*Mc>Cr(hW)UCkc%T@Ch9Yi84s|Iu;R0 z$iqK)oJhv71TNzVhA8BJ5>KL*Lp%{jv6x8ZTi!&7NMo|yd{HeWyaX?y4)-!R2 zW%7-km_g(xoiGOTOF@w|=YnenyWMcBs19fBao(g`r&RwSPEa~z8@am~a{nMi4U9KB>uiUs)oJ8BZbWHVWFrNZeRw3X1c$*9kvM=wTi1rv9 za;_ShN}MjAf>CJ43aeHdAy!(Ov>}O^BaMvX81f!w-2~;7emAa=eF5bdlubEnbP^r5 zuv~kg(+oN$!EhURo&A2<)j`#ilUQrdOJSE=n6jaG78~B($TGan$x*EDhT^~^HV0M1 z>(ckaj?|n@t3)^Ft?lE*Be$U#UT)t^Vh8J{o}QpAqSORQT^>Q&GY!eqtDRYsOw9)6 z)~ov6iH1Y}Rqh~)iI1_HAF+GK(T}YLq}f zaUbVKV}l2Xu@t4P`&=;+3#}es{;cO|D0?!z#2J~r%^9Q O!WO#DyIyn(w*6nul98|g diff --git a/libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class b/libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class index 52af9eb1d384d1719ee7ab6851a3071f3883cd88..e3f8cd25d9624770d0517e08c536331bc2a791ae 100644 GIT binary patch delta 40 scmaFC@s4AHg{)RqVp(E^enoDMesM`rYGST_X-Q^|elVE5(O;4U06fMH@Bjb+ delta 34 pcmaFI@q%N5g}6#qVp(E^enoDMesM`rYGST_X-Q^|{>D&A769cH41NFr diff --git a/libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class b/libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class index dc1e8a4386194aab0451b330b415b99069c1b373..2d85ccaddbd36a794e35f692337cf899b98b8bd2 100644 GIT binary patch literal 2315 zcmaJ>T~iZR7=BI?NQf(hGy$z*i((;Pq*iOIQOid_LlaO4K`1RV~H8WEi{+Lu2SMYrL#&YkZ4=tx?P^P1ovo7^cT$ z(6JKvYFVvoRXx+0uhX&?D>3+{t6Mw>FG30w^fO#|TiRHu2Mq5h@FO5rQ3XBLYEVHC zrx^P3n$G7NyPMo7s+$!qxDlvINi{UFw~fB~Bh92@`8FAk2~8RVDmEih{4I1DlpS7| z4JbaTQBm($EJxar@xCo_WGvPx0pTSVr|9w`1)b8&rIzHBh(!0>UJOHa8cTNl&0M4( zh$NXHX)>lDh7t1A%q-tl8zeq|+}QqFHN7G{jEqDyb5Q0r zF}0>2gyd376#Mqk-J(lD_t5bSVj44kWEpxTNGGF$S==R75BrnS5UybU?)*CjJny`v1=#HP!RXA=*I)%_XbOD!9l8E3B#7`1#X(^4hcMgWzosI zVzr{+Ay#Qr#jT!J8z$+LbXP7uGOGLH=49NpTUJ6W$r{u!tL2UubblD7i#lc(E;{pY znx)I~@Yo~LDK|L>m#Ph;%x5)urJWlip1W~D8^ffbmwsLJ9}({ZJ*N@zI>;}*4fGAd zN4!syS1;`j;302dAf7lvUp#q;a6EO0NIdF0#K0>$@!*U&mtGU}KS>#;&`0fyB8#(h zcFoFwcX5t(!uLFeD8E<<3?8`>D7qy`FZgMz`|=np5wqKQwQq09Ti*DjUrN;l|W zxs5xN<}*qoMrA@O{x7Y4WZ6iB$D5e4(hs@P_a{O(o4A*->P;m=x5X}WQQF8D@ip-| zMOvokI8%6yiPdBi3r8rM9u;d8uhV@2_Rx)e0{evK_FIhNJEZVE zuHpxR_ak}#ggHD#2|r^Uzu+tUDv8A{$Tl$ok2QQj73Qde>(oaNMFhxuL*Cr4sg4Kg E|IXOqEdT%j literal 1777 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 E5Az4SGXMYp delta 789 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 KCplRKJ@r4)*PIss diff --git a/libjava/classpath/lib/java/util/Scanner.class b/libjava/classpath/lib/java/util/Scanner.class index 1e95312c90ed1bcdcddb12110c1fac93e42e8213..65be0e897ee6c1c7d55f0282e29c46e9614c8be7 100644 GIT binary patch delta 752 zcmX9+TS$~a7(Fwq-}kEvMXa{Vs=2GCZCZ#%WK^Q&tu$RP&_iz#QJ7Yw8HD7E8b#^v zr6hakMh}wfu53|=mPJ<1g?Z^FG>Z>2obUV2IWxnY=N{qn2$!B0@)$v2 zK$d$hylS)OeYI@MQRsF=vf6lhEQbc(**Lo(JqF>pz0a$Rve9%jYvX}u)-jl6bcpz*uRKyP7HXm zx8D%;Ly&YA!88mbJ%pJaA(EaTik=~keAqxE$fZ&2rZMcHm#CuGsG&(5r*~)|KTgwo zw9rSi(kFD%XI!Q)7^1JZM^ku8-!Vcz@rq_JNwfGybNE5?n4#a8rN8(`3u0LW3t?k} z*v!EqgIVNom~gVu(^w?Lsu+Z@4MvW~QeKHjPQ(g!Af8vlq53Io#}5bslGR3d^8DE}(N zakcV4h_!qO>-jJ?@eyQk4f45Gsq6ICl5xu!gs~12w;_hx5zC!O;4UO`x8C4%hxa0s zU25u9p8bm9g`IEf`K4DaKBXH`lNYe^D57`_Hl9$^H@d$fSx+nLuuLn)9Kv~CF@C8x z{y{1)AWeh*p{&tY2O6nyEtn_zU zeX8ss)P@-|A<`C&77-Ou64Z){XaOsi!nSM6!@ZnyzU6SaUyoPxd4*fI`?bOc49FaB zy}d?+9ZhUOW2-!N0i~*{Q|EH4T&+8D8VwRw{YTE7$`+~;ZFEvRpi|;8ofbWGMhsG| zctN`OKy_l8T+)~7PX0G!Zf_u>!^t4>wYiA;#u zN`xW?5-xF5bf}pDBce>6Kr(!USx?V33Xiuqw^>xSLsAEP=^g^93*qz-5%dU=^aOF# zjg{038}(xc4WNVuQBKcrfJShHMsb|RP)*NKLoZQFuW*iD;|jgOU3!cA^bSwyBl_tR zhUqiL=nLM{1jcC+6EuxU`iAc`BSOOHm$0x9YuO;I>?^X^PdM4%d(k08!UFhl6aqOG z!5oJOUW6!)$3jj(qME01G}f^NS)8PI=HE`U!ocZDk%76KiE!Sa6gI`SV+m)&${S(l zTsYW)Le9rlF3{bZI@3x(yi@Jig)lBv{$+^c-O9flsa%2Oya#J|FV^!uWb=NdKBzYo z44JACz%>ZvT12ysSaxACpGQ1j(p^rEu?ha%tWdY|^e9FPVz^D;wz4Ta3 z5y=Cv@Q^}>_0ggf-Bx(kG_DvEF!H2gOsO}1#ZsQZGXAMg72Ys~AV4!BR11Syn~zA% z1dA4d7%fU~-(o8+Qr~P)IS3Yci5`@-VY~U3?8-}a&t?PV>JFO4wIoO_89`dgpAbd= X)%*_;g8zj`B1o)I0h8XWqAJ601Ol+l diff --git a/libjava/classpath/lib/java/util/TreeMap$3.class b/libjava/classpath/lib/java/util/TreeMap$3.class index cd8444dcf7c5f9ec6de3bd9a5777d99a20bc8539..b1058054be378d18719b4506846618071f1e223a 100644 GIT binary patch delta 278 zcmdnbag<|&1S6*yg9JN+I3t7n#0L4v(u`rMa*PbZS&3zd`lThAIrCgX0U3`-3+pkTH6`qCzmj*xhpa70YyRb zWl{f7z`Ms02VnS@Bjb+ delta 271 zcmXw!&n^Q|6vlsNZmZLqNmZLLrnJSh#z;+t2e7cUkcfocEV>{TBGhxpeGxXbu&`n4 zAq3CiWQKE+^L^*0m`@U*^+1ySu%(%1&-3lcW4P-nVq<2Gr;Y zVe)X?b|2E16V?Oz?o+0w#+K_!?9RP6n<45@P2INXjjAlr(o|R?#A8{xM?_t54^xcR zU+A2r&#bz8Gd%3m&}!NLKQ&|RsaTxXX!QX0n~MFRsd-T9l|oIQ4Py6Y#=C=JW5}jr Ug@lxmvgl7#slHWO!VY7iUzQgkIRF3v diff --git a/libjava/classpath/lib/java/util/regex/Matcher.class b/libjava/classpath/lib/java/util/regex/Matcher.class index 0032b67ec1482c519ca20b6326002bda294aafe7..d45d34752126a163d7d6d88f432b1ebb381b0bb3 100644 GIT binary patch delta 122 zcmdmLe!zT#pL9_=0}BHa0|SHlZU)9ktt||)KrFwV;i(Uhc0I-*s12gGF+4xO;IWm# zReJ+aDHDS^kQ4%HWMGPA5MYX95NC>KP-RMBumFmSL5yRtWUvDA1Q^5_UIST-K==l% G_bmXaXcp=K delta 91 zcmX?LzSVq#pR{BQ0}BHa0|SG?ZU)9ktt||)KrFwV;i=E$JZVW&J_cq62BugB0j4+x iIi`393!q9dh00>_LS&TsV2FPb(cnbhP01sOL diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class b/libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class index d198c53a833998265f408ddc3cc0b698a68c37c6..08c83dde41d245ee637e571d248fdf5966fbf7b2 100644 GIT binary patch delta 871 zcmZ{iOHUJF6o%hZ5<0DuNWsLoFma)ztu;gqD}o6&E{qqVtx7?S1N~a2PRBBx*03;5 zT=)n42d-U+tpkGMT@mkhQM@bqA54tro2gofZf2fy=A8FEXTEQ4^-Q#7_Q&Kjfc5z1 zhmWxKWXQK>tn-vo@uNmqp3}-&hoPC-j)ZOLW_EK)H`2liq6v{X4b12;vg1_;H!g!iAN;Y*k#vH7+e{MoIK$ z2<_npqu#-s7_z$>y}fDKyo!>7n>^*fkf96H?v|+;6}K@ogb zfey%j@j=CyJcbY-L*n-!$+ppgAT)&|TLajHFDmi~RTq?HL@TP_1MNy>p05D$%{eiJ zYAWjBoP+Zdm>$RV)*B9PMQb?Z;7;p(j|U|`^f)g0vBz5^KlQjz@^g>-CBO7|zvNdQ zACx@LTw#NZ4Bm3!;QbjM#fM>jZh#8VE`(?|R#E~HN}`kYpojKi2kk?O`XDHU5$eY= z8o+U`)wxgg)81KZ07U3OxM(D+?x+X~De%B3Y~6!qjO!Q-tlN*-nOV>4XqZOhm^gjoR><_ImdlCOW? zj*10>W8b{Y>k+OlBQCInW#(i)ujft(f&X+h?mre&bzH5qNDw-_@xL>DZ7{52jnL35 zjnsJ|ZJuQ#DmDm$4k|Nm2|h^RN>gIwxKAkWR1Sd9#CI}y^TaXqg3zAd!k~rGCqy0* zbI)5?^gp28!iqa-zgsxC*BLBq-m*$T7h@~x84tOiL?@2m!!i0e?`Brm-QhtGXM}A= G1v{TT@Q3#R delta 36 scmZ3@vy6l5)W2Q(7#J7~8H_h_F)>Y^&g{s@y7?yaWkyy81||k00NFnY;{X5v diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class index ba5209e1a5b892acf5c03596c857c78443ebbdf3..bcbf306c9229a000c948f09f1eb9df4dde749765 100644 GIT binary patch delta 257 zcmdlT_%~4C)W2Q(7#J7~8IQ9wFflSHPkzWMH94M}bEEMcNnJ6Y{N%)(u*9Ow#H5_m zkjjG85DZXj*Nz|IiCxQB5c11G~0pb7gKI2jKB g=|e1>41qxUFi?CtkUj#WzX0i@K=EHd`WOQz0PcW9Qvd(} delta 193 zcmewxxI0kb)W2Q(7#J7~8IQ6vFflSHPkzWMH94M}bEEMc$;tLo9W1*U8Kl61Po>0I z_A@dVK~->VR+fIu&3JS&yLuEO)8r)eEEWbv#toAnsXKFTWUyvn1oAd9Zk}wQVa2?K zaqHw<4M+cN4BkL-CdTbR8<`k)Fzy7>Rt)S65sbSS_b_lWECK4-%fQLF4@e(i;baH| Z(g%U!(}DCMApHeM9|ns50@6nqH~}qyF*g7J diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class b/libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class index d213fcbc6042d423953e16da7c2e0b2e0b1abc2e..81822c38a3afd04884efa8913ef12bc1468a9acf 100644 GIT binary patch literal 13569 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 DBEZO+ literal 13208 zcmd5?dwf*I^*?9sW_OcZUV%jt2rqerO+pYcY6y=I0z?x6B!H1hT#^MM$!^%)@DQnD zQPgS`-=IZNA!^YoN@7F-E55aAZPnI3tlBDSeY8HSEx+%Xd-v{!r0So)47_P-AwAfgla8xJX_;pYU_1lAQq*EWV$6vTq-Vg)N>%}oV!YAP!hM;c?n zh=*KE!@A8XSr&~&0`)O#5>slp)oJ&wkm&`D;R0)PGLuJEof)oY8l?w&-Vqa8n}eYk zUhsumf}yhJWxs8)NJ1>Q@FLb%6-xswJgNS;=F;XnmkXuVl^Wzoe(-JPqOcx|VR1 ziOZp%d}|7Zu#L3B%a=!kvARgGInWrw_Duck3CVq#vg@o!V1?*BFA%|}qi1R~7Kp^k znu5)ct~+EhU;*U`h8nDC8OvAHwFIJ3V1QTag8E%Plc{ff08{O5cQNFOO=UVc$5Jj~ ztnQnMnA#&|#_cn15tFMl+z?D7gGQK?O(U7c|A3{ER!Ai{gGnjmmev@PJmi&Dj!CJM z<|RLnO_Pp1lhVnQ)_9Y8QEv}TfKJ-Qk}T|{iI8bbQ*5%ACP{0BvN0%M;Fxb56lczUEJu&gO4-W#qD zG%X558s)p)>58pvgs+YK4(m9F&AnEiTBR(k@||@B>zH ztSc{Ldwo0%eJoP6OiXEI>*|9ovBq#H>Y)J6bDS#5tDF%JLF&;m(1j*u1R4YxdDoem zMnPKPq2)lP+x%`inY5A`K`kqSv6;c;f!3zjf^b-$F&rhPAvxo^qZ>bHX|U`nlbQ(U z(F^8V6O2S*t85FEE^@|S8MnwoVW#7>hDn|}qqVWAAsF$}YNlRLYIt0$oHPniRPcs0 zJ{#|(7blBFLbS%DwX_c29B2VYHi+QmmgEIVlkHvL_~(M;@`lTs=gFHJneuyD+v0&9 zS2!O>ahxo$$)pSECxSrO;#KgSjau^FlhbG!T_lQJ%rvlv&9rX?=@OGJrOV(1ut+Hw z8TUyrV#6oc+G_QPZaQ5~Kl9KPOoO^v-d@6_E9okx-dMd_D6vYjvOaj_auBaJ=^DBg z+SG?bF%UJ*R~OW)mYoxy1W|Mv{ zo-!crDRYvTURJxsq+4kx?u}TuBoYa%mz~EY-!t~!Ub-FDD=tW*U9`zVySosdHOEVL z!aP%D+q+Hrh4_wFAGQU7wP;3c7sn-O-3!*;1XyCh=9YxyB1>RJ4>z7I3HE@tee}vD zFAQf%*Ran6+I5Dl4Zc{l-r%+1!~mC9@%JcOFZ~;Jk%<@ELm1q?hDfZ*^HkS!qq#OfUTg(cJK8unE2&Y>+v> zHR*RU$5T3|tn_r5@)}+kUcWL}zbe?^rQgFhG{3wd{PM?R_@xK9Ebd4!)SuzwQ$~8} zO)NB04EmNyZ__()x0QitWjGSF4F^ZSrHP2f6MzTmcyL&ERUHMz`(R3$D{drS13I>N z?pQa$L}OJD=P)^Tv_(e@u_n;e3cB~=$i&veioyUNne?%cp$EPq>r3CKCjFEC1zu0~ zABa7or@N(#pkDeM+84_){?eqq^nkR!HtFB=4Q|cG=!~Xt{VMGILrxqJN^Jq1HVbZO z!W3HZqJO|L4a%uO~$ui8rq26ADE|_JWV@ELon_nUM>-rD6rIo5qi}pD|W0Ex@Zj>mI*{* zOJJTvpQiC7o?~*kj$Fhs0?UF;UOrv#Va>xHZmR_X|87k%6H%8wi5`e0X&6Y7=bOC1 zBFU=C%CfmNUao;Z6pzTy_p-#o`T5u*-G0GNQ={ucv6aCnfY2$NjzYgPqC7Jd$8?Fw zKjO2XV`X6H-)3Ys@B-T&|2Js zfJG_*_Au^eUS)EVL}96oQH1c|n+6aUZ9+)JVUt^A$c?N!yao!mQIcqBjX}GdC8d&) zco<)@SA<#%#K$eyFP+!rGD_np%@eO&Yw|kAb-fDKR#(2K?*Gg_A~52F4t?E4mgqL-Q6s4pbG+~hO3R+Rsl$w6K&t*cC4X^mcO z@(5~{zH3dcqGn;j>rK8vj(i_sLd(la!>u9BlG{w)F7ba_Vodz=W|My|{+Uu!UQ;WbEL0AeJlAUd%A^l_u3iv=ophHq+zUmV#whAn4R!kXq-xECNCf3)Onz3bZg*p}A{c;)v#jaM?dlQ= zLsDL{t3QLRK`S2!NKwcs4E3(JZe_cKg*!Ojfixc1sW?wdQ)5huU1?OnFPr=ueg&|` z!s7pSGUGxrQ!2y1Gx=4qzT0{m1qFWH4Z*qbtewi-;rYRyKvPc zdXV{|$Pts@=MUgr68x;I0>Uobp{V?MBPjGO3x}KF#yaNG0wI)x{vqL#5F;pD%m0)- zy$3>wN5NQHR)R)Ys5;ylsSnO-lyXp?L@jo_2nMywL!n?qOC5}Q_$yeu=Sy4O1kesa z!^?3S&N|B|ZA#xU3v1ndM=sn)`F_u%R8VVVoKRis$~dvQHYMYv>RNZk z$<_PlRKMCsljUQId`y#%5?QrWKFZ`{w%^!C765h{3X)X-qz1LYMNsApDx@>%Wc;6k{}r@^7GU;bs-qv#*%ZLPY!TD=>HFP{%k=XAJhCkm)Jl)OA_FgCcurLXiBsRrQg%waaAb9*1&TX!AH)Z zQvqrb{!hpMDuBBX;GPL^>i}*8z-v+M?*Hjye;C$4^mkt{gi3SkR8;^U;7|U8`2=KqknE2 z9fxOWemia5PNv*V;Ox8uJCFYHSmWOS|K0|p-;7hRlP1t@I8C<$ z`r82SE(*hR>rvj?NPA$)dtuo7P~O{%BHRO*bsu^jLL~Sw$`y~G8ghVMql5G&+8@y4 z^a(vpU(vJlA9|h#qpC8BUev~)D&)tbZR2}68*2}Oao3}aaSsfwuuB709t7imMfvng z?4yv8`{{n|5H88nZ8s37I9r^6{tFk7Q+Zx)Cq2ki*+#4KI_Y7ixw*jnkfI`2{$q4_ zJJsOvXlGa}w zY_ZQ@nYJIjI)QB=elj8YGYI}oQ1e^(t>bO{Qt@}np?9f(j)1w|r)fZG76Otg`UrgV zCT*a9B^{3QoWpS*{S9y8rUHk(OYcGRemH(du!4a#&%i40LwA>iHa03rhXY8-7*Q2) z`3G>p;}d{lsr8w7i=&4h8h+u=XoKR?{AwEwNpdPoOY*0Lsw3qNV~EF!dL!l<$tg6J z-IUK>Ithh}xu`}6$@(oZ9JQ+GTWxj^&4G)U5WP2*XjKi&L;(gWi(%(sMB&*tcQ5@{ zTk;ScZfD+uJ_X7r%?$(>OXVy=&4K#hDLW3d-g9>BYXj+$$Pi=4@CaPqf~x2ksMtN-j{zrwkrXW4M5Fc>;a~J^{!~q*IY5Cy*&}`*yH)J=U^Gt{#qNMoyb00Beu4B{Oz1+{jj|Wux^NhSs9>^&DW*Q_Dt#`7~ zOlUD4S1$1k{1{zIUY-eL%V+@4qAaBKV|Whid^&#NtDs`8q*CM_iOY1Rqs>ek^|6%A z!+1DkcQNvn9(1@A8pshI3;cyub2}M7a9Up)rh@E756N!l(M2wQrmKU;B*Yvjukl#` zdnx(2j)rpp;?-+$tgB|MBhFX{+~GVAy(okN5v$meb^EyPz8}Re%Mw)?V6<tn_i{RWLqbp`bPA~Da^O!oN1}evmEz=r}1o<1xlPIg8(66A&Vrg zf+AZfov)_;d<|vtbuc}PhUM>gLPG@mQrS_u0kh3h8N`L@&N+XvRcF>w`k zWv#A4W$BA(H;jH4gt{B({sO}6fiU-KVXUw)Nf^g<#@Of5CHb~3Rx;^s78e3q6CfDa zwlZ%o&$Fqkz@py%Ty0$`8~XD?hk+A-NxVb+5M+B87Jmd5K9FR|2@XIL9GS*xn=1T- zK7<#;iQ%eJHLzLqVn`_x`5lRDGM$^hm(Scq{qR`2i_-8odpD)H_819%wQzbKvb;e3 z_(dAVFX4E-46I&BlF9GLjV9ma6aXc>AlQ8Q zescIY9YG`R)go7JrmK_BQHb#TiOU}m4>uokl%S<_hZe^}%R>n@^>J5O#qVM-h2`Ez|K zlR9|KHX4xWvcH_$&Oct{rUrH|G?N{I&?Yy~*I2Jmkl&Z?8kD3h! zm_xbhG&%|2r>RPsqpX`$2g*Pq?&9Tq5n?3Kv79f~R~K6L)s;%qc?(|xp-nnbBbEY{ z@P`w&VoB^|YydY%%yuxh5-zHv!Tff7hwVk~{7knMxO+0)h}Cyfzf4bm-qFstZX>s=&?OUf-2IZz zwGH`Kf4&_sx6%9d6}3x_CW40k+}6%_9ioCFcc%MEdQODlF>UlK5n+!OVS&YpbL}^O zDR1I@+re;LweQmk65OvPSSc$%pjS>82;19ep>#cz=-S^#Gvez4GMXTeKKi{oVA8=h z^2+4L636W$nhgK0Bc%dxs(R|JmeWAB60C9#jZv#;ylSRXRhUZDYN}9Cs!^>}tJYGT zT2GB?1BKB(PhCV?)E2r-T|!r@%ji0FIqgta(4Fc^+OMvn1L%8NT|+OZYw0z01HGYc zq_@;f^s(AbpQ@kJ7itF`Rkv}P+Qt1;8~fCqJVf2aBh=kIR_);ebuXW!?&E1{FPEWR zrP{exb#jB+&rRx4UaJoB`RZ}rqMqQ()lQz3V-q6(1 zjspM}jvo%RtaL*0qx?9o9|iVr*K}fF&S*Z2`7Y$O+4kXRBsV{Sd2W;?TKP%TlU#H) zj*GBq3hh8FC>fTU?nD|P8J34WMUe0mj+Yx@yx&@nC&t&~Y4P=V3!Q9_Uh9nRjE_Pt z{EbTYLz%JzhZ03R^=&S~MVttDZYg5-t=n)JPtC=*vfZ#dDmmr$m)`Q6y;~mz>lhcM z_%l;*kh8bbK#Y}dqcl8D-$q^>5Ot$_*8QpxOtiq)>WC``j{iw$Cd8da6G&RU$!@_ohi%q{Qb% zU8JN<4bVjrpGT@BZOW}zFS#Ak!k@QVGi9u#jo)_`Es+(y{!FjEA_ia3Ds<(dPTgmb z(LMIba{Jsn_*SFP(?%d8k3~j$DY|Jhe%JQ++?tFwBGY)9Q3lBoC3b-Kq?Y5-QqlnQ zmDu&266q_^J6YVd(I|8a4+(i;m;6kRMPA;_luWP1Ua6U0o4rz#*vl<5HG942b0@Rc zr~i|^yqVr7={FV-ZS;(mVvlB&8jHSQe=CX5`~_DyhQQq4hlE35O?q*Q!A!I@g)P>d z7Kd4#NhBsvJ0$kqc#E+e60@CHd-mxLqw&vBSR{1>jP?P!)Q99zA5n(-m)R$DOzNQ)K8>&>_g4K>vz+h@N42l{lw83!G#fF!zFw*FH1Ajbb^rqX5 zzO={aM|+I{^pN4BgLob`j-zLdOnTACqCXkK=`CXfePE2D&y2D3wUNUfBcFR21eo{DrYfkr7fZBdpSmh#F+9 zR#`?&4KrF*j<9s#SxIk4Jn^d*&6Sc&+NCk{7YL#)RT8;Jw;|g_= zah2L?T&=bn*Q(vd_3D?#cGY3rtR69TsK<<3)lSf~&^%~lLHSSbLjC<5a#y<6h z(XPHR9@32aEoBNn#TgeZn{m~@ZN_z}ulPAIsR4U^&d+O3Emns#3&R$47ZQjJaO%ah zgMW>d2T^7z5{e9jBZrY9Nba4=1HrS>@}jU{@wS_5Y$o*}v$uHL%lG5=9pP;^QlyaP zZ4bVW(7f$MdSdZ*D#B2Ux4mkK&D(CZG`=2gM|(ZhVe__I9d<@vj*o(|@kf3(ZzrO} zS-3S2TT*W!*Ov@@{I-K%bNm>Lj#1+Y>Sa8sF|ROfs5 zqUwzaF#U2t8t;8XCuOYPu)UZ*OWHuBiWDiBG!Lr zNFrw*ie2PY<-)IgE*JS+ZaU88p)7nK<4V`|uqvWCj(jqvQ`G zY^gTeQjM~t@(s46y0yDR?{$+1fsrc<5)Gk#uA$W5HH-%0`$*UENfM26BpSv4;E%*T zQE7@x6t5F0`7;b#qU&vm3Z?MU!5%v!-BVI4ad204Vl;)FBdpqwwAZ%4~ zEz~AZAJ;@0;F?53U4=B-bu#7P`y|)oBpC}G84GP0`=A>6FB~SZ>hTV0pUK+%Ie&qt V{Iu{4e~I)v6MsMOCI6dJ{|}!xVCDb- diff --git a/libjava/classpath/lib/javax/swing/text/html/ImageView$1.class b/libjava/classpath/lib/javax/swing/text/html/ImageView$1.class index 81ef92d48c5fed07da25b13bea24b8e5516e1348..e2596e2f47160568d1f503f20c08e7d6b105c66e 100644 GIT binary patch delta 23 fcmX@bc8YDoVJ1em$w!#HS-lv9nY<^9Fq;7YU&IEG delta 23 fcmX@bc8YDoVJ1e;$w!#HS$!FVnfxY;Fq;7YU>gRR diff --git a/libjava/classpath/lib/javax/swing/text/html/ImageView.class b/libjava/classpath/lib/javax/swing/text/html/ImageView.class index d3bc2f35e04f2738329de61d149be1be5ce5dc92..4e76a81b2b3002f54ddb9777e329d42979253007 100644 GIT binary patch delta 555 zcmXYuNo1ws)1Q{o+Xk(B+uqx1nhp|_R$C3#;i|T`+!RrjDA8^#Of|F-v?UTl zEY1e8F;8i*!NSTytm)3ULShIK5gVMU)p<|8 z-kk`?+(5XetCks{IDuM7Q!80&BUkOjl%PzjsZ^3$b<(J{B(#pC*3+#G^r@Q)Ul^OH zWf6=0%>x)F6A`$oNNvzds`}jCNL;(zqsW8OAyPE#86)KQbB>M@)iH{6oCckwMW;OD zG+T7WUC7-Lob|6d=R$ecOE3C#iK)6wNLR?#RZ4Y@3f*9tZm~wU>Cz~@y5rvFZPP>7 zoWEU9-M##c!81=BbD`+g%oj}2OQz|S=f7sQ-nfydt9<91-}}i2Klw<8J~2z5DbN?@ z=^HirPQ8AxNM#cExoS(iNHGF`gD zL0xsO@OW_DPd4pRi)NxXe09^$c#CY^_A|~9)hso-L!<7pTld(f`yAFo_qu3MPhCUt zkY2di;{IUH6JNR1$f2A!r0OjhdguA?S*Z{1T*Php=#xMB&S&5GLYBUgt8d=Gch>3$ z+w_y|`bE3u>CkTy2E8WNT(UDSK?p3Jz%p23%gD4W zaxI&D3lXv9R9YSztbnZ+rrwI!Va2pt89i1`(kd9VN=7WogjN5uT(v;@Z#iI0r%Cgc zb2*_iI*XC?*E*@;zt_-+yH+~6v6jVF$5N|jg*8xUO;lJjYb@r;E!0}vlVikuov?QH KTenM;o%#ba9cfhn diff --git a/libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class b/libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class index 864c6d2597cfc47ebbdf9745187072bc5106bb7a..618b87947a496952108744ae32ebeb523fc1c4f7 100644 GIT binary patch literal 9209 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 R(B&RAV}U z7fY*Uzf#>ODiX76{!>3&t(4ZYH_Fw=#SOnwdQ!gX6*lY7(uZBTIq0D2b?Ko`q0?h` zY!pXbA{?+ua3aESGpEM&0E6banh2j{I6~5VP{aBZr_B#FrACZxy$qjm$uMqSTcc{y ze6v#BIeMdXao#1%S@YXU7p^t!to!BF?EK1F@nI$ZAA|dWg}fQk*K3NXM73~ZvB134 zT1F2saeYXt+p@Q09rQ8{;@&n#Jl&w*%WQE>Pwp_JXps6O2#Zmf$)T zU{1D~r8xn!U|+O|7dnUw{}R{UlJb^BE3_P>YAFVocDDCKzmQwn=G@mN&y?b0+ew13 t)ORJ{JqEZhJ$S%0%iLt8!`(v5o#w*c%Zsh9Uy5;A4jeHopNlJ4e*rW5Zvy}T delta 526 zcmY+B%PvDv6o$Wjb}xE*%F$ByOG~v*UF$kxXdp;KM1@4eGnjU6LUU$jBw}Jf(nd)tV7e(VC}W`%G%%muk1JTBV@jQKRf}`ESAix())3?)gp{#qKR2VXjACS z=ynK2+#*O*h)%kLbScs$JMFjVq1U}q21jZ|ckSQtMu7UN8~Nu6;|^l}l~_LRkpmWa?Sk}Xng$=#6L?_?|3&OK2_S7>*# zWjb`ON}r;_(49;eq~wg^lXF7^Rtd2toOMQ|V+l_vq{&EDo~N3^swk+UG!sslp(^L5gfuUS%aktuQ27AOg?^4GYJi=5xMLI^|k}_#v3YPfcmlg8{W-!aZ4jHtCWa7}y zWYff`^fgP0E-4NyG4x&)H;Fs7)D=a{fQA)@7M~>_f7M3shJiH%7@T${lMdSlL~tZe zLnm1~rGsH!%Fa`F!5?FfBH$QcT%0*JgG02AK_v|>=*KWP;30^LD%4X_DErV%9wD59 z#XP<}-wx2;5sjHISQZyrBVR>GJZN2PO?+wfY+V%S*5D?piJ+hXwWuRk$t72gy9F<) t9Cwi_3VE5CgYAFC9K$VKray;majkdO>>`+_#Pc)kAwe$xB}!)>%0EyTS_}XH delta 351 zcmXYsO)mps5Xb+sFWP;&8@2U%=7DmypKOq?yc1X8!Zb%unZUhxlx~y#pA+;iEWF`9&SoQiKRsv`D)^5>_+J zn@D4UL)xW3Yhnq@1Um9yl`wJT?_*65SUKcP7+5F7``uLiy=N zZxG$_wP%_X{`QpPgc&5{$R|%YhAIuP>qr)Bn03|32l!*oGXmYiRm}0JH>EDZIM>Qi*YJ&Nrb7$ z7s912{t`iZ8+L0mFG-5r>~g9o#a@vi+{1EWRqU|k8|$rLN-7oXN{xa&?91HzGbjB3 F%0DpiL4*JR diff --git a/libjava/classpath/lib/javax/swing/text/html/MultiStyle.class b/libjava/classpath/lib/javax/swing/text/html/MultiStyle.class index 3904a2c29c3b5af5750fcc259bf37439550c85f4..ecf472579f68cb0ae78f144db69d212714dd793a 100644 GIT binary patch delta 216 zcmaFE_kv&G)W2Q(7#J7~8C=*Im>3xpCLd%}*l4hxS)DUDGd(Y{q_ilNkwI3&Co8cm zQNOe#Ge_SwuQWHcD6u3nKhH+XZt^W=bz?D~{N%)(u*9Ow#H5_mkjjG85DqVQq_H;> delta 82 zcmaFC|AtTC)W2Q(7#J7~864Odm>3xpCLd%}*l4hxc``SP(&S_oD@Mi5^H_YCCeLP5 lpDf8P!)(Q1J=u#rgwba5e0D2-TLxnWMj*5U8o|V14*Y&Q()FEl5{rv%wCpDTWNu~rI=P-DfsuLg1D0lKC!k3@42%p)3<3;x49*O!K(-4| IjETV&0QHj|$N&HU delta 45 zcmZ3-{f3L{)W2Q(7#J7~8C*7UePW)h!_vg~c=CFd1V*OG0<6uPj0{ddStbT&0BWBM AtpET3 diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class index 9ceb67c7a63b768593006fb4d2a91360cd94bf3b..2109f1f4734892c00d367dbd88e135637237d569 100644 GIT binary patch delta 299 zcmV~$O)CR%00!{q&+}lj(dI4fU8|xx$OgJYeUx7 zL>31kizeo^)basbR{VZNSJ4&kvTh%MjKRt{9892%Np$cCULIqZCzxOg(@bNI83dWd zGEcF}Gi>l2Tf9JsIqdKf5ndt6Ys7eiL*638JLGteJo6~<0q=Z7i3R-f31vPT^2ONs zYFy2HGj4vEZho2pew#6tOn^VhwAEvRWw`l=P61vS_*H>PRU#l^R#jL~H5OHa6&0Y!~S00000 delta 299 zcmV~$%`3xk00!{q%kyBrHZQ}H9ZVrFqb;qS#sN)n5U1VAfm}E#`2%*5rIy?N0mc@M zd5IhNB{r; diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class index 76409493a57567d75ddc4ffa7afc05be2db5ea83..5c70650aa9a33ddc18fbd9b2276f4e8b6499b9ee 100644 GIT binary patch delta 140 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 delta 93 zcmV-j0HXi44z>=kqy+`<00jW zOn#BqH)r*nb9yg-k>AKHYWQ2&F@Q;Yj&DJ|molc!Gy$EKI9cIgjh|1#d=XbwyVUDH<3f-29!lkl_|=&DmKZ{rG}eqZ{&^N0DSK&;s5{u delta 230 zcmXAj%L)Mj6ox0i z8Ls5GQQ%IA2L?}Cyy(e1ELK2B=)>2|m8Pr-^s#L@hq*SUjL}E|IQu0~GzDFfx zTCp@psDxV5T3bsgtJU^sncA&U@#6-#c@P5{eSOI_y_zB;2Jp%E>7BNfPSF zXy=^Yt+)xGq`*@?K^2*3>8FU4$%vKD&_z-aFH?{pQ!!4`FiECirp!c^%)&yMgQYST zDx5OiH*gnRvfHcx73F~aK@kGw zAVTF3BBTT@Clp;xfz<4=@R5^_qat8C|tbO+!*2#HnmW%jO zE;%1pKNx(&w*P^$@+Z9IHvHudYRg@OnKzbuXfF5BP9Eg<4fw*9{tRyN9A5GQzVZ?^ zn7Rb;RlvRED248SVZ zz*^SC2G+u61|pYrkk23#vM#=3J)E`d3PW%souRnR`gp`}JZFTEk>bH9@nf_EFh;`J zP@>sLTC=fqW)tblW|GLaB!$goHe1PD#>#xQmTb0>)yB2v8!X?Fb1&?!}uO! zjLq1WvFyi=#xCq{=>QI8JSXyfPT?SC@dK{6WFr%}mBYB5iQH=}Fh5}VK@R7)9FfkW z9LZ9S;!nnl9KoOM;uj|II!E&+$M6ov@`>@O`3uWmFZS&oEmr(9yq) zcez9#a;eM3B`yyxb9r&OE6^Ckg|2X}%#RAX!}Kj6bKuFXsK{;bXRcKz4=uPIaok~b z*@}4X!f5VBGWS?b_F7E}kj8zO$^BN9A~-yR)jW(%EU}6l!2upeF;7@MN^zB^tQq_9 zm}l{t=fs`or2>Bxe_oPWye##?c|{_5RhsacwBdE>&KnZX-(`sLL*p=Gk`1QtR{r7O zeN4X(4?aYBK0+lvMpZsRE&hW#e2P#$LnL3IDPN*F|3zEAMi;(8PZbPQVyG%UGM}vO zm~ON4vIY=I^wT&B~XJULhDJChDfZ2N}PsCFAbN$8X+S!Qc^TpQZ+`>?3}61 zWS;s;ww9CC+ETV?E6LMXDKHjmYdNWH9cN#j7h^+6`XX9X{H_ zDG49u)gNv;0G>L~(s-vygMt=AZ6?u@;i#Y^P(?=~Kt~}&lh9bl;B6g?_L_`tIu8AH zJQ8&Rk~IaBbfOayk>i^N51nS)(@|415USJBP-i&5MifOZfV(b4d0k{X7o&z|BiKAz zm!g#}LuXx%?z#eljiYpxQyRI#ZKLhlvKi` delta 1546 zcmW-fd2o+s6ot<{_m`w0i?t+Ys$HX!AVHLgr48{zsAOaqzS`B^ zFrvDocCm$MEz=NNZKb8H(#2M__fG$M-sik`?)!Z+XJ6{R)GrSO1!TZe`k<<0B1lG| zfsA%4gMLZQ24w=gWg=?GBughFMm|E4!r|nQL{i6Ir+goy;s3YR-?MCajpe-^4N@5q}Yk9_1C~{aLIPF-SC%E`-1%l zl>>;7gJ>d0kSOKoC`Zv0y%ODGvzc2rPAI#gVk~t8{`LU zk&Djw+WW(A*!JI0MQ)**+(xk6L4ElHk>&~VH(JSEw3mA&eM2_6+>hZQPv9$05h%}4 zmp~Ya#&jW$9(a>pXhUCgrXPCIAAML2{TP5Dtd4Znz!(N0n>CTcU`%Ii6fgt}SqCdv z7pqtgYZ;0StdGqMLkV9)DI4M_!*SZO%Z$L!ZZ^j6jKqCL<1u4|j1@1&Nf6^DgiR%i z%_NQq(uU2Y3tLEEwv=?Xl58f*Y$nMZwvj@%m4$34D~+qn*IK@T?WKqvq?jG$D|V7S z#!~YGmX|SEj_@rx#?IodU>CV)hszfHXcs^6ZMn;6dCG3|U~l^I9R{)w>lnlME+g5O z@y6HLk4fy$PR6brV97uZ<6utY5KiHHEMN-PFqP|=#*Iwp=N!%*#$D!nE#J=(Jjju5 zmNSDVn8|a-3mnNyc5#)Xc#WfZlVf>jN*1=afj7pr`2RPa=8b2+-p_Y4~GY_l4V%WBUX`e?By|(@wnCFB(AW+nz0uT zScw-rBc41femp0^yeRc}Ng77+ip21$H0L#G%j?pEH)IfR%24C`#x!H54QBJ#l0)IU z>Anju-iHq#Ab<~1lmDO|AE5#NMFbxshELIg&(Mm`(T*?CRe@eg3{=H1bz!Xehw6nH zHal0nu|TU}xmLv*^+A#PVXOLMy9S_CU&Udqj+0sg6&i^18iXqvjGJz)jXyO6kF*Y+ zYdvvkeeu->Qcc4oSQ|>HHj*Y9F0mRRN!nPFHA;GGw4`W^jMP}k)_BR$rjl#td~GRn zHAoh!kF3*l8ZUD>2n(hFdZMemW90Gy@@;iAFjK2|5OEXcju?Saj2I=&$3E zuGz@a37D*toJLKG0;j=C-L`!?>go(c=u9-#Jm-3oeKGUksq^8Z3vA~?)KLfF=5e|h zt#t{y=u-61QN-?ceeQ$2Iz65nP=%qXGVPKe_KLux&QzG diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class index 6f23724597dd8338f21d1d7a35e1067223537aca..25f7b08b78eb9a8fe864684eefb075567480ea9c 100644 GIT binary patch delta 69 zcmZqRZQ$MTorPD6frUkbfuBW(L4rkhG7D=Uqv7N*)*3}~1}+v01`!r326+}+22~at X1~nEt22B=w1}h-#%;GrtGixsZqofPt delta 69 zcmZqRZQ$MTorPD0frUkhfuBW02&0503!sF05JrUlT`*$0hg1f23!rC z015=102BnD03QUQlMn~0DW?Dl1gQWM1gZcW1g!uf1grof1g-!q1h4=y1hfD;1h@c2 N1i1iB1iO>t2dgtD8Xy1w delta 107 zcmV-x0F?iZ5sneCJO&ww00abt01pI(01yO*02%~~03!s905JrOlT`*$0g;oZ23!r6 z015<`02Bn703QUKlMn~0DWL!f1fu{G1f&2Q1g8KZ1f~EZ1gHQk1gZcs1g-!&1hN1{ N1hW851htdn2dfu(8I}M5 diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class index 891da01ae65b85ca8a6d428a90a4d37da4b494b4..f370cc8fdcb93b4a6e6c7e77d7980fee50e18cf9 100644 GIT binary patch delta 99 zcmbOuFh^j+TUOBk1{M|{238hd27Z-U|S@ CDHCb{ delta 99 zcmbOuFh^j+TUJpo1{M}K238h#27VSF1`!rt1|=51$xLiMj6swA*^))W8Q57O7zA0O z7{pj&7!+CJ8MIguCm&~9Et|o>$&$q&%#sZh&1Fz#DP+)QDP=HaDPu5ashr%;-U|Sr C%M$DW diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class index 3a2d2889bffd112937c06adb51ae47c35981b64d..61185f2d28e93df3d998b9434eca6bf78e38a874 100644 GIT binary patch delta 1099 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 diff --git a/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class b/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class index 607238c174407a0744815da319e92d478194c2ba..fae368fe419678e823fbf6926fdfc8a7b9bee48f 100644 GIT binary patch delta 837 zcmY*XOHUI~6#fn~Ew(chgubTjwB=1-6jV%{tTYs0=S`c+Hch2Lx=X~F}XFM^~Y<;>i`4B)Y z)s9$SC}KkG6|a;&^G6kr@k#7gb@OKxi})haYRhPOo<>FSww|u@UGa12RB!xH@>sh6 zOoO;2IYqzKL`|dhwo+2uDz>1`iWqrBD!Q40$ z)U(NSd;j3hWa`Apv=tIXR0@qI3aWGIi8$?QBS}oTPPyJPQxyaUqIiuNNNm5utcbaX zr1zK;)9y<8AZFdVbKdJSu&~v92mY`o8(8&)SGz(>Vni!y`HGu-J%mlT&6W%&j$#>a zV1fr7_y#-7*aI8Bvz3cKjaN}Kj6!xO7SBZoD?<+Z)kw3Iq4a|(UH4qD%&}+Y%n{-D z`gYVr93}%(d&6Uh#0-o~qjS5g$&X;y82K|tP}Btml~NuA!Hoo##dtv1Oa7CWjq|c(~@kX5Sk4tayPRM#Ky%%Xc>|G3o41CO4rx8i&vVrwn^ypW*xGsn-oW%%7 z7C6z5ub6^_IyB-YM>4$V!3thMK>$bbjd@nI!G-S}+3J@j^OP%Cd8Z>ei`-S%k_GI%i?yzlfw=;qP0A_L$cV9^zp7N1XYp(T z_H@P|sq>;j9;HZ|{QWp>kbIj}EMh)bcX%)T!VxYPXQX*uojq*ljO&mBgX{ayOjfdS zS5>IQHFR(v4cz;r=`?^GZgI~Fh_;AsZ&sWO#U(pA#D#FRxE~6sDiysFIX5sh{2y~| zV4a(=5);e+JLjfSu@D|q%W%Nd*-GUiA899#xE!e{_wET@M}kL^;;%j=_Zs9E3z1`< zfH}w%+<0VO4pERoqBXkPxwuQ_`B1pHM8&1(s9M3+34Y|UBHXcXW85_K_nJ%`t2_WI zzA%#s?Bl$6QED<(plZ<*Yl_w4hS_0)n96dSNx=fuG07ty#uCvKZ&@f!8UB~C$_aj- MS=o+muCNXG15VnZ>;M1& diff --git a/libjava/classpath/lib/javax/swing/undo/StateEdit.class b/libjava/classpath/lib/javax/swing/undo/StateEdit.class index 9a5067181d73985012a8f9e3bfb9d064ecde761c..c5c079cee897caa4fc30e36c0c8e3f53fd2c48dc 100644 GIT binary patch delta 140 zcmcaAxLQcy)W2Q(7#J7~84B1Lm>3zPCU0bt+Nj0F>L})upPZNzmROXTn3R(mQdy81 z0%9;SX!v9$mL=+!mSpDWdzPdYC6?qD*+9f{67$ma{gbj%lS{1aHXE|OVq!cvS%xEq jk$G|@N3e7b&>|iNMh0F67lsUmTp){)ArC0V#E=gF85$=X delta 56 zcmZ22bX8E`)W2Q(7#J7~8S>Z}m>3zPCU0bt+Nj0Fy19b&ITPdh$q5`Wj7*dFas+cS MGUNaiGBM-=0N>UQv;Y7A diff --git a/libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class b/libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class index 494247e4249e628678bc39b4e320e329f5d56a43..e4d6664394ed000ad4d3256cfbd8e28288277d41 100644 GIT binary patch delta 570 zcmYk2%TE(g6vn?h(wXVZG-7FZm7*9z+d)#%l_}9EF~$T@l2XIU40J-;j5A{yP-7za zuBd3eDvGbTVx^(M6iX9yXQKaxI~Te)5zmMVbCdJBzw>>$cO&|-qw&k{^$h_1cr8I- z=;lm}Rr-DflG|Z1v?YcL#*C4g_VQM0(6KCY!pl2$I+;}vfvv%T%QIq+ScE5GiqDBH zUDKFhXt2!-9z!IN+!C-1dop!$yg>VD{ze>TMgCKq*PDl&3B$@7#k?_YnVE~OnehvT zga7#+_spVE{<=3JyUvt%G?(`jlrS&hHbboJ!~z=b;4WX0_Ok{4O-hIlHE=xQVL2Tx zp@|`A+PP6TXLzQBr~HiEtuCU;*Lbes#p;4w6@oQ1&;bVd3AJ^$j>wq)9xZDqRB?8A z8R5Pf&M|yKc25oG1yFm5VQKSwg?6?fN^v)2if^Id9aOBK6(0~s4La6wfbtR4(Lsd1 z<%1YHsUt^R#w-}|y_mxl2#9wQcoo-3_&Na^UB>@TZqTF)H~9~BmvZa$GGx8CihI0G z8({Z&RvXy)0F4CipruoUGRp1rjKiOy>UtGrUeOM<)6e{4_K}y*$aR#)*6^4sp&s^x e_lKf^Me3jNkx+ARN%s|e8#i=JdP%r|SAPJoaf+G% delta 525 zcmX|--Afcv7{-5Ro1K|vX2Ep9QrA9^rAEC-5rTwLh^~?fDz-auhbU}!Yo{-ww6Cq) zzU*Y>R$k^+(Nd1B3+i1Eblo4(Ro6xJE=nADpYxpayuWjJS2~v4o4)>8S_XFW#v-QZ z(#lL#dw<2&Fa_TJ_aEsBjnE_qBUZ47Nc4x$cWw2y~wFUYv*THNk-&G z=4tM&abB^?@tzu&Vu-z}sQmp=6-tbDsXMTxzQf@?E+5#;XVTQz#S(i&hp5vb2_K_J zWSA74qK(~kCQ#DgGsz9Xr6qWiTWnxEw{^kW=G-|kkL`Cyly$`$R1fucZ*c1)nxt)$ zAP!4ZiMGkVhrZzYe#B$lm)O@PlUdL73AmB5>y$E!XkAXE_dolOxU!Du7sNmXx6X{D iUaa^T@kaLK0t0h0rN#phFa0$w>z|2()+?dLc>NE?ntD3` diff --git a/libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class b/libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class index 1059715baf44e2248b6484c88a3615a8ad0619ef..4207957c090003661ba94cd5469a97c7f1bb1546 100644 GIT binary patch delta 233 zcmWm8ODlwN7>4oRC{vSWVJIo9Sy-5borNrH*oYdFY*@%b4mm3l6LMIvnjCVL5HA{D zQSuRdmiY|+HqUi0?yLK$4?-^%4dmn_lgBbExdtdobhB{&4ThgKv+1)L=*|+(^HC;D0(X5dYR^6Msyg BHHH8H delta 233 zcmWlSze>UZ7)8%dNEC6<1QD7X9CT=FkOmiB!aze@bdWIrAW1f4M2HSH34&Rsq(hmR zC5qxx_$)p{*X6t4aL>8Bz%H;ja2l45*|~{jF>!^NJa&pWDBRiy^QkkR44NoikVaTYpgtzhX%rRY|FT!3qr$>@E()7tNpuoFE zM;iUq;84toVzqU7jeo(O BG;06= diff --git a/libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class b/libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class index 24d1a36a60435f05bd99f2436af011e9af9c14d5..53d2e006d635d5ba365f83c1b4322cb81d253ab6 100644 GIT binary patch delta 202 zcmWN@y-Gp>0EXfBOK>PpDhCnsB>qH!$Z>NJ!O50LkOrrQ5EMlSacs)LJCHV)KyeGa z02i;JMG*-D8!RFu2ZPS^JQI6jzqHNLj05JlSzxfl&l^Ejgm}kd%{d<=*^uFrtYeNZ z3Vd_P4_9ot=9e3GR2*yUY4JCnnt4^_!jhY~4oT~XtUMHCP}DJHdAXI3JNc>0q@e&! pop7%(ZCO0%lt_LhI%A*L19ZEOh_? delta 202 zcmWN@L2H2l0LS6qe}!Q*=^fgOQk!z%wu978TtvxXCx@kol;pV6cGx%2Zo4RQQ$B#p zJ_AXbnuD#i76&^m@9BA_$!T)j^_OOxFvrdU4@-Qk2=GpbH6|ZivmwEj8$L-}X80n@ zH#vUD^GkspW%g7p>m2CtH+l2ls>VO2L`*hPvXhpBtWGJ)$(>wOw>NVJSfPc^(TdRmPt>SyeQ18BJ>qypcq44F;aZeFlIUe)}Snj diff --git a/libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class b/libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class index dab5cee5a126aeed5e1763d68388289a180349d9..2279f6b79395e3d36dc3e462f24f5d591e580a2b 100644 GIT binary patch delta 1730 zcmZWp{a2G^7`~qE-QIWO6=*PEiV}zm*kF-~I13OzkQ}qL(4|HbUSKrX+NNQaOZ>%Q*$*{`LS zN^>9lbK@3(THKVOV<_c*Q$F{yS=Va&SQdj#MIL4|c=@C*k6%@)=`33@qZspK%;l$< zRbPUq`E^#Q6r)VVe3bJ)SzWyy6*8V-$m#QM_q&4rfgacLpg$T_QHgSf>>e$a*?U6% zE-hjPgF}TA)qJC_#pFV*jAt3FJfT<(DxSkaepgplXU8HHby&zCcZVWgf4^pi9rc3Z z5{CSWO3zHTwOjkN&e&2JOL>jHn7zo?=u5KPXjEZFlL$Sj%P(vl&_?Tyh)3{GNerypa{Ft^MJk86ITIc$xd9 z1%>Mv@@9Cf9PHG>u|Q~m+f2p$oOGPM$r}y!d0WvXqmv(212e?fuN?KkHI96n%B|72JxPX_pysX3R0UGiYj=m zVx3h7DHz+6eV7R=u)ts|6yFBxNtzlM;PW6@`^G$4#+sf zQ1Gy-=55{GT14wwr-><$ahQ+F^DLt{A_(p>V+34SNBJ$eXwC?Zt2lwx3`&IVdjbQL zYDDlj$^VjzWTPOdMYyaS<%>*fr3=&~n&#Q#XG{(qOOF4RmCxcdFFG1`z{uDHiV|e$ zkR$dqg1{Td%^-kD%sri1X)n=P0aSoB(>((rF~@zFCom_8QV*FX3rk{whqdV&9CP>T zDRNbt^B$TU_mJgqCQ&m6**Ssd-Eqk#C9(JpSYiWf8$*d(N~6GMqhGhr@b$hT)`?jWK&kwq=bL7b4?D8vwK z*oQLgCy!xN#c_~c(+EAHVbtRgg*uF89HANKXvHxKd>kFLcH$(0IF(VOfoi6Tu|Bg3 z>s7o)iWFiC+6mK9icQ#njYOuNbo1eLBGO9gZNg@}#tc&8tYo5647X$T;Y&zK8NOMto_E`l?g-IE7Dye-g*yZi84qwHbsr6AG817Xf@m z<$sIsXq_65J}L(|P5*mm>Bc#@aGw4;E?^}t!i!5({$(ok3jDZA-q+BFaf&d35UwMN z8`PIH_2WAA<0kduHc5PoX8BGWU*acxgS(XKXN=(&3i}|V`esrK6#NuvEj}0VIVsF2 zu^V5ImyXiT!B_a2RNnv#Q9DDzhOn5TiJlCheEReRjl)?gMj|hT^3ViJjB=f$Xz_>R zeLe$SBkaz;Q_5||1KpLnr@w!C%as2SVOFt5#A@vwCK@!q4 KBtgZyP5%d@!)iPL delta 1695 zcmZWpYjaao6kR8|xi?KNrKF`0S_*{%rEMBokV;!r9^oNrcoeCTXJ`XW4NXk~6c8ea zP*D&$2qFR^v=s^%EGC5@>No>4`pG}wUts*^_yJuv1p%2%a`xSOoxRsyd*56u{jD_b z*GG5m0jR+}4JLt7`Dadn^obESYdS=U6Ga-v3FLJIb_CqvK<8HX>h@?b(59mp<7I(q zy48sZIwta-$241=j42w*`wDSgk^} z2GoDhF%vTcv@MaSFR(3W!(_aqBOkM6#OzdF78oP*lrd&2>SdpK zg1runI&7FLFk1d@FR-t%p$@O=cn$O9Lvw?*4hwWFgh$pYQ`N-=bcx)cxW()8m{P7T zMXrV>c~_ZIv|J$nX_ubv)?imW6zLRD!*Yb>oLDCZEK^H1V3UT8&k54JD;5uK(-FXC z`Oq?_u1!GCCJIH|i$dX`6YbwCC{nF)(D~oE+&6g3#V-tD9F~>9uI}xEB*u95J#@@)2(9{cFRX< zS<4bDU!&>jdlqmez12MrLtrvf_Yj*5+8Na8SnwI3!PM3pv(< z8a|YNXhq^9`L|Z$IfA1GncX(@;1k0-&iv)xCvC6dh6JMx(>aVDoX{cR5wIG2;|+DP zPLDz9lw5BeEB9GXh$c=hU)~n3u~}-10DBS7r5XPoZvaI3(avUOsNy~)SJh!6wAfcG%t-O!M zius^E>9G(LmrUDa=n}(T|l6U@cZJ z{&OpXrT#RQC1JuO)T03jZ`POxAIum@8a{FbLeS6wJHi-+PI@93jVMYGBYG#Q(T!T3 zGdZ>f>_H>;VjhPxAN#Qw2hhTEEe@d#hmpr@vtVJqAXZ={pYq|yDmKlR04=p>#%i*e z2`k>f8j_d~ClkC$%TKUQ*l_GEdTiOZ(Ua>+tR2GoWCpE%N03$;TbqoBDo1-79godz z!)C-^mBu^NCeF@x)GJPfs_o==k5h51P2oMNmvroJ%8FZ+!u$P({xlBzT=!9yL61L! zBYsyJAE$B5xSztOiF%81o^)D_+hSPHcFOh{CF?~WPg7RT4vb?LNBIYIoYI|yn~{2) zf(NH5_2=yL4A$cdzK>^l`y55TzzmlucrV57qqzMPvzMZNLqP|4`zmivhOs!GXtG8`fzGELgan<<5|n4@E3^mU6bhfiGE9VYxbHR2e;hvd7WW zY~TXEV)Q(RbCFRCb90l4N{nU^g=q^pAuzRxA3&|(T3$-h8t&d0GVn{5Sm7{&WL5fz zWk)L^6hZ1&iF=Z9AnUpQg6GDwop delta 23 ecmbQvG>vJ352M0F0SS%>Umw@9)Vz|3c`E@=z6Xl{ diff --git a/libjava/classpath/lib/javax/xml/stream/util/StreamReaderDelegate.class b/libjava/classpath/lib/javax/xml/stream/util/StreamReaderDelegate.class new file mode 100644 index 0000000000000000000000000000000000000000..90ce1d54945def95c45eb494f636590a01f74a53 GIT binary patch literal 6619 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 diff --git a/libjava/classpath/lib/org/omg/CORBA/LocalObject.class b/libjava/classpath/lib/org/omg/CORBA/LocalObject.class index f666fb8fc3240f8759d10a61fc0f02c428c60c2c..f2a0dd036bdec2cf4d503ada308d9ac21c06f5ad 100644 GIT binary patch delta 74 zcmeBE>{Hwj#m6W(Sw=u{at)t0qvGTheBq3GllZ+EZ6~ki7M+~PufymGW-SJ?LMC4T V%ESYehcae?MA?fN7#NrsiU9~v6T1Ka delta 74 zcmeBE>{Hwj#m6WxSw=u{at)t0qr&7BeBq3`llZ+EZ6>eh7M+~Pufym8W-SJ?f+t@9 V%ESSchcae@MA?fN7#NrsiU9{36SDvS diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class b/libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class index 7e5cf6ae038d313f3ed4b44ecdfe2fd9a389d66a..8a4b11e483c2097e2a860b869ec402de3372452b 100644 GIT binary patch delta 65 zcmeyR^h;^OZ+^yx$$$9c8K+H-5!k4?gn^xL83PaFat3L}6%0y@D;YExS2LI}u3@kS VvOO5rG59mCX9!{3G}%nh1pv~I6D$A# delta 65 zcmeyR^h;^OZ+^!5$$$9c8K+K;5!k4?n1P*fDFYAVG6reJma7;{bIfh;uuB{313 delta 63 zcmX>ma7;{Zyfh;uuBe)Tc diff --git a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class b/libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class index 7dd148569c10c69db4726b1857beecd5ccab136c..4e8f95bde05598ef2b160a22dfa799a0c7c20a88 100644 GIT binary patch delta 35 mcmX@dcaCqvAvV@N1~!KN$pvhRlV7kIvd#zc7Jzy7?EC=JvI>y^ delta 35 mcmX@dcaCqvAvV@t1~!Ji$pvhRlV7kIvd#nY=7V|m?EC=JY6^`2 diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class index f86463f4847a02b1a1d93b2f8f4e53e13856d6a6..7054ff8eaf3914ecf329610698c1d1372b922402 100644 GIT binary patch delta 69 zcmcc1bC+ks4Hixh23CeL26l$h$q!k~SbZ5-82l&8usSh@O^#;`;Y?!SW=LibWJsB; W%O*MbDyu(d0Z^n6C{hFzF#rHy1rO-} delta 69 zcmcc1bC+ks4Hiy!23Cer26l#$$q!k~SbZ2+82l#7usSh@PL5{{;Y?)UW=LWXWJsQ@ W%O*MbDyu(dK2W3pC{hR%F#rHwZx7u7 diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class index 5e1fafded160ba27a2f292d02bf1a0c38059fe72..1cf45304ba9b231704f53a0b1e5b22a0e2bcb392 100644 GIT binary patch delta 525 zcmXZXPbkB27zXgY%eLP(WA^vAR@*_jZDqv1Q9st=;J+49NI6JR=HMW14le%m?!ZZ! z9F(>L#X*r=kfU-EIg(n5R^si+?ejeEdwFt+T%vfa**i=YbJk=t&-1y~Wa%7d=8H(JR#MQuG0BiptQF$O6Ty6uF^gQ5d=t)j{EEMfK2(s1-UB zbwZk3(I7M|8sjZ@FLwF)Q}O~X=^8~V5R2BJ7g6qigOyu6iguCKJq8^@5#7q~(w`u; zc@4UNc0{*ON%SC!@_g~hK?*AP it(*-iN+VrM-v>o>gGQl6y@94gQNGb*G>2ubknInpsi~;| delta 525 zcmXZXO(?^07zgk@Yn%VxZ1z5CE9E$8#D4AYXI>6k%OWpDl7mt!+eN9}9Gn(CE4e5y zDW$fc`n~_yd1CAH0!XzY|I;)j4OPu^_oWwCPSJ( zwG@r>rPa@4))>t}ELsvJD9_(kMQhw+OVB#!Y$+;n)t07h{CVtsv=7bOV|2oMfiNH0 zbvlK9MOU~^I27GN2cmnZA$o=eoQmF{P0<(hATmLn&5B%5QPc|Eh&rG)m!d9cS(Jp% zL?e*qR+NRNM6BxK=N>1#;+ zUY#zW9Z?->i0(vD&iWKRqC52I^aA~eKA=gzP6Sm%4oC~=6oeK;?V@RlA$x;5C7_Dm i!iAusL8NQxGf*U?(+sp4>ZV0el{dZu$df=c#c3 diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class index 4d3a705dd7431680439961e44de6b3e0dd5d4e5c..dda829bb18bbfbc786e0051146bec16c49c43b01 100644 GIT binary patch delta 556 zcmXZXPblPJ7zgm*cl?=Ve!m&am>Dw{Sq_v*+t^vJgSVzg`CF(dB~sejQj-g{DN^RN z2hV}FwI_;$C@wC-ZMPh>TMiCNQIvx=<>27)&F%AjpXYsgo?^C`-J1=dOXdREvL2_@ z>63#%4#V>3#l#DyF-8rjzECScgBe)}CFLe)F;8{485CJvcGFm){&^HIS=1dsAW1E$ z8mPaj7V1N#K|57YbyCNwL8_w4V3ZnDO;J0l0`;Q$M)gFD6x_J{h?w`Q?o{inwM7lK zsAbi@oJ9L^#O<4^Eq+srs(;j_>WXTOS=_5?MPdd|e7lWx_6b9h$9e>TtH-q6bKO4e=G)lwdZrq3x6AOtHp=2S270JR+#>RrXAb%?* z3z95Y5If06Q#MLjP|8M>jpBIip7)${Pxmavm*Pj0ZZw%GcRZuTO1Bc`#NB`n^KLuF z_C(Q3wTp(SRgc1ine~Ouvqxiws`JK>WH;%JVuiZ#mSEEi$d)v_6uYL(uEn9`2ArB* zJAo^iO5m2W9lj{;Wm7kvxbMTK@y1TGU*U^d6S>TtzYRX-nrwv-wIC{?Qld(#I7dNI z9g8fWjiRA^N}TRkX!gZJxp&l@uMDtGqUx^Z(`f z8rRgEC`CPp9;s?a<5g5>jHB?$+KW@?!VjqnG(6P0$f4dvMW!m)jSA-eaHiQ0D#V$- zgBtZzXGkMK>4Hpi5>n`5$_i@?QvIS)>P$3A1tJ>r)JPWFIm73EN8t~q{l8dbPq>T-vCK8tML_Oq*C zGgV!U7}Xck=%E%xPpJ!0ni}ZT$WUKJV^niey;C8_RCWF4O%S&O6m delta 573 zcmXZYF=$g!6b9h;2OIP9UW{$>nmmZK5W%6u(ijpis28IFk)RZZ20?{_IEbZmDh(}) zU$5 z$aU+ORW-v%8Mn-gUB(@GJ=3srctCaS5|+$t(l@7~7qLnW{jgby=CIC2Tl6B(ODBsr z=Cq@*W9~ZV@zyk*GFs-lQ^iMCFSsRisfL@wK8N*PjRAEp5jN8?g#$L$M1QC+q7aoi zp%9}Uiqg~vQI@jf3TLUBNKw0@t7Z_tft$>glM1(~SEBpWPthWkA62MRPejkCzKH9Y zi7|yO{w;`hskUg3auW*e|9fbBqFM=!uheK#Slirj=8bzZ$h4W z^V_)OrDVXx4RsMR^;$sTfg4Yv7s@VG_@L%RKh(9zLsge41gQy8HI*0DQ6)izq$rIR z_MUVn^(pG7I?5G>sjO(6dKS%4$qM!V-=b)hvs;m-5+Q{gH7Ppy|HH)@6$`t#pr%Dv zqCwoVlL1rLS1J@(^OY{%sdU`bk23#aHAGy1%7_9~K@_D_m5UlGE3&C~QHuJz)D>0e qU^PTcy(5)oeMMaiQGGENW7NKAibCAM9F-O=|9w}oVHie{vH1&ok){^_ delta 553 zcmXZXPbkB27{~G7$DjTAZOos|HnoGeD4W#^UkATTyQ~@IvXW9tl+>IYRwCJPwQrHa zMQY(d4xGqQFifzRXb{$CQJx5n{(x@_0`q>f3i0=3J zbe}VfF>2ANFr^P0gSzaDVUDwq8Ags8H(RlymraF&J~ex=uD{JVwso&7g?(;pxVmvn zy|}_S=cTCI!WDJaVABP+!VNd>L{C(>M&X^xiGHX{Q6<$}t58c#i-OdNsEx9F6gov| z^s;xP6V!)jm>Q^47^RA$N$OFQrK0uf|Gx!Mp0jIFkqR{^Y*I6#(*GY8j;KJRg;Odk zx)5bhW=GvN-R@PmXXU&WUa54@rf+5b$%^y|lxnijLKQ_F)SIZA`n#0$ sE5un5pG|K|4YI!c7BbXOz`_Jo63tQw#xPH%MN5C**;ft2s4&)k0XspZ-v9sr diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class index 6fe1051030b9af38e966d027cfa7a14d921dffd0..b126b845ea0eab631c6ce1dfe12b940dbdb87eea 100644 GIT binary patch delta 593 zcmXZYODKd<7{>AM5u>?%W-!K>C5_dnN%@>or=&>k8<#STg>u=DvYy{&|MQ+sz31AwcJ?;hs5hJLs+<-p+iEjU?pk!3(O}3_ zd*bM$CPl;4iAQ1Fw0k2a=+&4OHDQjEeXoNhPSR1A@%Z9c<9V}ao0|8P;=mmE6pqci zuNoJo++T|uGvsf=BX3;!9lTHxJB|;&ma;XzsE_>D) zH5V#eQY)hS|2;IGsfLio8?`R_G|!c09z-itB3g+pDlOW} NY?r%gSyq;{_6rFDukHW< delta 593 zcmXZYO(;ZB7{>AYh|$d4xePPLn4Qnn6e)L37N;mlhHONkStzj)vKbjRN>=J*A@Wfy z)YK@-MwEqxBqha;vQUbhl9G2GcEA65Pp95<Zor~ zBh^)^&`Pa~I;dAsALRxWhD1FWW8X_pQ?+FZ^VE!JnYs`eDp;)*n%*W{pHN;?#*K zL6uf&v{U1v9_m6gNX4QWqg4K-bW~xIH4^cdJE=6QzDi?>S`e*L526jKDb|dADkI9} Nw=3SZEUUoU`31jwud)CD diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class index 2cf9fa60d60454c2bad9659b92b6925eea1b7e1e..b0cff4484532cec5f5e6d58e66e9d9ce8462905f 100644 GIT binary patch delta 573 zcmXZXK}gea6bJBqV{P!?{+pZqH@7)<5_b86G^qcN!G5rVD9B{sVW419Aan?dGC{=h zB*iX0s0bAF!&b7;9 zp>U`vb*GM&oX0(R?HJsmeyHwJLCnW2HK$sn_F@KYX~uJsid(!=jbe?RPTa?aD!{Jf zU4wlYcLN+t+pXi1d~`=~#<{DB>-bJBBz*kluA_v-U#gU}h_d@2X^^JgtBO>*$DmBz zR8^=gRgLKRq;HF!ZiQmx8%Z-ak%;$1O# z%g$}pA=OcxP?tP|&)pv)GNI`!)23(fi>ehO;${r~Fx|*lgsFF`B$duu6YEtE##U%AaHLY7(xX)b4Tg-Q-Bl0|Nu*CFD>q6BE7Aw@t SLIvx*;G*E;4L|eyqyGW(3AM8T delta 573 zcmXZXO(;ZR6b4|gpR2~)VTOyDAsfZ!rYP=5d^IH&nuwy5kd%dm5(`RJN^G2@lwxI} zM1IOfiDaS3MzW$PqAZmKr#HLjJ?C^f=P)=7_M8yfBsWx_lg`M_=#*3_gU)*&WvG}1X@+};8C-V)W)VZpRiWL}CQA4U)YERWn{i@ojbkv}m z+E5KpAF45`DP}N9Evn|I2h}1~U1+dMO{+F#zc9_eJn@PQj@cPeolys>Ybw(-xc~pb zk$z3jOuL@NC)JX4#4R@XW*RKE$f8bE5h_+<5tp-gg-nzfRI+xVwHm6t)S{7^QngYy zs!pmpZqZN8t44K8A10XV5*D-n(~hhp3>KJPw7x>MBrP_mwPYQ(dBJualnc z+E<3lNa>vC1u{AnH1)p6#u(M=wJ=V-7EMzn(Jb}PYh!`3AKLgr{sl2mS%vaLW$Za8vn!h5Gw1 zdjW-JNiDkLkwQB+-itb^Em1EO4k~G!3JxO8{8REM<*HZ6Qfbj7RTRxom!f$p@mOJr z`XpMRPDI}+t3hF%%87naJEFUe(ME+M&a$FER9SRRxlM)t(jkKf?6qb(2vEL|g9!CT z)J9cA?OK@T+{dP!}IhNve^4o0XCqPNt(=pAK69OS5vqB&|JT&K?>3X4qfsDlFa lS@ccsMKf4q?u$97P+wzR*rKYp7cmRJtBu?R!!T-$isq=-90yC3lj~rOnip;BCM%@Riaq*4(jMnkJ_pCtgwMtW zbt1Z|zDO7S} zN>oc-i5jS2KuP1SKn&f?N0JAr%zT9rsz)?V?TBWn578pkSfH>T%*{JA=IuX55*_OhWbm&6{dmUOXOv+d6qJ)ZzDyTD24HXQ!P*g(H zN?nUOsPYmQ1JtxAPTh(UlpS(0O)ZEPs6^1CpF;{OOwq85b!tVF)ah^^4wzdaE>5ZS XNF6Sz-`n?yjr4D$>(sbvi`r0qD{Izmz@9X^28Yt;-o%l-a^XvuP^Ayp6cN!3SPt2P*<@~TnlgX*#TsP4pb=G=9I zd1_AemindoNTq5F)~G4fCRI|gp43MSzH>IL`bll5j;UbO;O|8bi_6q{)WW60F^hyM zk4ENF$R}T82F*-f+#*Arcs`kk8|0XFblycZB`kWWC#nHzU-ghm)mltaFH}#d@=L#K u4Q82k;y$@sXYhvUWu3(Wb*fsW+C7UR_0DU-7wSZ{TW(iTa2)57^Zq~aPOU)z delta 618 zcmXZXO-Phc6b9h$mHNc_`Np4|8D~Clq3CLi)S9jcm;AvNGFlr4p#(t?A`{$*f)qg@ zf>1{iL6E2rgFptv2u5lpA>a*$rRaR**N@Z0O)T(Mm4k|O4W$vyr zSfCbEE7YOt1J!)ZV1s(5`a%^{tS7bA20u6(Qyoxw)n6(UH8}s@!=i-x6txIb6)}sr zDvLViLd2DCF@q*1KW<^DW8anOxIq`wp3eKI#u|%3>Zxjk`l%YHniCe&)ST)CReb3v uVepb^FYZcb(qNhCb<$#$I#K1QyS_!9dgHfXn>to~FSaXv=QvJ@^Zp;8z^wuR diff --git a/libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class b/libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class index 51fbbae24d6cae4d7870dc6e7be545e47aa7f089..19b0a7c974df09c7c0c09c9c09d5503dcdb6ebe3 100644 GIT binary patch delta 43 zcmZ3;y^wo@ISZrLWDAyB-cSZMhA;+hhHwTxhLFjJSezMiC$q8oFjh|vX7vLA-o*+A delta 43 zcmZ3;y^wo@ISZrbWDAyB-Vg>hhEN7>hA;*`hTzGESezMiCbO~nFjh?tX7vLA-ZlyU diff --git a/libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class b/libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class index 24aa49d5e7899d8a9ec408b4ae391c827d342830..2060cb2dcadf7f7eef433cf9b67f5b4afdaa7298 100644 GIT binary patch delta 43 zcmX@adx&>~3oE1dWLMT&-Z%y}hIj^Uh6DyahS~3oE17WLMT&-dF}UhByXphIj@(hM39cS)CcnCJVDAFg8yvVe Test.java /* [#]line __oline__ "configure" */ ifelse([$1], , , [import $1;]) diff --git a/libjava/classpath/m4/ac_prog_javac.m4 b/libjava/classpath/m4/ac_prog_javac.m4 index 0c505dae840..2162c1d8d8a 100644 --- a/libjava/classpath/m4/ac_prog_javac.m4 +++ b/libjava/classpath/m4/ac_prog_javac.m4 @@ -34,7 +34,7 @@ dnl @license GPLWithACException dnl dnl Modified to remove jikes by Andrew John Hughes on 2008-02-11 -AC_DEFUN([AC_PROG_JAVAC],[ +AC_DEFUN_ONCE([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl ECJ_OPTS="-warn:-deprecation,serial,unusedImport" JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides" @@ -46,16 +46,15 @@ else fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_CACHE_CHECK([if $JAVAC is a version of gcj], ac_cv_prog_javac_is_gcj, [ -if $JAVAC --version | grep gcj > /dev/null; then +if $JAVAC --version 2>&1 | grep gcj >&AS_MESSAGE_LOG_FD ; then ac_cv_prog_javac_is_gcj=yes; JAVAC="$JAVAC $GCJ_OPTS"; -fi]) +else + ac_cv_prog_javac_is_gcj=no; +fi +]) AC_SUBST(JAVAC_IS_GCJ, $ac_cv_prog_javac_is_gcj) AM_CONDITIONAL(GCJ_JAVAC, test x"${JAVAC_IS_GCJ}" = xyes) -dnl GCJ LOCAL -if test "$enable_java_maintainer_mode" = yes; then -AC_PROG_JAVAC_WORKS -fi dnl END GCJ LOCAL AC_PROVIDE([$0])dnl ]) diff --git a/libjava/classpath/m4/ac_prog_javac_works.m4 b/libjava/classpath/m4/ac_prog_javac_works.m4 index a03f476e3f8..7fb298d49be 100644 --- a/libjava/classpath/m4/ac_prog_javac_works.m4 +++ b/libjava/classpath/m4/ac_prog_javac_works.m4 @@ -16,7 +16,8 @@ dnl @license GPLWithACException dnl dnl Modified to test for 1.5 by Andrew John Hughes on 2008-02-11 -AC_DEFUN([AC_PROG_JAVAC_WORKS],[ +AC_DEFUN_ONCE([AC_PROG_JAVAC_WORKS],[ +AC_REQUIRE([AC_PROG_JAVAC]) AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [ JAVA_TEST=Object.java CLASS_TEST=Object.class diff --git a/libjava/classpath/m4/lib-ld.m4 b/libjava/classpath/m4/lib-ld.m4 deleted file mode 100644 index 11d0ce77342..00000000000 --- a/libjava/classpath/m4/lib-ld.m4 +++ /dev/null @@ -1,110 +0,0 @@ -# lib-ld.m4 serial 2 (gettext-0.12) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - acl_cv_prog_gnu_ld=yes -else - acl_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) - -dnl From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) diff --git a/libjava/classpath/m4/lib-link.m4 b/libjava/classpath/m4/lib-link.m4 deleted file mode 100644 index eeb200d266d..00000000000 --- a/libjava/classpath/m4/lib-link.m4 +++ /dev/null @@ -1,551 +0,0 @@ -# lib-link.m4 serial 4 (gettext-0.12) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) diff --git a/libjava/classpath/m4/lib-prefix.m4 b/libjava/classpath/m4/lib-prefix.m4 deleted file mode 100644 index c719bc80900..00000000000 --- a/libjava/classpath/m4/lib-prefix.m4 +++ /dev/null @@ -1,155 +0,0 @@ -# lib-prefix.m4 serial 2 (gettext-0.12) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) diff --git a/libjava/classpath/missing b/libjava/classpath/missing index 1c8ff7049d8..28055d2ae6f 100755 --- a/libjava/classpath/missing +++ b/libjava/classpath/missing @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ scriptversion=2006-05-10.23 # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ Supported PROGRAM values: tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ Send bug reports to ." esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ esac # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg. fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/libjava/classpath/native/Makefile.in b/libjava/classpath/native/Makefile.in index a55b702cc8a..8761df3e5d3 100644 --- a/libjava/classpath/native/Makefile.in +++ b/libjava/classpath/native/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/fdlibm/Makefile.in b/libjava/classpath/native/fdlibm/Makefile.in index d4790fb315a..0fa84e35a6a 100644 --- a/libjava/classpath/native/fdlibm/Makefile.in +++ b/libjava/classpath/native/fdlibm/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jawt/Makefile.in b/libjava/classpath/native/jawt/Makefile.in index 40025986ebf..1965c7d041b 100644 --- a/libjava/classpath/native/jawt/Makefile.in +++ b/libjava/classpath/native/jawt/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/Makefile.in b/libjava/classpath/native/jni/Makefile.in index fb2a84dca5b..542704bf4ba 100644 --- a/libjava/classpath/native/jni/Makefile.in +++ b/libjava/classpath/native/jni/Makefile.in @@ -39,6 +39,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/classpath/Makefile.in b/libjava/classpath/native/jni/classpath/Makefile.in index 2923747ec32..5df9d61b00e 100644 --- a/libjava/classpath/native/jni/classpath/Makefile.in +++ b/libjava/classpath/native/jni/classpath/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.in b/libjava/classpath/native/jni/gconf-peer/Makefile.in index 8a86ed5a341..431f0a87ad9 100644 --- a/libjava/classpath/native/jni/gconf-peer/Makefile.in +++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/gstreamer-peer/Makefile.in b/libjava/classpath/native/jni/gstreamer-peer/Makefile.in index 349c95c18a9..8f3afc61c31 100644 --- a/libjava/classpath/native/jni/gstreamer-peer/Makefile.in +++ b/libjava/classpath/native/jni/gstreamer-peer/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/gtk-peer/Makefile.in b/libjava/classpath/native/jni/gtk-peer/Makefile.in index 59242f85f8b..2ca2fe57af0 100644 --- a/libjava/classpath/native/jni/gtk-peer/Makefile.in +++ b/libjava/classpath/native/jni/gtk-peer/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/java-io/Makefile.in b/libjava/classpath/native/jni/java-io/Makefile.in index 86dd1a468b2..0052aeeb825 100644 --- a/libjava/classpath/native/jni/java-io/Makefile.in +++ b/libjava/classpath/native/jni/java-io/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/java-lang/Makefile.in b/libjava/classpath/native/jni/java-lang/Makefile.in index b33a74fc48a..ea9c3af09a2 100644 --- a/libjava/classpath/native/jni/java-lang/Makefile.in +++ b/libjava/classpath/native/jni/java-lang/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/java-math/Makefile.in b/libjava/classpath/native/jni/java-math/Makefile.in index 03442a3bb64..67e4e84c725 100644 --- a/libjava/classpath/native/jni/java-math/Makefile.in +++ b/libjava/classpath/native/jni/java-math/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/java-net/Makefile.in b/libjava/classpath/native/jni/java-net/Makefile.in index 2c895959d0b..252b9c526ff 100644 --- a/libjava/classpath/native/jni/java-net/Makefile.in +++ b/libjava/classpath/native/jni/java-net/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/java-nio/Makefile.in b/libjava/classpath/native/jni/java-nio/Makefile.in index e048010df7e..d3458810f8e 100644 --- a/libjava/classpath/native/jni/java-nio/Makefile.in +++ b/libjava/classpath/native/jni/java-nio/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/java-util/Makefile.in b/libjava/classpath/native/jni/java-util/Makefile.in index 62eca27d4f6..50189a649b0 100644 --- a/libjava/classpath/native/jni/java-util/Makefile.in +++ b/libjava/classpath/native/jni/java-util/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/midi-alsa/Makefile.in b/libjava/classpath/native/jni/midi-alsa/Makefile.in index 03d61220fcc..8a32375b47e 100644 --- a/libjava/classpath/native/jni/midi-alsa/Makefile.in +++ b/libjava/classpath/native/jni/midi-alsa/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/midi-dssi/Makefile.in b/libjava/classpath/native/jni/midi-dssi/Makefile.in index 86e328da2bc..b9083b0599c 100644 --- a/libjava/classpath/native/jni/midi-dssi/Makefile.in +++ b/libjava/classpath/native/jni/midi-dssi/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/native-lib/Makefile.in b/libjava/classpath/native/jni/native-lib/Makefile.in index c006509de17..83c9e26b479 100644 --- a/libjava/classpath/native/jni/native-lib/Makefile.in +++ b/libjava/classpath/native/jni/native-lib/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/native-lib/cpnet.c b/libjava/classpath/native/jni/native-lib/cpnet.c index 0444981131b..154a7dd7d58 100644 --- a/libjava/classpath/native/jni/native-lib/cpnet.c +++ b/libjava/classpath/native/jni/native-lib/cpnet.c @@ -578,9 +578,10 @@ jint cpnet_addMembership (JNIEnv *env UNUSED, jint fd, cpnet_address *addr) { struct ip_mreq req; int ret; + struct sockaddr_in *sockaddr = (struct sockaddr_in *)addr->data; memset(&req, 0, sizeof(req)); - req.imr_multiaddr = ((struct sockaddr_in *)addr->data)->sin_addr; + req.imr_multiaddr = sockaddr->sin_addr; req.imr_interface.s_addr = INADDR_ANY; ret = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &req, sizeof(req)); if (ret != 0) @@ -593,9 +594,10 @@ jint cpnet_dropMembership (JNIEnv *env UNUSED, jint fd, cpnet_address *addr) { struct ip_mreq req; int ret; + struct sockaddr_in *sockaddr = (struct sockaddr_in *)addr->data; memset(&req, 0, sizeof(req)); - req.imr_multiaddr = ((struct sockaddr_in *)addr->data)->sin_addr; + req.imr_multiaddr = sockaddr->sin_addr; req.imr_interface.s_addr = INADDR_ANY; ret = setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &req, sizeof(req)); if (ret != 0) diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.in b/libjava/classpath/native/jni/qt-peer/Makefile.in index fa5c36d6ae7..ada76339080 100644 --- a/libjava/classpath/native/jni/qt-peer/Makefile.in +++ b/libjava/classpath/native/jni/qt-peer/Makefile.in @@ -43,6 +43,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.m4 \ $(top_srcdir)/../../config/override.m4 \ @@ -61,9 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/jni/xmlj/Makefile.in b/libjava/classpath/native/jni/xmlj/Makefile.in index 35c8bebddbd..5394250d366 100644 --- a/libjava/classpath/native/jni/xmlj/Makefile.in +++ b/libjava/classpath/native/jni/xmlj/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/native/plugin/Makefile.in b/libjava/classpath/native/plugin/Makefile.in index b5f6d1e203f..1d2c51a75a5 100644 --- a/libjava/classpath/native/plugin/Makefile.in +++ b/libjava/classpath/native/plugin/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/org/ietf/jgss/GSSManager.java b/libjava/classpath/org/ietf/jgss/GSSManager.java index 3c735a2fdb5..60eca49ab33 100644 --- a/libjava/classpath/org/ietf/jgss/GSSManager.java +++ b/libjava/classpath/org/ietf/jgss/GSSManager.java @@ -180,7 +180,7 @@ public abstract class GSSManager ClassLoader loader = GSSManager.class.getClassLoader(); if (loader == null) loader = ClassLoader.getSystemClassLoader(); - Class c = loader.loadClass(impl); + Class c = loader.loadClass(impl); return (GSSManager) c.newInstance(); } catch (Exception x) diff --git a/libjava/classpath/org/omg/CORBA/LocalObject.java b/libjava/classpath/org/omg/CORBA/LocalObject.java index a3fd131caf6..c4f095f21d9 100644 --- a/libjava/classpath/org/omg/CORBA/LocalObject.java +++ b/libjava/classpath/org/omg/CORBA/LocalObject.java @@ -267,6 +267,7 @@ public class LocalObject * * @throws NO_IMPLEMENT always. If used, the method must be overridden. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public ServantObject _servant_preinvoke(String operation, Class expectedType) { throw new NO_IMPLEMENT(INAPPROPRIATE); diff --git a/libjava/classpath/org/omg/CORBA/portable/Delegate.java b/libjava/classpath/org/omg/CORBA/portable/Delegate.java index 6d1024461a7..2c716f57e86 100644 --- a/libjava/classpath/org/omg/CORBA/portable/Delegate.java +++ b/libjava/classpath/org/omg/CORBA/portable/Delegate.java @@ -375,7 +375,8 @@ public abstract class Delegate * * @return the servant or null if the servant is not an expected type * of the method is not supported, for example, due security reasons. - */ + */ + @SuppressWarnings("unchecked") // Needed for API compatibility public ServantObject servant_preinvoke(org.omg.CORBA.Object self, String operation, Class expectedType ) diff --git a/libjava/classpath/org/omg/CORBA/portable/InputStream.java b/libjava/classpath/org/omg/CORBA/portable/InputStream.java index 2f6a487b836..aee540d0103 100644 --- a/libjava/classpath/org/omg/CORBA/portable/InputStream.java +++ b/libjava/classpath/org/omg/CORBA/portable/InputStream.java @@ -237,6 +237,7 @@ public abstract class InputStream * @param klass a CORBA class * @throws NO_IMPLEMENT, always. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public Object read_Object(Class klass) { throw new NO_IMPLEMENT(); diff --git a/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java b/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java index f1e348e5304..c121ac1bd3d 100644 --- a/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java +++ b/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java @@ -341,6 +341,7 @@ public abstract class ObjectImpl * @return the servant or null if the servant is not an expected type * of the method is not supported, for example, due security reasons. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public ServantObject _servant_preinvoke(String method, Class expected_type) { return delegate.servant_preinvoke(this, method, expected_type); diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java b/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java index 349590eed2e..a59c33eba4e 100644 --- a/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java +++ b/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java @@ -99,6 +99,7 @@ public abstract class InputStream * * @return an abstract interface, unmarshaled from the stream */ + @SuppressWarnings("unchecked") // Needed for API compatibility public Object read_abstract_interface(Class clz) { boolean isValue = read_boolean(); @@ -147,6 +148,7 @@ public abstract class InputStream * * @return an value type structure, unmarshaled from the stream */ + @SuppressWarnings("unchecked") // Needed for API compatibility public Serializable read_value(Class clz) { return Vio.read(this, clz); diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java b/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java index f1369f78246..818c718d25e 100644 --- a/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java +++ b/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java @@ -136,6 +136,7 @@ public abstract class OutputStream * * @param value a value type object to write. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public void write_value(Serializable value, Class clz) { Vio.write(this, value, clz); diff --git a/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java b/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java index d4b569069b8..d72ebabbd79 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java @@ -68,6 +68,7 @@ public class _DynAnyFactoryStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynAnyFactoryOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java b/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java index 0e3e390589f..fa19da14463 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java @@ -66,6 +66,7 @@ public class _DynAnyStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynAnyOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java b/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java index 869e269c3ef..fc7ba978b3f 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java @@ -66,6 +66,7 @@ public class _DynArrayStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynArrayOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java b/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java index 73e9fa72d61..fd3e9db7eb1 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java @@ -66,6 +66,7 @@ public class _DynEnumStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynEnumOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java b/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java index 97a3d94dfef..5fab8b1b2e7 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java @@ -66,6 +66,7 @@ public class _DynFixedStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynFixedOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java b/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java index 802ff2332cc..0fdc19d63ea 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java @@ -67,6 +67,7 @@ public class _DynSequenceStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynSequenceOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java b/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java index a48f2a63352..73e7650b343 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java @@ -68,6 +68,7 @@ public class _DynStructStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynStructOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java b/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java index b7ba74e00a8..8328b5e8694 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java @@ -68,6 +68,7 @@ public class _DynUnionStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynUnionOperations.class; /** diff --git a/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java b/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java index 5c6b7a209b2..a781772c560 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java @@ -68,6 +68,7 @@ public class _DynValueStub /** * The purpose and value of this field are not documented. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = DynValueOperations.class; /** diff --git a/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java b/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java index f323f6d381c..3cc4be9909a 100644 --- a/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java +++ b/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java @@ -70,6 +70,7 @@ public class _ServantActivatorStub * This the purpose of this field is undocumented up till 1.5 java API * inclusive. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = ServantActivatorOperations.class; /** diff --git a/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java b/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java index 9f142e1e839..9bbd58f8848 100644 --- a/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java +++ b/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java @@ -71,6 +71,7 @@ public class _ServantLocatorStub * This the purpose of this field is undocumented up till 1.5 java API * inclusive. */ + @SuppressWarnings("unchecked") // Needed for API compatibility public static final Class _opsClass = ServantLocatorOperations.class; /** diff --git a/libjava/classpath/resource/Makefile.in b/libjava/classpath/resource/Makefile.in index f9f680ae6d6..81e609175f5 100644 --- a/libjava/classpath/resource/Makefile.in +++ b/libjava/classpath/resource/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/scripts/Makefile.in b/libjava/classpath/scripts/Makefile.in index 214b84aeb51..d8685815e03 100644 --- a/libjava/classpath/scripts/Makefile.in +++ b/libjava/classpath/scripts/Makefile.in @@ -40,6 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.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_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index bebea3dd976..adb8c09b7d6 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -54,6 +54,9 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.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/no-executables.m4 \ $(top_srcdir)/../../config/override.m4 \ @@ -72,9 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_func_which_gethostbyname_r.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/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs diff --git a/libjava/classpath/tools/classes/com/sun/tools/javadoc/Main.class b/libjava/classpath/tools/classes/com/sun/tools/javadoc/Main.class index f2822a6e2664674dc1a97437eba527e8648611f7..50a486c56018e2f7f3301e3427519e324dcdbdfb 100644 GIT binary patch delta 23 ecmX@ge3W@ZIwPaT;}IvV;GFxkR>ykoG3~n*(YlbvgLvUB@`i2wtO9s-Ni+X-24&l z{sR}X9V`dl)AQ7`z3;Q{*%vyo{7r<@jExr3X{CrZ{IpX`2Mu(p5~NGD0eTptml^uZ zgLUg3)YK3$43oeJDU1?OUd^~Uu=mS^`Ly>(OcTkB2_~(%=akJ8%K{cl>Ru+572R1i zA4vzEO;xwFYg@0_A(35NiWTfpi80rX`+`HFIMStKoSbO>lr+xpa8ABr4VTn$W!9Zf z{ud&6)t)yTypzcXUOw^hMHS!b`k|3u{pgQwUKo-vbDn(fl4vp{hFr1Xm3T_UqD&lj zQ!Yz--NZ>6mZam94BXDTT~R5sOmHvXrnP TrCcb#k#a&3;8rTlW6J(NFz!wZ delta 389 zcmWNM$t%Qh7{))Z?A!ciF=H?ewiIeca*&-YNr|zgIT7JtODS6%EZO4g;G(#>D01^h zxI4&pFcc+i!mKY~y2x9K~vO zsb|luy261QqPSI`JDl8;$pd*j;^#?!46EvyW?uB8H@dl@pLcVVa_Q!a48F5U~p;;v;g&9!I$A7n#L3jhEB diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/IOToolkit.class b/libjava/classpath/tools/classes/gnu/classpath/tools/IOToolkit.class index d5f72fb6c6dfcdc822b25e42cf2bb51ce28212f8..967a3a8e8a941ebf4d7a4a076b8ba2f5d7a6c5b3 100644 GIT binary patch delta 268 zcmWNLPb)-m6o#MK=-$Rmu2Qb%*4!zR1q;ez784swMapKTi)^vPHaqNc#2&YD>+GBPc-22p z=^@?XF2|%ep$R)zzSf mXFd6Xr#Zu`%r|}5G~bEHZKY!O@m)5Y)(kCdoHkWr^hKHF6yufSxSdmHdYppu7^f8A`jsak delta 101 zcmey&`I&P=9IIpq}jr3SX-tnur-ZBA`>cFRHUsCp&(s_Vy9M6M$|$5 z5TO+jY6l?-IvD*0K?ZfJo5zCahnfdF)N^^B_xsKBKD?gQJ6W^+Pt7XPF8S4}Or6@)pgr25 zjMCa`GpjDOE2j?iYo7|1UDrX~w)DP^YRqa6bzD!CbGgWecn{?|!v^(ItFzSW90}!V z(s^3UXVmBRSG-GKz^9A&b%~$`2&-VQmkqXHjVlIx)qn@-)DVX?%n`fk(KXi*eGo0O sPB$pkO`^I*wTf)k9rrETt#P+IcEFpm*FAC{WA*MyEalCZn>E+?ADgUSvj6}9 delta 458 zcmWNJ&r8#B9EYEm`gP9fHk;q2!!?bFrEY>SL52uQhjeDfLL+TOMW?196?E{&L1EHC z`XnM09fATO3OWS(2jrok&S9+|2ld!ti2cyd>GeDhZ{DRuDe-3A@4TRfm*%y9)Y-tx zrtt+XIqxlPS!ywhfwk^0RB+dp2l$yMM1cmDiLyeRZ4!K?lW+7;B*S;I{2<3q^87Mm z!3k#<4|{Jnfi zDae}Yc%l%`RnNLyUMb8w9p{4@`K$;NnZY$Cg3rG{7-sXwncd4HMUST6KX= z>uFsyef3+ZQ9K&Mt1HxKoPe$pQjUn-n68o3byAw(tZp!FOf3|2rQ$soZP#URHR&7cBgYcs|% Y*fJ(CgfS*DL@=f>L^7sM-pd{b06fPJJOBUy diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTag.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTag.class index 2aee2cfd5644501e35fa773bc9d14e40e0f38205..939e890ceaee35270c0221330eaf108c11558f1d 100644 GIT binary patch delta 316 zcmWN~T`Ple7{~GJ`?q`DNlPv2F11?i#DO>AXeV9(uf)-m5~bAEmMDygiLBOUL!mI# zG{!u}O`e7F{LKIK>UVv*+}b%_bG-7Y764Bq}Zj#m$iTh)FHO z;%8JEiAyu%($1trNJyNNq)1DSDJhVVB3ZGSmIr3!k69ed<6?nI7ICvgHOpA!s9^;U zt9V(%N1i&?X`w)CfDPIx(!my;Y|}-FAUlNFrJFr^IiQb2q8t(9m=R7G27={1uq9PFzNWq0b5ZturC0e=Z0qRLw88na(S>6UgFapaoBEf6`qdB7} zEW-vWZj)sLQM77PKWB9YzGIuVnGL#~ed46oYInC0&PCmwMrcSJM8w6gco-2cQ3+s4 z3!@TbLOO^^7jYRNA>&L+nxy2JmLfA!A|+*J#U?GEWaN)I94z1=O9MH)EYd_ClO>v2 z#>WbNRtZp`l{LCqrzgY){cI6tn?ZJnuuGIZ#wZeFpEw63IAn?=k{pwwM1~XQDeKLd z-c%HSuGmY(UMcdLO>UG_(DfasJaECIHc#4Ax#by~7w)NP`iifrgPPhm)i3Xciw~ob PFT>>9@bhEU)mQ!johN38 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTaglet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTaglet.class index b88206bf8adf863a72023d1de778f79bb6cd9956..d81864f04a86ac18c451176a82d6145543665683 100644 GIT binary patch delta 176 zcmWN`yKX@N0LS6~?@x-?C^g+-)~ zAl|^l!nb})Yia$RO$S~*;8|bH4uNgMy)qUd8ARkFDi4ne5|>3xNfNS2DTl2B88u0( zO-=*yno!h?Cv7O{hq885^iNeso^|3yS86z^6Q)6i7FpVS(q%x8DX+|VR3L!> delta 176 zcmWN>%Sr-a0EXf3{Xy|CN{mGwP;3eu?SP^bikj$N+sde?|1?2i6F)?WgAEGbTeq36e@<>5_~bY*o0DOIA-@t4=`! z@)}aqgpy{I_0EkJ+-l98zNzR3R|l&4rKS`2#CagkV|YEh!I&l!TDffYda*eJ#$X@U diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTagletPath.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTagletPath.class index c16cb5a7d251eb06c1025bc605fc90f98dc87720..9336e35848185e070f1e1217f5922ad8e60f1d2c 100644 GIT binary patch delta 33 pcmdnZzMFl+7beyw23E$#$v>H#8QUh?GCQ+&GjK8XOm1a10|2~_3LgLf delta 33 pcmdnZzMFl+7bez123E#`$v>H#8A~VIGCQ+YF>o Iwq?-)0A-C0_W%F@ delta 53 zcmaFK@seW$J2S5n0}GQ211FO!gCLXJWD({7Mz6`=nB^z8Fl#aTPhQXL#ux(RyD>&i Iwq?-)09Q2)ZvX%Q diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$InterfaceRelation.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$InterfaceRelation.class index 28d360b4d6e2fc68292ee35b796d7e1f053d7388..0e061038e7293d55b2415a68eb67890535da06c8 100644 GIT binary patch delta 29 kcmbQvI-PYx6q8^L0}D$X13ybWgA_{xgDOko<{9 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$UsageType.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$UsageType.class index e06dc5f523ba5f882d2dce5fa3d9106aa7767528..c962bcc1c39003fff5fcdd22655005e1135ff869 100644 GIT binary patch delta 77 zcmV-T0J8tM4!91m!UZ9t01N}902l+M03-vZ05Aim06YVz07wI=08|620AK^4lj8+9 j39SGG1FrxH1F(}L22cUClXM1J0l1UT20Q`0lMDweJ>(Uy delta 77 zcmV-T0J8tM4!91m!UZ9c01N|@02l+503-vI05AiV06YVi07wIv08|5+0AK@;lj8+9 j37h}~1D*g01D}&422cT`lXM1J0jHDC20Q_)lMDwe7Nr!h diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet.class index 6158ab308bf7689b4a865f4a4076eed34fe5e662..794d3568d94c3045f20262d914639282d3a85b39 100644 GIT binary patch delta 2373 zcmW+%d3eod7Jkn;-%oatl_V~bCX6I_B9VkfA|xUa6-yG4gd!o#Xe|>plJ-g|RkihJ zsS-0~T8vU$TRVfc(xHtdf~Q2s&RB{^$5zYCoG1U>bH4Yyzw@5ud%nBvG;KRg+mEI= z%V01GzLpXhn~Lj5!wn3?P2}PhM&J&L@C(Xu594tk)9?V(@hhBo zh}n3AMREjJ9c_JhZUdx=O_tHH~?UPmIq44K|3RTGF`BD zroY`K6mA>_Z*GeKcA$;=k=!1gxdXa#IJ$ELlGN|Rk;vqZc1hnFt1EoDn|-D47{4Ac zoQNP!LI@|L9lvT1@3+#C4tMU0*4z)_oPkc9i3IMCH1)GN$K{scMT4fP=ydpVrP5}g zJ->x$o~eR=LOjnxB3Gd&S0jbrMi#$=e0HLQXJZ1_;P?D4-r>1e%n(3aO|4{NoDT1~YMd3qkff5lk-Oh5k|Q+Ok0@g{u5TX2KFpfr6CK7gUE~Wb;wAEgFiFH-FsQ19xWQfAZO_+ECQ2)Kiy!>N zAE6R}NC`%FX^kXlgFX_1Txp9UabT3R!vtxMX%dcViE#N1e!$Monk5GQ5{oeDf)3IR z(b65s5{F(AkN%Q?Z0Uh~NkpL}p4Tr z2B2QD(I7c!l!5q3a&bxhs~W#6d3Y>Ch@3K%+@*kmrI5m81UaOLB4i}RsNYpeC`n4G zw~V0-8B0TD92H6#6-hablJPV_{Ye_Hlt0irGMN_08?;p3q>p3@t&*wq7xgzNzEy?x zN+o?GGpJr>QlreG^HN1O#7S9qWi~yR8iu^fEOXdR=5j0b1Eh)_@&R|0g&Zdzask(YQ&ty4Km4PljGtT%#v#tny!J5Cx8G#O9)%Xs0Y@y0`= zkE&@&EsQ7m8b1m#{*+{bns4KHeFj0j^riCA*GD}W#C~?GqG#c4;bk1~H|-E)+M|Q% zfGiV^!6pJj6)QF!?U<1(d}82cVi9P%A;!enY2$(_|yS1HJQn_`Sm zJI0K%n@axZF;2fNgSVMr7nV-)nG6r}hUR_~5oVfwymWHVJk2&AKIVP2F$*-?e644p zoj2-Xy1qr`Bh^{1Ix94?60v3#dYF%qY}RO}Yf)fowaaxVGk?ZZ^C_y$YRu92eC01S z8}0W-?~d9A%WT(q2g#rMaaw+(wAGqc!}3D03H` z%zgVoS%m%CxRQ{^%6OuTr^@(E8PAmQTp2H$8P~@Zhgt?LEerlu3xrs12)Eo3WqF{J z<<(57E-MM~S4My`0+kV@j9_K7Rz`?2mIXz?-FgMSRwRO~D0EO8ZFSO}1lwE7D;=@$ zu)4ro|G~nnZg5y}h}84%taxQ5>P?#KNP%VbR)tgqT4|cO4`S3$v{I06W!RU--|jh3 zqq(X-2%*+sw72q9dkDH%L($V3jvQ+ka;hI@vrT$K_H%*LJ{O5^7{|~KeDY5_n delta 2373 zcmW+%d03a#5`Jgqd;$WpC@3HV1X`eY1(HPtK@mYnL;)8NH4wzBxultzaT()q1(mpp z4{!|&QHMpifzNOYD{vd@aR(c47u)a$w&NZS;{lG~PtE*D73%RzK0U!@dWswL48PNJ zJfgqw7rh{%|50OlN!|?dXQEJMieRB=Hk8PIl+3}DDKn{;IZFe~6)H7<&}j35CR-h7 z7W&w$J15g9`%32o8fyn6b+X>mGAG%ENfQI7!wECsf>~&c*=UA2@Wnhd$9x1}fqg$I zhdy?sCQqlz6|k@ho>;AcYD8d-c4RHO;|uh~ml%q57_GHU##fqZ6Krfo6}BkLp_OjK z9$gPBegb>7fBWzY_TxTkNN|wcafq7ZFooj?wNo2|V-$zu$^d%k@j&sYvAd;=q?7j6 zl=s`Zz=<2fja|`{-Oxh)Fm8g^*#lARiD>phocdk3Dbm=-E=-+f1;T@a>|axdc!j}m zIDEJj{J1rOIKuARby?uw;LPpOoTCxKF=)-Ph~+nstbPV3IGnngcnQH@ z7-3=|S{flvoX|y_ktMF^FK!ql?kJNc7%QHbB3=%!UiZ1O1)Rkn-V%TSX^CJ7LWG1M zUV@P*q3ABJB16KEC*dfNRwz|luGn~q#58G(=@NyH)Gm=Ws8Xz2qVcuFV7tU(pTyyW z#G_Uca7GewUOM8k`d2l6SCUaLU5F|rg`6dge5E@DNIC^d4+@nGic~*JdQzNZQD@1a zZql1_C6@}M5A~P6G)VHOO#KRtkC%ZoRSIdY6wzWCL?25rEtkQxO8qs8Z&aZjQbGr$ zluk$)osr>mQ7WiTMp61*d7GZgXoieoma*(4duu?Bmegw{Vs1Ivu@OYJFw5y&$e$4MokmZN*)H}XNcmAX}FEU^ce&tq6Y5z`lu(_>}7lQe-`2jSK|h6;|?Fw1i{7w>BbYi zj2Chh8)$s&$N@{;{o!N+(98rO(gfSd!+hZ8W+)Tb*P*mYw2p3bNxd$QC46#oYjr19>*(SiZ40@QN zZ;_d%I@48WhDK(hjhTfv%xuJ)d0OdwP8Fv~O*WViGZ~j!uL!~@YO1)AZE9Hq&o;6UWloa|A znpg~POWhg0@x)60EMsv{I2}bwh6}4MmEVD`%XQiApQmmhu^tYtJdqpaT0$c_%8d bJ%&fq2s>5RrS^DTi|zHpV-){sc<%oJZ3->W diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletConfigurationException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletConfigurationException.class index f8f42878876ffc7d5fa850bc8cb85849d4a2a0e8..28d3cd17aa598db57543c3a6ee50069996341408 100644 GIT binary patch delta 17 YcmdnMyn%T`Dy?jGwA>TWK;%7 delta 27 jcmdnbvY%zcVMb1A1{MZc22KXK$!8ed7?maqGwA>TVFCsO diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionColonSeparated.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionColonSeparated.class index b51e16779fa8962c4aa5e24826e763b30d7026e0..5f4f6b4a514c63fda3d7cd49fcbd7326226f467c 100644 GIT binary patch delta 79 zcmey&@tI?TFEgh(11p0ug8+lY?c?tdV0LGdbD}x*Z7lZO-P9`@-^~nKDmW(=+yO``)4S_O7lg~1#0RX|^2)6(L diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.class index 72b2822fdfda0938dfe90109bf1ed8f7f33dd3c5..3f9d436cc8405adc4bb41a3d3cd11c64fb01d58e 100644 GIT binary patch delta 127 zcmdlZut#9SW>!u+237`p1}+AN$$MCR8C@oGvDq+sPIhOTr0WNi31ARs2xO3F2w~7- z2xBm32xqWjhybdOWN-(v{TO0^D&l}D5+}2ld{E delta 127 zcmdlZut#9SW>!vJ237_=1}+Bu$$MCR8I31%vDq+MOm=6Rq-zV5v1brxaA1&UaAweA zaAh!OaAUAya0iNd07*9nKL&4x00v)%K!$+HZ0zllVGQgH;S2%{Q4A6c(G0Q-F%0TJ Y+JGT$@-p^x&J>_*Do{3KvKWUN0M4Hk>Hq)$ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionString.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionString.class index 39529c2667c9eb266c2725b3350e3e94015347e2..79bbe2c51b2812ae3e1ad5293797a93a4e3b6d9a 100644 GIT binary patch delta 43 zcmeBR>tNd;%*1KLz{;StNd;%*3h4z{()Yz{Q|6S%%4tQEhTElO?0}wOg4-fKvI-lnt_3Vi9rScu_^|v diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageMatcher.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageMatcher.class index 6370bc4a1ef01a3a62430c568b3eebb739f260b9..88ed2d53cc68cb7b657fb5ec0f7124d448a0477a 100644 GIT binary patch delta 194 zcmWNJF{?oV9L0a6?sFvuuH_nJqqn_o%3vcxM2SK~&wyAYypj!%(v6k%ZOULZ`2beC z^?e2Z<#f*Zoz7ExYUh_?H?R@Gg>m^;JeGC>D@hbmxJjdtK_|->Iilo=Q;<}oOo^sw ziwfUV=~H7wohc0#LN-G7v^mk?Pkt_RxzgjtfCodfV?TN)e8}F(3?DxP#D|!hy1MZ% cQCSID3;87|Z(+84N@uV$@9NlcFk=q=4eT2z%K!iX delta 194 zcmWNIF-rn*9EP8Z;PN7J&~v#4i6cndp67jdBQr98|Mi&7As3uthdVu?y*M0@N2frXD@?AjD3Ze!D^aD) zEft=Hy4=vC#w&G(H29R_bH|K(0v=fK$PZ7fAc^W-q^FeId;WYW`SijS6C@l2&b28vV99;&G5o zJ$W>k=T^Jv+gz@pjEU(P-#sVMs`I6NyODczD z)yRr+v8sAlQ-dznm4^+rCMCe8I>4_&Y^yLk>VbfICaAvI)tWtR5YTDt>r4)HE=Rh6 wW8KP$p5avcrElTYCTFH2DPmk;a7j8>W_hwN<(gP-vlG*e=>I1FX96Ng_eF578m z;o!>2!I6vdCphpA@JXL~zk9t-pZB-(+j;wCwNy|{rTJs^8MPGP5UMl1M%eD8hz6Qz zq?0ByYjc{fM!?=GwoPoi*p7eew*~AyVtd8*iFMs)ZSVTTO(6r6Fi0gs)G$mv9=fF6 zcqK;|mGd*kG(JMo5uq64#F^lbNsgJ~O8SNXIcCT+%L754ndgNC-dN;=C4N~}Erir0 zD=NsUT4POZ23c48Y^XDVOTy}!MU^9>@@%O)qUw=t^+`-?cCXdMX8EtZ8`b)oz6ox!j&8g`rOO&Uva4x$qWOtf=GUij6>kq{uL_Poj diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/CssClass.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/CssClass.class index 9fe21945a26e0838ac0f00217a6154560753f53e..89ca9bb2656d4c6e000d80da1027fc0da1ee5c63 100644 GIT binary patch delta 782 zcmW-fYfP490EVyU{Co&)o>FlxZ5WHqDFojKc?zeXl}imgW|C)|n8Orm;#XjrmWsWE zO;NFu%B;WxrKVFSTAqelPH{E=h?~vHmd)kz@XkN?uKW6TZ+A^;O=;umjQBtj8AMOg zNg*So7Z^e&qsgLxC`H6rNH*o|j1#qt7Y%VHh-O|FCn*q@C=}P3C_0!d9x+8G zGFA3unoQvhna*@Mj5p<2X2|Ij$r5JD3TDf7%#roXm5t1oM=6%)SRnsop}b9re83`= z#M>&F#VUm@QZ{WPIqt)-`qCdnXe}+H&6)yXmT=Dm~8gaBmdT=e0%7CCFGt=C_ z(jGjYH71+j8H*FtUN(DobV)yPQkudex!5Qx`eHJptFaF-a&4deZ%Y?1lg&g{}XBrDeVa* G<+#U^Q_1!K delta 782 zcmW-fYfP4P7>BR_`FR=W2h4<-c_80pmVxlTpiIRS(A4IH#M1JR5hg}>fK+@vJ1rA^ z2rVhG6wPeGQq0ViPAcgzOWTyq!)DXcS!gXbHdfF4^4oP^+kJ2M_N%R^t!Ubm9_vRu z57USKq%eRd7)TC-CI8=e&B87HnWUUZNz z{-Z#~GeP!YqD^Q{*h3mSs$p)l8FHDU=Nq$tI@DuPK&4GDBYGIeCYf zvYS~df#+2+FQ`=JsBGq{Jm#rqcu~z`zAEP>6|1I1ZQ*6LlTx*hS5z|#)hWu2fqifvh#@tTW?TZ;IGp=CaXLuqkHh*lhN*#T?}g)5@FX7q*%!yk%~&&2&;@HQQ}3 zcGwhZZ5nUeT>1v-7uaKO(qOyT>*DypCG(*R zv(II)-{sTjp5=gBz(H3{*+;I1L#~03T@#1hNj`CHeCpb1a<^!9-F)UHaKw9v7B7`! zUX;(hVvc+B`NCVu32!Z5dfPbZ)$^5im{Z;fPJ7>T#=A(Xcav|uPQD8{&W0YOEfl7& z-;t4FE@1i9ACfu2T*A@rS7sIk4~Mww|C~A7Tqlm-{79tK{2sVJ0yn^KjT9!`Msp`H zf6{}$NTh=#?gq`h=ch-j;`lc>)frT|%Rds$4}lA67%#N1vvNe7pBrS)ARqAktgz^H NpUwr8be|Hk-TyO1#MuA< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.class index 125649f93ef987ee1dda8cf7f68db54c8680fd6d..16ffa3350ae036902b96804ddf0890f244db0a51 100644 GIT binary patch delta 284 zcmW-dO(;ZR7=@p=EL>fetGSCinXEJmg#{@|q|lV2C`2jarxf`MQCHDy#$@u9G=pLz z@-tyUEM#M6V@oL;TN|rcc(Zy=om1y@@{xQbcVJ12`E)#UV>P*L6cD3?c0zRE(|KJK zNYIT<4^eulrH=+>BmJ~8Ko^5dGQ=vw1j+;>BpD@5oE_yZW9&1|5fhwf@`@=QnC6KY zo|P}m^2!`<%=69yUo7&?5^&~3sP z^I>Pbj5=AW$WWuzbsSR9u}Ky0`DeJCQpPzR7n;AMQgt;s)9l3M_Wy)CCo1=<%Krcs C^F?0( delta 284 zcmW-dO(;ZR6o#Ku7Ot+#mAkk%la*$njD(5gCki3uw-ouAn3{zmn<2L>)X)^Z(r8SQ z1v_G+SjfiC#+Fhxwl-F?aI$*dI*a#tPcc%A+!QQ{nNP_{49^ zLJ7OD=_X1qjr0*$w$o1!1B@_8k|8!3CRFY+%06QpFwT+km5c zIi8g-%=5|uZ!Gf85?>_vW|<#W_$4V8DRCWE#b-?d)}@vWW805jno=#TB(0)bD!NU; zj`^_jUPdo_)RQ5mD$Qhd%%RDa=ll~~a#WGWQ>lOgb($MEGo4OCF8-fz??mNFQ_Ua4 CaX~Nu diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class index 4db03df8d4136a69c3fc50465d7202aaa86c92b9..3576ed98ead13691e0fb1a521133b7a7ab181492 100644 GIT binary patch delta 29 lcmdnWxs`LnEoMf|$+wxE8FeSivjnmlF-Y(lPcCI~004_H2lxO0 delta 29 lcmdnWxs`LnEoMfE$+wxE8D%ERvjnm#GDz?$O)h0|004*H2ebeH diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class index b2ef23465e097ad2d8dce401e08f81535321bfa4..3d38a044d032c7996ec76fc619fb7b9200d2d2a9 100644 GIT binary patch delta 29 lcmdnaxt(*vEoMfG$+wxE8Eq!Zvjnp`GDz_{O)h6~0054-2tEJ+ delta 29 lcmdnaxt(*vEoMgb$+wxE8MPlO_XD0ppW*15yF#lga~00qv6%1S}00aWc01pDq02BhwlO_XD0n(Fq15yFklga~00o;=m1S}hr B4Lbk; diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class index a9e919bdf84ff3e3dba87b2cadddd3ce02a071ee..1e86b0b069bb0f917283b9cb9d4b6c8d78cfda6e 100644 GIT binary patch delta 10342 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 V2Faqb$IUEEO{sU>v%*yM{{h2Q8khh8 delta 10342 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 LY8h^OGot?oug@_H delta 1308 zcmW+!dr;I>7(Hi)yNlZDkRmEi(S-$;<>iAk1sO%K@c|_HfCbgu_pN0?BNXK%FLk+TZJ`K;Q`}5W{^uqKNQmvF~l~k+czefHq%Ks(#ua$qD zlrJL_uSmI0sp^$rJ!WGA=3}EKc@BIoK?2MTC z?tVh<6XF)qUr2)OjTvhO3K_INeE7SLRl_ip;TX;c#4{4fj6w#Zk;xcLp_* z`Yl#Hmt$EzkC|M^2Ux{%T+Z=a%Li#yZxPicF*UO#%MM#ALHaUd^^RaY0B6g4l}t*(ODc*0|RmOMEt@ zLue<4a6i24KoUQ&g-NC6V|jcM@Hm>3=I&O{1M)ejnLf8JU!^&W5j$An5rwK}v)3L$7_BA;FpEysU{+_e2eM=U)ffpw delta 41 vcmaFE_J(c4Y9?MK237`T1}+8_27U(B$vc>$7&RvcFpEysU{+_;1F~cQ%$Nw> diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$1.class index 016bcdda9aa0ebf3626207bf292c4ce5b0463257..51027ef0e740025cca86b710071d346cd8986324 100644 GIT binary patch delta 19 acmZ3^zMOr75Hq9VWMO7cM&-$|%w7O8PXw0$ delta 19 acmZ3^zMOr75Hq8|WMO7cMxn{E%w7O7KLm9E diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$NullErrorReporter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$NullErrorReporter.class index fdaf194670bf6474d8d2e33f770a9c654389cee2..42b2a7d382f538d878737fe4277738754fd97fd8 100644 GIT binary patch delta 38 rcmbQqHj{0GG81FQWECb0#>~kJnB*tdFex);0a;Fr*+5cu60;-#(_;#* delta 38 rcmbQqHj{0GG81F?WECb0#)!!anB*tdFex)e0$EOsQ9x3560;-#&Q}U* diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$UsageType.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$UsageType.class index bc7fc363d33e03de70059bc450058d25f297d999..dfd0a2251974bce7a9c081482aebd4149d2e407f 100644 GIT binary patch delta 67 zcmV-J0KET!41o-=-~=7801ODR02m0e03-;r05Ax&06Yk_07wY708|LBll=rY3Aq3S Z2)h6Y2)vU$1zG{Wlb8iO0mGBk1uTIx6Tkof delta 67 zcmV-J0KET!41o-=-~=6?01ODA02m0N03-;a05Axn06Yk!07wX>08|K_ll=rY38(-B Z2&w=H2& diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver.class index 11aeeb98382cde35268316317c9a23de8403cfd0..f34cca51124870545fd0860efaf300b2504be32a 100644 GIT binary patch delta 5677 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 delta 5677 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 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.class index 7c022b493a5323d8e134d8de587b05c5ff7d7c0e..e18500ad88be3f43ddec780a9b839c67c1e52ac9 100644 GIT binary patch delta 39 vcmdnZzMFl+S|�$?KS$8LcOOVsdBoW?*IToovVK!5YB8#t<~Qo7n&W?FR~E delta 39 vcmdnZzMFl+S|&!N$?KS$8MP*VVsdA-Vqj&knQX`G!D`RI#^5-)o7n&W<{t_E diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer$TagInfo.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer$TagInfo.class index 0afc368b04bfed086380cd3f051ea03b28611b24..7c0462beb70c27bd038521a13d72cd99e2e2faf7 100644 GIT binary patch delta 57 zcmbQtF_~k-4<=qq1{MZ$27U%B1}O&X$*jydqP9>GI|dO3dj>@YI|eNV$H{HXVT>-5 I?=qVK04mN3UH||9 delta 57 zcmbQtF_~k-4<=p>1{MZ227U%j1}O%u$*jydqB>9!T?P>bJqASvT?Q=%gUM~oVT{I; I?=qVK02Z$aqW}N^ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.class index 32d55684c97169e5f626b35656e3c8603d8dfa2b..f153d7f0daa71629b112bf5888d36ca3a1217520 100644 GIT binary patch delta 1367 zcmWMld2r5G6g}s>UnGJge6mO;8oNvrOVtvUMr@%-1tTG{ptX+#i9I5M5Nmvh7(1D! z6HRrZr9tUXM%CVyluFgqn9+!vUEN~`t=^6;f4`pN-X&mcJ zSmkFl%Z!veUt1_3O@TU?8`xendA9#PzYJ~lUqMHtG>h^HHg+=47_#U^{+$zts0 z4!3vMFaCRBxX&W(M>r2)F!y34ODpTbuAAKB5Kq9Hr_hY25yUfS$8(6}dGxe@*qfK^ zSX{NEa1GOV9htm=1^f}qcoPMz#%A6|3GZMJ@1m47IKq)dFz48 z{L}j7FWlr~>ysyVU_J5JdZIR$wW#NFI()%~tfL?QWguU%CF|LSuNlra>>{w2$Y_Z% zGVCW$4v`l}s3DW&&2ehP6gA;w`7lGiTqr*-Q&X;1GZxCl_44O71#pi7S*{RP*t#l( z@msZG?gh2xMRnz6y~}F#;uA&jncm|o^^sAuyc8o}#VSDk6rurYtw9P`oI2?P_0%xM zYq&;fgp!q@6uV2;7)?>4GL)n&jniU#ldthwtyFDPnu=^ii6&^DCaFvxr|YmL>zJnM z8%@&gj0VOnWM zYLywQ0yAHQCYNW-8f|iywZGM33p}+IzS@RR6{D@Tqpx;gpmw=SI_&b_4<8+XO9v6C bQpBnZ$trgb?U>fE0$%zYjdj>v*)igOI^9T8 delta 1367 zcmWMkc~I6>6g}s>-{+PIiHJ)m;RcCII;frsqE@3FHAf8@G-~c3Y3WhQR!$ZDVCxfxv0c)T)@hTqUNVu z?lo{>tyRdgzVhLN0;{s#dfI?sI~0nK@ivOApAt*=2{Nz+v+$WE+-j#vE$VZN+JY~z z9eYrQ{n&x?R^$|rbHWe6%6if{QA4%$l{ViFEB*^Q%2!7+QXD$c{t zT!ItajFUWo(>#jfJdR&kgFjh|tGtVAypQXAioaw~BTw8^3)IRVx6}c56pwpK#(j;& z15Lz3rJ+t!@I-U)RCDn{*@TvnT1_dRjyBLGcQNZ}E9>h78|pk8shTgVh90VAQ$3`Y z>ga92=Ek9qd5JAdGqyIZ`Ko!1z9yP&OeWi!Z2FlT`kP#KFdwj^$!CE1h=Hba(xo$xz3O{hd|}cYGP)#BqQ#f>BNiW1R7f zb<#Q5naVh)h(nxGCOGA&arQFFIl!^bZ%lFSG1b+S<6OR+=n7)Gs~0m|V>#WG%UKmM zZI&=R3r#o|UYw8ST!6MVnVq=^!CZ_GW}~0&MKK4l_WVP*)TTBUnOuf-_FZHXT+CI4 zjr=Zp=fQBDWy(h&3lL*-oyheSb$(}zdppE3G-5fLawl4FH#%?+y6|iC=03d1{Yd2@ zr13D)c?2{09p>|Uab{ z_ZY#49LPtE=VK437oD2AZIRaOTTrF{}9DXPlOH_|#va4ELr95~< zo^=1DS6C%Ko>V(tP$%9|0RPqN{7;=_6r={~Di3v6bG@O~>M4H(D^R^`H$=VFS3}fK z?k>aQ`1P^u!8rYOx&v@$hNi!?~Niq%TRDbJ$wHB=iFuTPbzZ5o!UT^g>v8mWUy z(k~jNOB$`Kma0}Mx~=hgpb2`WiAI`a8Ys|3=^zrrjKTtFwHX2nr#Lv(H8}0}De411Cc$10O@!mNwnQd8P8CV(OCg-t;PyWNK&zLw_ PhsBmP6)2Vl6jK8LpA8MU delta 61 zcmbQjIfZkBD>JVX0}F#Q11EzE10RFy-O7f{EcpX8b2&|$Yw2vAJ=^(yzR#XNo^!sZqoAXpHZvIb zOjbGm)ZpU2s~jy?tco>Q?<%M@8mYA!r}zBx!B<)54~q{EELA{dZsr5^*G3Ihx#Cr! zL{%zTpF~c?zY_?5=|-v)qiyP=?Hb~EsH&BquQf$GHB-Bkt8cYTdsM2u+M<2h@9Lxu z=%Q+LL$!LS?|4jg#3@2Z2bruxWUHQheNT}Z_)tfv&{00pF)AJVYGkWUvP~!05!Mgv z)EN${iF!42N>R@098sO;C;iB8y1<|MnY(K7JYDqSbjcf~U%Yf(_OkS=H$zvvJhgcx zYWK?3;ceDcZaI!B-zG!!a=ce>ff>23!QYvbr)L-ev~^tM^_vDrLf z7x1KA;(Q_f?HUH!4GgelJY_#+u-(cKyF<-(Kf`SeL3@~l1bdVbwuzDUETe2IW9%iy z+IAA{RmR&JgzQbHcSwq~jHxr>40YmJJ<0_2?aqJ}X^i9D|qGBtrInoO2v@uKpW zs-;X*q4OoYqzYzeGc&ct@mDUN-Mr$mneDQenJ^LTecwRu@VX z%R2SueGOv0+kJyZQ>yWlDc$v7pxnQbR2-;OfRFv0LeQdm8sJ??Vn1`4@A|E KbN=YGl>Y$*soGQk delta 854 zcmWNPdra147>2L=_r9M;3^mO}E&VWHQxxQ^PHU-%=2>d4Txx1GF;NkuMIW2!EQy)F zDH0yQQc{OH@c_D<$3cv?4n%DwDjo_?rOno6R_{O0eLc_aKc3U|oa;G9CPf9-VVUAj zjmql3*wI45$zm|?5XCZvkxd-S{pP6Gl;aPL4h_mBz#8YtV*qQ3q=0DNBc4K%D5^ah zy&@3$&{;|d<71wolp&5I*-Q+dFqy5)VjJ_>&PvKz&!;X{P{R(+v6COzMF+ciLZy09 zr67Bhz-OAk=gMTSmaUOx86s5=auojS51p| zh*s|mKYDHa?A_wB=}eo6;EIXisu{^OlSsQ6%PkX{&u?ZC9VVOGW}Q=?d!~xtO&x!j zM*cLdJTh(kW$yF0dCX(`6#v+#d143huMP5_O^~svvNl5jo2gFrEp@ipF3(dp`@X_# zvAWw0>S4Di+*YWkt>mPwQ6GC)eQmw^#n{t&)?QMCZO{PQszLTAJ!jiB*xt|(+o7Pn z>-2#lYgT^8qIQzA;PJ0_t}FT6_^tsq=E^wmn9 z*DBZhYGRekD6JvQ)zekrUrsCt6cW$}{_9Eex)wWHPd63&UnVuhm$=DG>8Z{1(H0W4 zl~k4SlFFInK5B{ksAbyCYNz?CVy*W0b; OY#BHi>?Y4)Q3C*X;R{p% delta 59 zcmX@ad5CjE9y6;H11p2{UVnMjU-0D?&cxwBW|Cj9btwwrGLV{QS>&BBA_WuxGz?0k3{ RCxHm8C^5+=sUnLL*8oL*2EzaV delta 69 zcmWN^ISzmz00q$j2?epRvcbw2cNP!eoxKt_@i%WW%{Tuo-5YVN1U3eCMh+%UW-i@L QCX#?2Ba6PMhAJ)34=R`jDgXcg diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.class index 7fcd83c3b701c770dd4d67cf4498514a75b491e9..262031d4a56ecbe41b407b94ec3276f9e60428db 100644 GIT binary patch delta 99 zcmX>va9&`8DjTOU0}F!*11E#&WIeWMRx1WJ2J6XvYzt)_8Dtn-7*rWt88jK(7>pR) x8O(sR6@wRpHG|J&ANCotK|r;^K%F5BJPe@>{0w0XVnEu6Ap)o}axx=_9{_A^5F`Kq delta 99 zcmX>va9&`8DjTN~0}F#P11E#ZWIeWMR!s&r2Cd0`Yzt)#7-SfX8B`fe7&IA78H^ar xfY6k|ioue>n!$Rq5Bm&RN1$3KpiXB79tIZ%eg;lEA2%Fe3Cz|NpOxr^PL)0lyU!GwX6!F2K|_9jUS237`3AkT_{kHMNj4oGV; z*fTgVI8ILGNKkYE%DOVJF}N{sF}O2uGk7rYFnBWXGI#-1yD*3_cu#)DQOM{wIf65o zF>vx4P8-J1$uEIqlEA2%FZgwz|J5wxr^PLQ;C6vL79P*L1pqO_9jVn237_QAWxHlk3ow;4oGV; z=rK4j7)(y(NKiBe%9=2+F_22KW($vc@sSS=Yi7_24>G3SfgFt9K<0L2{{_!yiRgc+O}BpF;L zPh&1;^q9=Y62s^_Ih)0eF=+B878}O!$?t(=43HF^?8vIlmQ@{rq delta 19 bcmey$@|9)7FGfbo$-fyr8Eq!JG8q5>Qm_X1 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BracketClose.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BracketClose.class index 4a6a51783a10cfe68ab46dc83e7a2337ec21f6fc..3802e3405cedc6a9e4188d1b65f5c15f269c9132 100644 GIT binary patch delta 37 tcmcb|c8_gC1`}i4_buyna+w3QcWp-bQ#8ViQIyoOmYP}b%UDZxFv)gNq`0_pRHBrl zwu7sSQp!;|D&?ZwmH3@Lhvzwb8^K2K&I_2%rXTRkVMySrg|Oy`C{0vLbg4j0KHVzP zqmp%xUhUJT1NwEufR3#f4C#`%t{K)1Bf7QTGpa|%^u)NHN$7_buzcGOz!Y5o?pT4XYhQA_uQo*3cU5zfHKfC~YT2ii;~pB}zGJ zJGiQ>#mywCV+o-c0>>jeST(V%IXl%iQHv}m1HdAKSO z)TXseoAwFmfOZ|xp=0X>VOOIK{4J^1(j0bq(S_W%F@ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocImpl.class index d1be100e4a54d8721eeade84c667e35e838fb96b..36049302b99719e4e1ed937988ac07a15537f96a 100644 GIT binary patch delta 2854 zcmX|Dd0f?17XO}e?_-Ao1abicR2~rU*p~;mu_z*oiVA{)nweS(E|7|dsfn7)TvRd( zG|Mb2i^j5#xReX#Smv7M)-qX+qcv@o)70sG`pjSFe9!sbbHC@@`|j`UIZk_y({8Vr zh#7FhqwvFH=#80(!Ym}C1_M!x0?fu3%)vwzgc-1zl$ffJL2$ufcp@FXs6!CnMwkMu z>H$O}8}Z07@5JniD1gFnVWz`NSlxvcB&;xDSy3p=A|#*~sVFf|#m=Nsvp%((@wO#U znOUD0V7^UtF_UfKG~U#tbu;a@2%6+zTouN{|7XO-btWx9Fcu;V4d{!-co0hvho$I` zWf+7NC_ytSuoCmJN*HUUCs=8Z!wXJ~Ff)@p%$8JFQ<<1R2Sj0><$YLi*nE@| zV17unS&j+na-ac8v8FNE-z-bAT24vyV@LFOQU;wfPRSW`(NS|uvX!nlycY337tha} zPPSTZ$cnGc@5w{ymKmDTpT0BADGhypl;}_Jz|V3fcM*VJ5Qtx8%J&c}ej0v6HYpR8 zI+@8u2ARv``PUTfu0C)kUwDweNleS2Ub0iUcL>}m6uuM&KMFwz^);8%iYd~eVo-V? ziZdY@zGi-U1SL9Rd(*2Z#q_XeP`co5X1d)<84m9ydlqGx8}>9B&=Hc+sT+sFLc`!j z1+v9(*|rd#R0J=H`BE`@Pzl0lB*JMFB553=sRA~tL;{URGEG1xRiT)wF_I>tj3%Lq zCSwvkghyy9X3`^QplMi4)3KapqJ?H*6V+fd)nX^j#_Kc}osBdP2dNJ4Q$0@8;M@uP@mQg+}ry_ciN~xJDXcbMM)l^SwguRZI(0Y1? z4DFy6dWSa9N!m!KXcL{M&2)>NrC;bd`X9Bi3vFdz+QyB&Xgi0~3mi=^ass`?S@bez z(<_`$uW~89#^dO9uBJD52EEC()WP-i7B8Yb+)R7OI&(ZaG#XJIMVpqXp2foEeU&%wJq7Y8JEg6HEj zFTe#}h%dz6;l=ogn{bbpkTW-tFE6K_yn;e=<&G}kKvOnbq}p{JqwEZq4V?&tHe?wnMiC~n$X{WF*cQHtR{odSGkiKLClglqu#a+wi}JvI$`k#>hO7I{mcq4 z9}#S(j>z$zBH4!}J5{n%Br{Di<@A{8J~Go%E4kUyZLpa?(rTF}sLp|o3R)m&p`ak+ zJ*q6CNzf9wt0&;CmLfnclYO2{LcBBX%sCJm!W221E=!g7XkvhAi&Z|;q zxAgFatbem(_2>tw>>W9}z0%UV=%Mz>5q2U@?Uy14kf{zLTOE=!c@Ozwr>n!5qmE#a zI*JwQ7}lvSw5kvAtU7^R>O(n?Q+QX_9#W^#rOp`du?GV$h`dik-bImjN#w~@Q1%E%QrHXn~tCSl`@;<--2#CP(*pI>vvM)Ke%6gZ|ci)>8|6Ob*4Ou zelx$9+gYDDKlUMdU0IStCknrHwg=*Yhw?*I}5hN0ELU zC3*oy>IO{Ii%_E*F;_1}onDFty-ZXs$2$Eawuo)lE3r+lF`renxNa0Ro8Yfo&AQ3{ zrls0OTO9MeSZ$@P;`w&?O$?*PePG=wV)n~eI^m@c%2*DehkhTu^a%Fm=de?s$J_b>PDuQW pzJv?m5QAS#O?f=j62!Xlc16W~fDqUJ^}Vb?9S zB&#XQg^2=nBsG^LMk{SHE6d8ssp-p_%9^aHgc96 zpP}|?@W6EVV+ICcCZbV_WRzhf%8`!>Ou;NvC~wR|h#5AtEHn;oh=(`q@WmVi^HqfN zP1sa##2`UDiRSRo{dOl5(j?LjABpNOQNa=wE>Sk5OJs(`jz9`B&BoXo$}*c%{EXF+ zKx542!~pY6ikqo)MAA4@m+EI)9d?@Niugz(CjUPoF0L!73L&UQxUd_78r+RK#9@I{ zUWidxf(fXX&K^XAJdN@+VHujS(uBwVn$!$;JOV2=Naq_d0GkkoM-hb^jJqtm8WavGg;Rh^P-Gc`&5%+};cdRr|1 z=3=tV@~*^RHoqm`Lm!xXhK-Q7kn3XoC%o{v?8yxT;9m&B7c%895i5Est|JTo zG0`cNj30$)4&#?Urs#Ah^d^QESxjPT8hOe}CDuOhBrANWFZ`(wLdnm3m^z;NyI71G zK9~lX&@^AuFx*bzF58jeWfWloooQqj>}RT-Hi~v>&pR_H#@ukGQfzx@T9=Hfl7 z!pBsNPiY=*(*xv2HRMUPG??a794(+kT1a`chze;j6;VA+rv@seheT_nCV5uUa@r-o z&(Xtlm{!qwT1{`!8hV$S=_}em|D}!eKib4@)WW{BnVSZZ;YixTF|?HvXgg=n1Oa)Mv3Zhq4n8;{4sp9CAa?*!szfv%|C^nq%n0`&rYqz=-@s*|p%F8WNJq3h~9x}k}_&_48UJ&?ZA;dE2S z(lcRBC@rXbtRcx2lwUSje7!{V^?5oDFz5VKc&euDf3)w=gb zZw`bP2bnQBX%yx8fqDEba+kIEguO+zIqR+8f2%kcIJC+}$RBoVjUP^h~NK<6@E4hj4csVWO z6||mL(hh!DPQ)sDiC5EcUQ4e_-dp?#eZuSMbKYb;^0w1v*MyGb&5zlJUc4P1yh9q> zC5`Qt>-Y(T@so()J+KLm=e=<9)5zh!n5knQ@jn1JJ_v6}XR_Xjd_KMGeJkDjq#50q>|pTvbWKr~q+FFn6IC|NP&sD)gjf6Lfz?=HSs-)@(NEh`zG3p+RQw$7QqN0E`w*yJM1 zLT^1?G!4bMmiJ^VS6r|B)nbR`LqS(v$X=4;eobn8f6d-t4k9CG{deH92!W|y-dOM6;`>Xw6}PC z5UjlrrLFDPrfVt+gwg}xp@ZPB2Z}ow;W`9Ebtn>a7@Rr+qje<4Xd4Q&9mP5tb9EG| z^xasjW3WQUVvTlSllULk$!OJqct)p~)R|X8GtgU)fTzxcuO5kkdNc;>ETNT+L_G%S zI^QIeE|Nb|cRt<6O3%$GmiTFK*VA#Ao+%_tg=Cp9DVH{8AzshMNIeH*^?fMRb1^|z zVUnJQ3jJr)=?Ab#*I<}UX0x$TlIt3s~gQHWn0`=3!63Qr`MX6%6?`` zxr5fb=6R*uMlGWGw)o;&!_uz)C^K~zM9^dN=rfb$&@5>ieB}#INl*qHs)bHnaXhQc*cP5~H`a%mD)9y1gu38m1-Y;=b;{&=kkNKeLL$F$o=2MdF?3L~=BlS)v zW5_0Q2KfT{68Q(2uto+#$H#SZGVGC4HYIn%UU`E27?$~jzE(0$Duu4ta(rFynTBqt zo7`}uyq@0@#iyjr1Fc)hvf@E+I- zt&ji%+o2s?=m4Kpvk$<+F4)U%A3ysc4+o$K2kDSAik&p$6tRoSo}!TEG|m-QCwE7n=oAFN+l+mxm- zuyjV%Kg#LA;60hHa=P?CT?}$~pMC`~K9D;MWh_3V@k~r_b$#wb#?rdhlngCS$UB3f zp|P~4C#)}7-?4sUT@O#-BPwNk8Y<8LkExP9iIXz1mhIp66dK_f|2$Rd+8N{Xe|h6a J0N4U6e*q}Qw#fhh diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.class index a9b7f63119dc1994acf357a1d9a3844653889fe4..7f8381f9160093696469802aa85d7d9f98debf1b 100644 GIT binary patch delta 736 zcmXYvTSydf6vn>;EnZk*b!Wz%b$4c$rv7xZ%mS~3EiKp$!A!I}WI<(Q5M-uX7^q-W zd!mw}o=Vgp>84qdSzr(u6%;|xOFs1AgFQtL)!}c=a#{bQskfmKw50#uj40u;;82AHTu7#rbY6Bc7LmSPJ^P=iX;B7tr4 z)u9R7aRl{f#SWyf6Fu043)qc2*n?s0#Y?HDv7hI1PtpOVxXGzJMF+V*FTsBdKVJ`J zr-O=1Oh5bM*<2Y^bV!;mp9^|)m!+tiy@P@3bkqK7CNnI(p1#0=l%+Hu(Fbr(sie$=!~Wb%cHYABb`oNSLK)H zbRiSnl2?y}(#u`>9ZN33hqSmX38rD-3T#|O4A!L)Ac<^(Kvs0lIgg`#jc{~+CJub zG@(}qg&~kH delta 727 zcmXAnOGuPa6vzLE8f;{Q(V6+2Zyw*w)UB&Umgb^KC3Nb8$}E_y%z}hm*wb31A!YW` zD6>4-OM7jS(I6ox5rQ(JTJ&1AY*U*^qLyvybmcDozyJSS&b^#_XEHOHiKTvzLO!Bg z;a^u+3Li>PfW;`p5(H58_@duWjTM-S`Ld}JA*@6MX(X@;i%=ySt0h^D8q^^pYYWz( z6>G5{E{X{Vt&pLSUH)F=V_zztgCRw2 z|66l|&|X7*Li-F&hcy2TSo}An=>TiX<+h;3r!7r~OyB30qIUjfxpc(%+TwJTAzcpz*si@p_oCpyQrI4`caMzmJ6L$oWdY1DL` zl;nr)i`x^5heXFjKZt%6 z^~NlAl2v>>=Hu36z4r<7@DvWFcq-{~JYlhwD)GFKc~5gDwV7V=C;3FVl%_XAv45WC B!?^$e diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/CommentComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/CommentComponent.class index 063715191eecc987809ed946e5cce547dda65bb4..ce853e17119cb5f0b3bc1cffeee0cda5f08ce1ee 100644 GIT binary patch delta 81 zcmaFM{g!)!0t;i|WJQ)f$r1)BhEfIvhB5{thH?foAls3llEIsydh!XDZHf&HTnvp2 jA`DFoattj%6>SVo4DAe|3>^$f44n)a484=*v-$x5C&3dx delta 81 zcmaFM{g!)!0t;ipWJQ)f$z%p8h7<+`hExV4hBO883iHIwJF`T+p^yAmD% diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class index 774e33c0dad11ae7895e9720e30027c23e1e119c..8ab08afb24c829a22cbb309288a2c9b4f0a02716 100644 GIT binary patch delta 31 mcmey$`jvG<2@|g&0~3Q012cm$13QDsWH}ZaMvckQEcUF%4D1XhljpOzahd~J77Tn0 dR+HbcR0!Gvd3Fpu4E7AVK-!GKX>vKM0RRAQ4F~`L delta 77 zcmZ3^y_|c4APcV)0}F#J0~doFgD8XeWH}ZaM)AqfEcUEQ4D1ZbljpOzajF4X>I{4g dnv>tLR0!$-dAbZd40=FPm%)s|aB?}T0RY?#3<&@L diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree$FileNode.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree$FileNode.class index c1c373f87158f89b141f24a43afe079b68e68492..6d963c31b12694b107f824977d65ce5f2523322d 100644 GIT binary patch delta 45 zcmZ3_zMg%93$vmn11p0811Eza10RDCgD8VBgA{`agEE6DgC>I+gAIe}}xFsMvUW%dF9l)MGk diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree.class index 1c1abd549f53c3db4a73f82e460801ed3d85212e..3d6bf8c6a57b841c88786716253cf0cd413aa0ac 100644 GIT binary patch delta 37 scmX@bd5UvGI*X(o0}F!#gA#)igBpVigE4~}g9U>JLl}eSLTZbh(U#Qmq0xpQcpH;y zE!C+#7+=(q+Nq_DA5v{cW!h>x)&5^?edlF-4P6IvM14IW5=A5zg0X?PjwXm4U?^st|WPNqKg zgs@@G0r18^_#?;Ol^SH<3Cr|()o2feC-RK;FtcieofQ;>cloGc>lie~#=#t{w2jPGhVRA=rg5>_!CkAQt~X7wk2* z-N-@}2H{iWV!ttT$e5|daD0YQIBcvOK_QM}0*+ydc{dX$Fc&AW6sJ&zGgyOj*oO1C zfG_Y6HRkAmc(Xb1$Y_iJ?24!f0T&^-WRB~yDY6zm_}UbD5iRgfyG6Tw$#>zzf6yHF z5RCh1g9nJluSVs+rUj3Yi2s?!JVh@&Lk^xJA1^S97^Cq7g{0h`?VC^}gMD$T)cnumon-xTJ;$Fu-d zRE%m`j2e0eKT!zh zSJrbg*~HCd8~e*a4v^#AQqFRq)bLAkiG$=@4wgD@EkAOI{K8>!lOyB-N6KSvtD10> z^5b?Yh+|Y3$Evm*r(!u?b>hyd3%e3kcYZ}>aFXi7$tsV#sgc}W&E*uekWK(jD@8)9d=67{9m*``>MAz|BeVt47EncA?aG8G0EA>-eZ8_Pt zy!bsUip#B7USq{`g_XeXTS>guO5=4_PEX!oW$`9!3>8~bc#E}ww_0Vq!>Zs)Ya8#f z_VFI;B=5Cq*lk_oD(eRCvwq`G9mM+`jro8hoDVuWakV3rk2nT#r6Zq@yFHU`lFw;) z@#pa6vxwkx=*VB%IyuLA3C;L2TJRNjLGoI5{Q%+XXv#mM9se7h`392sCbIb+2J?O7 z@dHfY-!PAV$0Gg%8~6!6;TPB~K$Q@V3FC9|z(w)I_tFTzh&S#_V>}Wc(&9$};!i;m zKKqh%>~lWKATeK91L&Cg})3jmq?y-IJ{&8 z{3PG@N$XGJ?AOw!2Tz2SNoXLG;cH@`Ohd3tN4U&DjEP-jru{H&XTWSUk|OxXTL_Uk z=xSn$%tarWZy!kSXRaBKjMa%HU|C|+mZG7QqNyx1J1sYgWeAg%h%nFN7CUS%)myVAp0WqQBd@nK?dNpyV~Pehkd_g_g42K9t#0?=q^p-Byoca_xsh4!~0m zp|MmOV~5d7ju_!%rqtu6s1xXIVvd|bo}9)EIfuFOB^F2xisb@I`}Q(F zW#xc}@<1cygs*CVAk`49l_x??9;2EgUisk_<&R7ifZnPF`j|XdwL-oM!FUyl$tnzU rR3zS3ZSk&(!V(pSQq=*=OgW&G`9>1 delta 2196 zcmW+%d2~mPDG{^Alt_XQQ^;F_82dzxt-i+CpRvZ8?xJdl zsph$%4Qd&y>Q&3KUI!Ig>KWRnJW5|t@2sr*$Nu)Y`+Voy-`#he-7C0z1^4I0M#sR1 zSX4wDsv;gytcG}2M4LK3Q@F=`+gwb2BPY;1w%-t*YeeAOEn z*Wcd(m5_>XqT80)_G`$R+v1m>i`YR!c z3%ta7+5W}0%OwcIQg3#>{>}#Pw)NWgmA>ISsJMs&a? zD}FQjU<-1w75%US{jn1RunU8+8^f^&1=x#`*oQIp-2@!KRD6U5D7MFajFl*{tB3Iw zj^GhKMMnV5?BT#;%P|n}Ry7zIaU6;h)~=IQ``%Wqbf|pbIbn1*8PQU z7H5;_ON0J&FoZ4&=)-sh;cfa6U^y&dc`Ud2T2@4nt=rBj-r&Ry{wS2=D+p&D&!04; zLOd$5E^0CX_1MTOOlspK!?1~0l9b67-piz9rW7YPUhE5`!N+vFH4`E1j2g7lz^+JO zH?(9n+Oj)3vInx5gI?@|Jod#v4#!}=hG86m5iG!1zK)3;jTszcg^k5#j>ADtz)`-1 z3;YLevXD`n%ot8#3r=MUr?EW)?8uqy8sHrE=3EwV9>;MZ7ujby-{U?mW-*uY2$%7g zT{*)QJkJk!fvb6$Yj}lgd7VYP!HvAjO?=MHLVhR?w~C)Tq%wC(1b0a-?vc9OD^0my zdh&qe@*{bR#WINpWg0)0zzmkiJRX*XJR-|^Ojhxv6!Da7;c3~)GqQ(gWk0`=Pk3IA z^Go@hU&~kgR!aGu+~D`}l2_F52MuDW2J@PR^14>zkNOI4Y7B2{Jnv`&-qS?>N89nf zX7Yh%^P%?Ue>Inn0y=wNRidgt}Tpi^S+Aade0H^sof! zNhzo2q`Y2`V7(+2^gF4nr4ph)Nfo^%VR}cZ>jMeb-zCCSkw{ZrYM7c*)5J+FQ(tPE z#u8(iOPpyXfdtcD>X~$@Z@NlDlP8VLAW1Y+CCSW?#%7K*G4rLVSt>2e3Tb6lNs8GZ z?aVgmU=B*EIV$Pqv}BksB-7lMPUctXY#vFrc`Dt_3+dq)>FM~Tw-YRVolwbjqU3K* zjP!FFNS@PD1~}~lGSJD8d}o*patdUyGg^i^6XfsCBpKmMmjY*wjCAJ9C})w3bvzm8 zY?blOE_uV*Clj1vdD}TEh0Y0?=#GkOfI9L{0lAQ8>Gm$=q9D;E7y=G*D+FV zVVe9KGvzkc%N=Zy``9PH;h;Rg33-UK@)Q^48LrE7+>*cWo4mwh1s!!6p+45Mli5%! zu&GvJ8?DSt4PiG8<5&&ngzg%_i5kg;T7ye8imU9{Zc_WtXl)+XIy`Sj_@*7<+nQjf zvY~`(vczjMX`;=grM8d`+ETK#we-;x8KUjHa~(?k>8PX`2-i$|iRAgaqM~*~b)gBSxTt79d1NB1T_F8yh?5 zD0I~^UP;Fu_L>PwU*5V9q7yCKB$U_52-7L{q^Xwi9mHt>33feMXQ8#uMmwE@RGo=* zU4$%M>|IWuNzcp8$O%~qqrL3@98}X)sG%QtM>0A&>nv+gv70%YfvxcAHU#SqRMwrg zvE8Vpdo1xjD|NpWbpTy#%+X@x=|Q}qC77y5FE9pf>=_SVNDJJVTY*tRcXM4TER4pwI?c9?2`UFAx z)VlMB_3wYEsehu5K0~a{lZ=CA#>K0~hYS;hF2;|pHqSK`k#DMCgbBrH6NV`!9J5RW m=9);%H?^_QMB_ahmzh{^dzUq=@1Hb%w;leaS_$S!7JW?0I=#;}-yhhYhW5RevSSk9o#u!2FIVfADaCIbLf C2nHb%z&$=ewdWG68&GfZJ%W0=Ii!!Vga2uO=EOk+@Hn9iWiFl(|2lK}uo CSqrlO diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ErrorReporter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ErrorReporter.class index 3fda481956a7399c08770a0ad24eb80d74b480e3..d32b961f8c268cbb63f13154579f7e575ff2a276 100644 GIT binary patch delta 119 zcmeyv^M_}{U1mvd1{MZO22KWh20jKC24MzI1_=gV26+a*$={eGIfEF)8G;!U8A2vU zu*7jj0C|xNG7M3Z_p=0Y#xbxn#53?SBu2%9ZyIRh(0#pEzHH2}0;7@z&EgFK@c$v7`8ul& UWBgTsrWhUFNXZ27s}*22LN%r!5U)nGJxK(~$Z1{CCq;asc6<+2Kl3XGDuV4!o~6~ToA z3UTK+ir|k$2*zTBpa>(d)Vtoj!pE}`3MHmhY8G2%;b{UT)<9rq7K(lkNen%U(kSVGuey%wBb|w zqmfQDG1h}-Cg3wB;tQtZAhYo$U&A5J#Sy*Zt%IPs&1z!edNpF}LK3eRL* z6PdU!W}-{vHvBF+ z@Q3I`kGPCp(S<+7L;NNFL7#Yxe(@ANQs9yF#bX(OCo%;8$}s#VqX`*DdSnuXoJA?~ zO|XbQvY39dgf_XFgXCt~d5tR&kW7WQ?k&CsyrcoN8daYT_7mf@9Sw zzNF4FQC(w_y20`49w(?CPE`F&(cmQgEK_wPC+iqa)u~L^^O&K_nW;DMWxa)2dIz)h zF6QWuIbAoJ+QJ#y%USv)U)A4owm#2%eTUKd0bkdBHWv8Uxxgosh2FP94^S_MX0a7C zbedjiRN^ffI-hgO49nr*Y7F5TL~<=gavc&_h7@`*jT`X_HzAjmDC9d>#w{o{*Rqb) z*v@S@z<15nyoXEX&rN=SN37vA$F`JN+6u@CGR54P%;!X4oh#HJOs4k{cS4S{6S|Cu%Xo zUtV%EwNyr}lBi6VT4@>BgkVE!y~6c z6I2k1i_h0seNlM4wMk>dEo zNJ?UH+%#f&kYpYrg=u6lqvh$u#XZ7vu$1}e5&yBdUeBYDawapM=`8fG3MyGdwa;r= zLOoUNW-0qvMkC8<^4v@f?-J$!D>>--2&*~C8roRP_kQXEb^PKdFS3yi8WhbY#S&47 z&B_V0MZ?&tk!;rlcIaMS(lmDJVRoyGmsP_nTE!l%p;5KeYb#CK!)t2fb-l`)dV~Es zK(mhUmX6b+Hs03P98f#&se^;+ z-A;{hdwgwDfosuN_rAutqbhVKG|8P;lDnj0*BPxTJz`YSBUKNyEJ@ufHw&lINK#sn zo8zghWqw+zW|VuJPn;HTix!fp3I^#>hN+waRZ^tI+^5Hwsw(EGnniko$F-CdTFyp2 z$zDC>w_pWd_@1+RhO4SkFRfHxJsU|*{~&8EQGT~#w2t0dPqH?UuICu4=ebjLj8_Ab Nw1vsq7IFQ@{|_Dn@Y4VQ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldComponent.class index 32fb32e415ceb4df1c419a6ea15db5dfd20fe037..a38964f0f0851e5271b8c6447a0970c13c32d240 100644 GIT binary patch delta 353 zcmWNM$t%PG07kzzgTYUhA^RFaG>j106CskNh?|t1tO?;l9OOW`xQM8s&}7NQKj5My zIk_t3gv8)?``+ujyo1Pt$Ww0{FK!>3!?O4)i$3J7Pxe}o zCrM8v>vfS7y^*SS(&ZroE14K%5rTs#vPr;68o4IrQA|Fi6i`7ClP0ZD!kTF|C}-ES z`&4pB6)tKxrj`@xa8u6(4P4R0jlQ|1nFm^Uq@8Cvu)fgg&iBuux<>}RveTzn`ju$z qR0ic_NTm#`jS=-RYQ~OfiE*tmp>3wj$Y~v!zjJ1F&D^HTnEwa0Fi8IZ delta 353 zcmWNMzf05s07u`up56g5Ocf=i1i z3a6lQl+xlq;39~KE-s3h87cliDf@08c<&9L@z{85CX(uEG9@)08dxX9CK0wsW1A>D zWb%_dc8T+ga`vd?4>jyl#{mr-(a15aoY2lG-JH?GKl(VQUwLbYkA@jC!WUB*^#Tdg zne`%bX0Tu;OI~8xEY{3ncfeeJo5!J-`D@IuSB!eqYzxfyx`h^5;tk{8^r5$`w%A&4 z+v^?QdDjn?`YE6z-gC?{C%kXM3a5PFw3Q~U@>@{OTjK&dE(Z0Ak6g9R4eJg6@JX^F zz0AjrM14w*&0O;tMZqq%g>qY|_Bl7(ZobvWU>RM5v7n;9%q|_+Z@>LknKLA z!#j7dj-9;a;7{1Y5niF!2b`mm^920BK7QvlZn2-c98esuE0H%ennM~NN9}y39URfC990*e>m9yO565(hUY+5% zE^tEqoYZwr>4xWRPU|jTnsLSw_}WtV#?tuKvgotuNY2|>E?Pd9>@mK#N&IMqT()9< zvIYEX75rkA{A$(wX0=?gHS}8@e^@hDZ3EZrS^l&Zu3IaASsOR3lfP{r|JVWAteb!B zFt_a}|5>l+SKJ{T=pqH|tZzCiC`~`DdqHx>G?Rk)_aiRoxF7Ms*^H`?5*XmyO7#qB z5V=YS@-u5kY6uBRVUR+kDUA#bC9DT|Na>7K2IG_!#4_i^=X&#q;9llbjS8lOr)x~G zDLhN#V!h#973VQf`6T=LAJzm4^e8hlky)C;JQYx`>1=T=TUA7>B6RqBuPf@*Y%XaI z->HPlnim_MU7+H{%vKqTR8F-jSfeF0>j^e%DeZ3apq9DOYB#sSEvbbE?!C^yidne~_1({Xat=$`b$p delta 864 zcmWlXeQ4En6vjW#nQPA2+)L)}b$XXCXvyvr%lX#4I`5pi7d2&TqUlV_nsYH+k zivoji>|=hnF6Sx!q(5+wEU+_v=>b7i|8Cs~GV>-HH-lOC@mH|vKK=>LHL7@;&CQ=cFiDogE4FJ%RHL*tbjj0;cF z!@=rssY1!FaDn0jNz))Q6=9?bm>`djhES^E%+#aI)kxNPYthWN0A|X%P`U!*DI8P)iu=jA<$5dX`EpXP%y;!9&ul t7d%l7zTHapsL?~PijO=rpQ#D6mB2ugN;98_gi6B~#|34Qx#^V40 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FunctionComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FunctionComponent.class index 4a8a340e4b9ec30bff9a7628e423dd5bf1f284b5..11549cf7f8bbc4d7d978eda7561a745fd96e8be8 100644 GIT binary patch delta 266 zcmWN}xl2L;0LSs)H;|VHQbPz0(LqBk4F$EdMPrk04*dr$L0choO~LDRp%!FBmVqy& zhB5;aqEiYYkPf3`C~9zO?0x=#j~%cBcDF&q>M?@uNqLx(kJ+qg^bs;;Ft2(nHDIcd zMYXV`PFB=KRK3JBNL)j#YM6D6kkA+#nr2ILBo$*@Np`ePN(FXRBCTgK*(UcM69=l{ zP%e&COHO`{)l6P(oT!6>)1NwhQT?20lyi-9p$M0n;aVm)TA-w5ZWZNTaUQfrS)0z4 r;ZZrBl&7LAUUkQt%Dk(>hpK$)k1srYQ|IT0R(@&cg#oHo*cK?+V^bb4E3Tq?|!7PwZ78^tNf8vXyEhGq>oPqcwwBM)O1_uA2JY1IRF3v diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/IgnoredFileParseException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/IgnoredFileParseException.class index f0cf14df720410cb7e66097cf187748baf55bd4d..5b5aff1523b15920750d39c73eb64feab85253b6 100644 GIT binary patch delta 13 UcmaFL^pt6X2P31!WKTvJ03wS6`Tzg` delta 13 UcmaFL^pt6X2P32UWKTvJ03tR6=>Px# diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ImportComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ImportComponent.class index 7f30dacd1c699b5111fd52e0e27afdeb3da59fbd..884422294cd85151bf944b3a62d5097e4d16f488 100644 GIT binary patch delta 73 zcmV-P0Ji_i3CanuC<6holPLqIDYF0x0JH!T0JQ)e0JZ=p0Ji`!0Js1<0J#7~0J;EE f0K5Qd0KWik0K${`19}O@02%(0I2{| f0IL9M0ImRT0I`$#19}Oy02%=U12=;;g8+jKgD8V7gA{|^U}Xqn;A98~>WiAZf-RUg9w?Fk6iEb%q)g^uR|5c?a}mP; delta 99 zcmZ3-w~lXvBde$;0~><{12=;fg8+jzgD8UzgA{}Ahqkuf-RWW4=Caf6bS%|1W)E*R|5cC)evt0 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/JavadocWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/JavadocWrapper.class index df1abf1ac3773d671c852f223d871dbbdb53b5a3..d38c2bfd4f0a85d136ce3b7a91381f706649b549 100644 GIT binary patch delta 31 mcmX@Wet><0Dl?<0Dl?<>WHsh=UU>#)1_cIA21N!{2BpcfnAHGly#>4g diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/LinkTagImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/LinkTagImpl.class index 5f1ca92d6d16392790a104c8ea679680915347a6..b470a9af5f7def7a0dc3345ef683afc58193db2a 100644 GIT binary patch delta 44 ycmbQnK8=0D941af1~vvG25tu9$xE4{7)>WJ+b~*8Viuho#H`L}17h?uvjYI)Rtebv delta 44 ycmbQnK8=0D941Z$1~vvo25ttW$xE4{7*!@Q+c2t6Viuho#H`M!4Px{&vjYIw*9mg~ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class index 22adcc22814564cee44d7fbdd09fbf0d0410dab8..2ba0ccf09ccbf374e5d59f7d7eb24543896ae9ae 100644 GIT binary patch delta 23 fcmdnVwv%ncd?v=%lNT`guzq0RV);1vBa;UJZMq2m delta 23 fcmdnVwv%ncd?vvUmUh+A|3& delta 39 vcmX@gd6aX*6J|!$$xoS^MYR~XShX1>S#=mRSali9S@jtlS&b&wvUmUh(kckF diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class index 71d6e115251be311e65aca506c2632fd6ff8f2d4..bf1c99a432ee186896e7f8ebad8e853aaae55cde 100644 GIT binary patch delta 75 zcmX@Wdw_RC1}mfMSNKw1+>>#+JT7_#~@ShM;uII{*Ygs=uO Y!~p38)?kKwpnNe>#$lg7_!sfK-!Wu bjlqpIogoNFhp}cdqyW`tvu00T%@zXydt(p! delta 75 zcmZqYYvK-!Wu bl);TPj3Ed}hp|R5qyW`tvqnu`%@zXyRuK;B diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class index 6d12c7db17d353cca1a01d7048eb02a8f79b66ce..41645e8e9b4e1d801a4a7c8b04ae405539c2d9e0 100644 GIT binary patch delta 75 zcmeC+>)_jPl$9}e@-f!6mW2$wtVIk0ti=qXtfdTctYr-9tmO;_tQ8D~td$JLK-!YE biouPwnjr{Chq2Z&qyW`tv(`^u!xjSosA&;D delta 75 zcmeC+>)_jPl$9}N@-f!6mI(~JtceT)tVs-_tSJm~tf>s@tZ57etmzDftQic(K-!Wu blfjKOiy;U|hq2}`qyW`tv*t}+!xjSogBK7l diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class index 211ef8606c8ff015f9ba24a5d715a5d97aa1f58a..ed2e3427e9a2b2abd9c38d12def7c34ca8bb3c8a 100644 GIT binary patch delta 27 icmaFG{)&Br8#80mWOwEu&UOY4)(!>%*3QX`m^}b_KL^nO delta 27 icmaFG{)&Br8#80!WOwEu&N2oL)^Y{`){4oCm^}b?F$awR diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class index f758b36833d2e86d9022150767f49a1350bdfe5b..68ec874477a104c603608b2efd1e5a8cd9fbd1bd 100644 GIT binary patch delta 23 fcmbQkK8Jk+BQs<7WF}@`)(H&UtP>}PFna(1Nk#?K delta 23 ecmbQkK8Jk+BQs;wWF}@`)_MkR)`rO;%pL$oSp}g0 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class index b9e96b63fca953ad37d749bbb12494243ac2b3bd..54fefac98b262a3827e4e01976921b22a2fc0bad 100644 GIT binary patch delta 99 zcmV-p0G$7`4YLif`UC-!lluhiQJ4S(1(^T_1)2Z}1)Bg21)KmF1)TsO1)cyV1)u;f z1)%^n1)~5x1*8B(1*QN=1*ZUC1*rgJ1*!me1*`yk1+4&%1+V~{1+f691+W0C1+$Ym F26|~C8=(LI delta 99 zcmdnYyP0>xFBZn8$-i0N2DUS>uy!!8v34?WvUV}>uy!*@u=X%0u=X;jvGz0Qu})wx zWu3%e%Q~6Cg>@=}C+jqZc-9#VDXcRYDp+ST)UeKB=wqGFFq?G&!*U?Knsw1+OSUQi DBvu+L diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class index ae88b4f6695fbafa61be3155040426a7f799a4c0..81583d897832602c1dd2b2206e0ac058c11faed8 100644 GIT binary patch delta 23 fcmdnPwuf!QA|}SIlNU4ju4RLsky}#}Eq# delta 31 ncmey#^^D%X)^vjP>kfLsky}!kr4T diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class index 997fde10d05a2622f3fdcf688326e2b15b21415b..32e26ffa466d30d99203fd10f1c451864df780d4 100644 GIT binary patch delta 23 fcmZ3VEr}uA(ICHY7Pj@ delta 23 fcmZ31X1 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class index 8a1b9a090714b4a63d510984d1de8b5051e678c8..6dbf679eea38e36d051aa8b5c2f49f295c285e49 100644 GIT binary patch delta 25 gcmey*`k!?}8WR&M_v8#FPc~Ko1`bxi$=jJc0AR%iMgRZ+ delta 25 hcmey*`k!?}8WR)CugMuqo@^}t88}!OCU0l*004Ka2oV4P diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class index f6f9ff87bbcd4c4eabaddc78c16fb31cae1fd5bd..2a4473bbd2371a4eb31db26211270c6c3ed6b257 100644 GIT binary patch delta 23 ecmZ3+wv25<9}}bS{ftm^=VamO delta 23 ecmZ3+wv25<9}}bOdCZ{p^F&>z_l}QNzeftQy delta 27 jcmcc4dYyGcEEDH023D5s44f=GC#Ny_F|MDyl}QNzdZ`F@ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class index e23eda4701110a5e0e72f70e5193d0f5ebf4b6c6..2f46dd2828ce3259c6f7c043abdf65e324fc5387 100644 GIT binary patch delta 2341 zcmXAqd3;Z27RI0Fyvr3KvLT5qL_&flO`;WJsckGl)V@`ehzKHyrHt)Isi;v?y)9y! zsba)l8ML24Yp5=1JKC8xI_QUKYpJF7>Y|;u=AY+#?pfaZZui`^-*D|W-22a-O~%2Z z0HG*EJc{rrCZQYh(F0}Zug_pGviuu87o|P}jdBEG1?pi9BC!hzIEpk>qb)wc6R1HB ze#@R!wZ2!S7YK)C1Jq?Sq8No}#-Jk`A%}73&3Fu9BJ$V_k9*A95r<<0za9a5S!R z3_a#Ej1w5e$xLJklUd3%$4pLTHm9>4XRw=Nj$>cPew@j{oXruO%W<6Vssb*uz!rd(An_R}@T+Rzz$zS=B)S@r7xlY2kUIGodLE`vlY0g)r6E{g0Zk7Jd zHOh$!Aoj0 zFROk0RvqCLRn4pFG_R?zcwJrKcj~f>-RCX!fVXum-qBIKs~hv4Zpxo@3V+dA{8e`p z=w3qITSVtN4ic@$iqR#G)1T$d5%dl_jdPubcs%GQymZKRB~F*4pJNuf=X2{v0M+AcE5c9T-uL&|K9%&`6B z4|cfBu>~^EmPo)(lZAGMJZtAWravc3>{2PWFFUT0<#v;-u*YPj{YZR!T~^tfQekh) zI(tVp*!!}vYRaG=WbkGL$rdEZHZ+q;WXN`OkR9kGyO1lpF+%oWob1Iyc^!*oAIhD7 zr5wO2If#w&2L9q|w#(nKTMl8L9L7iTHfrQ})uEvsB=9jp5Hb2N}sNRTg(D5sGu zXOJRaqMMw<06CAr@)d^31&o%97%P`iAXhO>u3>>($5QzYf07$`MQ&l8+(D(>#R0j8 zBl11ok^88YAMuI&j5G28U&}AJBERB}5>hD!<+{rostlu55aU#BCa4gms0cpdE^`M} zpPf|$_EJ&or=mGf#c+g*;!dR1!;6GRstRPE{#Vjb|p0B#2NcBLe>WNt@2a8m1Y*xA0p`OIwTdQGl?P8fjXG)!qE$ZPQ~{c)@kmh<(Za>DREb|asv>m(lv?cGy#)2tQZ!J@ z5Tll(iF(mx`bbr)@Q7NC3{~N$=S`2>f?8^;8*>{%)OLicorqL>T~!qtsssMpdENPs zDsS`x321}b+Cx1Zgho0TDY_oAbtt;(F!a>nt|3QYn2y9~T^|#41C;58n60C*NJnFd zZiJT{*SY%5IuYA+D)#CO9MD;KTerpsIvbzqb~vv);gZh5HQfhybYJ|abMZj;qtg8u zsH+DuRu5vT9>R1zl9?{hS?9649?b!|fMq(HbM$1+)5R=zT&c^rUeDwvJ%^QgE|2MX zd{-~v$9f@8>2iLpm-4<|?)t_HQb)h!TENThlV2k(bcM9i8_)-Ef0PhFT4News-7F$ zl5JmeYu}6{y#=lHU(rTaqNCo9?s_K%>s=V4cVoD-pVB*!r}v;h??ti8o2jd+F6UQC z;DX!2D@f3{UHMPwWfbyEFs7LZ%rmiAX5z5g#AByvhNC78pPR>V#rz(3%}|ON#(HKr zlT0z&nrE47{>XgebC%i97tCR9GRJw)RP#eqZ>@O``6c-C);}K*N5N;bI-ZnvoO+>bhMQ5Ajr%ad@)Dp_Jav7Wa z%@Z=X!~fjre!o^xHjnz9i@LMgUs^OY?6e!_EW+%Uh_I*KIOqHuMFY$wSbN#;F|l{h z4S4n@;_MB7-Ng3%!9O*zop@4Jf0AXus{_xgi#lEiBE5Qu@8(uTK z$z?R4RVTmf|d~ z@xO4o!LK_di!1!jPB-~8oF4Kkr)2p%N`w82Q&Ju>rX+>C{H`ULtnr_5dd9CT$>Kr( zth49(p`}@F-?}+H;m>mVUw^05i~hONthzTJPECN&S~|pEIHkV-SXnsl`8~_B_>(`k MEK>-7Z`rs11DQoMVgLXD delta 2339 zcmXApd3;Y-8pfaJJ{BosXr9t(H+rtBhhs&1w73^F8<7?mg$e=PkX$(ktA0yhq(vL_BifmcN}E~PO>*H1lSip@ELj> zz$gx842LtGS**{IZ0^{SFR&d)vjfL4%`wBVk7GZ+$V_H)7$-W*B<3)eQ<%pY%;$0z zu!NKOuCsi=sr-a5^E1xmRnFyO&XXX{mk=(JDE>(T)wx*W_=Ys(o6?0#q$`(6e`g!c zl`@{IC71jrxY)s!KepuJWAv-udqHqI$&dbPzA;7+%(Octt1hx=!Rxoy=Rh6Mxh_ z`IGL&+q$pgK;F@#cvt5+7V?3f#)o}@HwcVv;h zD~s)YdA%Zc-~-9@5iCnlPnM&BtUwDXL5h^3i z zI8nbhMD>BE`XNj`gIF~HacUqMs7xfPp=j)U$tugA^jt}!JSbJ@-aQ4C)HGC6FQbN< ziMlG_BIl!#T7YKiRkTpWep1%txTOeE%UsRnh)^Y{tX3jgt#MiFP+h&}@5@T(hZWw) zxe`!!5u)z7n)gvtJ#@8xb^CdYZW`#J=?1c3h*lV>HO6a$0&OuvdnnRDcvXksEytBE zzg$P*eI0|Xx(;^ec&IIJ7uq;8ChItkZwd)(9=a94N4L!E+0?piC|g@JJ0l~3qy zY^0xNlFndD=SbCknC|ZS0C(35bVJV6!#P`z;6leG`gxY=7r9PP;08UB`*jWvx>@iK zozF9Rs+%9vcwf(SqhOYV>3I^PizHqzl*YPPn(D>q4d4w#0MZJDs8O+CR1>y;3pKTm zdU`2Z>9^5VuRteVf^@wSnYs*v^ePN>>k+yXS$Z|b>NS|;;-=|!72l7pkibcV=&w;* zf9KM#qo@Aag*`-}5zIEBSY*Pm+=OGZsftfc98Q_~xM5o1KPH`Gy0en$!Fpx{+nWOR zH8VKc%;$7d&ezRmt}_+fX?F3bIlznNIPaNL66$729dlV)n;XCHrjB28+{g%X50T~< zM4S7FH4pvbaYb>VFg6^)HUgDxCDgK!Xknw!&W0k@R`C?bd@OgOl0^;m> zf8~UZyyl;o&_V3&imDSW1NOhp`9Fl&M~Jq+BE~*OZ4YSZ5lNn)ji-?2Y4q|8`g;~b zJP$88+c+--xn3w{d0{B>!tt6Hfj7NMC~>wjuQJ~Cs$ioRjgP&m*y~lpA-6u_#r|;~ zQ0^a}`0ek)FU{%5TK?&rjNk-#UOhy34gAKFIqZ3OXhn2tXog?BlDBpnWZ`1?oZE8 z_ABLu`aAL)@sxidKRNuu?;j>WWRQ;V=jB%QTNhO36~9M8GOzoy3R((&^tTpV|35bk BH2wep diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MemberDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MemberDocImpl.class index 7b5557571a7948634e0314eebe89faf1297176eb..bdf920109b7646d383e08f2c5152adebc190d503 100644 GIT binary patch delta 391 zcmWNN-AmJP6o;Rq8>YB$a})JK5K{KL6kkHaAyXEX+I+zjmZWH9BVl8MQt@R*B)u`d zP!~#M=#3XT6R#A7Ae-KHB^XFEP5*+Ro6hC=!1?ezpCjwYO8v`s)R09j+0>E4b#uk> zR2s~zqh5TQ+m5tMH&a0?UT#xG8x6G6NC!>ap_w27IyLQLgl-gs@!WiPSSDEkvZ9s01sCNiT5;@l1vp zmr*7p!lcBRk|~1nf`q(d&Ug#{l)R*zc}0Dth_CVSM)BTqi=?rfH|_7S^TEWO0a-LV zPJiwvy_d-2v&nGw6?jb8Wrs75PRI< xtLpBn)_20HHNyeVIaG#YQ|6A9pJ3w`1!Qn@iih9YnbFQO$~affOS9>&{15(GU9A8B delta 391 zcmWNN&r8#B7{_0aZm8kH%`MV{Fq&iELx+k$`(>`!B%3YNS)q`mpbdqMjYgSHu|afL z^6?VkD%eR;jFCTZS7Fd0G7EO-uK$7H#fJwTp6C6Bhu8D2T2*WFw9#>i8hq5!P91(z z@5qQ{<{h1KxwPk~$lO&mItXxsE8Nt6i`!avxx+oW2DZzK4{T+64ChZK#2UB(i z8}hn;AdR8=v0vGr~D_^*$Gg^k}dae!MN_Hd{-5A^0=+W4oORa0{N&j5l2SHu7S diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MethodDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MethodDocImpl.class index 743f0be560cc0cbb4bb8f18805de445b4972b81e..5bff1ce28930aa52d938c4d7d13af5d7a6eeb1ca 100644 GIT binary patch delta 67 zcmcc5d7pE`5oTUP1||k024)6h26hIM$rqW!87(Gjve+=%Oip8ok+o;wWnf_7VPFK3 TstkM#{6LzK!2(D!F<1fs$O#GH delta 67 zcmcc5d7pE`5oTTm1||kY24)5&26hJJ$rqW!8Pz9ive+hHjYWbv>KOf@mnO*-SGYji!hhOk~PX-ilb*S=f0kNGD{2g+!z& z3k#F7APcf%Wp8C^?X1rEI{*3q)46E8Xv`*@jx0qqNXofd-HwB1+_X?hE48#Kg^2J- z7ahdulpkltjH#kq6>-@wv1Qtoi}p}VFQxS1r=I``f+W=?q1!{cpVH|tgN!i2D6^zl zWsG%t*kVF5?zQ?!3Yfyhw0h5|(=27oQO-OSENIpg)htrOk{F(du_EoBq(r@bx%PzR zKx>{iY;LH>CO)<$?oFDzN_$HCa-wvobfk1Ff8GJ}M7vW>Ig_Ms(Kwf!Z`^Z9K36!o z#^Q!5ZY5~Nj5}GjBF4SkSW(A=ekUitR@``!P)W*srjQrC?^XYhG2fKll|GaLV%v3& SPt|{^-j=l8WPHnxUG)#&yi|+; delta 371 zcmWNNODjYH6o9|G7`kE1ow=@O#&|^<&!z@5%3GAdc*d|9Y(_S-v#=s5q*I8bEN0+($I9POR+iSz>YT6hoku4V%mlNOZr2TkR7%{P4g_&ggNFc>)Y3>D9n=%yk$zek zp-q0=3A0m;E;T}OTH;8uI2R35L^q}MQmwY1C@u8SsWGIT5e67%h-rpdW0VcXNHf7M zVGfv-glDIDntWy`Ca$w*bup@dLVz^Df39PW8HEhF<;6M$@x~TbMm;r%_TNh zRB=@F3 qVucKj3>6Gc3{4C!lS5hZ7~Ll`vWiZ=$)e8a4P;p{`cJlDl>q>uY7gQ7 delta 91 zcmcb?b%Sez42z{Q11p0H12=;z10RDLgCK)CgFKMdV$fvJ1(FsF+6>+dItozV%*`T=A)16iT6E)0?k3=BLBj6hP3L5e{dNHa2c07)hW FPXIOX5dQ!G delta 111 zcmbQlJBfG00v17e1{MZI22KVg20jL524M!3$s1W(Mb#O&7&I6}7&IBw7_@*;n?avJ zZ?ZRQ6r;gp1vb&iyIIv44Z*A*K$a1Z6)J1YAj!bMz{9`@B;^>S7^HzTBZCK!WMc3H E0PiUf00000 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParseException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParseException.class index 716b5681f6de4c3d2d4b4c8d8afa9b4dbb42754b..52c67ef01b45a50157f985c49c099bd61773a1d0 100644 GIT binary patch delta 27 icmX@le4cqj5+kb?0}F%B02u@203-wE051dQ06GKc07V1o08j(! T09ym=0A>U10C5BDlY;~{E0q#; delta 61 zcmV-D0K)&d3AqWdQUo#400jfl00{%q01gAw02u?+03-v|051d906GKL07V1X08j(j T09ymv0A>T*0C5A{lY;~{5{wa; diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser.class index c12d30f54a39935a500853c7725c30ae83746c55..037311b3ba2d2c2ea953e8cf54d2fb1b18d55d64 100644 GIT binary patch delta 987 zcmW+!dra0<7=GUO`TagF9|%Yc5EZ$IT#Dd>&@M8Ag7QkFbFPS5E5sbRm6W8CZqg7x z6%Sq@X=;k5v$SvKlDwd;v_G^=nz^ZTv!YDF!Wd+o_1F8p=RG^m?KD(1R2{gJ=>CgP zT^iuH2B}{GY9lvoCMcjYc^5})pp0_~6~x<_W{dnf=_ZCsknCi^@gPAP07|i zxnKL`5xphTwO7h@K%UgwGFJypT-sC_4m_V$BlYyaWe`Fcj0lDxhM^cmFA^D!R7N0& zk(PF}r5uAY#$qnx@H9u^1ty?|qwyNY;7ulC6_c=rso26a?BxV>G80|QLbt6w%t0@6 z#bv&PvOvN(QIa|7{|o|U>CB4@L_9T5yDuE1U_o*E3(!-j(a&34{{n7aJt2t zfj2nIS~VMoSZHzPnTr|zm7d0&eLuDlRkNX_wwGbA0+N|U2-(Bzl_ zEBi2oXqd;wO&Fu)cuXtc(;yaTB?@&j*6SA3>Q)%7!hYR`Mtv7w z=ysgdYFyG9^l2@I^aF|24`q}F#IJRdr90(G-6e~3H?jcaV;CSykb_*i*~tt`S}Xg_ zx}>GjXgZS09zAMxv|yw*BTkPYQBPp9euY#$i5dDe9@jQg>@AV@@MZ5V37&yV_aKsI zF`OMpU^gbP2VP!73a=xLKf%wR@dR&RE_;#7Uy#o}tYAM@^CsTpZ>ZocZ0Bv%aRBw& zfdhIDhx9yJ^#V@nMYQWBT+~i<>38V0_h0o22J|ZK>-XYJ(H|s6f0P9660deky7tH{ zy(UlVby=uaBwugH^V%x~+GoZlKO;B8E0aqksCVG#U0cClh|#|huY(w;_pH|;oB0Fl z^It1ltz;MS=tcn}@CqZbiXN0O3U4zSl^l*L#-fIC*v)t}aWuYU0@^qZofdnTh<;8K zhhFh;l0-9Ek~sPQ4#IgU&&s?skkjGj3>%*h(ez_HGi`i68{JGy=PbkR_4M`5Cx~KWxIcYJRx}}ohY-gmJj}zG$|Kg?Va(*G zc!5Vz%4SjXcLwR>`*#;Asi6U3OS(;2D$c z%X9NjIJ{%(ebpm*&k_$Ip8p`j1UCM^K?oV4 zY=%!@J>S9JM$KpNG}%1obUO9?PBm7Ief|UkNn-TNZ!i<_2rz`jBn_l!AuV2LE0X@m|xGB_nC3`Jeq=`d%IAWM0qpD*ZNV8Mu_HjAUU%pbGl2GmCOj|x9 zoRh|vvU4$UNti3@xmLOxWxl18JEgm)j|T>LWRNG4l<;`gtuM^+s$1T4$Ghyivw^a% J{*a0r{{sw=KQaIS delta 295 zcmXYs&n^RT6otRvqWWiMP)tH6L?h|c0u34=ZB->i1l`z3#Ky+PU@@w(Q$Y}#OJYOf z1;i6r_Z{qQBz*=qjm0ycia#D%~$?5-e zM$=h_$jevkWVk?=b}fqZQo?1C6lF$PB11(s;x)4(<%BEWao?m1Zz{L2#uJ-7Q{_d@oz=*ze*Gpb GC-Vo*q&p=5 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportClassFile.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportClassFile.class index 75ef96cb9ec97b4b1d3979c40e24e604488540f8..a82823a90e9254171de672c25e1ed40f9b2c036b 100644 GIT binary patch delta 159 zcmbOuF-Ky*Z23F=s22SQ^20rE(24Ut{21(|)$!|DX7?UR#a&~EEFfcJ^0_C$A zc$jk-1ekMy@_7sj%!Lfv%tZ_a%*70*%w-IL%vF9z0EXdrzAp>L7-BHWQ74W$YBFS+5*uYlNmjPA@Ux#wQ1)kIYutdcbOScZ z1)MY(e`SFpl$ibVq(K^-*0a?Yx^zvqQijx`s2c*^66=mxwW;c!4Lz`}CwBD6o}Ou_ zog8Ib@hhR;i1bcbA07QkO1 C@iK}4 delta 212 zcmWN|Pb-4~0LSs~em^s7dnRqkN>6fl+76;+DREJ5l;q^PgFkmKLAgH{SMvsxqc@+^O3ANbI{mPu)SkODm`e0R`>H13bcYIXbm3~fxAj+)kH*J4JhML8U z2WU9Uya!oyjwKJV;yfEJ(sIDIOB{HFw#yv5!kI@o_ZS^l>3W>R6Y+kjor&Vw@a#X& C;WJhM diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionClass.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionClass.class index 4a29649dde123c3f50325424b1cacc342a2ea2ca..c0b66ddc3011f6a3fdfb6af4250182fe9034af87 100644 GIT binary patch delta 87 zcmV-d0I2`G54;bsp#>eg00jfE00{%K01gAQ022eW02>3f03ZXl051c%lfDIU0l$+l t23iTk02u?t03id&lamHb0nU@*23HBw00;xr02Bk*lR*bY0p62{2Q)xF8NC1i delta 87 zcmV-d0I2`G54;bsp#>eP00je|00{%301gA9022eF02>3O03ZXU051cmlfDIU0j`rU t23iTT02u?c03idnlamHb0lkyq23HBf00;xa02BkqlR*bY0nL+$2Q&`F7@PnA diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionPackage.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionPackage.class index e956768707e8a46e9e7c8677af5f833bc80ce026..2069ee6d1bfd12feca59c7411b01cd0db5d6568f 100644 GIT binary patch delta 77 zcmV-T0J8u05BCqS%>@bS00jf*00{%>lhy@V0q&DA24xNO03HMN03!qU03-wWlcNS# j0sfQw25Ali1OOQX1ppod2LK-g2$OOLPXYuElfwrz0_qmJ delta 77 zcmV-T0J8u05BCqS%>@bB00jfq00{%wlhy@V0o{`^24xN703HM603!qD03-wFlcNS# j0qv9f25Alh^8gtG^Z*_M_5dFP_mgr5PXYt|lfwrzEM^+V diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ScheduledClass.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ScheduledClass.class index 92ddaf87af793a8140025ec8b66b66e8353ca369..9c76827c8ffca0f2616efdf934016d100db253a8 100644 GIT binary patch delta 31 ncmeC-=;7Fq$ISbRftB$&11IAP20q4@ldG9i7~f2Oz^nrRm{AHG delta 31 ncmeC-=;7Fq$IN?^ftB$Z11IBk20q3cldG9i7;jI0z^nrRlXwZo diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl.class index f06d76f79d69d235b3286898cbe1cd6fbf1ae75c..3db73689da6e61a65c3bef7ff986d610e32c5220 100644 GIT binary patch delta 1754 zcmW-hdvI0N6~@1BpS2?i0U{&>NG>4{f{@&scVk`<0=bYEi3Dw+1|;}EMogF}U_dS+ zO7H>dMxlx=5h$Gs1h`c*6p7HPC}0tA8bt+L>H~2`+S<~B(lz{Z*80}^?Q_<*_nF<@ z#qKWddDL%DL*RFv{#-XDFw~v!XS;KO2p18U=*DJ6yT(8zK?JnZn;Nl{=Zn*OWQP48F}Q9%l|uGmm{NHz78dPTpeXY+$2#nKR5*-fDL7=O)Z1)2sS@ zU2uwX%qN^{F0#e^hx5!e-s#=Ixn2wxc=5c?8_R`WKJWL6G_PR0cN-t@nz__#;X~eC z?C|DuS@^4hZS;lEkB{I+u0jGIMH*KlosVM-*I)uW-ERx`C9hLrJ!1F_;`l6*_#86% zJp6nCIoyaUZgR_R-r@U|QomMW3r4X^iC2)%ttiu4kUPQ?ipn|jRYY(nqPPn~xLdJq zjN=}C$zBw5pQ2%u^Y^IbYna8?aR=YPJoccC`>~t{u!3)*i@n&U+-@F5n193(zJudD z;`)lW+GA?sxLZ^j?>3gqj60#~Lk#ChjN~bd))?SN&X(R|`?T}1a`pUFf8BbXb2pZ? zMqa`I{u{}>?ADfjSr7})Bp}u#!e>Sy#f-){GY+{XfO3O>u*QV2-mJuPW))u2+IF)VyOrrNPvDSw3h$bA_{cb%Hyd!lYz;3e_c5mo(Ox+Q zc@q)mRlw&>LaH|z1zsgeydcJ_uJWp|(5ptPa*MrM*E?}@+)zYFJch_H43`n`Ndm@* z&$U&o@uk2>DxxI~!z3LklBpd(awH46k{ynn)Xh*K2FT5bmm(xdF_NVa<77PiQjTJ& zK&4E^G^xZdB#7BE1$W6*v`H0~NHtb#?36k@Bh#=+>d_;&;4PVs_oNZWWCl*jtvDmM z;cwD}Z?*PMnZ*cc<`4-oRpv57T39$(=CMr58I<{~lY7}D_qiFBN8=vQvDz_E9>ic- ztkW++nmpw4gPqAM5G5h)uGH!y7$vK8;MK^I$JA2@CDIxGEO?or^=kcDM9K#B_B=+& z3rLrZ2*@u{C@(7Zl6u>WYIzxTvIVoGOTE2<4%v?7%CD7I@jKary|NbvWgk9}H`GfH z&dYvWkU!AM0mjIi>ZO;l@)lF%PxQ+X=E!@@lcOw;l4Goq<7|~byV+Gc>|fAd`dn0X zojs%3r|$OZ=E$>pGUt#WXWilIGJ76Y{_YxT;$1>bw*6YwH>w)!MTmUow%2T`{D(UK zm#+Rn_vEtL`Y#gYe|ltB)Y?^K$dAaDpHLvzP;7w-mY8e}s;q};R?uiInrwtyRa+Wi zqhM|S>mNH)d$8CJf<+EuFbN5$K{{rrYDOvU)_eIeOxIhu8Bb%r-o))P7%QYzH|Qib z*cf-J?%K>aMB1SkXyXxUhauh$N2(oxbejObO+=pc=`163mLyEIDLO|gnr#~9+0j^N z)3L;k!Nc|@tg&O^YzDU2Ozg6L^w=zyQU4V4T~B=}pL9Re=W?yPsUe>wuDN0Q{{aD4 BoK*k- delta 1751 zcmW-hdsNru9mn7A=lgk3ej;)em5Ub)732;n@Z+Kg421Xzt0VkuTkzVsaSyW{B<-0qlB>5iq3bpce_{(x}&5eaw)$@nv7;$7t80&c}$FbD6U3KvnQV?c9@@d3IpjP-Yly)9-g2h3gzg!yF8=h#{=(rH_paV+%*~ zeulH3WB52DxPy`0$0#0TG>(@iY1 zO#*XG2J=h-^G%7yRV*|OEHX>zH!E3ex>;g+S!()NW|nN{T=O)`&2G*!FR;=CS!IS) zzo`?>^EUGy1Lg`Bn6KGjZm`iC!GIURCNGYQyct~V<+0f-(0DGFdUtS{*US~(Qnq@_ zd5_o1mBGvTdziQiBiVsSb|RiX!Blo3g+IkK-iK1IcE6hS(&TkY^dN%0h~;`rY@F?Em zEAB$!ZhKr!yy`mraqbsIO|e6&PGUSyA&IZy79BJAYiIo{>}jpMpVkVp?q=HpgqlW-HMb+l+<|1X5NW0fxuzM#rUf--36_}USZY?F)!c&)vl3nAM_6lq zj9$}*&1Mz0n09P4op?%fdrcP(DKlt(hErw@PMdXj$2^EjW&?)JwqR#jBC}^A%*(_W zFAK3=HWIxYBzw8Y_wrEW<)cJ(wKp4WUIE&byU#0fLvwbhiMY# zI_7RpjD(RWgh@2UNi3#FyjBvBElJ3ciNToi!|YALXqkpMnU0Av1Cu2MsgjO#$wZ-K zqe60Vo8)1US+~g@@1%XX|)zF&6Wd3hE`WEW1z0M5!j^|BwA z^R#k+5u)#g9Ab)%)#lF-lH5Urn8T zQ=>C(aZPjRS?$a@#LHRtT1~M%4=ZoG!2CEDKR?U9tLlQPfV~Kjzq-BipRD*$oqwdW zFX^3JR$Ko>g8WNcHmue@L7H4amVAnQ`Al2)IZEXV%#*9AmVavtuc1-C#6tPXJy`1x zk#BVQZ*OjPvGzovdEEbt_?$}>UlOC-?Ncuv{7ib(O70<&}L(? y+K$CK8;8wy9GsniT{a#s*aQsPB$rnID3je_y`SCgtNI+?@1_UxnChAX4gUvhPM7om diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SeeTagImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SeeTagImpl.class index 9fa4c15cfe28d76c19061714115295e42a7258f5..324fb5be08fd3a06c4426d18bed91baab545caf1 100644 GIT binary patch delta 390 zcmW-bNhpM27=WMmi^DH7|6!t(?Lc#IpiqoS_BBiPWQh`GIar!9Wn@cs^V6Itk_%bV zG#nI%Im|&(+~nZu?xuYGm$&D6-^23;GlQ8o=Y~;4JjEp7xw|%wRiKnO$}p+GO(nTh zkw+~a>L{gNTLaZJ>Df##E%edKp!P{R@X^U4U2M|LE6Nn%z~1I$SdJ}F^d%JEA*3(`tJ##xeOR%C-!39%+;tjh%(5@Azf zY{@Iz^2v^Tvn#*s$sha5;6OP!R4zg)nH`nIkt*Os)o`ksI8$w0kp}ur15`WdWMDNq z{BmoRJCm$Whg-rnr8wR4pvfzbwp-etZF1wkkHwLhv(PAIm<0_DyXSe|`rf{zC+SID7>1X0ipZe&_Qp6-u~O0~!=wT)m71z3 zr{ShsQA?h;_1PLlL+MlaU{xhKRceS9#;7ejnA z%#XhC%c!I=AtsaJVoGvjOiKwf(!{LznUgLSB*dc3vm^NDZj+zkGL{OC?{Jgi*1!nR28tNsyR>r4pk6K^>d6H^b-cC0rJSl>TyKm z)bcxB)~CZO=Qiayy>h9^C)c)H+EX^YYr3<^VHV1xRb@8HleK92Due6m`yFU_dD*QA|qVcz+8aiWGTE3kSUY)nN+KXZ)hK_-q1TK(BVs0oYaS>kBI>`hIkms@|YkKSslyjR4lZXG8Ze|AzoTQS^QYT%X0ZK8FlWT6dCnf3R9s|n2z<@I0J(T=&Pav6+cQ7Sm;u))rG18`LXZqC3u(a8q+@_^1{$vX+ Ug{s<0UCfEG#>IvpTcx|AKOBQ3MgRZ+ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SlashSlashCommentComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SlashSlashCommentComponent.class index 751f5b6b6f3b5eab7bd480d6aba60aed5034c0f0..470c80c2d83b14122789e512e473d74e8a9a7c01 100644 GIT binary patch delta 43 ycmZ3(vW8_t86)Gw$>oeWl2aI@7^X7FGE8GoV3^LJ45SSiW-u5t%%1#*(EtDiybEUl delta 43 xcmZ3(vW8_t86#uEYHTe&t0Ra1R3f}+# diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourceComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourceComponent.class index ec9e789dc437e11e34918f9a3500fde23fce74f5..804802be5dc6cb989583869c8c696e9b7c67d629 100644 GIT binary patch delta 25 hcmbQtHkoaMEEA*cWI3h?MyJW;OxcWXlOHn~0038&2J`>` delta 25 hcmbQtHkoaMEEA*7WI3h?M#IVFOxcX4lOHn~0032F2EhOT diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourcePositionImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourcePositionImpl.class index da0e63f6c449131db196f5c5bdcee5bab5e94f5e..3f94fd12812844dc0d757f4886a2cf81ad2916d9 100644 GIT binary patch delta 52 zcmX@kahzkrdnQ3+1{MZW22KVu20jLJ24Mz^Nz74v delta 52 zcmX@kahzkrdnQ381{MYt22KW520jKg24M#ENz74<+LNQ1Z5RzE&j6C9ldm#|GFna6 HW|08^CW#9v diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/StaticBlockComponent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/StaticBlockComponent.class index 75640c84a52797571181ddcaedf63f11a27917ed..b59c7fdc62ffa06abba8716de52957778e4bc19f 100644 GIT binary patch delta 78 zcmZqUXye$>z{L1tawC&H>t6;|#($HKGTk>~Vq)N7Vqp+vVr7tLVq?%`VrMXB;$X04 i;$(1V;$jG7;$g^U;%BI25@4uh5@M)l5}kaF*#H2p84j8N delta 78 zcmV-U0I~mu2!;r-fC2&MlYs(11?&I?0qv8;0^c$L@c;|~^8ghA^Z*|L^#CaW_5d>h k_W(Ts_y9)%`2bM?`v7YJ{s4Ia{{Vdg0RVpj1e4YSF!9G2e*gdg diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TagImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TagImpl.class index e51bbf4f2f7ed496de1eea1a3de9329f8e9690d1..536c10741ad32bc1ba20ec7551a8c2daf48d72cf 100644 GIT binary patch delta 47 zcmX@cb&P9+B8#9Q11p0O0~doa13!Z)gE)iPWFwXoMvKYQS!@_BCtqO+Wwe^C#VP{; D-OLG~ delta 47 zcmX@cb&P9+B8#8`11p0f0~do513!ZbgE)igWFwXoM)k?lS!@_JCSPF*Wz?Lk#VP{; D(NGB( diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TemporaryStore.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TemporaryStore.class index 661f49305cc0cb481399eb5076cf700425010235..cf42c61f5beba275cb9f479b6fd1e48e551c1814 100644 GIT binary patch delta 35 rcmZ3&vV>*Bd`8Y31{Q`~22O^&$txIrIU5*Q85$Y57@8*kV^jkGqD=_e delta 35 rcmZ3&vV>*Bd`8Y_1{Q`G22O_9$txIrIrAA<844J<7z!uy@KFb6Q2PF~4uBWupU%fP_E X!@vk6SsC~k_<=MdgBFlvV$cQv9Zm~4 delta 71 zcmZqTXyVw=!^A4fz{(&uc_Nb+qr&7nOb(2SlVzE$7?mbRFb6QIOkT-sBdf;1%fP_E X!@vk6SsC~k_<=MdgBFlvV$cQv2bT)L diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ThrowsTagImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ThrowsTagImpl.class index d86084caa7025b8e01a4f7eb977b3d25504838c4..06cc77ca33bf81c038d87abd8a510b23f4565363 100644 GIT binary patch delta 153 zcmWNH%L)Nu7(mZQYNnAgvqbjFQkcf2m=duOO-UA0EZnkF<`t~|m7O=3c>vF%yoqmf zPMuEbrC#P*+ZF}dICLn{rHoHq-5{VzPivnU17e2kwcQwTXG}uKlL;@Ty!FVK^I^e{ rr8um_Wi3@AbG0tAF<&c?ovGM?#3r)++JPfbM3i|>oYlfZnIriF&U6{= delta 153 zcmWN_%L)Ne9DwofPwGq~WoC(Nreh;gl!b+CtdxygcFMeh)mhnjgP8~LEXtcW zo8MPoG2%@?jON3b s9}{tzipNay%*|C@WMRHa%gW>&Eo-xNg2IL)kVdRYPMmFphc!X?2PTvl5dZ)H diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Timer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Timer.class index 1d448e37d10937956ff548494e94bc8b5ff02417..8f5dc610960e6c487f56038fbc35349f72a47d94 100644 GIT binary patch delta 156 zcmWN@y$XR*9Khk1~9lYz-=p1nZ*_nb0?l<#L^*ojWDT=fyv7pS73VW(Nsqv-GkA}+7R0~>aMO&@u zs102?$NDbiBbPXbSNPFs2RoAXeEEQTB&dBzloD6*u)o-$7YzEt>8RRwA)qOMjn)S9N+ y(2}#e&>bAQ@^QPmXV;g&%+f=6jB@?xegMJono25SZm1{(%$23rORAT0;vt1;L!7%*5dm@zm`_G2~! E00vzMmjD0& delta 51 zcmZo+Z(-lCh>1~c@?xegMNI}~1}z2-25kmz1|0?oAT0;vt1;*?7%*rum@ybk_G2~! E0QTkw?EnA( diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet.class index ea6cb557f6e7a274960ba987b7fc91d019b84683..965ef1c33794abd93c9e75acc153f63b9a0ab420 100644 GIT binary patch delta 145 zcmX>ra#m!+4>n#M1{MZA1}+9820jL@$*k-~j9QZ|*kgH38Q2)i7z7#28KfCpCof{p zV)bHRX7HXY$Wh7~0AvMD?&dgU8VY2EF>o-119e9*hyd9#46zKF3~>xz3<(T=42cYZ p3`s!IWQG_Zox+gHkj{`cxr@`9(P;89PD4h$$v-%afTT8;5&*2v8~y+Q delta 145 zcmX>ra#m!+4>n$D1{MZc1}+9g20jMK$*k-~jFOWr*kgHB7}yw883Y;B7^E3YCNE;o zVzp#oX0Vzp$Wh8_4`ew^?&dgU>H=iBGH@`s0d>1Ghyd9#3_c8+489Cr4E_v$3;_&* pKp4gl#1I3dQy4-R(iuW0cX3)XDo#GeX~-x$`3I*FkksZ<0stP78UO$Q diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeImpl.class index e2e630a5c6b27fc127a2eb6219f3a9af26550ae6..50bb53e8f20575733f9217a8e95a1b3bd86bca5b 100644 GIT binary patch delta 153 zcmWN|%L)Nu96<5&6=pt3p;^#uBnw3rE|F_fL!?kj?zhD-uc77z{_kMzIlP9Qr!c!y zzfNEU*83MLZ7|uAVn>cW1rC%s(%?j&Gh;3+xU!}q8N4+E) zJ-}c{8b_jLSGnStH#L@5*c17hJvEiQzNncz^+?U-qnBzWcHGro_}xk1iyycDIBOkt delta 153 zcmZn@Z4=$_icQmlfrG)5L6E_VL5jhfL7BmaL5IPY!IZ&|!H&V7!JQ!h2m=|y8Du64 zv!_ccF|YvDa5AVc@G+<|2s5YyNeu>l2Cd1H*)uuy7}$YqAqKfze(f|=8Uft|sVftSH+@<-+})?fxPhLFiQEN+aklRvPCPCmh+&X@sY$p8Q^ CeGOCq delta 47 zcmeC->fze(f|=8tft|sEftSH@@<-+}Rwo8A2It8+EN+ZGlRvPCPCmh+&KM44$p8Q( CA`IOC diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ValueTagImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ValueTagImpl.class index 94302c2ebbbba4bc9ab8cb7314a18ee1320620a0..872c40309adcb3bb34fa52a8df0ef0af39f0b4d6 100644 GIT binary patch delta 43 zcmeC+=-}A!o{3eTfsMgn@)ssQMx)8j%r=aslN*?mIV~AP7_1o78EhxNVU_^^`G5+H delta 43 zcmeC+=-}A!o{3eCfsH|a@)ssQM#ag_%r=ZFlN*?mIW-tW7&IBw8FVJUVU_^^@Mj7Y diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Whitespace.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Whitespace.class index d7051519d561e60ce04db89c8b834669734b2b67..965c1aa4199de799077f1fb3c479ea8e187b9983 100644 GIT binary patch delta 31 ncmX@la-L?hWECcVMx)6kK+=5j5heowb^Ql^ delta 29 jcmeyu`h|6aJQJ%70~>?vWECcVM#ae`KvHe;5heowa%TrR diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.class index 3da691c8314d26627111e8d2d075e7ffadabea14..b83ad66064831fc438c4ed7872a16661008b47ab 100644 GIT binary patch delta 59 zcmZ3_yPkJL2P>;C0~>?hTf53?>X>3}y@p4CV}443-#0~>?vpk(44MqKK-z^tharGL Nmm!=%XL2f=7XU<736=l= diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.class index 1908c173d353d35ad26f8a1544551cd0e5a5eee3..d56220d9569525b2462289db42bbb9f52ae5b148 100644 GIT binary patch delta 114 zcmca8dQo&k4F{_(0~>?h=;BC92gWB92wMs zv>t;qg9U>NgA;=rgCB!CLnx4rVen)~WAI`qVDMq6Ven;W2GU&&{tPo10vMJs1Tw4! N(wi7UCO2{g007^b77YLZ delta 114 zcmca8dQo&k4F{_X0~>?vegb zv>t;Ig9U>zgA;=(gCBz#Lnx4r0g9wCSTYnaSTocx*f2B$=`IF4h8Ya@3`-as7*+%6 LO$^SH8@U1ihFTP4 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.class index cfaf94d3aece7e64a43185a6e21ec3dda8a9fe8f..52c0522fc1d37691e75b057dc14bfe59df7203ab 100644 GIT binary patch delta 120 zcmbO(FkN7S5F4v50~>?hW^p!K#zbQVZUz$uF$OaR1qO2lEe1;<%ZkAkNV_oDF!%vk z5e)VWDGUw_*+9C8!HJ=U!I`0r!IfbWgB!z4AiaRWgJBheC&Ly7Z-xU5J`Bf!^f?B9 RhFc5)3=bLnCvRm>0syGD7ft{G delta 120 zcmWN?s}4Z{007VGV%`p NnE0CdnH-<7)gMA06@vf( diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryExpression.class index fc81485e5a63271f3d9f1b793e359484440bbfb1..688a122096ff9e6b092fb7b719220cce59ccd629 100644 GIT binary patch delta 25 gcmaFP@|50}F#Z11Ez510RFpWOF7107z5>Q~&?~ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.class index 50cba59ca37e23776658724e65256391d8247429..ea6978d472270b19ebd03a95de8432a06442b445 100644 GIT binary patch delta 47 zcmdnVvy*3o87r$U0~>?hWNX&NlEw_&3?>X>3}y^k4CX+V6@vqVHG?~Y)#UH2P5|5G B2*m&Z delta 47 zcmdnVvy*3o87r#{0~>?vWNX&Nl1dER49W~*45|!T3~CG}44MoMK$bg$=H&0JP5{po B2rK{q diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.class index 0db661d7d2cb92d06835e2864256e55d11d62120..72a6fc8d4879fc07fba8fad15b3dc7ebadc358e2 100644 GIT binary patch delta 100 zcmeC+@8I8XmX%ePfsH|L^Ceb(MqgtFZUz$uF$OaR1qO2lEe1;<%ZkAkNV_oDF!%vk x5e)VWDGUw_*+9C8!HJ=U!I`0r!IfbWgB!z4AiaRWlVJ^m7sF--&&hi1Q2==R5C5~8EP1e7}^+27$z~8GRy?h3m7aI)-YHyY-X^Stj8V&05j_l A#{d8T diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.class index 885e009a8d705f59946d6ec968d32f8cd200bf72..5726e7a3861351a37fcf89d64b5ff8b182676dd3 100644 GIT binary patch delta 55 zcmbQuJDYby6DzAO0~>?hX>3}y@p4CV|v3>FN=K-!AIn!%01hQXJ? JdU7C}7XT*<32guX delta 55 zcmbQuJDYby6Dz9>0~>?v?hWCtdHMx)6SfTa242TTS4W#?vWCtdHM#ae!fTY^w2TTS4Vo?U< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.class index 26c14ed4f60eb66577b121aaeb2031c12c138eb7..f1a21239acadc8c2439facc56816a89cc80bcf7e 100644 GIT binary patch delta 27 hcmaFG@``1{XGT_C237{W$v+s~S&e`!I*gBDOs2MBc;%oq$9 U>=_IhTo{ZP+!#zJTd?^706~Tc761SM diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.class index ebba4c8e49037b62373529f00a44f476e36ea553..2ee7e5452293b0246bf7c87ce9a0109197cea98a 100644 GIT binary patch delta 75 zcmcc3b(?ELIy0v(0}F#b10RFIASpWe0*fA_&E)?q_Kc2`?OA02SE&%# diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantByte.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantByte.class index 07a85b1702e50a1fdb93a8ef0a6ae49a566a544c..3eacffbfb4e5e45b1b8f9e72854b64278d295115 100644 GIT binary patch delta 51 zcmdnRv5RBF6(&wy1{MZ=22KWp$#n1GdnYCOipLEWYnF!klBXOX!1Q~dq(rg Hax5|cMxP8o diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantChar.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantChar.class index 6d44b80c8734c758f0284a827c32f7daed7120d2..c4de797ec82f7395307e53bece4fe7837772b306 100644 GIT binary patch delta 125 zcmaFF^N43dF^jG)0}F#b122OCgBXJ$LkNQrLo9!7g delta 125 zcmaFF^N43dF^jGY0}F#3122O-gBXJXLkNQ+Lo9<5LmGoJLq3BFLj{8>LnDI*Lob6K z!wd$a$qQIQIZc2%%osQs%qRb2ab>ig?855I=rFkhNV-lw!)nRsHJOdgUe+I|n}LCc Vfe}b@08LQ?(u@plK$3~U9RQD*6jT5J diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantDouble.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantDouble.class index e5b4f83f02fc631c576553d7fe3a8f00e27a3681..38700c72310d345946764162b14ca3b30c9f2566 100644 GIT binary patch delta 65 zcmeC+>fqYo$IPkAz`~%(+J2jVc=vioxGaamCdJtnVVv1jz1{Dwsa0I(7czyJUM delta 65 zcmeC+>fqYo$IL0iz``KMz{4OvIh@&>QxV8hX5eH{nY^0Wl~H5zM`mY6-N~jbmW)P| U^I2>d%_py6v1hcI{Dwsa0GJsL1poj5 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantExpression.class index 791aae005ed721af698237c450bb0fa1960e64c8..3d194a9b57a95f7516bda616a7c7221b2b64d592 100644 GIT binary patch delta 19 bcmbQtHkob1Bqm0U$&;BP8I2~tWl{qGJz53) delta 19 bcmbQtHkob1Bqm1j$&;BP85JkLWl{qGJW2)H diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantFloat.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantFloat.class index 0fe33bd94e19b12c4463f8ed2367904b277dd393..61b969fe0f487395039adfd85dfea9eb8ca4c452 100644 GIT binary patch delta 65 zcmZ3%y@GqgU1m;Q1{MZ=1|9~3$ delta 65 zcmZ3%y@GqgU1m-h1{MZ61|A0a$ delta 89 zcmaFF^@wZ3d}dA=1{MZ61|A0a$t#$BI2D0BWd<$=mC1jZT^ThdJF_@5>P~KFv1Bxw ne2~S3(R?x+tG%oZgBSw?P!A)JI3w diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantLong.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantLong.class index 32af351937b25e936dc0289282473743d0924f6e..726914985dc6e2a03909d33536961f8c2b1def99 100644 GIT binary patch delta 97 zcmdnbv!7=}EsLNo0}F#bgBXJWgEoUPgB^qE diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantNull.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantNull.class index aabd3f5786df643e37f6801f34597f913b49cc74..d2c3574d80b35faf3049702a3a1c39391ead88b2 100644 GIT binary patch delta 49 zcmdnXwwG;#5fiI60}F%hWOF8KM#IU)OqPshlNFgoCm&)`VYCLb{s37HK$Z*uB_|7& delta 49 zcmdnXwwG;#5fiHv0}F%9WOF8KMuo}6OqPtQlNFgoCm&)`VblV%{s39}K$Z*u8tn@& diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantShort.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantShort.class index 082f9f06f76e8a46f5a7ca8af55ca7b83e74c2e7..691a01933c5a79cc66c8b6d08446dd80e1a68b34 100644 GIT binary patch delta 75 zcmX@Wae!mPEhbJ~1{MZ=22KWp$&Z;_8BHc@GCMO`PR?bvWVD;SoY{uadGZrxdsz<# b0R{#J9tK7r$-yAVAOxft8FYap6N4TAgyIb8 delta 75 zcmX@Wae!mPEhbJG1{MZ622KX~$&Z;_8I>n%GCMPBOwMJtWYnF!oY{uaXz~+gds%Y^ b0R{#J9tK7r$-yAVAOxft8FYap6N4TAYPbwx diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantString.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantString.class index 605278d10ca5b22f93ce1ddcc2f2bb9e29846d01..67ef948195b908ec9946b0d01bdc0ab662b449fa 100644 GIT binary patch delta 79 zcmZqVXyn+if{9a?frUYzfs?^t@Wt2lS1{Yi ddN2quFfi~iFak+d20;cPAkE023?!KtQ~;O)4A=kw delta 79 zcmZqVXyn+if{9axfrUYifs;Xg@WoH{S1{Yi dnllJ6Ffi~iFak+d20;cPAkE023?!KtQ~-QH3{U_7 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Context.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Context.class index 3afc14603fef985a53f8fd7a2d43da591bec4597..0a21eff60b58be120cf308a3ac8fa175d68ec89e 100644 GIT binary patch delta 61 zcmdnQwux;+H50Es0}F#811EzK10RF&Mfg~$~D1#V~ MW@L~Cl1vOT088fwz5oCK delta 61 zcmdnQwux;+H50EK0}F!!11Ezb10RFZMfg~$~D1#V~ MW@L~Cl1vOT06QxOSO5S3 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/DivisionExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/DivisionExpression.class index 3543f00ac8a90528165c9ee27806b0a6100a38f3..95cc47b5c35df2467c1674ed6ca803e02a76dc74 100644 GIT binary patch delta 41 ucmdnbzMp-A7Za;40~>?hWPc`qMx)8|fu#B5_dwESvOTjuqvPa$W&;4^bqd=6 delta 41 ucmdnbzMp-A7Za-t0~>?vWPc`qM#ahVfu!2x_drs6vOTjuqrv2UW&;4+p9*yV diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/EqualExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/EqualExpression.class index 222c6e40ef64c06df169f3c6af320145f7977eb6..2fd2087c821b82c6d52aebd2370d598e9a4e5028 100644 GIT binary patch delta 59 zcmZ3@v6^Fp7Za;40~>?hWPhemMx)7r%#xG$G1)MhgIOZXHjFkvRtTfx?vWPhemM#ag2%#xG$G1)MxfmtHVHjLUpRtTfP4od&E!ywdN-qzLI$r9n^T0rF~_1rh_VSGa`=zREEZ+-IeZ&~XS%zF z`*+lj`s-oVyy|Jbx#BoTpp(Q!iU4UsWH87QAxD(_yK9MQi4rC%*r;NshLbvO8hB{p zr%jL!Vc9rcIrk{gr_6vBL#Z(%CMc#{nekz+e%8BhA>vZRm56H*HzICD+=;js@gU+} O#1nbW6uGFc&G-X=YbH4W delta 188 zcmWN}JqrN=9LMqRW%5vrx-#6TEXd%_L!Ks%5JI9n)tQ74g;#LHjmj(*W%N3{8-st} z;a9)mW2?6MdbpL4^K{=dg8(U1(r9FelO;(Goje7KQt54ZN{U&=g^7AmUNP PgNP@w&-A%CU!VR5d>tcR diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.class index 9b3655780f76ff564a164c89d549ab72c6e4ac9e..0474dd4a4350e57b7a40371bbd6a9add6ccd01f1 100644 GIT binary patch delta 29 jcmeBS>tWkq&cv$Az{a3A*@nrV(P(lHkTjoshsgi{WIG2C delta 29 jcmeBS>tWkq&crIiz{Vgu*@nrVQE_q)kW`y|hsgi{V5J7k diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.class index eef127e452367667096cecf0d00b55d28d0f5f1c..33a88296aaf497e47300221d9374ed995797cfee 100644 GIT binary patch delta 49 zcmcb^eusTS028Y&0~>?h;M1& delta 49 zcmcb^eusTS028YW0~>?vAp+F*VGvo)i^?h+ delta 49 zcmey!{*iq{Dif;=0~>?v15H>*E7!C8aNm_iJXmGOk7Rf%{is~Agx?1MiA|2aAdp$>eCj)0g7b7=gcM}g&FEj6Cd@Ot| N{j5@H(KVav{Q(Nj6Nvx- diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.class index 7c9b52e78f3889d9ad4515f2f18ed5483ba35182..312246f29ed5403b7ad4049219e2629ae7978c2a 100644 GIT binary patch delta 43 ucmX@ea*$=iDMnUZ237{W$>$l}S&e`!V<1bMUzkCJfe{Er85kIt7{mbKTnA$S delta 43 ucmX@ea*$=iDMnTq237{y$>$l}SrvgSB_K<1qJ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.class index b54b51b2d68101d5331ab1effbd5aa41b2174a3b..8ac3c22952b01f3d33e2376171e54f88337748a3 100644 GIT binary patch delta 29 jcmZo=Yh~MDz{IM{z{a3A*_6qj(P(ljkTjosmB|1AVNM3- delta 29 jcmZo=Yh~MDz{D!Uz{Vgu*_6qjQE_rBkW`y|mB|1AUAP9K diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanExpression.class index 08f71e49970a78e8635ac001bfd902d3745fb1cd..d0d6923af183ad870236b517afa945fae0876c57 100644 GIT binary patch delta 49 zcmcc2ewlrPI}@ue0~>?hWFMwbMx)7o%#xFLGubejgIR*iHjFkvRtTfx?vWFMwbM#af~%#xFLGubezfmwpgHjLUpRtTfP?hcg06=;S AWB>pF delta 49 zcmaFC{(^l&3=^vi0~>?vAp+F*VSvo)i^cg05*gR A{r~^~ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.class index d031ae37df14ea643680a0da7bc30d4c1ca5f558..da9124b4224db0e418358186d6510df79ee499ad 100644 GIT binary patch delta 23 ecmdnWx|MZ<1{13;0~>?hWL>6kMx)8COa=f%6$MKG delta 23 ecmdnWx|MZ<1{13c0~>?vWL>6kM#agkOa=f#1_c-Z diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.class index 0fec9ca8c04decbce77a4a5688d3c89c4f1c308b..055856eef695b8c242f348f556966a65fd4fca1f 100644 GIT binary patch delta 35 rcmbQrGnHq9BP**e11p2xWH;7Hyv7XN45kdC3}y^E43?9hvKjyYfyf5y delta 35 rcmbQrGnHq9BP**611p2uT4vKjyYdx{2y diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.class index c9a6dbf87b62d1c75dae81a458d3256fd10fbc49..8ed300494d7ee37509dd0486b7bc20ea259f0f55 100644 GIT binary patch delta 23 ecmZ3@x|(%^922W90~>?hWM!ssMx)8qOa=f!F$Ea_ delta 23 ecmZ3@x|(%^922Vy0~>?vWM!ssM#ah1Oa=fyA_V3D diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ModuloExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ModuloExpression.class index e005b63964726bbe76eade3ffcb2bcf2c64526f5..ec9870c0bd17b33779c7ef14424ee0ef7c3fa610 100644 GIT binary patch delta 41 ucmdnVzLR}}3lpm@0~>?hWKSl4Mx)6yfu#B5mq5~HvL&-WqvPaGW&;4<`wFW7 delta 41 ucmdnVzLR}}3lpmh0~>?vWKSl4M#af9fu!2xmq1c`vL&-Wqrv1(W&;4&B??6V diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.class index f5c4efed22e6db9313d49842971a724981cb2f29..770c4f4f63f0a32b55e6a7ab25a3960ef38f210c 100644 GIT binary patch delta 41 ucmcb}evy4c3=^v^0~>?h?v?h?v6_ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.class index 07e417c9cbf44b9c06a419cfb80bb7e24e6f4b19..f7f21d2138f793a4cc8bbb2437c036f842490bd6 100644 GIT binary patch delta 29 jcmZo+Yhl}<&%~?h?vr*CRtXJ~KaXzXO-{NG^aYVKy?Df6=Qw)U~{wGFE{ F{Q*4c7196z delta 104 zcmWN{u?hiU007|6pw3y(ih+peL_|axOtP6xR1|Yv}0fTIkv2+Djb_oD7|fT#N-1H&b^rFLUpFe=L2i{H((+ FPXF<16iWaA diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnaryExpression.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnaryExpression.class index b4a86d1b50318346a30c8a43a1564c33a9eef797..7189a2938cc608d392d8e35fdcda52956a1ebbfb 100644 GIT binary patch delta 21 ccmeBS>0#M$myuJKfrUYzfs?^t@-s#?06Pl=@c;k- delta 21 ccmeBS>0#M$myuJ3frUYifs;Xg@-s#?069Pez5oCK diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.class index 97557e0366426c2ed6bfa1eb70374994b72bed8b..3e678af8986152efb25a268be49379b4d9b12568 100644 GIT binary patch delta 17 Ycmcb~e3N;@I!0Dq237{W$(tF~05l5(>Hq)$ delta 17 Ycmcb~e3N;@I!0C*237{y$(tF~05cr~$N&HU diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml$State.class b/libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml$State.class index 71875ab874b12f4e3f5fc8572567c7dbd1881218..f056c6252d872e281a9638f1b177a4fe633c9432 100644 GIT binary patch delta 59 zcmV-B0L1@<2ZRT(`~oGi015%K02BeV03HFg04M>r05So$06YP>07e1108jzC09paC RlOY2#1-$?S0l<@311#5a4^;pF delta 59 zcmV-B0L1@<2ZRT(`~oGR015%302BeE03HFP04M>a05Sol06YPw07e0*08jy`09pZ` RlOY2#1*`xB0k4x-11!Lr4v7E& diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml.class b/libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml.class index 31d9d66d82d724187ef13d5660736c853f37c598..17de273a03e3b88213f06934b6cd93420780848d 100644 GIT binary patch delta 3649 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 literal 8421 zcmb_h3wRvWb^edEt6i03KJNKS@&VSDN&%JkEdG~WK0JuOt5I~t=(NJovHIa;Gv!n6caBD7|PG(zo z#K+^qtt+&3OC~-#YG(rQ2_ostP;0t>hn>jnvin=(*^$;<#11`f0fB521eYd~PRhwG6O=bJZWj1f5T+33A{@XOf-0kPGM*Z8 zL9}ot<_YEu*jXoI4=gW;-I$B##;6a4Y^#J|zJ-~n;rK2mW%rDY^xK(U*UFl%bRwSI z9M3rV>@`*_^^~YT6~@LVjhjO#N4N_U@cu zRzZUC(K-|R?E$P1oO6<7aBb0Ss6+==Sy+uVjKX*#VP|QMbcWE0s{(kR;LM`;GxlJT zY1P`D9&iR7J7b{>-D-=65EW|ZY}}@rud{Hq21!8SGfIj>MNecX=XG%u)OWq7zQk^t zlkFYOq<6Wo6k4@AVUL=y4&WNbxzX22w|1_Zd=sM6wpq9qvzX0{^_?3vqqFME>nvQ4 zK82FWM66v64Uiji87DQ=9z?t#)ih7e9YO+j0L-H5B1Y~Y3xgP=J$o8Y zm%&tEj9Y@mXB;d}V>qoz%yh|(w zoz%d_WSXKEHJnCtHFm1iAF?nFA)WOu{kc7a`|&^kA30?ua&u~}on&ZP_$dB_K1`3> z84|j(bm!?ze>xhHv3>pVERCxr6rF_{<4(_snodQZQ%aQ5sNi7>e~3R)NcZaFCoMdR zhgelgg;Q*qGooMpcgFsnM%JOpSSP@e31q-Ry#@xwcygz z@os5kd&wBUmjrW*ndLTjj5)~xn~9ac5eqNlZ%Cx$@#L7jZqUSWv44R}O0e=Ihwu_! zQNvz6hJFe(KD z1pd*&H}FkTI9F}C&eVXtTP@P6!HSc>w=8@c-!a_RpEc}z93yzbf_Q^vYN2}Xdlvo~ z|H4oj9b+h6R;s^;P6;?Cz{_i*I1O;-YC^+uj1QG5dzZTs6ZjJaVo|MW!6=JEZna}4 z2bdg0?c~(FBIR7IovFGVAMrx)hZcUMY*@iUN)ZA4m}}9KR6jF|Tdd!96YHlIex_s? zOr%peu2Qoh`~trW;J*ato?HV(%k8q*$>g)DTjSV$Jh+<=_N-NVVVX=+;QkVZ?Qs$iut&kZ@(2P>GSc1kyN9luMk z7}`C~FRXa7*pi@B>ZCP6xqvj1(8P)aak>U4;P{*4r49WX}Q{x^|FCW^1>om9qUFzV`*t9q>LL&$6y?k zUcs`~*2v0rk)CzEkyR@@dn3JTJ2ysFcXq9cv_za-#K}fR;)!8yZ6iZ=N;h-%K%^zw z5=k^Q=`|?K#hfgrn7ZXDcY+K*z9}d- zFy`yI@Ex!R836tI#9LJ?D6Hr+>qj&3p^@{l1jk-h(a*1f7 zL?bS1Ns~0|>oH5lrH2cu$&BF%5BH#)MRr@VM<)pE$}oL<(?PjewI)$GgAw|M)oZs` zll!SD1NH1lVmP7djH8Og?%mXqayF*NG6{RNqlYdtjb`2<(qc6q=P-K9c>)#WKaT_W z3*D!gD>p>u$}NJqaw%!9JZ3Og9wY$OXXxPvpJ#FuNssbo^XUR!^>1d4e`g6Lr^+&Y0p2XG#58+qGw0L@YU zEG|l$L-m1f__)Qd!c{!FSx3oN8|iagSvcP_EMiP$m{QGo{M8xv@~S{Aj_${WhtMYI z+J|t{AuJVq9v$7y`?2yM);i8VNa0xaGJe?}|ZU;v) zqxBTwI8A;_3w+e%HlnoiW%!=qb@*lMjPk0;?aU)}0K?Cs?jh9hId=rp4r81y+x;Sa zw}&@3A3&~r=|1R?Tjm|YZDqta(X9fSIl8AsZRE(7Jnr1GS7e^{JA@Ak9y|IP?}z!m z==K;7y}*M69ve{Y3|*gNaE;+2?$wuJ7glhuv>rEM8*b+L$1NCQ+b-P39s2FY{HSY= zXa1Gk9InS2n!g@%a1Z(jz&5(`4=7s$lKV%#({Q<)PYOgcHM%#C`+NhJ??atF)aCKV z449s#mV@{(-Bb7E-m;^0449bQiGP*i&xpTs%RWrk z`}ur$a!Y|*@i1I_&Ky;KiYAC5Kd6(rx>w^N{qYK zb3%yk3Um{r1f`ocl8r*IQN)7<{!Sqtd4tBY7D%P)cf?EgBUr&lrs1Dhp zBXADmrL79|LHzXuzRYm`N*;e3^KsZj*hlo+{ImTJqJz)dV-?|w>ef8|p)C-um>uwu zKL06J!8grepNa`rxI$`Prxe$DDlCuhPCDg|qEmJ-YJuk&VJ{G(7fC!{AZ2_J4Lm7` z;Y+MOU#25oA>+PEYWgZ^>1(8-Z{SXRlS%(A=F7M70KUWIeS^;UE)L^+f8S`5v`Ow+(V)+q}$sD*Ym=@{dgyjpS1a# z!oHT-{)6~AX-;|yY54UbNQ+o@fVUaBKPEu$P?4W91%Jl$`#G8R7gXsT9-;lx7`V)x z-ZPMj;Me#Kl?$<#n~GKZ8llChoHFY0Tl^1IZX*BxuQ9Mp*ZIdqaL_YroWb-g4Vq-d z>kC$O^r-V&iZQewN4+rebHGH{Pg@_vEZ#TsUWC;u#??%v4l#(ZS!0c1(h?2(4vMdU z#3zeLxH2M8C2HNO<*l6EM3Mu zRA#VzyQs|LRRf@$PA{hvb^A5ke7bj+5N8bqKR+*WBjq{!C&WqRZfH?vW!5|%^ZDBR z`>-VJbBl$9G+p+KRre?sY6^v#@={ga=CAWV%KKWGm6th9+T)D8%+pb(ZoE{qco{to zsp6-~YDULQOp_YS;Kp{Q%*K3~gGF)%nz-|Am3g>O=HpU1iywi`<_5bK>t#WS^&2Lw z-+*7Ur>N%at#wfE&Ss31^B{YTLBvOVS4zah#C(1YJBPA#smZ;eXMGpP>BwrDQJK7;Zgi@>chs-(f_;w~bqCv~azJW-}=e9D{3oOSeqE+_AaHdQoFNDI+x z<#gwlOvhP=kD!LF7qV5K*y&=gV_RM>i#C-PhO!*X68&j!^5x}nj#+Lx_)UjeSz#o| zs)MpxT~#ZcI#I1$WqSFvSJAp{Br3>aTGvXiT)A=;p5}RZdw#yps?mDqU-iMrAg`1^|A2xdUkwTZ;@RqsvOd@rUhZNB; zzTz@hy4n9&%wq%br+QM%ernFvXN0nXsR?MMO(wZ2}#EM zVSh9)>1bHpkO}*#U@q+A?=Dr+Pt=iUo>8jPb(Er?dnG6#Bq{om`wvrmZe3YsLn= za4FQtn`klY~N~WUoV!6I9(`r_z=t}mcV^%(EDoojTM@w-j6-)O<=~Ob^+uX`iV+OP4%48;= zTO5n8i1qSp%}M+2D-)TF4mJW6ZEnro=T>ZR;z-up>c_VYj!4K`Y{&c zyr`vi?Wne?y*IEQ#w(0Vn7L%uOw1fo*=5mjMn)wkRzP8Y17qOh`Hp1TT$CT^F|*xb zQX$ZhiN{h)V%elT+l!tS+ljh{qVEK`Gj9#%ZTOoTm-yjC&_F#75d8-laKq!p!3x#; zVCly}m@HeXWov_h3i!PUF;&CS6cLp75d)PN&B(33BqIoQd|plvd}k(a5si_3Cc3di zLc^vIZul&{LX4%^*x;aPpz!&i)Mv#sTXoNo*X0ssDWS|)> z^qEd6)Y?Gn)OPmtn{lhTkvw(8R}r$$>#Ks1Gs~IpYG`j<;=?Qj?_jg|KUXfzm$TX`1Fn&4nIW6?!3;lq65N~m zc;m( zm5FH`s|>7`Eu-dio-nIpD3Y%d`Tj(PtkAKXW#DXWXh~=L9Bs&pa|zclcT3HsEt}0` z{Wu4cefTeKzJU0z&j;4*xRsmSGfa=O_v?G5eiBj_PGn$`*vKAlc%U&rAJ16PVQAz&BN zA!}C|_@1m)a&1m>z)a_)LHn?g0nFF)qa`RMbd7;;W3HUI&cOB9q%fK%+EONuSVCF$ zTt+!EGn=K)-C)2ApASD^kvHkGyve{?bc*&L8u*bEXoZeMko4ge?hA(G?X3nDq0@(- z67*nekd4$IlgTzalTWk#sU*ARaNk}$JT;s5ts*J%JE^Cs>8z*#T`;g6cM-$fU@A#v zQ_B0&P-7TjpvgG6#*ZDi*Nb~N4?ew7E-=@u%48Ec13PgaT^GKrUR`VelSi_)uhZ;T zr50Zvo}@mOwb)ZeY2Z@nA_)~95J0zzlfRVSS51l~(+Q?Zp=`vJ>(YI5w_qM5q->Fu z1DTa(ccwJfIYD%7?0x@e9swH}mW_DS!0)8rd(1P~LvxbI#|-=mzxLq?S~y#ro8!YD z2}zm>=M5-sYO4Lo!2Q_j!!z7v|Ee+5BaX(H>$xOe=>016}DV|5>tOvh9Cgc)q(F>(qvvG57Qm%A0d*79( ziZM)Lz)oJZ-TLFCgQU*5;~b`)g?41V+e1yqffD`#Ti|lufx6qd=)eSid-RsWF;TC8PrN1C$9w36gX;%`!rSqMkb4^@g?8YeW!rJc zHcSaQ??vM_gokyF(+(fQ?<47C6Kc^yZ8Np*aYaoy6jP~@IuXTTw4>aE zOvge*u$VC&hojKNYhyQ^T7o%Pies^iZ%@YYIJGQ*u2KM9d@K2I$jGn*c)<>!FT53t zZ-OVV@7p$7Cbk1H5$iqH)(-)YQ7 zh6x&EEN2i0i>LBs(e{<1?ZY>40;5ziNbP8sGZ{ksiQxjyUl?&k3b@FXDBzNXLJ2<2 zSQ;7jFrZU+CUHND-kpp6ah|pmEb1s(nrK^c^A9jy_8Fhzh2T53&G)!lD3Edp=71^`_C*f)`>00LIYUW^*jy+V2r4)P0j@`jb-9~mfnAK|BPRWTn znX@(u>ueN4;lLdQY+ES7?_a+`{APSV3q|Uu-G#d;2^5i?oA88>xS z;bx4(EeP_t5x1846(U=9aW4?knP8V>ls{+Na_|q$V977eP}{G$d?P)<9}3@vUxW&H zaMo##84|2uhlTN%szB|CoGPL*8JY@MyPPLI|(tgqN$c2M6vWx6~iEIqa^huj2g zU47Ig>=~=s5)S;vhDg{lthvb4UDSL(v%Cv6c%TfGu_X&*wcpZ|#^Sd+TaHq;95T?0 zR@Gs&DZ^pCSe+#KfQJH$BwRm@sVd-+jj}REvL&lb*t7cAm6*;UP#X%@x?HDk$M3^| z#|wCJt!q!MtNw;PZ`8}%NZH#zFrILv*2U~URkr-JKBQ`0LWRdek-g@?BE|>oriTwP z+J~9lM>q!_WqxhO(WrxA{gGn}}3J3wWWm z-mwY3z~5M;5obM{O_NJj{4(FRz+dMIyv&Mda?7GO!j(w9>+}L%Z6bf_+}rVn{OoiW z(R@qrs`HSm;lSSs(l7@??4rO+wEQwF?-kC$S2?C$BMPr`R=mNAeiNtQEq2?tb;R?E zK9(X*lp;>xpSp{Ax&L1};yO;Ae{;=6tGM8A`T&#hA=}DFgkz8VKMxitg(b>?Wy*eu&SlE4mIxoiOSUT literal 5349 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 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class index e226ffbd5d728c354ced8ad3cbb43200702b728f..559adbf2a45db6a0405af22063a2aba3bbd9894f 100644 GIT binary patch delta 124 zcmdla|6QK<)W2Q(7#J7~8BVh^Fin2Qs4(##_eKk8ZbLDj{N%)(u*9Ow#H5_mkjjG8 z5D^f$Wn&F(!sn0GQ7w*Z=?k delta 56 zcmew^ze%3=)W2Q(7#J7~8BVe@Fin2Qs4(##_eKk8?#*r7MNEv3CjaF9%g8kOJKs}I MMuy`+g-i@509>XM!Tt8JwOL`-R@i#4f9ibbVS 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 VQTi2A_oA@4kLniqv#Hd#{|(pVAr}Au literal 4472 zcmbtXYj|8m8Ga|-&Dm@ZAz9kO7HYQ*)?7ASu~bX8mbPg^w``NPNz*n8;bix0a@x)A zvU@g7xq8D36r@GKR-^(#6y;Ja+w>w9MXRWY;tdgndiS3{{N?kA@60*5HiCXp^C z%`JH=W1D#m9)Tq@A8@w`l&`ijmc2$`MQwcM?VAlN6OBt-5i1*MwbEv^ySuJSz|)*f zntsedg$^&u1ul$R8MCc8&}-&9jo!2=5Qt|JM!L($TXOCSJ$AoU5NMpm=6Nwi1uDkE z7YNOAR{1NSWsA0SR-kgS^8#M0u))d;h;EKk*?fYV=I+f~w%KZ#=_GyIJ{us-G7UTO zMlNUOqq8`|AQaRccHT4wqIF#rxC9F|1O=AO4EIFsIxfX!%u~vBtICO_Xj|z>+$z}7 zxp)Uc8WuB1m7uW|9ZRrOz{i;KhMi@w3u@~ooQ}D2YPcNBG`y3!8rLwos^eX#Wui0Y zkS#E8R72Xx^hMfxcbf@2s-d3g$maVZStZzO_C}1tK!h=yBn#neBTFh!hp>)DEN3)E zB4HK?vWWTdZoEgs6#@&DaiutKrqa|L*_=&U3_P!61+J8#6gq6fwi5KGHdfay&%Rg3 z`{bHt6ghOzd-f4IL4~!lXY|TD2~dJcsA3gVV%Im z<6D_aE7P~WXr+^8Ugon|#|E@WjEsRP)||ajKdwPc!$yIcnX^u=Y&6p(l#WffmLLrf zV@cj+wNBQQN3KRUkrPFJY(~3=Hi4?C&g$5Lt;9&-(Vm*3(uHJNm21%+)ls*|-pAe_8_1;vE^%4Gi)2DF*cyGfOJHTBKD41d)Yje^YS|F$40Udd zb%a`D@s?0y$g)FLAv9nl`ei=)%#7@7W-?SC@#AjvYq&??B1Qely5;Ji4+mHnHI{Qt zhF0&+Sj+o)@6C6@oP2_=2l`BVf`5+hyT*N&_ey)w&J}IaQTFy(pq`W?x6Gy(tbo7+ zIx2CYb$SYV?PsEHQh1w-WZ3$eXvfvBBjn>5NWy~@GBkjvA~C4Q*f&fzY)+K=tJy5 zGIzgax9jOq?InRXb-X28xHpl`78tQ7r5={vA?MQf$*D6ece2I1ewxsx`p9&2WQ%-$ z%CaNs?8=j0^2=pI<4cZ(%KrtxzTlBBZO%2$Zs6FQoP#=KEmhfom?6y)v_ik>ynz`Y!e2OZ!6uu993 zBsok5ol*`h;87kNbEukb9Hd$g?!#wX^>G@ORINOP#IE{dxW6HM91lKAi9<_CU0{#W z7jkxv>8r$Hf+W`~Rj6egKZMWohcj*R+vEv)sv=cAB|M^r zm%BsBt)R!H)#EOmJoP~j6Fqze3CY*9@Ei?#nfRbL@D&my=xtQLfv3ne%APr2=4?Ld ztbg74Jm-9ls}DEOtrJd(kp0&L%iR(=-J}JzV|ac9-&FK(q=j!O3sU^z2+o%9Bg$TJ zW%T8zoc>&@r4Gf}=ajqk;h^_8e#u4Gk=Lepz?Ii0`u>LN+V94b{WKZ~?u`W0ChUU< zVlSVlL+l(kk>j_J)3+i{-fd+{b~54DlX)gtmnPrxWZXWo?Kbl54svWiS#}@pWE$^c zs_w>?WI}TWnK$3B}%!Hr=F_OD(kpw9wF|l(y2Eid@PzEF~pPYO)Ef z3Izof6}0}mPy`e$M!Y*yLeUw9XUB0IpY+8iUzl-x@DC8rFKLlcUv|$qzu&oi&e{F4 z>=$>zcYl3z6Tn)0p}@l6nbB9wXvelW2EwCJ-Au*}hSr`jJ*77$&2Xf#OHUlyp-*hg znId|0v~j?Uhohry_gDf^(-<}4ZJTGVOikaXA`b-&Zcpw;IM&#gG$)cK`5F3nTYXT0 zi=ps8Ih-iOa^YOeAbIM84ltCeP+%95TZI)iCrRZhR^on!f>3On!Ww-kBOZzA2NDck zPY=JyesPiP%(57M|HZj=rP{>G7N)~Y95wt6Kl%JIop);tACM&o~6o-75BAFTW&jwXespiv7^}ZFzD{Nlz@K zM}m4htdB&D!Kn#jPzXdk7brXYfN8{aGZx>dZRY!|%{5VmqAWO?X`s(P88Rl!a4hP? z1mX&wVpt`3|7gvV5-|C%*1firiZLAF?Y1K;o@KCh(_RhRag4AH3$NoUPT)EIldWmP zNe0XCut5BRiWkwzARjOiAtz4b6$LNTxU-q>*+3Pq;tb!Ul-f_@H5IR8hVN18wsVI3 zDo=NBz#mOjX+|_9=JS?{x3N{=ObnR184lTTjx=A@SSX?=5_X(taF7-o88bqr6Blqv z!A1UqQZBuR_xbONzvu%h&{riEa85LJ*p82QhyBbJa-{Fc0w-iT%Y#bKe6l1Ukp(E% zeAlr|`xb?}uA}H0N;K~^lxYpuvEu8jV+GH1luuWZtmPa~g=*5sRjfRP6H*OUQ4%3N zfYlV*B0hp#Dn_j6CXn>bqxJ@T3_H@$eK)X<;TBqY8|KlvfX(M&OQTzxM+q4^GU%Fx zZ%J#ZW(oejbJ& zCU!z})Re31Zb!*%^^9O0#t1^xMJet10T>iv3*0z}QR?Loc?yiVTVcAz1aW#t=tN*1 z&m#6`IRN<@6<6k6z;rBwb^aqggOLL{0(%i){uZ4lJvuv&9HPp5Qps-QlDmzrhab4o5Is%IBH zU2o)W&}iPAg{ryUAw3O;=9*n}UBJ7oveax%qgZoYCZpz-i>>Q2`0%8a6h3DT`g2LmHjbt(SWLn0QO*pdZCmY@&XTq7I+n UQ<9F;c8!qDN_0LWFAF~Z8`nNtPyhe` delta 1509 zcmZ9M+fy4=9LK*W+07>5P++-(EnqE#C6Ur1R;b#7sf0pWL4&l^bQ`u12m#5GQWZhP zdaX*gUchS=jgAlM3=P!Ibo%UruTE$D2Yk~RXB=OwzmssOzU-XyyMI6D?73C`U0ME5 z|NM9ZKoh=EU}NxDhi#t41Cxt?BptaNF6^+z*{+U!hJsN&sW(oW(O6@ro*3!TC*8<{ zDq;#5?4J6N3k<~^3Y=n9$|1wyrd2sd1uCtd+3&7Bs8dkOP`jvCT(a>)93Ip&DC34X zGBK23$nV~6(;ZEiZ8>OwPl1_oC7A*=rk`uwTJG26a0iU>Z}pIWfi2jQbd* zxG`fg6nU&BxzM5Deuf&WOsT1Ip#=|cw4#l{p+_P{f@WX=Hy*^p3Ldh4u~+#I;V^?U znh5G0&Cb~3J5Kjo&q3j4DQT$1c0i3Yx za)+}CgB+*uloga`tiR>`ENb~2Wv(%dD~K`dri0y?(`m#e4Wbgqgq3uhay-ppV9L7X zI9G9wLGGd>4m)w47=+yz!?PUEVb&T|nnQC8ws2U;eu3k~jO-yJ5piPy7ZkiqCzqjr zhkA}z@G3)2Oi!4B_>eJk>}+;&lCpr;Io`mV)}KmU@GXYiYEM@%;EyM(H6xxB_}}4J z+yLKa68VS|7BTTwk4C6q!ijeoT(p}wGipRkH{QpRf)5xb%$rNMv(Ccyj0mNWe}Opi=X$fos>1H?W3+t0>YMuA)Tqt)c7( za@%m1^{uONZYQm^Yyx(niguJLEqFjN!1vg-t_;gvk-N1Q2dIfCaJFG6(4m*e2H%RI-U_rVkmZ5XhEOAw1PdF z`aC(wF*l!IpTsW)JwEa!KJB}vyS<7yw@t(TjUgq zHT5GhYUNU~yf2MU7Gzc|mrFOU-2P2dKO@h!>RuGl&?jm1L4sr*7PX%zQk9wnkRx`vdKg%MOij{{V#NYFns_3 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class index a0f008dbfd898387934b0ce3380b5adaefcbf665..b7c8453dff0b28e35bb079329face9fa4111249f 100644 GIT binary patch delta 122 zcmX>l-7h0>>ff$?3=9m03|rV4m>3x}CO*{IXc5F^Am)>woR|}qSd^KVl#?1#S&$k6 zVlXm@`(!1SCF+-!Waj95mZTOXmgE=NXxVLU=c;04yfB%G=QShqff$?3=9m044c>)m>3x}CO*{IXc5G`u00D&=5g0&5Mi4Hq0pxP-y=UegICIYR z+;fNFk)fjE`>m+uqYRX+5NaS1Dzh>xvob5QGRj9qR%T^Z(r=$TqlkV!_0RXNz1P}n zueJ6%`|fAnef%(h3970ThQf$8FJG5(tz0f^g_*k0_uX9GI;+FV)XldyZt#P2t`x-z z<$A8pwY;{vg~@exDpcqdX%z;pYJOiC4+F<*t5-1BcQ2 zn`edjz*ac(!xjx6b~;_VZAiI}=Y-Q0imGdtDHJ#QX}c8tKM-Oe3KIjkAkpZzXI;C~ z#6WJENLViS^;=C0R_OEIFp)4ZggJ2{*KXn@h0;jW^Hl}Ikf|l}p>5)1g}&7GOlX@^ zxql*&%sX!Ac!>@xVFhg_hDST5dIC5-a@0N4tImkFN%>wbG;wCPF$Y>#6K!I5hPIb; zd{0k}Rwzj%oOX+@$LiD~S!?PFBagLVd=nJPsEbBgdsgJxwUV~0hm#{WUfy+0oE^!5 zZBd>YInlDVVzKEYuyag1#qiEmh`m477UxCwIhNB-o0u8d7e-p!7-_?eSz8x-PNXf2 zwD$aH+~KH4olbQ({!B;{E%0R?xxSsQI?f*QYLoMQDC<@Ic96(5q@cb%_!|48`xoY@jgp? zj`F%3pW_y}OjM;WaJr{KAB*HoQ9JI_a>(AJ`!DgUEXduy_D9Mfue<)sTHfG9jdGB2 zgf@F33iuF96lNUu%2&8wm@pm| zD>1x^7}qpJcd%abdJLs7wet5d`~gSl*-EDs23H?T6ai^l#=BwIJV~w1XwO zsT8EyPg(9VD{%C|DTlDvUaQ|L%XKn&U$1 zo+?8>{5^($;B98*+Fo0jVFuMT+`1p$iQ!-PHx;^sGx?WST-{XDs5S4#aEt+>cP^jQ z7o^9Vp`yB}=_7YIqKud-(xr(m3(N6xrK*?0kQ4tlXYubNZ3o;ymBy5*dh0W`+`PT8 z^@N0a3i=TVsbbZK$E0{nA2@@a8Z0waKZZWCjE3bgH9!dyw6g3&p4!;|t7_eG)@v7o zVrsCe(5>tjc2F2p{Sjqg@pPl><32HMeROd@AEfNL>`wme^}IaBX-f=eos0NnF;J=7 zlTxK_IbHo|RyT=>K8SIqFHpQ0#gt&&U7k6Fel0~(9&afYiMRBULGhLnsff3f%FuX= zDV6b-@)8+FmdYulDW{RWWdvC!BgsB8ii}A$*;i`GelmvaFXPB^8BY$7iKNIRa-d8h z2gy0)V3|f%NCP=UrjtWu26>XqA}eJ!StWDHVKR?ASuP+?k!JE#SwNm97m>qdF*!n( zkf+Nsa-^&v&ybbmC|OOODQn1TSxeSPlB|_9Ia*rDF_Iz2$~tnKxMZDp&o8@8hLfK6&kVnad z@_F(i*+VXpz2su~A{m!1a)}%um&)VhGI@erE{Dk#@>Q}$o+MYwQ{*c7Cb?RkCNGv} z$Tjj^G9k~BYvno8k{^;ud7ezk3uIb;O4{-w*(xuQZSu?bKD>MoM_TsdxBKu~QT;B+ zUc9y!FIP_N!ta)EgR11<@Po&WJ{Gm@9|3h3KIQRj=Lu}zi5P&hP=QIP!epF=DHw&b zF$U*QGnJf%>8QtSG~fc9i;Fl~hV!r*GmykgWH1XJ8WGZB6Xswm=He=xkLxiHx1tF< zxavO4$3tkwZd`~xSb#1p#1r)NBo^UmEXK2l<9RH>i&%=6>HSqK$5E`nn`pt?Sc!M} zf-1&pRmS&IIo7BOKAwhQts23nQ#F!m9N$fokXF<9XqtgmH5YBF85y;hFQpY&r`GU| zl!mL;@p+Vmr#kpF+JdaQoKK_e2-J;y7Tu0e-GjV(03B*4pF)qKQ|;wL=m0jcUYpfZ z*rJ}{^XEBSs$SsJ=Ot`aM{t>X9ha*&_~>~H+tfR_(g3b9N^rFi!*)Y(jWHD08mHho zVOixWibBJB?P{Ww_X3_^2}i+-GdT z{l;Z@z_@|GJ1`n=@bq}?7?<)&`V;=lk}Mo+AjR9INh)dCEL`os(aD5wyF#NEFXFQu{YUYwMA9MYrF8D zE~W0q(1WVDrS^a-*{{k5s=i&Sf0r7#r*;qB7+}9acr^k$*=!egz{`t;x&Uwyr zp7T7mvv63LSZ}~I&Sq`E0>Aep;o9( zxsK-@A`ik=@?tYFVXFHT6*`K?*kZa2|ep?e}>xlW7cH=F3A(Bs2q zB4MH*y<@vW`iVp`@3^7kCEBcn6||T* zD_Swt<-oAWP-j!mIy+h><$Jl%#5tYHZ0NCbqeblY(DrhU@9C~eg_1ygogmdDu8ziNdtjzuj!Ixe#8T1ng0&GREOUfy+0ToB2DZBd>S8PT%Vx+pRd*g0-H zMfVu|SR&EY)*2T_`ZMeR1HxR2}_GQZzfWa7^TRj*HN|-w8EIQaF1*= z<$2n4n9a1^Y~@`JT}HRkwrlHpX;m=Nbk)~=em*$oj%v{gWLaCUzky9Lxb9YkB^*z?vP25y#KC~jIZ($+PWt+!7ML%z& zx@WI9al00L&byPwC`7s1OW*yh9avF5?&fmZnNQI{KZq3e({wg)+AJNTduTcv_#rO| zT}_{%p)4ciq)dF4h620A$#J(P4)UZ0HodfiY+#3-!Fz!EY~^)0KF1|;nJ7x1XLnbD zele0aM&Z5MR}ufi8xxGbCZK!NfPXOI`P@3=`j^Io)u$#cykKlyyK&e5Z3nAC~XZVBX`Q zH}QQc<#_=V&e#w1K#o_Xi67Ezn-he2eR6-yW!rph^e5EsIz=XaN~QI>wiDdS&pCO0 zCOU1upmXgy8^7eL6qt_gQ2130-B41BUn}&EF6Wak-!i<6S7Z1M$~dPsx`Xwc*JCJ! zsR!SP;dl5wEnDfdLcfZW?)SpwUsJhKp;rU1sD=5~q#Z2PMWrAOe#&wit-#Uk&Q8U{ zr0UC1gjW?tH2m-XO%0D`iyhXrw=ZNo6-J)Ce&_$C@+6l!yUGy5J2CtXf9I}T+iM9k z+(AVpmyY4x82*X(IG{r~oj!g9P^sVY(!@bMqu4E{dScEANxx0otXr8>u!o3|G=e{4ft0X@Zrl%cvaO^Rvy zNDjJU&}ga{V>_aZil@a?FICPBT3Oa1vo`wwidv_iHQI#4R3Ft>m$F}2L7{KODZ;?u z=|b1({`j_a>f(MrNZGSlo&4=}y&=YEO$=j|74h+5V300PN`rLC@moZ8M;XU^0L53J zm=cV=<(bD3Ybuh{;!VX;9&hR<5^pMzzVW6~=^t-0WnjFiyhH|(rE&&o$`G=<3?<8C zIN3u+kTDra_LK_pG^rwc$$4bCj3Il=SW;v>*+(XjePtrqPc9_;%VctZ)RF^b3VFIr zBL~S0ae!k$g^cBIYJuAb7TcMQdW}Z%4)Jg z){vF5maLK_IZD#xdD2XdmJB&Y){)iXl4Hdq$4QnPF9CVJgyaNiBQKD4a-wV`C&?!A zLfK4SBwNVIvX!inZDg%nOI|G7$tiLJIaPL$(_|MpU2Z04$gO0Z>?UW*9po(8L(Z1F z$T{*!a<1$n>*WABPd-h~mwU+uxsO~R_md0d5V=SmBp1sU$V=ofxkQeTarqLtR659I z@(9@|kCMyfF>-|*C!6GJj5hF1P=ix$*TtrUB6x3iQYB3KNV=-He zn2Obyh9ssVgBkEphmaZ@F$-HT8`okEc3>`UMLqU#);`R~y=cH8EWlwbL8 zm*6QZ!83^CIV{BsSjLOI5wBx8-oy&LjV8Q{m3W`;rDCjBWqd4^V~y(1r_vc%tA_KP zRDq-#!$;Btq}62DY8sl=Y`%;dkWowcCR%}YY7L)5X}D?~pF&x9s*O*fO~|UPd%x*I>IN< z*s9**8|NKtQ}5v#1Gv^G!F5Iq+YQ0>#z5R)48e`Y2<$Mbu+tceUB*P*WYpqjV+L+9 z7$svNZZno*x3Lnp8*6cg(TqC{7kdmJ)kc7Q#wP4HuEGIhC%=0zim?Inri{(JivEbV z*i!n(Sh$E#%`Yz^bgMdwKYf^V-dwu#!^v6!$M9!_71~>#M40aPis>{Hp^e_F~{MWi(YiqKc0yvybZ0p?Y?x x-iNCW(~JSu8-!OQa3AaIe%93kteQj79{LxSQvH}wuo`Ql-OzhAK+jbJKLCqrgv|f| diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class index 417249696fc5bcb9887da2dde55f2100bffe727f..57adaabe3ec02e5e54150ceef6167353f5ff13b6 100644 GIT binary patch literal 11933 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 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class index 71974cc7d10b1d640320de64b96c0d58f8f0efbc..fe4f73270ec5a0623e25f4454751bf7bc68fc33b 100644 GIT binary patch delta 863 zcmXX@NlX+`6s*tmHe)AX!wicUC#VQ51n@u%A_k4<2(k!*;6^hH+BghjcY`1bqTs&L zE`W++VjwY^5Xppi;OM~%Cy(Atycmxj)%U^Ee@j)pSMUD}ETpG=`SWQRKndQ+NMgu! zM}@2fecn?XsOb$G(PqOkjgDxfX)qpX;sHZ?O}Ei+6!ke~v?%06EW_!w%Jm9&#WR^+ z&7hQrqh`!>Dinx5)S_NSojWWPdKz%V{UBtdH8CUwgS^$O;viZW{CRGJkf!+1isLfc z+~2~ceJ5~|v`o9vF&s0@AmoMe+Z3E;knPnHDYU{+(ZPXU)2_G7e#41)(TS}xXisis z!_KH-+bxz6k4G#{IHTe$C&;E+>FHE3+4x0%+SSDtQDMblfER`}vza+FL zFkB|;nIb`S?dsZCVvm)Ho>FNJS$=7T%irWWoUwys$0X(_`tt1G@49w-jYF&6O`hV= z2OO$BO2Bo8d=sai;u(1+*Qi90F2SQoOd)ACnuedQl7SUG#|sGbn^{Psnuu|%$4hL3 Xgtv6d8N8y}JaQ=JHHO#3Pr~d!BG|@Y delta 780 zcmXX?Nl#N@6g?k(Q=6BF4_hc=tP{3R5Ol!;9D+s^K|~QyMBy=r4@<@NQ704!a70l* zQCk&<#9+e4M)E>juyJGDxN@(Fi5vfb8})w0)px&p&pG#;o5}wb@O}RCVIIH+yv+DM zdAKZ1=GQW4o4TWR%yzbDkbS5}gNi*oBb9pgqLF`>3d;904z`hF{E zl|`*sUs;nAw_|-(krp3XaY)5M9+8)CZ^L1dwi8W`<=EW}Qn)tKrr`*Kn#i_DuoWFT zIt9>cCmQ2+(sFve=)xKm#3<(P)Z$Ws>eX>fpj10iW5=whhU282wByc@6(ya1L{*$% z2=En3K-MvU82>F->-88EhEFjp4fBvvus+hFA;G}1VTN=hMHufO`F9$uf$Z))AM$Zl z$2pwm<4RDupyMJ&_>5A#=rS?GV%t?6qZs4glpR~I(``yZ8g9}oBD~(#F)qCN>_l}} z!iihmj)uFGKeRbiuHhcxs>CTD=-_C6-=oej_L}E<>sStN_qL9B$?#54R)BqlN4)rH z>{>UATo-{9q>Qoq|EEGSsaox#&NTM9XcC_}w4|V$MmzndvC=Q4v23A#G>yEHSy*%E zNyBRzeS{F>A|X;V2iwI-(-?_U+bnhAOk)+nPglx8Ik(KknF=K+`xU9v#c-u;24#Yn z#-)X|M88rgdn%M^6#A7ZA%9Ki2*yUz9aWg0=<~1s{xFRj3mmd~DzS$VH9Es^<<1;F`i;A6uiMUJi~M9 Qy~RqZMUP>M_&Ip-4`+9;YXATM diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class index 3b03aafa0955ebf685e2e091ee91fbd9f1a91a34..1608c7127f60d623b782e7ec1cb478655034313d 100644 GIT binary patch literal 3678 zcmb7GTYD2#6kVqcOd1BMp%f92f)tw+8bQ32AX3Z4N?Iy~VnM)ZGqeNgOq`iut9V0H z1aIIS?^nDl3JKUxKc0N>C-~%xPd@stt}`2+K; zv){7ZkbT9`UFobqvZ<1p^kg%MUV(KLl`HO9*+8V-%IY!9!nF!&1!h-3sUnWq0@DU^ zx@HShHzj%%%n_J(S=R@)-8!h7#v{62gSnWe;5q@-(=n{nCL^b-xE}KfU1q6A&ug~k zS~M7+>{$$TSg7I#EE1T$)-Vlsoxn{2)^I2%FHQ8y#fw!e!HrChsgJmxUjlVaL4v{t zB=klV%WxBsY1u3@9o}YZ{{el#O(%9qqX`vBG!wv(=5$)N?%8#`i0l%Wl`%}ct1#TJ z+uODN9QhE>SOZ$FSF;WI9S9@tkij+0nMy2_(V9eBvL%uu+c?O`2~^4V`95@ykXMAC z3+g9sJ(@3XA0x(%Bkl&nc4ExZ?J~%BTmd?usZ8@4dV1B4E?pTzE7nSrcM7yLO#!0J z+FabF;%2NDSP`Tk;Ekyb>*SBC+v&va$r+E~ZfsD{E>L@!kzS2DDmG#hDWo~FTm>4N z!t2Y)4MozcYRQRvRCM58xip(?%jL-SaHX|dxg2@HwnA!<0IqeA&#XZ+%7lTCc`zm1_IkvOv7~f)~lih)1$bb1?d#b7TGIWyk^lN zZN#t(4=C7O2JG{B)N%D;6??E(U$yKVbDF=#L(+5-aFsgPr`t5+kDloH6v+8*{|P>IJA z+J0Ix-kK8fTcUV~1v!w9!GxiJ9GgPDtd8OkE4eM3Z6J3@D9avgaIFc^8zHeabZm>k z!6PzwkCG@;310iv#A=sB{@9d!zcq@QD4rCUTh6&;X~^{$4$Fu8@Xo=~v-aySBm9FzOA<1?ihOUvr4#rfrqZ|ZJp$F_`DhW;dbWNhQe zfbLhLf|mqt@VbXo?bLGnEqhqca?QAsEY??4oWv=CsKI9BpI-IlJ-klb5y;as@EYDw z@H%Vaa#JeLs(2G`(PMcyU3o4AO-aG&iRJBG9b}VySH*jHpXae_(LE}a9SA^rTYsqH zBY9LQJgU05i-J$ehjE}L;e4jzbDW`;YkB=rps8Ymtk5(Se90p(m?-b8;A`?>Jd6_~ z9>Z7oRxwMBq3@NAfGxXF7oNWwgjo-$?RjG?Y?`H!eCVL{g!sLd;iXeeUoPL55d|NG}G z^{TO)&+BO!SkIMhsO9-L8ym2IHqn9!9mpFaN+KzZ3{&1v(QD1bJN{`2%kjtL(B}XVZ8h=(wj!_~5QsrfH z6+;0Y>eI0X*J3RLvWM5#y*#=0F@G9!JcJ%t*pEXP!DBd%qh6rueMmu|mcYRC%&i1| z949#U0ZU!Tb8>2+`L+Pgxa; f+`S4VT;RBh)>=8rpXLudsr{c5jE95qh(G=hVqVHE delta 1547 zcmY*Y`&U#|6#mZ4F!#>ofG`M&qD(3VGdu+%q*4?W5=Z3eXjE6Y!5}g;b1~2a?OpT$ zPcPB37t%`$s~Ky0uvV+q%2oeBKe+mxAN#pzpSc4p@2t6J-|z18oo|18-`jZ?*K4=_ z`~D{Y75I8uJ3sx){t3sPP_LnZBV9onL)L(PN-rBRgM(%D;jli|9E_M8YmmW^(lco2 zVFr6)QKteoL+)yBn;8xc^|gmi7(>C+M%ab5$Wf5Zz!N#aP}#oVpuuq$)-j|F>t=tO zF|3DmQ`};?Y9`imY(Sn^WYzSri6b8#QD`erIW}`_!B){>^U#}Z9QUA5oVCqnYkF_* z-chq57>;OkTBRhY5-s-i>|W9BEJ?4>P>uT}TFX#+K`G`%oieeGqXhSh+xG379>gvM zI~g)o>qyib;i$)MQR=9q^BXw!VxI^)8rT7G-I05wQkvzL#2GFyv~Z-rDWg^n1x^+1 zXAsPELcM)jwt9_K5tMT>MLs-iI~*4=Lvv?_I$E14sj#Ry!82r-WrWnFVhWcz-bEpa z>enNF5~kqF^3WyIWV=4#_z)inzpEx^mSN4YJ9!k$iA%0L^(sD7RMZv!O^V zY55agioMoO_)ttw#6jceBwiVnVjbmXQ0-+Xhn=vBl{2rd*^utajXrCOVpZzkz$b-{3G=cFe2C(H-!* zA9X+GJ|07F6n(T|fRI588M2U2z?;$Je!?Ab#4ut(qm*>oeMW9OYa!!=oO3@dk!J~6 z_WMs>lkhvoQkblAGlF=ITxRrp9xu?l7fHXY>ZL?yf2UY>wkugmGf6%qWlJMv9L40p zIczNc4zDvT;7z|T(ExHkinnFk>CGjEnWevd_S_%wUKH;y;A4LrR|6$6eDW1>%N|@# z^PQ2?VD+FYsZPZqe4dzwJk;R}T$8!v_H|Nhho5HQOUzPagT*tC8^p1lc2v_UuWoCh Puid&r$#pcjj$7;hS0_u> diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class index 8877bc5af20a449828a416ac8f4717af7da8af99..313ad8786ba6e91031f6960a0cf3f2d7d8602af7 100644 GIT binary patch delta 222 zcmWN{yGjFL07T&v$32JE}SXtZZ3)rOf2^MTDl1C6kd>1t+ zsKG|@Lc~V#uLiz3{j{H643yrG*DVFzQPPk_-P6=VcBSLwkw{OJ^-M*hpf6e1gZe9p z-YDul=m%AOhUbg6#&q<}R@hzrWMf~i{SxbsX+z>1B~P&6JatF3EY@u{f^ECNUg!=y zbvcZq+)hI5A~Q~zb(x0eXnUTHD{Oj+eJ_V}g+o_43Vz}mJ+E>a`ZG5}ogA;@TB_(9)on5JYqh{a{dv zOVSTTOHomV(9$~{c+PW9J8Xx?9fjw_bitG^$>@qDby?GObgI474RPI)Q;$XUoerXs zb@F$lG$gHirw=Ua(VHghb|SJ&UkFo;i7Ah1d1EJoJEsu=|fC|ZJTo2F(->NZ2eW@$R#w|QEY=D__!%W`D7 IXeH752S1rKw*UYD diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class index 3510ef7b167101eb5b021c2a9959ad6e72442af4..8f5efc349206b3563bfb71beb1e0225747f49103 100644 GIT binary patch delta 5024 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 O7oeOy8TvG|`u_o78qm)G delta 5024 zcmWNUcbtq@7spS#cV?cM(R(jhZSCs4ENh9jBCBomzE)jbutskYi?PZok!V5G5xpdW zC_xY*f<&UTi&bAG-t))Z^EhdHKu5?9oggQ4fr8KjN zW0Mywa`V-1eQQ^SPHEmEqJHW5d1pWzVg9(>vjFN z;D-%b^Loeu-|5~hdcrm+4coQJZ4d)Hp*8G+wy<04-U9 z@T1mv7z)GD;AwSFs(VV^U(`LN?zv!-s%`MMU|Q99|DWK7Ymg1DLs7U9`cSnc25teu zZQXJg^1>Y`0QaB}+=Alpua@%w%E3dZ1dpILq(dFZ(1ssFBY2`MW$Lv))eBFDZtx8H z!3({>moOS$>6N{P6!@QB?HgDHZ}ocL!5Vn4jsB-ie$YnV!a)Q$ga|)IBEiqda0(6l zfdbcb;wD;nfG&85Zpc6nJX8G|9R&1-URRI9Ko)RecF2x7ARp$05||6hVs5B{d7w7t zg&52SEigZ{!vfG53qoHk1cR_JjK(4`0gJ*+ECwl99F}4UScM2J#4=ciRjD%O}y(6p?I$aa7cs0n1)uAxf&>Ct%Ijjveu?{rA zy3ka;PqBU|z19*8G=dx$1I4kiE^7ki@nfj0x&}6by4V7mU@UxstzZa#0&_497GN7# zg6&`(wuf!lLCb5SrFDX1*jdZ!0+&=@#qL^CFD<7xe84_>H+|8I377@@VJ=L>yf^?$ zVSg;Eex!qgu{t)xXiN%ashbtsjR1qAwDe@CfD^Rj07T{7cdp)z--kiI0Ba8+|aOkkNklk6vT!4Nu)v?E`oSm z3<oT7}7R(VwmP-aTiv^Jyg+;VE2*r*XOJRXVpB&*2vQRng~l*Eu|j7j^cMX20VVyo~?g zRlJYaF%$pBw|J8TZ;=-tP%eB(Meq>?iefrd#tf>fNfbV&hWLbH@F_LJOlpbGDGpyy zypHbpk`nM4_185+@P9NK-_YmymZso4nx%R!exQX!w33+Clh77&(Jpe+9`eu;a_EHW zGvuYKl#L!xc6vrR=so2O&i41!GLSmT2)B z(-;#&pPN`3Yuc!er)1NWCYVH;Y{t?QGmEB~1vK5PrkQ2~%{Dve3v+3f?&yX_0w z>$0>b;BwPGmqYtqg)|nY1Fo`k*cDDcxFYFCS9Ln#szXOzG4zw`WA$6o&#rhn4qbMo&=prI{oz_dS6wUBTTRzpJLzxNF1qRZf&OtFSACjp zyZ)qmuIqH)b(aDUT;`)3wv_4i>Bvpb+(qcQ`y+bcE<;b; z;q=H|kzTuN(f{1h^v2zW-nl!|dv_lOcLJlkKa)F&**%<%JDJ5jQT=J`a(}^&dm;PX zTREHiC}(va=bY{n0nX(<&AHv@Igk4f&gZ_y`Q7(8ulu1+KG98Yxv)pLsK?L6JbAdd zrv#VqgmajuE|>DOYl(JuHiYT$q}yYxyW@qm$qPMKJKj#GZcTV#l=T{!={KX@jCp^;0gs*!l~ZvyvVy-$6;RVJ;n>YCv?pjUgEvXY2NF+!uuDm^xo#Lybn}A z=C8fad5!laul2s;bw1=ZKFb?@S$UH$A8+=R;H|ze-sTGr@D5)!4*6&_($I;KH?j%dJ-S?&E{jiARqTF;gh}%e9E_%Py3GW zFTT@!#&?a+`fl(!-%bA2cbCum9`Hq9I{)T-rsFMN@*`jH3!nA3@bK^coP5QfoB!|^ zArYKa!gI>+s+HD8A`$%>VdX@-2TGzU`0aJN|Bb*Pp=m{6qP^e+)nHC-X!9 zWKIt)i|ghJ@KY$rnNWqFK^#Aaczyv1{1TEhAHlC+9KVJ%egmudE$rZT5aRc+hyQ~k z`~fa#en}917lJ>9;U5urqWN>N@IqYhM%+kZ(TamE@uE+Bm``;f$%4ftE0&Y&7^p0{ zu!`iy8j=SasctHHF;4PfTgi{zqyQ$W9xMfMj1$W=a)&CRGFYT&m$Ksex~# zCV>vO)S~QCn+i&GDx$Hd)S+;xLKUSR)sp(uP@<@rG|;z4L;6hLB0cmCGEAD$IB8B( zr3KBCSXv~lX}x?(hb4|qNE^B!ZRv(|pbUwp5Aqp%r6cE(SS~Jsu3S#KadqjzQPP`R zOCOGtzWkXaa8K0<(vOEqA}7lLo-PAFtn7tyvJWC;KU9~4&_E7ABlVifA?P4KKo|K52Ffv*A}3&~oP-&23ci%n zkSb?jrThY4tG`ap!67*hKgtETAiu*!xeVzVGj;!axr#=vVHUZLc?0qnmXNH7+;VXobm6n@kScs(Po%Mf*%{I%e|Hag&cO zYrJL((QQ+h(oGS1XNoeLVl1XOyG#l8o06Q(gmE5ID!|3eM_f`T%a}4;#e{QXQ=Z$K z2<~7axudDT-AzUAV=D6qQ;A2bKi*X1X{IL6HMMw=sm*Im9o}i`@&QwikD2=Xn~CB} zrU73u4f%$N=9?ylGfiWDZ5r`g6D44ph{t>^jy?m~jHj98)}(-G9!%|Z&(jKA<`eLl zPlMBYUyW@Kj_CloO-CqdIzcJZ87i7CP{VYEhNc@dHQgc3^nlMyPv~WOL4VU5MwmV@ z&h&+8CIRM{ez3?S!U{70zBYq`kqJYBh588VD@RH`ys^~fK+n` zmY5$x5&gq4_Lw4%EApfwPbu=WB7afj8AYB|t(-yr9U7iu_HHmlXNCA}=fQ ziXyKn@>(#Wf8Nl60TnRzrhaDsKn`;o3Yj}l(%gjza}TPT`%vFJQ0zm+K7#fp9lDzg zNHC9KsCfco%u|?bGGUf^20`;2(#%T;nb)D3gBoKi^In<%K@N*h$P$#a3=vkKsx?sG zT4-!t@QHOpd+UMj)`0};g`w65W2_%0+bl54W`&^525B}2glw+h>A@R3`5>3g4|#0C zVDgaR#Y=**Vc@f+A)hS^g>5-KBOJ=8SIL%y+O|S4d(yku8oH_`IJOpKwY4F)tpf#Z zeJE}lXf;t#!8U|iHX5RA3^cKg;Zxfby4vQ@&9;P*HWo(d+$7r?=Gr(|XxoH34&6q9 zcyQa#Ae-%^xXy~}3Z-p##r4qUdO{7`OEEp6t?dh)Yy$MKiO|pXhaq+#46}o@!67i+ zCTW9%6geE0+L5rrj)L8GG#u3UgXTx=SU975uh?X`rDtU5d9Umg1UnT?D?1H6DstHA zSisJ}Vs;jmv$L^={Q{%y9Bg6dV!Tbko_0Pa+66dRz40~`r|H_DU5X2B8m`m0!7jsX zc6sRX2p{@aYfo$Riq`7&t_waH*~_z8FKvrn)Yf3F34{8Kmof~FMJ<_ UX)JH|>xCbL>UL-FzfleT52iEKF#rGn diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class index d18117c043d076f3aee3fd02d5d7b0d4a049c68a..8953e5c7f525bcb395e825a2d01990fb8e657b0a 100644 GIT binary patch delta 27 jcmeys@_}W;dq!4k1~vwp$zK=)S)CbJ8C)iNF{uFnehvqE delta 27 jcmeys@_}W;dq!3*1~vxm$zK=)S&bN28H^`;F{uFndfo>% diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class index 1815f7026757d50d4a4cb03f8e4fa91e7a96cdf9..2161af5c8b1d2fb4237ff0e855aac53c17c72ffe 100644 GIT binary patch delta 178 zcmWNJy9z-89L9fV5);cwicOgcS3?hW0l;sSPjzP#Jw-hoQR+&T=P) z{?m8q`+aZqtv)^$C18FnKP`%b7%mcc&E3)j!v!}?J z5?9LHslJ?6O{q1oOTbMVFCF~!2uUzOpA-Ws45e~JoiSZeUHDXH$&9V|56m%Ga1wHn NM>p0y*cfly@eiVACA0tl diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class index 82784b8aad159cedb83144ba9b0b218f83f17f3b..2f8ed63d06e4ed1f8b3a42dc7e1eadd048752053 100644 GIT binary patch delta 233 zcmWm6IWGfX0LJm(YiU}Ht;E70AvR(#HSSxhj*wU^&enYsM~oH&Lq`&mNz&MD65<1N zGy4=?%X1~qznZS5Uvr7jS;;5Lq0lF#U$X)22K5*+X4sMu8%ABnc5B?D2`?tS%lVY| zW6G~WU^*ntgeJ40&0NTuuXHCf;c6vfSJhk7U|nN`wJ2&;(qU7VEm_-o?L_!)gzj0e xZ_$Behw*h3*JC$M+&T3SbJ>|E=bl}7bLk^`Ei!7Ne#K8Z`hO}a-G8U*{s8|cEzSS{ delta 233 zcmWlTxlTf16okLuhH%01LP7&3Bp5nG7THlk0m&s4E+8nYD;7KfhSJ6Yi(5iMMP+hh zPe%gr0qCfG3XaXpoSezbZ1t`FZP?V2Rk4|>8bad)A7O%=k|RQiC@o^V5a*pUK1eVn z$$}J1(yYm_Bg-E-1$kxXTzR=r#}rhCq7}Eh)aX)TuQ=oyH#c~w;ipc3TS7FXs3{?L z!QnPmd?TArFjs#4}%?$_F(X5 z@M8#I2w@0f$N|!&Kz=<#C_@uN7(*9B1j7V|7=}3vaSRI>;u%%~`I{M%Ca+*_00952 B6#)PM delta 103 zcmZ3%v4UemDifp942BFm48{y%3?>Y+K(-o#1%oz&6_91aUuv%nkrgS_SU_ delta 23 ecmX@fev*BIDl?`}b#z~W1m>mE|xdzAp diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class index 61b2f4d7610daa66e0833b241ced98183144af52..25b43e13ed55d07256eec47d01b24dbad419d2a9 100644 GIT binary patch delta 23 fcmX@jewuxQIy2+a$r{XYtg9F}7*bhQka33`ZCw7>-Up&+GsIl==xf delta 31 ncmeC@=;zoF%*?oEatL!C??wg=hD{6t44WAw7`9A4&+GsIkcSB7 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class index b29f6c366393bfe9ae8931b443426a78dc7bdfd3..7dc9274e9f3f6556987bbb5bef0ce0c17f373616 100644 GIT binary patch delta 23 fcmX@ZeujO61~cRF$(qb@tY;WF7|u@aVRirjUNZ-8 delta 23 fcmX@ZeujO61~cQf$(qb@th*UF81_u=VRirjTt){x diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class index fd1326a565c54d3d8a8c65beecdef95c880a98b8..d162862fddba15216ab10b6a3f1fe9e46b65916d 100644 GIT binary patch delta 31 ncmeC@=;zoF%*=RxatL!C?-d3PhN}z$4A&SW7_Lt~&+GsInXn0! delta 31 ncmeC@=;zoF%*?oNatL!C?_mZGh9e9D3`ZFx7>-Ro&+GsIl|2bS diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class index d69b423fe011f9754f464bfcda3969a67cc269c6..5eb04cf9122a9530b4823d7311643ef28e3e30ef 100644 GIT binary patch delta 19 bcmZo+Z(-l?hKcd!mF9lm@&2 delta 23 ecmbQiF@s}67Bge;mF7rv`}t diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class index a35be9bc59936000bf444888ddc906f401baf745..1e8a4a49d1b96d14f205eb54964cfb38819ecde1 100644 GIT binary patch delta 23 ecmbQiF@s}67Bge+mFAnFiMY delta 23 ecmbQiF@s}67BgeamF8tOle2 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class index 8b0fc5e21e1dd268c798ab1567042241a8233604..6472ff9f42a22b0b05709c334a7f9ca3300c4220 100644 GIT binary patch delta 19 acmX@Wet><095Z9tWO?QU#+u0u%nkrOO9j6G delta 19 acmX@Wet><095Z9;WO?QU#_Y)r%nkrNI|ZEp diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class index 0d6cceb9dcd3fb6e0ebf0b78aba918bae9fd30d2..68bc216efa86bc9f025e89e1a503f479b939bed2 100644 GIT binary patch delta 19 acmX@Wet><095Z9xWO?QU#+Jzq%nkrO%LUH> delta 19 acmX@Wet><095Z9?WO?QU#^T8h%nkrNy9KQP diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class index cce1b586e253f22792344c30dcd7733aa88942e8..57fa66e4ebb0a7ecd27d33d06e70ddfa21f33bcb 100644 GIT binary patch delta 23 ecmX@fev*BIDl=o-WHshE)@}w4hMvit%nkrm>;|0x delta 23 ecmX@fev*BIDl=p0WHshE)+z=LhU&?k%nkrk{|0IR diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class index 2558b26cc24ad4c801dc78771a20c6afc9b1782c..1aafd5883e76bcf9cf86edb3e1624894f2269714 100644 GIT binary patch delta 23 fcmX@fev*BIDl=o>WHshE*2xSU3{xg|GCKeOR@4Ty delta 23 ecmX@fev*BIDl=p4WHshE)+PoHhUUqg%nkrl=LUiR diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class index f715c1786d930ff525ca894cbb57f680030acb64..f86dafaf9d378b13911b7328325b3645dc2afea4 100644 GIT binary patch delta 532 zcmW-dOGp$@7=^!MhWV(`8cj_x$bk}E2D*wL7-5J9;=8ZqNqjm#Gq66!uig<_lN(#ClkxW?)67166DfEKFvgE zp_EoCX`_b33~`M#w-_d4KfyVs7-iag#Cc}9zlu;2Q~kIJw_+vcN9>kWvlXE314Jgt--C73D0^ zDvDK2iGNtF)zqn$2CWH$(cNkaGtsyj!%yqxu)Z{|mXNYGhl|#2Vb+=q3)U@RLs?u~ SL$9?pT(!1^r`C?~m6^Xti+Cvj delta 532 zcmW-dO-NKx7>1uO3>%APve8lu2}Wo9z2c;nxw3*Rg`$KAiy^cGNkOZHVWW!*gj#qM zTI9m0&5$C9xyo9&7$GRgA`)EmGZ00ff>>Gf)?GZ$d(J)ge&6{LUc#Gf_veI2BaDw? z{FIPI8M%~`PiShuKV$LzY~=t!4w6S5Avw$;JPuPM*K(YC8aXC6af)V6b5^{d+(rwR zIY&3==~eF2&P^^d$R&o9NAz}-P9D%jLV294OmmH=@^hU|a)VcKh1dFQkz0I}Q{3S@ zcUhBvFl@$%`Q&Zfw;-dIC+G9f!aOohuH>=RGH&(q5uR8RGuAAhVb)?ivv#?Ir1daw z*JYKY0LW$&SU*$MnYk8!!)D%U5bp@^Uc*>qH%sj00}(z^rLOAuLIYnp!8c+o>pCl3 zVU+=OdYg5ex*g*u6Z~S94d%3-=Qj)d(O=j2Z2Yf#lyp^3QK&Khds61J4EJ*9U`{$) zEQ5eGGpxYDesmAIH#?1se(mlTWKhFIzay3C9)xsetXb3_rH$_@Q3nh?{Qp$Elj23b! zsWeS-+#Y+nB#2a1lviG_%AE0ST3t>a^rkl7q58;*#@HKC1&|-vjXDgW3Tx+ zU;&O;kdzhDButBi-D8nqXR}x_v5LjoB321It(1iN{Z{6d7S%fy>wEYyZR5w$(LxFW HIV}GNJ56|V delta 504 zcmW-dOGuPq6o#Kq11~e9Gmhg%|3%_PbEP1Jy3kOAL^R7?p<-!Fw2?%_+p0x~q`wyo ziAj?vtc)>13ruh&SSF&BN@ST^W8m%Qa{< zh-wtoB&u0GTF9VPWE1(c+aXth)xj?)TfJdx~0@f4n4u47{6%?5X)nghV*!t zT%Jf`M0TEXooC$Px!R4Y^$YItl77X9${+Dc^q8uznI*_PZ&+u7?@aQODMGwuPjO%Q z5$`x<+C=c)c$pyyq!9ro0V~+y_M5BoGVwtsKFY*`OnefsC=*LEu}nQH^zxZ;RwcH^ z9A72)O_dG4D6T8tV3QyELXtmZ%Y^gGE{@yGU{@>H(+YlT1qaeT2DwUgtkti=CwI5C>WiKU}~*w#Oc FoqsnyeJTI| diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class index e3ebf5d1623ee0f6e7bc5b5a8fb2d83568922e0f..221530b6bddc084adf23d2e17895f9edf0d94f13 100644 GIT binary patch delta 27 jcmZ3@vYKVXN=8;o237{E$?F(BSX~&{7+fd+W;6f*XYdCT delta 27 jcmZ3@vYKVXN=8;q237{G$?F(BSWOt%7)&SsW;6f*Wbg*l diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class index d914461f7238090d52194d9c1c641d6c6d4db55e..e6a69af16298700c45bdf628facd5dc0c191dac2 100644 GIT binary patch delta 421 zcmWNMUq};B6o5T9uSiE3C7>%tSzc@5*v@DH6`I`PVz()8M=AOAkSp%bH>PW zix)!7$T`a!Uh<9{1zxetYgU=#2YKzcm73p+upq*s2tQEIM*=L!aq zy)eN=dFV79uNxWR9nkz)PD()JW^p@nhi8(UN_MhS|sun;SkVBE1XihM@BuDBAc zR78lRP;3N$kiS3=Q{1^T^V~C~Xes*E5Oi(U82n3hQbB?+-PF=Ugg%<-r&arQ2Iysw zafX;>m?cKoVU!$W_$0}znr^R{;99l7B(F^IL7E?CY%8?v=Il3gA6uYOx|$3%tWZam zCRT~DMx1pz*ih=G5;CONE`C*cE}0YA7da5|MGi&sB1a;}A}4xo3O;3;Gv+yGkqZsE sWLKZ@xzWk3)*X*L@T@uS6s+D$2c9TXAK=CIytpgcx7X!9tvuZF51I@=^Z)<= delta 280 zcmWO0NlU^}7{%e=T{JlG7lampSc?W)2(`;f3T(0gD$sCan}~=88jByucrB9ax!Y5kOW&PZ`Cc%hO! uyA-r>rBvibpL^h%7p01NKDf25&VuWSI-YS+vNL>o}AcVuKW$q$!hQ3y*DSJM2@T#x57^QJ2=>fTl1l4te8< z52}1}j4#v|C#o~}8$Kh*IfGmh<4PX8CeIB;ZpC;fo_n#?Rm`qg4?;c)`J`U$;Xko2 BJb?fJ delta 284 zcmW-bOG^S_6o#LH#+k{9XxEfvRvJ=>SyDk*Zo(+An^|aHN{B8HbfL(mHip~aTej*4 z2th%Men8vSvuWGDA5f=uFYkGtm*Y8}^Yra=0<_UbCqa7XCrpSq10)G3+eqmVd#S#Vb6xm~&Q_8qhXj0{#9Uj=_QJ9uoU)krK z13oy!Ngk+oYDvt6qp$vP7HqAQ6&dUBQ}5J!^+A19pVVjdMSWGL S+MDLC&eRW|r}YZoV(kz3D;7ln delta 137 zcmWN|ISRsH00rTZ*hH`vf~AT3N*Wt6?i!a?@L0bG@dzFyx9|c^`5yCCaTR~ksFs8* zdM{HNWHjm0qDMlX4g=SaIU{n$te8+RrDVq4_sN16dHAW<>O#FyZ`C{XUVX4Ts!!^( Q#YJ7Juj-rn5x({IA9x!SRR910 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class index 8d46b6f4edd12410d314677f78600d9a4015ad05..5d3be82096563d2fe30ebac8506d94fee3cdfb76 100644 GIT binary patch delta 27 jcmbQtIhk|AV`j#h$xoOII2#yv85$X+7@8)>vX}t?f5Qk9 delta 27 jcmbQtIhk|AV`j#j$xoOII13nf844Ms7>XvxvX}t?eB%ex diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class index b83195b8fca9c1197402e67a22f1b88b83a6b722..a0a4470b9f9ff39cd69bc5c0c2581b834955002b 100644 GIT binary patch delta 31 ncmZ3>xt4Ro17^my$q$+9dAk_67`hq68G0Dx8G0w@vN!+$s7VPt delta 31 ncmZ3>xt4Ro17^mu$q$+9d8-(>7^)e>8EP2h8EPlzvN!+$q!|e8 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class index 8acef502ca3e66aa3c3d398cb76a820e38933a6d..5a544fdbd8ded3db409e4bf839f52cb9ff3f9662 100644 GIT binary patch delta 23 fcmdnSzKwl@5;Nn3$;!-rtWy|x7^Y4xV|D-lQj!L4 delta 23 ecmdnSzKwl@5;J4NWMyVQ))odHhStet%nkrh!UjG7 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class index c1b42dab8e30148a8ffd07ab79c44956e17d2b79..fd84c775a1d7e3afa2d9f5aa73889dfee769f870 100644 GIT binary patch delta 216 zcmWNKJxfAy9EBgDi(E=CR+k2cmJ5O)G;5a{9I{9#P*JZI7zs5LE(JA-6fGkB2Vb~S znuwG_<>2fmXsof1;78~;oriM{=eU+@eSG_LnqGma=r`+@?O;y6NARJi7jiYgd&?S@rurwhaM9Nx1+ z4U-2VG>Fn-hc*yU8VIBw23 zkUZp^BQEfAC9i8?Z-|nVHAR9ncVx(ur7TR90#6jFQ&M@YWv<}l;cuhqJC~2xct+<1 zgI5B45TQYgrszLK^Cj0d_jIVyAcDZ`BUX3T{R%I(XgW`Qy_VnKE`Y}DkEWW$05St%(C6w+Za3uVeI zP>2QPvT%(UqO6f?#IUfi^7ie1&*|+v&t&0b;ab9(*FrL_IBCN}C+T#NO%Ephl+Z_j zp!OQ&DyZv>N;Rg3jF6hpQCEhJ8>X7JWOtcr)>5q~Vrft`Ckm;kl@pR2RhW|w^SWX}#|>{G!3)f`gC5%nC?$O+Ay z(ZRVazo3^m16(r76;qNUTrW_fJt0+dhl6{mc$C5?GI=JK7m9eLls6i9C(H-K zd@{}#GbC8xn-zYf;8#BX(<9yqw@M;O*)UWJ9%a`#zABqnUVOS;lqJg6QBi@&)DOPE EKWpA#%K!iX delta 365 zcmW;IO(?^09LMqZuh1U;8{4=@d1xDI2b9Cafp!~3N+cytT-@ZaLODpD>gQmJtUQz< z&m~V$4oaguMjlIXTM<{^c6)v5Tc1zgQSYdCEpE*Xl0r3BYDlA=bQ;N`1vl*!(uNO@ zb{HkfqXR~n>e0Q1UxjqUmZ4*YTlFPmvbohjLRF%{ghHZWkzb7`a$NF+$fXPHe)A+I z!qPRRJM9hTX<0CXi-N@1mPKqVkxEoR!3%S|vdSChd=TSH4>(5be3Qfv2EX#PKb`F?PlhC=bgRfBvg(M)DRSv|r|%!f Cc3<59 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CodeTaglet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CodeTaglet.class index 7fc603cbe03de72db98fed4046326fd38ab20e0a..051e7849a2046ccda1c0d4686e9eda58549591a6 100644 GIT binary patch delta 97 zcmey#{gZn`7Bi#8o_Ko_Kzpou< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CopyrightTaglet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CopyrightTaglet.class index 84f93434d11e2f75cad64877248ee99e243e3b9a..d957f4cd476fa93be44a75a4437bf5624350c3d4 100644 GIT binary patch delta 177 zcmW;Ay$XR*9DwoX4Cg&8(u*?4^lk=BLXjvN%78LZKFW6?qs?OTzXfG=1unrQh{fy@ zoZjW>*Yj{6?tQLRRu;OTa&psoRg{ly*)}E_$5T~bGpo9IE`Iu*AfM$qcM36BdCM1}Wv`#T6&4L_DO01}{rp<=E^^q+n LcAPoLFVOe{K&CBX delta 175 zcmdldv`=V5HY=mTu1!S3lSxbN{D=_OG zkYxvENwBLhIssY2lLOc-Io%jI7~B~|7(6CVV)tY8p8SygoTEPjD?Eh&rk|v*E1wBv@s+zbTgz){=ne} E0Q)s6FaQ7m diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/DeprecatedTaglet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/DeprecatedTaglet.class index 3c9e77c20d0ad0be05ad0e75b27c642409dc1052..5e5946ecae78bec91fa444ae8c67f9cd248705d4 100644 GIT binary patch delta 211 zcmX>sbXaJEJ}avQ0}F%kWD`~+M&rrptX7QHlNYgCGTKiLU=yAEkyVA!8O+jVQ(<%m zvMd?B!Tk9^zCW0C6UYh%vxM1I7{e!9u={XEGjK4(Fo-b3PVQw7<4j;+V@PBWW=NU* zhJCqdCIdG^76UIs9)l=DK7$NH0fRC_A%hk}5rZK^F@qUH34<*|DT5b78ABkDAH`4s o)LS|E1V@x&6VRp24B`w73_J{sK$4Y#pFsdfGcv>hNhXGP0O-Og)&Kwi delta 211 zcmW-b!Ab&Q6h_aL{+SVzLL1t+(FO#ABGEwyYSE&F3K@c=P-+>vt@m(sA0Tk!)^~8z zEBFp>dIK-Bx!*Z_@NsvAU159cT$K|l+HiHL=)xsZ)3s~MjrP4z|6L^Yl&-xRS8|NV^G3)!B_>=krN)dq oK8X3`o;e-9crhQdux6=$!MOZwpZ;(OoFaA|XPjG#?Ldaf5dr@vr2qf` diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/GenericTaglet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/GenericTaglet.class index 50ab7c08ca2d36b09d4229996b18c39f0f0e6cfb..6b767ee4854199df75bbea880070112fae0dfa9a 100644 GIT binary patch delta 225 zcmbOtIz@DY0-K>D0}F#G0~doCg8+j)gD8U+gA{`|gFJ%|g9?K$gBF7yg8_p-P&RN&RNO8&QQf5!caR|pL3OI6HvUFfsdh`L5!h;L6)JD zL5-n{L6@PM!GxiQ!IGhu!GWO<=)Qi25FkI6VIo5c!=%Z4T+ytv8CV(SOwQv{0{~k% BF1i2! delta 225 zcmbOtIz@DY0-K=$0}F!+0~doTg8+jbgD8U~gA{`mgFJ&ZP}GJ&i@}z`fWeNzjKLnr zb6{{{aGV^-*2CyBnV&;+@@F=6Mh`H{fL)!@2h7R^vI4-YRX|nVWD=EDoztsRh5@5*Ejt@8cy%3ZKoeUXLj+}BguhHnz9_*hFO!7@xVl+cEL24 z%yPvX*QB^1pvAm;kz1CzqsTq$wAti=I*;t|#6HiQ($TFhZ@kdg*%v)VgnaXA|KjJ_ WzP>Ub1I!?rQN57RDjaG~ar6(0M>Y5W delta 254 zcmW;Hy-EX75QgD*WV6}h4+g>#EQLk15Cw%bqzDp0LkbZLD2O5!Dn?U8-BlA&uvW+^ z#6|@xJA;K6;w4ym1?e)J=9_1}W|(fFTljkQGc$NZ_QQ|OtZEL!y#4c6WWi2nixS&h z5ZWXgNy(|FDm(qFDypKax_vK*q~`RZT6g*lVzY@)ojhAMZ`Nej?wE=ke7_q{>PL)l z%oq*EIVI$bh$d6&MOrLz&N3HNxnzTcZBq8R;*e`?Zn&k*GacTv`{a%u_x$i+`@`wv WqrURQ1TczdX7oZ%r*NVX?WeQ-lnrz1`0|1zj2x$NS delta 33 pcmcb`c8hJpTqaIV1{MZx22KW^$;+7B7zHN3WeQ*voovS}0|1RC2e1GD diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/ValueTaglet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/taglets/ValueTaglet.class index aae85fb46046a96958ff31912f09a7f61d8b7021..185f8e4b545ff2a1dad42641a2bdd79f48ec62e4 100644 GIT binary patch delta 175 zcmZn{Z5Q1T&&FszIf2cJ(RT7|HcLjw$%Y)llV7l@F}i|TO6+Qko?uoCkmUW*P$*Lpp;PLk5E!Lnea( zLl%QMLq3BeLji*yLm@*5LlID>7|1K1yqq(evzkGOfdQzRX>vT5=wt&fHOBhM;amm) DVZSGi delta 175 zcmZn{Z5Q1T&&H@WIf2cJQD^dOHcLi>$%Y)llV7l@F`9r`O6+Qk7GPEkkYxjAO#`wV zz^n^EmJ680#i7RN0c81b`Y>=X_%etv_)Tu(aApjge2Qa>W+(#}Ll}b?LpXyRLj;2X zLnMPaLmY!6Lp*~YLjpqxLn1>4LlQ#)L)zr!oY|aN3_=VHK-El>Ac13exO5)B@=aH#VEED?M`8WJ2%5EK+qf|3dfrGuDdZxGT8G~I%> zwz;`D`x%5jjAJ)v`(5{SE%(?Pd-IyLSvE*Z)9#zJ{MfuH$e+!b14%gv*^T(-FjPfV z4mD8)p;oHnP%+0hr>dMem$q}{UJ~UBkBTgvGq*~F8gc59jIJ9kVzk-hhAnP&(_x1$ zzIu-y8Tu5tqr`xKdro-Zf+1BNx#o!$&)U4GUU}z@FGfr?{qn(#Pv&}A@GV1kU?=+7 IRMzhHKS-xF>i_@% delta 235 zcmW;HF-t;W6vpxY3%*`25)NHAX}Dbo8p4DEg&HCnR45XpAkzrV)Dj|4Nmqr|BUG!K zn~SrbLFmIcdbr!~oaf=dnR-)i@nr1*5qxRbjPd2q=FFk|+pIZ~w3C$mXkap-Dyq{^ zKdM})wdy=n+zHHuDr>H!ThwT4+R^EaKJSd^GU0=7KKa%Cj2?4M77SQ2lrOh$$NJes HHg0MQ7VR?b diff --git a/libjava/classpath/tools/com/sun/tools/javadoc/Main.java b/libjava/classpath/tools/com/sun/tools/javadoc/Main.java index 28930301356..7f0fc108805 100644 --- a/libjava/classpath/tools/com/sun/tools/javadoc/Main.java +++ b/libjava/classpath/tools/com/sun/tools/javadoc/Main.java @@ -1,3 +1,40 @@ +/* com.sun.tools.javadoc.Main - Main wrapper for GJDoc + Copyright (C) 2007 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package com.sun.tools.javadoc; public class Main diff --git a/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java b/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java index 0ec243d5639..3a21fe96e43 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java +++ b/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java @@ -1,296 +1,313 @@ -/* gnu.classpath.tools.FileSystemClassLoader - Copyright (C) 2004 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.io.IOException; -import java.io.StreamTokenizer; -import java.io.StringReader; - -import java.net.MalformedURLException; -import java.net.URL; - -import java.util.LinkedList; -import java.util.List; -import java.util.ArrayList; -import java.util.StringTokenizer; - -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.jar.Manifest; -import java.util.jar.Attributes; - -/** - * A ClassLoader implementation which looks for classes - * on the local filesystem given a standard search path. - */ -public class FileSystemClassLoader extends ClassLoader { - - private File[] pathComponents; - - /** - * Initialize the class loader with a normal path string. The path - * string should contain path components separated by {@link - * File.pathSeparator}. Each path component should either denote a - * directory or a .jar or .zip file. - */ - public FileSystemClassLoader(String path) - { - List components = new ArrayList(); - for (StringTokenizer st = new StringTokenizer(path, File.pathSeparator); st.hasMoreTokens(); ) { - File pathComponent = new File(st.nextToken()); - components.add(pathComponent); - if (pathComponent.exists() && !pathComponent.isDirectory()) { - List subComponents = tryGetJarFileClassPathComponents(pathComponent); - if (null != subComponents) { - components.addAll(subComponents); - } - } - } - File[] componentArray = new File[components.size()]; - this.pathComponents = (File[])components.toArray(componentArray); - } - - /** - * Initialize the class loader with an array of path - * components. Each path component should either denote a - * directory or a .jar or .zip file. - */ - public FileSystemClassLoader(File[] pathComponents) - { - this.pathComponents = pathComponents; - for (int i = 0; i < pathComponents.length; ++i) { - if (!pathComponents[i].exists()) { - System.err.println("WARNING: Path component '" + pathComponents[i] + "' not found."); - } - } - } - - public Class loadClass(String name) - throws ClassNotFoundException { - - return super.loadClass(name); - } - - public Class findClass(String name) - throws ClassNotFoundException { - - byte[] b = loadClassData(name); - return defineClass(name, b, 0, b.length); - } - - public URL findResource(String name) - { - StreamInfo streamInfo = getResourceStream(name); - if (null == streamInfo) { - return super.findResource(name); - } - else { - try { - return streamInfo.getURL(); - } - catch (MalformedURLException e) { - System.err.println("WARNING: In FileSystemClassLoader: could not derive URL from file or jar entry: " + e.toString()); - return null; - } - } - } - - private byte[] readFromStream(InputStream in, long size) - throws IOException - { - byte[] result = new byte[(int)size]; - int nread = 0; - int offset = 0; - while (offset < size && (nread = in.read(result, offset, (int)(size - offset))) >= 0) { - offset += nread; - } - in.close(); - return result; - } - - private byte[] readFromStream(StreamInfo streamInfo) - throws IOException - { - InputStream in = streamInfo.openStream(); - long size = streamInfo.getSize(); - - byte[] result = new byte[(int)size]; - int nread = 0; - int offset = 0; - while (offset < size && (nread = in.read(result, offset, (int)(size - offset))) >= 0) { - offset += nread; - } - in.close(); - return result; - } - - private static interface StreamInfo - { - public InputStream openStream() - throws IOException; - public long getSize(); - public URL getURL() - throws MalformedURLException; - } - - private static class FileStreamInfo - implements StreamInfo - { - File file; - - FileStreamInfo(File file) - { - this.file = file; - } - - public InputStream openStream() - throws IOException - { - return new FileInputStream(file); - } - - public long getSize() - { - return file.length(); - } - - public URL getURL() - throws MalformedURLException - { - return file.toURL(); - } - } - - private static class JarStreamInfo - implements StreamInfo - { - private File file; - private JarFile jarFile; - private JarEntry jarEntry; - - JarStreamInfo(File file, JarFile jarFile, JarEntry jarEntry) - { - this.file = file; - this.jarFile = jarFile; - this.jarEntry = jarEntry; - } - - public InputStream openStream() - throws IOException - { - return jarFile.getInputStream(jarEntry); - } - - public long getSize() - { - return jarEntry.getSize(); - } - - public URL getURL() - throws MalformedURLException - { - String urlString = "jar:" + file.toURL() + "!/" + jarEntry.getName(); - return new URL(urlString); - } - } - - private StreamInfo getResourceStream(String path) - { - for (int i = 0; i < pathComponents.length; ++i) { - try { - File parent = pathComponents[i]; - if (parent.isDirectory()) { - File file = new File(parent, path); - if (file.exists()) { - return new FileStreamInfo(file); - } - } - else { - JarFile jarFile = new JarFile(parent, false, JarFile.OPEN_READ); - JarEntry jarEntry = jarFile.getJarEntry(path); - if (null != jarEntry) { - return new JarStreamInfo(parent, jarFile, jarEntry); - } - } - } - catch (IOException ignore) { - } - } - return null; - } - - private byte[] loadClassData(String className) - throws ClassNotFoundException - { - String classFileName = className.replace('.', File.separatorChar) + ".class"; - StreamInfo streamInfo = getResourceStream(classFileName); - - try { - if (null != streamInfo) { - return readFromStream(streamInfo); - } - } - catch (IOException ignore) { - } - - throw new ClassNotFoundException(className); - } - - private static List tryGetJarFileClassPathComponents(File file) - { - try { - JarFile jarFile = new JarFile(file, false, JarFile.OPEN_READ); - Manifest manifest = jarFile.getManifest(); - if (null != manifest) { - Attributes mainAttributes = manifest.getMainAttributes(); - if (null != mainAttributes) { - String classPath = mainAttributes.getValue(Attributes.Name.CLASS_PATH); - if (null != classPath) { - List result = new LinkedList(); - StreamTokenizer tokenizer = new StreamTokenizer(new StringReader(classPath)); - tokenizer.resetSyntax(); - tokenizer.wordChars(0, Integer.MAX_VALUE); - tokenizer.whitespaceChars(9, 9); // tab - tokenizer.whitespaceChars(10, 10); // lf - tokenizer.whitespaceChars(13, 13); // cr - tokenizer.whitespaceChars(32, 32); // space - tokenizer.quoteChar('"'); - int token; - while ((token = tokenizer.nextToken()) != StreamTokenizer.TT_EOF) { - if (StreamTokenizer.TT_WORD == token) { - result.add(new File(file.getParentFile(), tokenizer.sval)); - } - } - return result; - } - } - } - } - catch (IOException ignore) { - } - return null; - } -} - +/* gnu.classpath.tools.FileSystemClassLoader + Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.io.IOException; +import java.io.StreamTokenizer; +import java.io.StringReader; + +import java.net.MalformedURLException; +import java.net.URL; + +import java.util.LinkedList; +import java.util.List; +import java.util.ArrayList; +import java.util.StringTokenizer; + +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.Manifest; +import java.util.jar.Attributes; + +/** + * A ClassLoader implementation which looks for classes + * on the local filesystem given a standard search path. + */ +public class FileSystemClassLoader extends ClassLoader { + + private File[] pathComponents; + + /** + * Initialize the class loader with a normal path string. The path + * string should contain path components separated by {@link + * File.pathSeparator}. Each path component should either denote a + * directory or a .jar or .zip file. + */ + public FileSystemClassLoader(String path) + { + List components = new ArrayList(); + for (StringTokenizer st = new StringTokenizer(path, File.pathSeparator); st.hasMoreTokens(); ) { + File pathComponent = new File(st.nextToken()); + components.add(pathComponent); + if (pathComponent.exists() && !pathComponent.isDirectory()) { + List subComponents = tryGetJarFileClassPathComponents(pathComponent); + if (null != subComponents) { + components.addAll(subComponents); + } + } + } + File[] componentArray = new File[components.size()]; + this.pathComponents = (File[])components.toArray(componentArray); + } + + /** + * Initialize the class loader with an array of path + * components. Each path component should either denote a + * directory or a .jar or .zip file. + */ + public FileSystemClassLoader(File[] pathComponents) + { + this.pathComponents = pathComponents; + for (int i = 0; i < pathComponents.length; ++i) { + if (!pathComponents[i].exists()) { + System.err.println("WARNING: Path component '" + pathComponents[i] + "' not found."); + } + } + } + + public Class loadClass(String name) + throws ClassNotFoundException { + + return super.loadClass(name); + } + + public Class findClass(String name) + throws ClassNotFoundException { + + byte[] b = loadClassData(name); + return defineClass(name, b, 0, b.length); + } + + public URL findResource(String name) + { + StreamInfo streamInfo = getResourceStream(name); + if (null == streamInfo) { + return super.findResource(name); + } + else { + try { + return streamInfo.getURL(); + } + catch (MalformedURLException e) { + System.err.println("WARNING: In FileSystemClassLoader: could not derive URL from file or jar entry: " + e.toString()); + return null; + } + } + } + + private byte[] readFromStream(InputStream in, long size) + throws IOException + { + byte[] result = new byte[(int)size]; + int nread = 0; + int offset = 0; + while (offset < size && (nread = in.read(result, offset, (int)(size - offset))) >= 0) { + offset += nread; + } + in.close(); + return result; + } + + private byte[] readFromStream(StreamInfo streamInfo) + throws IOException + { + InputStream in = streamInfo.openStream(); + long size = streamInfo.getSize(); + + byte[] result = new byte[(int)size]; + int nread = 0; + int offset = 0; + while (offset < size && (nread = in.read(result, offset, (int)(size - offset))) >= 0) { + offset += nread; + } + in.close(); + return result; + } + + private static interface StreamInfo + { + public InputStream openStream() + throws IOException; + public long getSize(); + public URL getURL() + throws MalformedURLException; + } + + private static class FileStreamInfo + implements StreamInfo + { + File file; + + FileStreamInfo(File file) + { + this.file = file; + } + + public InputStream openStream() + throws IOException + { + return new FileInputStream(file); + } + + public long getSize() + { + return file.length(); + } + + public URL getURL() + throws MalformedURLException + { + return file.toURL(); + } + } + + private static class JarStreamInfo + implements StreamInfo + { + private File file; + private JarFile jarFile; + private JarEntry jarEntry; + + JarStreamInfo(File file, JarFile jarFile, JarEntry jarEntry) + { + this.file = file; + this.jarFile = jarFile; + this.jarEntry = jarEntry; + } + + public InputStream openStream() + throws IOException + { + return jarFile.getInputStream(jarEntry); + } + + public long getSize() + { + return jarEntry.getSize(); + } + + public URL getURL() + throws MalformedURLException + { + String urlString = "jar:" + file.toURL() + "!/" + jarEntry.getName(); + return new URL(urlString); + } + } + + private StreamInfo getResourceStream(String path) + { + for (int i = 0; i < pathComponents.length; ++i) { + try { + File parent = pathComponents[i]; + if (parent.isDirectory()) { + File file = new File(parent, path); + if (file.exists()) { + return new FileStreamInfo(file); + } + } + else { + JarFile jarFile = new JarFile(parent, false, JarFile.OPEN_READ); + JarEntry jarEntry = jarFile.getJarEntry(path); + if (null != jarEntry) { + return new JarStreamInfo(parent, jarFile, jarEntry); + } + } + } + catch (IOException ignore) { + } + } + return null; + } + + private byte[] loadClassData(String className) + throws ClassNotFoundException + { + String classFileName = className.replace('.', File.separatorChar) + ".class"; + StreamInfo streamInfo = getResourceStream(classFileName); + + try { + if (null != streamInfo) { + return readFromStream(streamInfo); + } + } + catch (IOException ignore) { + } + + throw new ClassNotFoundException(className); + } + + private static List tryGetJarFileClassPathComponents(File file) + { + try { + JarFile jarFile = new JarFile(file, false, JarFile.OPEN_READ); + Manifest manifest = jarFile.getManifest(); + if (null != manifest) { + Attributes mainAttributes = manifest.getMainAttributes(); + if (null != mainAttributes) { + String classPath = mainAttributes.getValue(Attributes.Name.CLASS_PATH); + if (null != classPath) { + List result = new LinkedList(); + StreamTokenizer tokenizer = new StreamTokenizer(new StringReader(classPath)); + tokenizer.resetSyntax(); + tokenizer.wordChars(0, Integer.MAX_VALUE); + tokenizer.whitespaceChars(9, 9); // tab + tokenizer.whitespaceChars(10, 10); // lf + tokenizer.whitespaceChars(13, 13); // cr + tokenizer.whitespaceChars(32, 32); // space + tokenizer.quoteChar('"'); + int token; + while ((token = tokenizer.nextToken()) != StreamTokenizer.TT_EOF) { + if (StreamTokenizer.TT_WORD == token) { + result.add(new File(file.getParentFile(), tokenizer.sval)); + } + } + return result; + } + } + } + } + catch (IOException ignore) { + } + return null; + } +} + diff --git a/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java b/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java index 4e222d26777..8b6b9542c95 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java +++ b/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools; diff --git a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java index b2ac3ce6cf6..9afcf047656 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java +++ b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools; diff --git a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java index 66ab1282400..caa471ec54b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java +++ b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools; diff --git a/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java b/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java index 8c35c257312..03121ddab13 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java +++ b/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools; diff --git a/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java b/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java index 214dc1b6609..d70ea931bdb 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java +++ b/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java index 87772077ec2..8ac9add6875 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java index f75c6cdb727..6db6cc76840 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java index fec2c7ac749..ccfb7fa6c38 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java index b33519fd231..5bc4a6c623b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java index c1f1c3c6323..f1daf2da886 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java index 0909a86fc63..e6d206f3808 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java index 261c676c380..37a359b8823 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java index b9b956691cc..2bff9ce16f8 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java index fa5cf842a66..2897153b622 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java index f8806c5696e..eaef3e49a99 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java index a005b16feb1..bad38f885a0 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java index 23da79cb387..0f1b53fbe43 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java index 86a6a4ed08a..7701a6eaa01 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java index e62636985b0..2029d6ce933 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java index 63026de420d..ff93f8b096f 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java @@ -1,3 +1,40 @@ +/* DebugDoclet.java - Doclet for debugging + Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.doclets.debugdoclet; import com.sun.javadoc.ClassDoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java index 50867598109..48f1c190a54 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.htmldoclet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java index 7fd2fa0624d..4c5eb1d6e36 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.htmldoclet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java index e49e1c57341..7d5202c9cee 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.htmldoclet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java index 0026e0b8a46..e833627fda0 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.htmldoclet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java index 5c6e84913d0..5cd272d106e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.htmldoclet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java index 6f90338b2af..b08d4902608 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java @@ -1,2434 +1,2451 @@ -/* gnu.classpath.tools.doclets.xmldoclet.Driver - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.doclets.xmldoclet; - -import com.sun.javadoc.*; -import java.io.*; - -import com.sun.tools.doclets.Taglet; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; - -import java.text.DateFormat; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashSet; -import java.util.TreeSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.HashMap; -import java.util.Properties; -import java.util.Set; -import java.util.SortedSet; -import java.util.StringTokenizer; -import java.util.TreeMap; - -import gnu.classpath.tools.gjdoc.TemporaryStore; -import gnu.classpath.tools.gjdoc.GjdocPackageDoc; - -import gnu.classpath.tools.doclets.PackageGroup; -import gnu.classpath.tools.doclets.PackageMatcher; -import gnu.classpath.tools.doclets.InvalidPackageWildcardException; - -import gnu.classpath.tools.doclets.xmldoclet.doctranslet.DocTranslet; -import gnu.classpath.tools.doclets.xmldoclet.doctranslet.DocTransletOptions; - -import gnu.classpath.tools.taglets.AuthorTaglet; -import gnu.classpath.tools.taglets.VersionTaglet; -import gnu.classpath.tools.taglets.SinceTaglet; -import gnu.classpath.tools.taglets.DeprecatedTaglet; -import gnu.classpath.tools.taglets.GenericTaglet; -import gnu.classpath.tools.doclets.StandardTaglet; - -import gnu.classpath.tools.java2xhtml.Java2xhtml; - -import gnu.classpath.tools.IOToolkit; -import gnu.classpath.tools.FileSystemClassLoader; - -/** - * A Doclet which retrieves all information presented by the Doclet - * API, dumping it to stdout in XML format. - * - * @author Julian Scheid - */ -public class Driver { - - public static final String XMLDOCLET_VERSION = "0.6.1"; - - /** - * Used for redirecting error messages to /dev/null. - */ - private static class NullErrorReporter implements DocErrorReporter { - public void printError(String ignore) {} - public void printWarning(String ignore) {} - public void printNotice(String ignore) {} - } - - /* - * Taglet context constants. - */ - private static final int CONTEXT_CONSTRUCTOR = 1; - private static final int CONTEXT_FIELD = 2; - private static final int CONTEXT_METHOD = 3; - private static final int CONTEXT_OVERVIEW = 4; - private static final int CONTEXT_PACKAGE = 5; - private static final int CONTEXT_TYPE = 6; - - /** - * All XML output will go to this stream. - */ - private PrintWriter out; - - /** - * How many spaces to indent each XML node level, - * i.e. Tab size for output. - */ - private static int indentStep = 1; - - /** - * Won't output superfluous spaces if set to true. - * If set to false, output will be more legible. - */ - private boolean compress = false; - - /** - * Won't output warning messages while fixing - * HTML code if set to true. - */ - private boolean noHTMLWarn = false; - - /** - * Won't output warning messages when encountering tags - * that look like an email address if set to true. - */ - private boolean noEmailWarn = false; - - /** - * Will fix HTML if necessary so that each comment - * contains valid XML code if set to true. If set - * to false, HTML code will not be modified and - * instead encapsulated in a CDATA section. - */ - private boolean fixHTML = true; - - /** - * User-specified name of the directory where the final version of - * the generated files will be written to. - * - * If no XSLT sheet is given, the XML output will go directly into - * this directory. Otherwise, XML output will go to a temporary - * directory and XSLT output will go to this directory. - */ - private File targetDirectory = null; - - /** - * Directory where XML output will be written to. If no XSLT - * sheet was given, this is the target directory specified - * by the user. Otherwise, this is a temporary directory. - */ - private File xmlTargetDirectory; - - /** - * Contains a number of TargetContexts which describe which XSLT - * sheet to apply to the output of this doclet, to what directory - * the XSLT output is written, and which postprocess driver to use - * to process XSLT output. - */ - private List targets = new ArrayList(); - - /** - * XML text to include at the end of every generated page. Read - * from the file specified on the command line using -bottomnote. - * If present, this will be written to the main output file - * (index.xml) in node /gjdoc:rootDoc/gjdoc:bottomnote. - */ - private String bottomNote; - - /** - * Brief description of the package set. Can be specified on the - * command line using -title. This will be written to the main - * output file (index.xml) in node - * /gjdoc:rootDoc/gjdoc:title. The HTML generating XSLT sheet - * uses this for example in window titles. - */ - private String title; - - /** - * Path to the directory where temporary files should be stored. - * Defaults to system tempdir, but can be overridden by user - * with -workpath. - */ - private String workingPath = System.getProperty("java.io.tmpdir"); - - /** - * Temporary directory created by this doclet where all - * temporary files will be stored in. If no temporary - * files are needed (i.e. no XSLT postprocessing stage - * specified by user), this is null. - */ - private File workingDirectory; - - /** - * Whether to deep-copy the doc-files subdirectory. - */ - private boolean docFilesSubdirsEnabled = false; - - /** - * Which direct subdirectories of the doc-files directories to exclude. - * Set of String. - */ - private Set excludeDocFilesSubDirs = new HashSet(); - - /** - * Stores the Doclet API RootDoc we are operating on. - */ - private RootDoc rootDoc; - - /** - * XML namespace prefix used for all tags, except for HTML - * tags copied from Javadoc comments. Excluding colon. - */ - public static final String tagPrefix = "gjdoc"; - - /** - * Classpath for loading Taglet classes. - */ - private String tagletPath = null; - - /** - * The current class that is being processed. - * Set in outputClassDoc(). - */ - private ClassDoc currentClass; - - /** - * The current member that is being processed. - * Set in outputMemberDoc(). - */ - private MemberDoc currentMember; - - /** - * The current constructor/method that is being processed. - * Set in outputExecutableMemberDoc(). - */ - private ExecutableMemberDoc currentExecMember; - - /** - * Mapping from tag type to Taglet for user Taglets specified on - * the command line. - */ - private Map tagletMap = new LinkedHashMap(); - - /** - * Keeps track of the tags mentioned by the user during option - * processiong so that an error can be emitted if a tag is - * mentioned more than once. - */ - private List mentionedTags = new LinkedList(); - - /** - * Stores options to be passed to the DocTranslet. - */ - private DocTransletOptions docTransletOptions = new DocTransletOptions(); - - /** - * Stores the package groups specified in the user - * options. Contains objects of type PackageGroup. - */ - private List packageGroups = new LinkedList(); - - private HtmlRepairer htmlRepairer; - - public static boolean start(TemporaryStore _rootDocWrapper) { - return new Driver().instanceStart((RootDoc)_rootDocWrapper.getAndClear()); - } - - /** - * Official Doclet entry point. - */ - public static boolean start(RootDoc _rootDoc) { - - // Create a new XmlDoclet instance and delegate control. - TemporaryStore tstore = new TemporaryStore(_rootDoc); - _rootDoc = null; - return new Driver().instanceStart((RootDoc)tstore.getAndClear()); - } - - /** - * Output an XML tag describing a com.sun.javadoc.Type object. - * Assumes that the tag does not have subtags. - * - * @param level Level of indentation. Will be multiplied by - * indentStep to yield actual amount - * of whitespace inserted at start of line. - * @param tag Identifier for the XML tag being output. - * @param type The Javadoc Type to be output. - */ - protected void outputType(int level, String tag, Type type) { - outputType(level, tag, type, true); - } - - protected void outputType(int level, String tag, Type type, boolean atomic) { - - boolean isIncluded = false; - ClassDoc typeAsClassDoc = type.asClassDoc(); - String packageName = null; - if (null != typeAsClassDoc) { - isIncluded = typeAsClassDoc.isIncluded(); - packageName = typeAsClassDoc.containingPackage().name(); - } - println(level, "<"+tagPrefix+":"+tag + " typename=\""+type.typeName()+"\""+ - " qualifiedtypename=\""+type.qualifiedTypeName()+"\"" - +(type.dimension().length()==0?"":" dimension=\""+type.dimension()+"\"") - +(isIncluded?" isIncluded=\"true\"" : "") - +((null != packageName)?" package=\"" + packageName + "\"" : "") - +(atomic?"/":"")+">"); - } - - protected void outputExecutableMemberDocBody(int level, ExecutableMemberDoc memberDoc) { - - currentExecMember = memberDoc; - - outputMemberDocBody(level, memberDoc); - - Parameter[] parameters = memberDoc.parameters(); - for (int i=0, ilim=parameters.length; i 0) { - printOpenTag(2, "firstSentenceTags", false); - outputTags(3, packageDoc.firstSentenceTags(), true, CONTEXT_PACKAGE); - printCloseTag(0, "firstSentenceTags"); - printOpenTag(2, "inlineTags", false); - outputTags(3, packageDoc.inlineTags(), true, CONTEXT_PACKAGE); - printCloseTag(0, "inlineTags"); - } - - if (packageDoc.tags().length > 0) { - printOpenTag(2, "tags"); - outputTags(3, packageDoc.tags(), true, CONTEXT_PACKAGE); - printCloseTag(2, "tags"); - } - - if (packageDoc.seeTags().length > 0) { - printOpenTag(2, "seeTags"); - outputTags(3, packageDoc.seeTags(), true, CONTEXT_PACKAGE); - printCloseTag(2, "seeTags"); - } - - ClassDoc[] allClasses = (ClassDoc[]) packageDoc.allClasses().clone(); - Arrays.sort(allClasses); - - if (false) { - for (int i = 0, ilim = allClasses.length; i < ilim; ++ i) { - printAtomTag(2, "containsClass qualifiedtypename=\""+allClasses[i].qualifiedTypeName()+"\""); - } - } - - printCloseTag(1, "packagedoc"); - } - - protected void outputClassDoc(ClassDoc classDoc) throws IOException { - - currentClass = classDoc; - - println(); - printOpenTag(1, "classdoc xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:"+tagPrefix+"=\"http://www.gnu.org/software/cp-tools/gjdocxml\" name=\""+classDoc.name()+"\" qualifiedtypename=\""+classDoc.qualifiedName()+"\""); - - ClassDoc[] interfaces = classDoc.interfaces(); - for (int i=0, ilim=interfaces.length; i 0) { - printOpenTag(2, "serializableFields"); - - FieldDoc[] sfields = classDoc.serializableFields(); - for (int i=0, ilim=sfields.length; i 0) { - printOpenTag(level, "inlineTags", false); - outputTags(level+1, doc.inlineTags(), true, context); - printCloseTag(0, "inlineTags"); - } - - if (doc.firstSentenceTags().length > 0) { - printOpenTag(level, "firstSentenceTags", false); - outputTags(level+1, doc.firstSentenceTags(), true, context); - printCloseTag(0, "firstSentenceTags"); - } - - if (doc.tags().length > 0) { - printOpenTag(level, "tags"); - outputTaglets(level+1, doc.tags(), true, context); - printCloseTag(level, "tags"); - } - - if (doc.seeTags().length > 0) { - printOpenTag(level, "seeTags"); - outputTags(level+1, doc.seeTags(), true, context); - printCloseTag(level, "seeTags"); - } - - SourcePosition position = doc.position(); - if (null != position) { - printAtomTag(level, "position file=\"" + position.file().getAbsolutePath() + "\" line=\"" + position.line() + "\" column=\"" + position.column() + "\""); - } - } - - protected void outputProgramElementDocBody(int level, ProgramElementDoc programElementDoc) { - outputDocBody(level, programElementDoc); - printAtomTag(level, "containingPackage name=\""+programElementDoc.containingPackage().name()+"\""); - if (null!=programElementDoc.containingClass()) { - outputType(level, "containingClass", programElementDoc.containingClass()); - } - String access; - if (programElementDoc.isPublic()) - access="public"; - else if (programElementDoc.isProtected()) - access="protected"; - else if (programElementDoc.isPrivate()) - access="private"; - else if (programElementDoc.isPackagePrivate()) - access="package"; - else - throw new RuntimeException("Huh? "+programElementDoc+" is neither public, protected, private nor package protected."); - printAtomTag(level, "access scope=\""+access+"\""); - if (programElementDoc.isFinal()) - printAtomTag(level, "isFinal"); - if (programElementDoc.isStatic()) - printAtomTag(level, "isStatic"); - } - - protected void outputTags(int level, Tag[] tags, boolean descend, int context) { - - for (int i=0; i"); - } - //printCloseTag(0 /* don't introduce additional whitespace */, "text"); - } - else { - printWarning("Tag got null text: "+tag); - } - - if ((descend && ("@throws".equals(tag.name()) || "@param".equals(tag.name()))) || "@deprecated".equals(tag.name())) { - if (tag.firstSentenceTags().length>0) { - printOpenTag(level+1, "firstSentenceTags", false); - outputTags(level+2, tag.firstSentenceTags(), false, context); - printCloseTag(0, "firstSentenceTags"); - } - - if (tag.inlineTags().length>0) { - printOpenTag(level+1, "inlineTags", false); - outputTags(level+2, tag.firstSentenceTags(), false, context); - printCloseTag(0, "inlineTags"); - } - } - - if (fixHTML && lastTag) { - String terminateText = htmlRepairer.terminateText(); - if (null != terminateText && terminateText.length() > 0) { - print(terminateText); - } - } - - if (!"Text".equals(tag.name())) { - - Taglet inlineTaglet = (Taglet)tagletMap.get(tag.name().substring(1)); - if (null != inlineTaglet && inlineTaglet.isInlineTag()) { - printOpenTag(0, "inlineTagletText", false); - print(inlineTaglet.toString(tag)); - printCloseTag(0, "inlineTagletText"); - } - - printCloseTag(0, "tag", false); - } - } - - void outputTaglets(int level, Tag[] tags, boolean descend, int context) - { - for (Iterator it = tagletMap.keySet().iterator(); it.hasNext(); ) { - String tagName = (String)it.next(); - Object o = tagletMap.get(tagName); - Taglet taglet = (Taglet)o; - - if (!taglet.isInlineTag() - && ((context != CONTEXT_CONSTRUCTOR || taglet.inConstructor()) - || (context != CONTEXT_FIELD || taglet.inField()) - || (context != CONTEXT_METHOD || taglet.inMethod()) - || (context != CONTEXT_OVERVIEW || taglet.inOverview()) - || (context != CONTEXT_PACKAGE || taglet.inPackage()) - || (context != CONTEXT_TYPE || taglet.inType()))) { - - List tagsOfThisType = new ArrayList(); - for (int i=0, ilim=tags.length; i"); - } - printCloseTag(0, "tag", false); - } - } - } - } - } - } - - /** - * Inofficial entry point. We got an instance here. - */ - protected boolean instanceStart(RootDoc _rootDoc) { - - this.rootDoc = _rootDoc; - _rootDoc = null; - - boolean xmlOnly = true; - - // Set the default Taglet order - - registerTaglet(new VersionTaglet()); - registerTaglet(new AuthorTaglet()); - //registerTaglet(new SinceTaglet()); - registerTaglet(new StandardTaglet("deprecated")); - registerTaglet(new StandardTaglet("see")); - registerTaglet(new StandardTaglet("param")); - - // Set the built-in Taglet filter - - AuthorTaglet.setTagletEnabled(false); - VersionTaglet.setTagletEnabled(false); - SinceTaglet.setTagletEnabled(true); - DeprecatedTaglet.setTagletEnabled(true); - - try { - { - - // Process command line options passed through to this doclet - - TargetContext targetContext = null; - - TargetContext htmlTargetContext - = new TargetContext(DocTranslet.fromClasspath("/doctranslets/html/gjdoc.xsl"), - targetDirectory); - - for (int i=0, ilim=rootDoc.options().length; i= 0) { - writer.write(buf, 0, nread); - } - writer.flush(); - bottomNote = writer.toString(); - writer.close(); - reader.close(); - } - else if ("-title".equals(optionTag)) { - - title = option[1]; - } - else if ("-workpath".equals(optionTag)) { - - workingPath = option[1]; - } - else if ("-tagletpath".equals(optionTag)) { - - if (null == tagletPath) { - tagletPath = option[1]; - } - else { - tagletPath = tagletPath + File.pathSeparator + option[1]; - } - } - else if ("-taglet".equals(optionTag)) { - - boolean tagletLoaded = false; - - String useTagletPath = this.tagletPath; - if (null == useTagletPath) { - useTagletPath = System.getProperty("java.class.path"); - } - - try { - Class tagletClass; - try { - tagletClass - = new FileSystemClassLoader(useTagletPath).loadClass(option[1]); - } - catch (ClassNotFoundException e) { - // If not found on specified tagletpath, try default classloader - tagletClass - = Class.forName(option[1]); - } - Method registerTagletMethod - = tagletClass.getDeclaredMethod("register", new Class[] { java.util.Map.class }); - - if (!registerTagletMethod.getReturnType().equals(Void.TYPE)) { - printError("Taglet class '" + option[1] + "' found, but register method doesn't return void."); - } - else if (registerTagletMethod.getExceptionTypes().length > 0) { - printError("Taglet class '" + option[1] + "' found, but register method contains throws clause."); - } - else if ((registerTagletMethod.getModifiers() & (Modifier.STATIC | Modifier.PUBLIC | Modifier.ABSTRACT)) != (Modifier.STATIC | Modifier.PUBLIC)) { - printError("Taglet class '" + option[1] + "' found, but register method isn't public static, or is abstract.."); - } - else { - Map tempMap = new HashMap(); - registerTagletMethod.invoke(null, new Object[] { tempMap }); - tagletLoaded = true; - String name = (String)tempMap.keySet().iterator().next(); - Taglet taglet = (Taglet)tempMap.get(name); - tagletMap.put(name, taglet); - mentionedTags.add(taglet); - } - } - catch (NoSuchMethodException e) { - printError("Taglet class '" + option[1] + "' found, but doesn't contain the register method."); - } - catch (SecurityException e) { - printError("Taglet class '" + option[1] + "' cannot be loaded: " + e.getMessage()); - } - catch (InvocationTargetException e) { - printError("Taglet class '" + option[1] + "' found, but register method throws exception: " + e.toString()); - } - catch (IllegalAccessException e) { - printError("Taglet class '" + option[1] + "' found, but there was a problem when accessing the register method: " + e.toString()); - } - catch (IllegalArgumentException e) { - printError("Taglet class '" + option[1] + "' found, but there was a problem when accessing the register method: " + e.toString()); - } - catch (ClassNotFoundException e) { - printError("Taglet class '" + option[1] + "' cannot be found."); - } - if (!tagletLoaded) { - return false; - } - } - else if ("-author".equals(optionTag)) { - AuthorTaglet.setTagletEnabled(true); - } - else if ("-version".equals(optionTag)) { - VersionTaglet.setTagletEnabled(true); - } - else if ("-nosince".equals(optionTag)) { - SinceTaglet.setTagletEnabled(false); - } - else if ("-nodeprecated".equals(optionTag)) { - DeprecatedTaglet.setTagletEnabled(false); - } - else if ("-authormail".equals(optionTag)) { - - if ("no-replace".equalsIgnoreCase(option[1])) { - AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NO_REPLACEMENT); - } - else if ("mailto-name".equalsIgnoreCase(option[1])) { - AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.MAILTO_NAME); - } - else if ("name-mailto-address".equalsIgnoreCase(option[1])) { - AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NAME_MAILTO_ADDRESS); - } - else if ("name-mangled-address".equalsIgnoreCase(option[1])) { - AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NAME_MANGLED_ADDRESS); - } - else { - printError("Invalid value for option '-authortag-email'. Allowed values are:" - + " no-replace, mailto-name, name-mailto-address, name-mangled-address."); - return false; - } - } - else if ("-mailmangledot".equals(optionTag)) { - AuthorTaglet.setDotReplacement(option[1]); - } - else if ("-mailmangleat".equals(optionTag)) { - AuthorTaglet.setAtReplacement(option[1]); - } - else if ("-docfilessubdirs".equals(optionTag)) { - docFilesSubdirsEnabled = true; - } - else if ("-excludedocfilessubdir".equals(optionTag)) { - StringTokenizer st = new StringTokenizer(option[1]); - while (st.hasMoreTokens()) { - excludeDocFilesSubDirs.add(st.nextToken()); - } - } - else if ("-nonavbar".equals(optionTag)) { - docTransletOptions.nonavbar = true; - } - else if ("-noindex".equals(optionTag)) { - docTransletOptions.noindex = true; - } - else if ("-notree".equals(optionTag)) { - docTransletOptions.notree = true; - } - else if ("-nocomment".equals(optionTag)) { - docTransletOptions.nocomment = true; - } - else if ("-nohelp".equals(optionTag)) { - docTransletOptions.nohelp = true; - } - else if ("-splitindex".equals(optionTag)) { - docTransletOptions.splitindex = true; - } - else if ("-linksource".equals(optionTag)) { - docTransletOptions.linksource = true; - } - else if ("-windowtitle".equals(optionTag)) { - docTransletOptions.windowtitle = option[1]; - } - else if ("-helpfile".equals(optionTag)) { - docTransletOptions.helpfile = new File(option[1]).toURL().toString(); - } - else if ("-stylesheetfile".equals(optionTag)) { - docTransletOptions.stylesheetfile = new File(option[1]).toURL().toString(); - } - else if ("-header".equals(optionTag)) { - docTransletOptions.header = option[1]; - } - else if ("-footer".equals(optionTag)) { - docTransletOptions.footer = option[1]; - } - else if ("-bottom".equals(optionTag)) { - docTransletOptions.bottom = option[1]; - } - else if ("-doctitle".equals(optionTag)) { - docTransletOptions.doctitle = option[1]; - } - else if ("-nodeprecatedlist".equals(optionTag)) { - docTransletOptions.nodeprecatedlist = true; - } - else if ("-uses".equals(optionTag)) { - docTransletOptions.uses = true; - } - else if ("-group".equals(optionTag)) { - if (!processGroupOption(option[1], option[2])) { - printError("Invalid package wildcard list in -group option \"" + option[1] + "\" " + option[2]); - return false; - } - } - else if ("-tag".equals(optionTag)) { - String tagSpec = option[1]; - boolean validTagSpec = false; - int ndx1 = tagSpec.indexOf(':'); - if (ndx1 < 0) { - Taglet taglet = (Taglet)tagletMap.get(tagSpec); - if (null == taglet) { - printError("There is no standard tag '" + tagSpec + "'."); - } - else { - if (mentionedTags.contains(taglet)) { - printError("Tag '" + tagSpec + "' has been added or moved before."); - } - else { - mentionedTags.add(taglet); - - // re-append taglet - tagletMap.remove(tagSpec); - tagletMap.put(tagSpec, taglet); - } - } - } - else { - int ndx2 = tagSpec.indexOf(':', ndx1 + 1); - if (ndx2 > ndx1 && ndx2 < tagSpec.length() - 1) { - String tagName = tagSpec.substring(0, ndx1); - String tagHead = null; - if (tagSpec.charAt(ndx2 + 1) == '\"') { - if (tagSpec.charAt(tagSpec.length() - 1) == '\"') { - tagHead = tagSpec.substring(ndx2 + 2, tagSpec.length() - 1); - validTagSpec = true; - } - } - else { - tagHead = tagSpec.substring(ndx2 + 1); - validTagSpec = true; - } - - boolean tagScopeOverview = false; - boolean tagScopePackages = false; - boolean tagScopeTypes = false; - boolean tagScopeConstructors = false; - boolean tagScopeMethods = false; - boolean tagScopeFields = false; - boolean tagDisabled = false; - - tag_option_loop: - for (int n=ndx1+1; n:Xaoptcmf:\"."); - } - } - } - - // Use current directory if target directory hasn't been set. - if (null == targetDirectory) { - targetDirectory = new File(System.getProperty("user.dir")); - } - if (null != targetContext) { - targetContext.setTargetDirectory(targetDirectory); - } - - // It is illegal to specify targets AND -xmlonly. - - if (xmlOnly && targets.size() > 0) { - - printError("You can only specify one of -xmlonly and a target format."); - return false; - } - - // If no target was specified and XML only was not - // requested, use HTML as default target. - - if (!xmlOnly && targets.size() == 0) { - targets.add(targetContext = htmlTargetContext); - } - - // Set the same target directory for all output. - - // FIXME: Allow separate target directories for different - // output formats. - - for (Iterator it = targets.iterator(); it.hasNext(); ) { - TargetContext t = (TargetContext)it.next(); - t.setTargetDirectory(targetDirectory); - } - - // Create temporary directory if necessary - - if (xmlOnly) { - - xmlTargetDirectory = targetDirectory; - } - else { - - File workingTopDirectory = new File(workingPath); - - workingDirectory = new File(workingTopDirectory, "gjdoc.tmp."+System.currentTimeMillis()); - - if (!workingDirectory.mkdir()) { - printError("Cannot create temporary directory at "+System.getProperty("java.io.tmpdir")); - return false; - } - - File xmlTempDirectory = new File(workingDirectory, "xmloutput"); - - if (!xmlTempDirectory.mkdir()) { - printError("Cannot create temporary directory for XML output at "+System.getProperty("java.io.tmpdir")); - return false; - } - - xmlTargetDirectory = xmlTempDirectory; - } - - // Create target directory if necessary - - if (!targetDirectory.exists()) { - printNotice("Creating destination directory: \"" - + targetDirectory + "\""); - if (!targetDirectory.mkdirs()) { - printError("Failed to create destination directory \"" - + targetDirectory + "\""); - return false; - } - } - - // Check for deprecation - - boolean hasDeprecatedClasses = false; - boolean hasDeprecatedInterfaces = false; - boolean hasDeprecatedExceptions = false; - boolean hasDeprecatedErrors = false; - boolean hasDeprecatedMethods = false; - boolean hasDeprecatedFields = false; - - { - ClassDoc[] classes = rootDoc.classes(); - for (int i = 0, ilim = classes.length; i < ilim; ++ i) { - ClassDoc c = classes[i]; - Tag[] deprecatedTags = c.tags("deprecated"); - if (null != deprecatedTags && 0 != deprecatedTags.length) { - if (c.isInterface()) { - hasDeprecatedInterfaces = true; - } - else if (c.isException()) { - hasDeprecatedExceptions = true; - } - else if (c.isError()) { - hasDeprecatedErrors = true; - } - else /*if (c.isOrdinaryClass())*/ { - hasDeprecatedClasses = true; - } - } - - MethodDoc[] methods = c.methods(); - for (int j = 0, jlim = methods.length; j < jlim; ++ j) { - MethodDoc m = methods[j]; - deprecatedTags = m.tags("deprecated"); - if (null != deprecatedTags && 0 != deprecatedTags.length) { - hasDeprecatedMethods = true; - } - } - - FieldDoc[] fields = c.fields(); - for (int j = 0, jlim = fields.length; j < jlim; ++ j) { - FieldDoc f = fields[j]; - deprecatedTags = f.tags("deprecated"); - if (null != deprecatedTags && 0 != deprecatedTags.length) { - hasDeprecatedFields = true; - } - } - } - } - - htmlRepairer = new HtmlRepairer(rootDoc, noHTMLWarn, noEmailWarn, - currentClass, currentMember, - false); - - collectUsage(); - - // Begin XML generation - - printNotice("Writing XML Index file..."); - - // Assign output stream - - setTargetFile("index.xml"); - - // Output XML document header - - println(0, ""); - println(""); - println(); - printOpenTag(0, "rootdoc xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\""); - - println(); - println(1, ""); - - if (rootDoc.firstSentenceTags().length > 0) { - printOpenTag(2, "firstSentenceTags", false); - outputTags(3, rootDoc.firstSentenceTags(), true, CONTEXT_PACKAGE); - printCloseTag(0, "firstSentenceTags"); - } - - if (rootDoc.inlineTags().length > 0) { - printOpenTag(2, "inlineTags"); - outputTags(3, rootDoc.inlineTags(), true, CONTEXT_PACKAGE); - printCloseTag(2, "inlineTags"); - } - - if (null != bottomNote) { - printOpenTag(1, "bottomnote"); - print(bottomNote); - printCloseTag(1, "bottomnote"); - } - - if (null != title) { - printOpenTag(1, "title"); - println(2, title); - printCloseTag(1, "title"); - } - - printOpenTag(1, "created"); - println(2, DateFormat.getDateInstance(DateFormat.LONG, Locale.US).format(new java.util.Date())); - printCloseTag(1, "created"); - - if (hasDeprecatedClasses) printAtomTag(1, "hasDeprecatedClasses"); - if (hasDeprecatedInterfaces) printAtomTag(1, "hasDeprecatedInterfaces"); - if (hasDeprecatedExceptions) printAtomTag(1, "hasDeprecatedExceptions"); - if (hasDeprecatedErrors) printAtomTag(1, "hasDeprecatedErrors"); - if (hasDeprecatedMethods) printAtomTag(1, "hasDeprecatedMethods"); - if (hasDeprecatedFields) printAtomTag(1, "hasDeprecatedFields"); - - // Output summary of all classes specified on command line - - println(); - println(1, ""); - ClassDoc[] specifiedClasses = rootDoc.specifiedClasses(); - for (int i=0, ilim=specifiedClasses.length; i"); - PackageDoc[] specifiedPackages = rootDoc.specifiedPackages(); - for (int i=0, ilim=specifiedPackages.length; i"); - { - Iterator packageGroupIt = packageGroups.iterator(); - while (packageGroupIt.hasNext()) { - PackageGroup packageGroup = (PackageGroup)packageGroupIt.next(); - SortedSet groupedPackages = packageGroup.getPackages(); - if (groupedPackages.isEmpty()) { - printWarning("Package group named '" - + packageGroup.getName() + "' didn't match any packages."); - } - else { - printOpenTag(1, "packagegroup name=\"" + packageGroup.getName() + "\""); - Iterator groupedPackageIt = groupedPackages.iterator(); - while (groupedPackageIt.hasNext()) { - PackageDoc groupedPackageDoc = (PackageDoc)groupedPackageIt.next(); - printAtomTag(2, "package name=\"" + groupedPackageDoc.name() + "\""); - } - printCloseTag(1, "packagegroup"); - } - } - packageGroups = null; - } - - // Output information on all packages for which documentation - // has been made available via the Doclet API - - println(); - println(1, ""); - PackageDoc[] packages = rootDoc.specifiedPackages(); - for (int i=0, ilim=packages.length; i"); - ClassDoc[] sumclasses = rootDoc.classes(); - for (int i=0, ilim=sumclasses.length; i"); - ClassDoc[] classes = rootDoc.classes(); - String prevPackageName = null; - for (int i = 0, ilim = classes.length; i < ilim; ++ i) { - ClassDoc c = classes[i]; - - if (isVerbose()) { - printNotice("Writing XML information for "+c.qualifiedName()+"..."); - } - else { - String packageName = c.containingPackage().name(); - if (null == prevPackageName || !packageName.equals(prevPackageName)) { - printNotice("Writing XML information for "+packageName+"..."); - prevPackageName = packageName; - } - } - - setTargetFile(c.qualifiedName().replace('/','.')+".xml"); - - println(""); - println(""); - - outputClassDoc(c); - - closeTargetFile(); - } - classes = null; - } - - // Copy DTD files to temporary directory - - // FIXME: try to solve this via jar: URLs. but this will - // probably break libxmlj compatibility (?) - - String[] resources = new String[] { - "gjdoc.dtd", - "gjdoc-alphaindex.dtd", - "dbcentx.mod", - "ent/iso-amsa.ent", - "ent/iso-amsb.ent", - "ent/iso-amsc.ent", - "ent/iso-amsn.ent", - "ent/iso-amso.ent", - "ent/iso-amsr.ent", - "ent/iso-box.ent", - "ent/iso-cyr1.ent", - "ent/iso-cyr2.ent", - "ent/iso-dia.ent", - "ent/iso-grk1.ent", - "ent/iso-grk2.ent", - "ent/iso-grk3.ent", - "ent/iso-grk4.ent", - "ent/iso-lat1.ent", - "ent/iso-lat2.ent", - "ent/iso-num.ent", - "ent/iso-pub.ent", - "ent/iso-tech.ent", - }; - - File tempDtdDirectory = new File(xmlTargetDirectory, "dtd"); - File tempDtdEntDirectory = new File(tempDtdDirectory, "ent"); - - if ((tempDtdDirectory.exists() || tempDtdDirectory.mkdir()) - && (tempDtdEntDirectory.exists() || tempDtdEntDirectory.mkdir())) { - for (int i = 0; i < resources.length; ++ i) { - copyResourceToFile("/dtd/" + resources[i], - new File(tempDtdDirectory, resources[i])); - } - } - else { - printError("Cannot create temporary directories for DTD data at " + tempDtdDirectory); - return false; - } - - // Copy package data-dir directory - - { - PackageDoc[] packages = rootDoc.specifiedPackages(); - for (int i=0, ilim=packages.length; irm -Rf directory - * - * @return true on success - */ - private static boolean deleteRecursive(File directory) { - - boolean success = true; - - File[] files = directory.listFiles(); - - for (int i=0, ilim=files.length; i"); - } - - /** - * Prints an open tag at the given indentation level. - */ - protected void printOpenTag(int level, String tag) { - printOpenTag(level, replaceCharsInTag(tag), true); - } - - /** - * Prints an open tag at the given indentation level and - * conditionally appends a newline (if not in tight mode). - */ - protected void printOpenTag(int level, String tag, boolean appendNewline) { - if (appendNewline && !compress) { - println(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">"); - } - else { - print(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">"); - } - } - - /** - * Prints a close tag at the given indentation level. - */ - protected void printCloseTag(int level, String tag) { - printCloseTag(level, tag, true); - } - - /** - * Prints a close tag at the given indentation level and - * conditionally appends a newline (if not in tight mode). - */ - protected void printCloseTag(int level, String tag, boolean appendNewline) { - if (appendNewline && !compress) { - println(level, ""); - } - else { - print(level, ""); - } - } - - public static int optionLength(String option) { - if ("-d".equals(option)) return 2; - else if ("-fixhtml".equals(option)) return 1; - else if ("-compress".equals(option)) return 1; - else if ("-nohtmlwarn".equals(option)) return 1; - else if ("-noemailwarn".equals(option)) return 1; - else if ("-indentstep".equals(option)) return 2; - else if ("-xslsheet".equals(option)) return 2; - else if ("-xsltdriver".equals(option)) return 2; - else if ("-postprocess".equals(option)) return 2; - else if ("-genhtml".equals(option)) return 1; - else if ("-geninfo".equals(option)) return 1; - else if ("-gendocbook".equals(option)) return 1; - else if ("-xmlonly".equals(option)) return 1; - else if ("-bottomnote".equals(option)) return 2; - else if ("-workpath".equals(option)) return 2; - else if ("-title".equals(option)) return 2; - else if ("-tagletpath".equals(option)) return 2; - else if ("-taglet".equals(option)) return 2; - else if ("-authormail".equals(option)) return 2; - else if ("-mailmangledot".equals(option)) return 2; - else if ("-mailmangleat".equals(option)) return 2; - else if ("-noindex".equals(option)) return 1; - else if ("-nocomment".equals(option)) return 1; - else if ("-notree".equals(option)) return 1; - else if ("-nohelp".equals(option)) return 1; - else if ("-nonavbar".equals(option)) return 1; - else if ("-splitindex".equals(option)) return 1; - else if ("-author".equals(option)) return 1; - else if ("-version".equals(option)) return 1; - else if ("-nosince".equals(option)) return 1; - else if ("-nodeprecated".equals(option)) return 1; - else if ("-linksource".equals(option)) return 1; - else if ("-windowtitle".equals(option)) return 2; - else if ("-helpfile".equals(option)) return 2; - else if ("-stylesheetfile".equals(option)) return 2; - else if ("-tag".equals(option)) return 2; - else if ("-header".equals(option)) return 2; - else if ("-footer".equals(option)) return 2; - else if ("-bottom".equals(option)) return 2; - else if ("-doctitle".equals(option)) return 2; - else if ("-nodeprecatedlist".equals(option)) return 1; - else if ("-uses".equals(option)) return 1; - else if ("-group".equals(option)) return 3; - - else return -1; - } - - public static boolean validOptions(String[][] options) { - return true; - } - - - /** - * Workaround for non well-formed comments: fix tag contents - * by replacing < with &lt;, - * > with &gt; and - * & with &amp;. - * - * @param tagContent String to process - * - * @return given String with all special characters replaced by - * HTML entities. - */ - private static String replaceCharsInTag(String tagContent) { - return - replaceString( - replaceString( - replaceString( - tagContent, - "<", "<" - ), - ">", ">" - ), - "&", "&" - ); - } - - /** - * Replaces all occurences of string needle within string - * haystack by string replacement. - * - * @param haystack The string to search and replace in. - * @param needle The string which is searched for. - * @param replacement The string by which every occurence of needle is replaced. - */ - private static String replaceString(String haystack, String needle, String replacement) { - int ndx = haystack.indexOf(needle); - if (ndx<0) - return haystack; - else - return haystack.substring(0, ndx) + replacement - + replaceString(haystack.substring(ndx+needle.length()), needle, replacement); - } - - protected void setTargetFile(String filename) throws IOException { - - OutputStream fileOut = new FileOutputStream(new File(xmlTargetDirectory, filename)); - out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(fileOut, "UTF8")));; - } - - protected void closeTargetFile() { - - out.flush(); - out.close(); - } - - private String cdata(String str) { - - if (null==str) { - return str; - } // end of if ((null==str) - - StringBuffer rc = new StringBuffer(); - for (int i=0; i=0x20 && c<=0xd7ff) || (c>=0xe000 && c<=0xfffd) || (c>=0x10000 && c<=0x10ffff)) { - rc.append(c); - } - else { - printWarning("Invalid Unicode character 0x"+Integer.toString(c, 16)+" in javadoc markup has been stripped."); - } // end of else - - } - return rc.toString(); - } - - static void copyResourceToFile(String resourceName, File target) throws IOException { - - InputStream in = Driver.class.getResourceAsStream(resourceName); - - if (null != in) { - - FileOutputStream out = new FileOutputStream(target); - int size; - byte[] buffer = new byte[512]; - while ((size = in.read(buffer)) >= 0) { - out.write(buffer, 0, size); - } - out.close(); - } - else { - - throw new IOException("Can't find resource named "+resourceName); - } - } - - private void printError(String error) { - if (null != rootDoc) { - rootDoc.printError(error); - } - else { - System.err.println("ERROR: "+error); - } - } - - private void printWarning(String warning) { - if (null != rootDoc) { - rootDoc.printWarning(warning); - } - else { - System.err.println("WARNING: "+warning); - } - } - - private void printNotice(String notice) { - if (null != rootDoc) { - rootDoc.printNotice(notice); - } - else { - System.err.println(notice); - } - } - - /** - * Copy the contents of the input directory to the output - * directory. The output directory must exist. - */ - private void copyPackageDataDir(GjdocPackageDoc packageDoc) throws IOException { - File docFilesSourceDirectory - = new File(packageDoc.packageDirectory(), "doc-files"); - File docFilesTargetDirectory - = new File(this.targetDirectory, - packageDoc.name().replace('.', File.separatorChar)); - if (docFilesSourceDirectory.exists()) { - printNotice("Copying files from " + docFilesSourceDirectory); - copyDirectory(docFilesSourceDirectory, docFilesTargetDirectory, - docFilesSubdirsEnabled, - excludeDocFilesSubDirs); - } - } - - /** - * Recursively copy the contents of the input directory to the - * output directory. The output directory must exist. - */ - private static void copyDirectory(File sourceDir, File targetDir, - boolean recursive, - Set excludeDirs) throws IOException { - if (!targetDir.exists() && !targetDir.mkdirs()) { - throw new IOException("Cannot create directory " + targetDir); - } - - File[] sourceFiles = sourceDir.listFiles(); - for (int i=0; i= 0) { - out.write(buf, 0, nread); - } - in.close(); - out.close(); - } - - private void createIndexByName() throws IOException { - // Create index - - // Collect index - - Map indexMap = new TreeMap(new Comparator() { - public int compare(Object o1, Object o2) { - return o1.toString().toLowerCase().compareTo(o2.toString().toLowerCase()); - } - }); - - // Add packages to index - - PackageDoc[] packages = rootDoc.specifiedPackages(); - for (int i=0, ilim=packages.length; i 0) { - signature.append(", "); - } - signature.append(parameters[k].typeName()); - } - signature.append(')'); - indexMap.put(signature.toString(), method); - } - } - - // Assign output stream - - setTargetFile("alphaindex.xml"); - - // Output XML document header - - println(0, ""); - println(""); - println(); - printOpenTag(0, "alphaindex xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\""); - - Iterator it = indexMap.keySet().iterator(); - - char previousCategoryLetter = '\0'; - boolean categoryOpen = false; - - while (it.hasNext()) { - String key = (String)it.next(); - Doc entry = (Doc)indexMap.get(key); - - char firstChar = Character.toUpperCase(key.charAt(0)); - if (firstChar != previousCategoryLetter) { - if (categoryOpen) { - printCloseTag(1, "category"); - } - printOpenTag(1, "category letter=\"" + firstChar + "\""); - categoryOpen = true; - previousCategoryLetter = firstChar; - } - - printOpenTag(2, "entry name=\"" + key + "\""); - if (entry instanceof PackageDoc) { - printAtomTag(3, "isPackage"); - } - else if (entry instanceof ClassDoc) { - printAtomTag(3, "isClass"); - ClassDoc centry = (ClassDoc)entry; - currentClass = centry; - printAtomTag(3, "containingPackage name=\"" + centry.containingPackage().name() + "\""); - if (null != centry.containingClass()) { - printAtomTag(3, "containingClass name=\"" + centry.containingClass().name() + "\""); - } - if (centry.isInterface()) { - printAtomTag(3, "isInterface"); - } - if (centry.isException()) { - printAtomTag(3, "isException"); - } - if (centry.isError()) { - printAtomTag(3, "isError"); - } - if (centry.isOrdinaryClass()) { - printAtomTag(3, "isOrdinaryClass"); - } - } - else if (entry instanceof ProgramElementDoc) { - ProgramElementDoc pentry = (ProgramElementDoc)entry; - currentClass = pentry.containingClass(); - printAtomTag(3, "containingPackage name=\"" + pentry.containingPackage().name() + "\""); - printAtomTag(3, "containingClass name=\"" + pentry.containingClass().name() + "\""); - if (pentry.isMethod()) { - printAtomTag(3, "isMethod"); - ExecutableMemberDoc mentry = (ExecutableMemberDoc)pentry; - printAtomTag(3, "signature full=\""+mentry.signature()+"\" flat=\""+mentry.flatSignature()+"\""); - printAtomTag(3, "method name=\"" + mentry.name() + "\""); - } - if (pentry.isField()) { - printAtomTag(3, "isField"); - } - } - - Tag[] tags = entry.firstSentenceTags(); - for (int i=0, ilim=tags.length; i0) { - printOpenTag(3, "firstSentenceTags", false); - outputTags(4, tag.firstSentenceTags(), false, CONTEXT_TYPE); - printCloseTag(3, "firstSentenceTags"); - } - } - - - printCloseTag(2, "entry"); - } - - if (categoryOpen) { - printCloseTag(1, "category"); - } - - printCloseTag(0, "alphaindex"); - - closeTargetFile(); - } - - private static class UsageType - { - public static final UsageType CLASS_DERIVED_FROM = new UsageType("class-derived-from"); - public static final UsageType FIELD_OF_TYPE = new UsageType("field-of-type"); - public static final UsageType METHOD_WITH_RETURN_TYPE = new UsageType("method-with-return-type"); - public static final UsageType METHOD_WITH_PARAMETER_TYPE = new UsageType("method-with-parameter-type"); - public static final UsageType METHOD_WITH_THROWN_TYPE = new UsageType("method-with-thrown-type"); - public static final UsageType CONSTRUCTOR_WITH_PARAMETER_TYPE = new UsageType("constructor-with-parameter-type"); - public static final UsageType CONSTRUCTOR_WITH_THROWN_TYPE = new UsageType("constructor-with-thrown-type"); - private String id; - - private UsageType(String id) - { - this.id = id; - } - - public String toString() { - return "UsageType{id=" + id + "}"; - } - - public String getId() { - return id; - } - } - - /** - * ClassDoc -> (PackageDoc -> (UsageType -> (Set of Doc))) - */ - private Map usedClassToPackagesMap = new HashMap(); - - private void addUsedBy(ClassDoc usedClass, UsageType usageType, Doc user, PackageDoc userPackage) - { - Map packageToUsageTypeMap = (Map)usedClassToPackagesMap.get(usedClass); - if (null == packageToUsageTypeMap) { - packageToUsageTypeMap = new HashMap(); - usedClassToPackagesMap.put(usedClass, packageToUsageTypeMap); - } - - Map usageTypeToUsersMap = (Map)packageToUsageTypeMap.get(userPackage); - if (null == usageTypeToUsersMap) { - usageTypeToUsersMap = new HashMap(); - packageToUsageTypeMap.put(userPackage, usageTypeToUsersMap); - } - - Set userSet = (Set)usageTypeToUsersMap.get(usageType); - if (null == userSet) { - userSet = new TreeSet(); // FIXME: we need the collator from Main here - usageTypeToUsersMap.put(usageType, userSet); - } - userSet.add(user); - } - - /** - * Create the cross reference database. - */ - private void collectUsage() { - - ClassDoc[] classes = rootDoc.classes(); - for (int i = 0, ilim = classes.length; i < ilim; ++ i) { - ClassDoc clazz = classes[i]; - - // classes derived from - for (ClassDoc superclass = clazz.superclass(); superclass != null; - superclass = superclass.superclass()) { - addUsedBy(superclass, UsageType.CLASS_DERIVED_FROM, clazz, clazz.containingPackage()); - } - - FieldDoc[] fields = clazz.fields(); - for (int j = 0, jlim = fields.length; j < jlim; ++ j) { - FieldDoc field = fields[j]; - - // fields of type - ClassDoc fieldType = field.type().asClassDoc(); - if (null != fieldType) { - addUsedBy(fieldType, UsageType.FIELD_OF_TYPE, - field, clazz.containingPackage()); - } - } - - MethodDoc[] methods = clazz.methods(); - for (int j = 0, jlim = methods.length; j < jlim; ++ j) { - MethodDoc method = methods[j]; - - // methods with return type - - ClassDoc returnType = method.returnType().asClassDoc(); - if (null != returnType) { - addUsedBy(returnType, UsageType.METHOD_WITH_RETURN_TYPE, - method, clazz.containingPackage()); - } - Parameter[] parameters = method.parameters(); - for (int k=0; k/dev/null. + */ + private static class NullErrorReporter implements DocErrorReporter { + public void printError(String ignore) {} + public void printWarning(String ignore) {} + public void printNotice(String ignore) {} + } + + /* + * Taglet context constants. + */ + private static final int CONTEXT_CONSTRUCTOR = 1; + private static final int CONTEXT_FIELD = 2; + private static final int CONTEXT_METHOD = 3; + private static final int CONTEXT_OVERVIEW = 4; + private static final int CONTEXT_PACKAGE = 5; + private static final int CONTEXT_TYPE = 6; + + /** + * All XML output will go to this stream. + */ + private PrintWriter out; + + /** + * How many spaces to indent each XML node level, + * i.e. Tab size for output. + */ + private static int indentStep = 1; + + /** + * Won't output superfluous spaces if set to true. + * If set to false, output will be more legible. + */ + private boolean compress = false; + + /** + * Won't output warning messages while fixing + * HTML code if set to true. + */ + private boolean noHTMLWarn = false; + + /** + * Won't output warning messages when encountering tags + * that look like an email address if set to true. + */ + private boolean noEmailWarn = false; + + /** + * Will fix HTML if necessary so that each comment + * contains valid XML code if set to true. If set + * to false, HTML code will not be modified and + * instead encapsulated in a CDATA section. + */ + private boolean fixHTML = true; + + /** + * User-specified name of the directory where the final version of + * the generated files will be written to. + * + * If no XSLT sheet is given, the XML output will go directly into + * this directory. Otherwise, XML output will go to a temporary + * directory and XSLT output will go to this directory. + */ + private File targetDirectory = null; + + /** + * Directory where XML output will be written to. If no XSLT + * sheet was given, this is the target directory specified + * by the user. Otherwise, this is a temporary directory. + */ + private File xmlTargetDirectory; + + /** + * Contains a number of TargetContexts which describe which XSLT + * sheet to apply to the output of this doclet, to what directory + * the XSLT output is written, and which postprocess driver to use + * to process XSLT output. + */ + private List targets = new ArrayList(); + + /** + * XML text to include at the end of every generated page. Read + * from the file specified on the command line using -bottomnote. + * If present, this will be written to the main output file + * (index.xml) in node /gjdoc:rootDoc/gjdoc:bottomnote. + */ + private String bottomNote; + + /** + * Brief description of the package set. Can be specified on the + * command line using -title. This will be written to the main + * output file (index.xml) in node + * /gjdoc:rootDoc/gjdoc:title. The HTML generating XSLT sheet + * uses this for example in window titles. + */ + private String title; + + /** + * Path to the directory where temporary files should be stored. + * Defaults to system tempdir, but can be overridden by user + * with -workpath. + */ + private String workingPath = System.getProperty("java.io.tmpdir"); + + /** + * Temporary directory created by this doclet where all + * temporary files will be stored in. If no temporary + * files are needed (i.e. no XSLT postprocessing stage + * specified by user), this is null. + */ + private File workingDirectory; + + /** + * Whether to deep-copy the doc-files subdirectory. + */ + private boolean docFilesSubdirsEnabled = false; + + /** + * Which direct subdirectories of the doc-files directories to exclude. + * Set of String. + */ + private Set excludeDocFilesSubDirs = new HashSet(); + + /** + * Stores the Doclet API RootDoc we are operating on. + */ + private RootDoc rootDoc; + + /** + * XML namespace prefix used for all tags, except for HTML + * tags copied from Javadoc comments. Excluding colon. + */ + public static final String tagPrefix = "gjdoc"; + + /** + * Classpath for loading Taglet classes. + */ + private String tagletPath = null; + + /** + * The current class that is being processed. + * Set in outputClassDoc(). + */ + private ClassDoc currentClass; + + /** + * The current member that is being processed. + * Set in outputMemberDoc(). + */ + private MemberDoc currentMember; + + /** + * The current constructor/method that is being processed. + * Set in outputExecutableMemberDoc(). + */ + private ExecutableMemberDoc currentExecMember; + + /** + * Mapping from tag type to Taglet for user Taglets specified on + * the command line. + */ + private Map tagletMap = new LinkedHashMap(); + + /** + * Keeps track of the tags mentioned by the user during option + * processiong so that an error can be emitted if a tag is + * mentioned more than once. + */ + private List mentionedTags = new LinkedList(); + + /** + * Stores options to be passed to the DocTranslet. + */ + private DocTransletOptions docTransletOptions = new DocTransletOptions(); + + /** + * Stores the package groups specified in the user + * options. Contains objects of type PackageGroup. + */ + private List packageGroups = new LinkedList(); + + private HtmlRepairer htmlRepairer; + + public static boolean start(TemporaryStore _rootDocWrapper) { + return new Driver().instanceStart((RootDoc)_rootDocWrapper.getAndClear()); + } + + /** + * Official Doclet entry point. + */ + public static boolean start(RootDoc _rootDoc) { + + // Create a new XmlDoclet instance and delegate control. + TemporaryStore tstore = new TemporaryStore(_rootDoc); + _rootDoc = null; + return new Driver().instanceStart((RootDoc)tstore.getAndClear()); + } + + /** + * Output an XML tag describing a com.sun.javadoc.Type object. + * Assumes that the tag does not have subtags. + * + * @param level Level of indentation. Will be multiplied by + * indentStep to yield actual amount + * of whitespace inserted at start of line. + * @param tag Identifier for the XML tag being output. + * @param type The Javadoc Type to be output. + */ + protected void outputType(int level, String tag, Type type) { + outputType(level, tag, type, true); + } + + protected void outputType(int level, String tag, Type type, boolean atomic) { + + boolean isIncluded = false; + ClassDoc typeAsClassDoc = type.asClassDoc(); + String packageName = null; + if (null != typeAsClassDoc) { + isIncluded = typeAsClassDoc.isIncluded(); + packageName = typeAsClassDoc.containingPackage().name(); + } + println(level, "<"+tagPrefix+":"+tag + " typename=\""+type.typeName()+"\""+ + " qualifiedtypename=\""+type.qualifiedTypeName()+"\"" + +(type.dimension().length()==0?"":" dimension=\""+type.dimension()+"\"") + +(isIncluded?" isIncluded=\"true\"" : "") + +((null != packageName)?" package=\"" + packageName + "\"" : "") + +(atomic?"/":"")+">"); + } + + protected void outputExecutableMemberDocBody(int level, ExecutableMemberDoc memberDoc) { + + currentExecMember = memberDoc; + + outputMemberDocBody(level, memberDoc); + + Parameter[] parameters = memberDoc.parameters(); + for (int i=0, ilim=parameters.length; i 0) { + printOpenTag(2, "firstSentenceTags", false); + outputTags(3, packageDoc.firstSentenceTags(), true, CONTEXT_PACKAGE); + printCloseTag(0, "firstSentenceTags"); + printOpenTag(2, "inlineTags", false); + outputTags(3, packageDoc.inlineTags(), true, CONTEXT_PACKAGE); + printCloseTag(0, "inlineTags"); + } + + if (packageDoc.tags().length > 0) { + printOpenTag(2, "tags"); + outputTags(3, packageDoc.tags(), true, CONTEXT_PACKAGE); + printCloseTag(2, "tags"); + } + + if (packageDoc.seeTags().length > 0) { + printOpenTag(2, "seeTags"); + outputTags(3, packageDoc.seeTags(), true, CONTEXT_PACKAGE); + printCloseTag(2, "seeTags"); + } + + ClassDoc[] allClasses = (ClassDoc[]) packageDoc.allClasses().clone(); + Arrays.sort(allClasses); + + if (false) { + for (int i = 0, ilim = allClasses.length; i < ilim; ++ i) { + printAtomTag(2, "containsClass qualifiedtypename=\""+allClasses[i].qualifiedTypeName()+"\""); + } + } + + printCloseTag(1, "packagedoc"); + } + + protected void outputClassDoc(ClassDoc classDoc) throws IOException { + + currentClass = classDoc; + + println(); + printOpenTag(1, "classdoc xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:"+tagPrefix+"=\"http://www.gnu.org/software/cp-tools/gjdocxml\" name=\""+classDoc.name()+"\" qualifiedtypename=\""+classDoc.qualifiedName()+"\""); + + ClassDoc[] interfaces = classDoc.interfaces(); + for (int i=0, ilim=interfaces.length; i 0) { + printOpenTag(2, "serializableFields"); + + FieldDoc[] sfields = classDoc.serializableFields(); + for (int i=0, ilim=sfields.length; i 0) { + printOpenTag(level, "inlineTags", false); + outputTags(level+1, doc.inlineTags(), true, context); + printCloseTag(0, "inlineTags"); + } + + if (doc.firstSentenceTags().length > 0) { + printOpenTag(level, "firstSentenceTags", false); + outputTags(level+1, doc.firstSentenceTags(), true, context); + printCloseTag(0, "firstSentenceTags"); + } + + if (doc.tags().length > 0) { + printOpenTag(level, "tags"); + outputTaglets(level+1, doc.tags(), true, context); + printCloseTag(level, "tags"); + } + + if (doc.seeTags().length > 0) { + printOpenTag(level, "seeTags"); + outputTags(level+1, doc.seeTags(), true, context); + printCloseTag(level, "seeTags"); + } + + SourcePosition position = doc.position(); + if (null != position) { + printAtomTag(level, "position file=\"" + position.file().getAbsolutePath() + "\" line=\"" + position.line() + "\" column=\"" + position.column() + "\""); + } + } + + protected void outputProgramElementDocBody(int level, ProgramElementDoc programElementDoc) { + outputDocBody(level, programElementDoc); + printAtomTag(level, "containingPackage name=\""+programElementDoc.containingPackage().name()+"\""); + if (null!=programElementDoc.containingClass()) { + outputType(level, "containingClass", programElementDoc.containingClass()); + } + String access; + if (programElementDoc.isPublic()) + access="public"; + else if (programElementDoc.isProtected()) + access="protected"; + else if (programElementDoc.isPrivate()) + access="private"; + else if (programElementDoc.isPackagePrivate()) + access="package"; + else + throw new RuntimeException("Huh? "+programElementDoc+" is neither public, protected, private nor package protected."); + printAtomTag(level, "access scope=\""+access+"\""); + if (programElementDoc.isFinal()) + printAtomTag(level, "isFinal"); + if (programElementDoc.isStatic()) + printAtomTag(level, "isStatic"); + } + + protected void outputTags(int level, Tag[] tags, boolean descend, int context) { + + for (int i=0; i"); + } + //printCloseTag(0 /* don't introduce additional whitespace */, "text"); + } + else { + printWarning("Tag got null text: "+tag); + } + + if ((descend && ("@throws".equals(tag.name()) || "@param".equals(tag.name()))) || "@deprecated".equals(tag.name())) { + if (tag.firstSentenceTags().length>0) { + printOpenTag(level+1, "firstSentenceTags", false); + outputTags(level+2, tag.firstSentenceTags(), false, context); + printCloseTag(0, "firstSentenceTags"); + } + + if (tag.inlineTags().length>0) { + printOpenTag(level+1, "inlineTags", false); + outputTags(level+2, tag.firstSentenceTags(), false, context); + printCloseTag(0, "inlineTags"); + } + } + + if (fixHTML && lastTag) { + String terminateText = htmlRepairer.terminateText(); + if (null != terminateText && terminateText.length() > 0) { + print(terminateText); + } + } + + if (!"Text".equals(tag.name())) { + + Taglet inlineTaglet = (Taglet)tagletMap.get(tag.name().substring(1)); + if (null != inlineTaglet && inlineTaglet.isInlineTag()) { + printOpenTag(0, "inlineTagletText", false); + print(inlineTaglet.toString(tag)); + printCloseTag(0, "inlineTagletText"); + } + + printCloseTag(0, "tag", false); + } + } + + void outputTaglets(int level, Tag[] tags, boolean descend, int context) + { + for (Iterator it = tagletMap.keySet().iterator(); it.hasNext(); ) { + String tagName = (String)it.next(); + Object o = tagletMap.get(tagName); + Taglet taglet = (Taglet)o; + + if (!taglet.isInlineTag() + && ((context != CONTEXT_CONSTRUCTOR || taglet.inConstructor()) + || (context != CONTEXT_FIELD || taglet.inField()) + || (context != CONTEXT_METHOD || taglet.inMethod()) + || (context != CONTEXT_OVERVIEW || taglet.inOverview()) + || (context != CONTEXT_PACKAGE || taglet.inPackage()) + || (context != CONTEXT_TYPE || taglet.inType()))) { + + List tagsOfThisType = new ArrayList(); + for (int i=0, ilim=tags.length; i"); + } + printCloseTag(0, "tag", false); + } + } + } + } + } + } + + /** + * Inofficial entry point. We got an instance here. + */ + protected boolean instanceStart(RootDoc _rootDoc) { + + this.rootDoc = _rootDoc; + _rootDoc = null; + + boolean xmlOnly = true; + + // Set the default Taglet order + + registerTaglet(new VersionTaglet()); + registerTaglet(new AuthorTaglet()); + //registerTaglet(new SinceTaglet()); + registerTaglet(new StandardTaglet("deprecated")); + registerTaglet(new StandardTaglet("see")); + registerTaglet(new StandardTaglet("param")); + + // Set the built-in Taglet filter + + AuthorTaglet.setTagletEnabled(false); + VersionTaglet.setTagletEnabled(false); + SinceTaglet.setTagletEnabled(true); + DeprecatedTaglet.setTagletEnabled(true); + + try { + { + + // Process command line options passed through to this doclet + + TargetContext targetContext = null; + + TargetContext htmlTargetContext + = new TargetContext(DocTranslet.fromClasspath("/doctranslets/html/gjdoc.xsl"), + targetDirectory); + + for (int i=0, ilim=rootDoc.options().length; i= 0) { + writer.write(buf, 0, nread); + } + writer.flush(); + bottomNote = writer.toString(); + writer.close(); + reader.close(); + } + else if ("-title".equals(optionTag)) { + + title = option[1]; + } + else if ("-workpath".equals(optionTag)) { + + workingPath = option[1]; + } + else if ("-tagletpath".equals(optionTag)) { + + if (null == tagletPath) { + tagletPath = option[1]; + } + else { + tagletPath = tagletPath + File.pathSeparator + option[1]; + } + } + else if ("-taglet".equals(optionTag)) { + + boolean tagletLoaded = false; + + String useTagletPath = this.tagletPath; + if (null == useTagletPath) { + useTagletPath = System.getProperty("java.class.path"); + } + + try { + Class tagletClass; + try { + tagletClass + = new FileSystemClassLoader(useTagletPath).loadClass(option[1]); + } + catch (ClassNotFoundException e) { + // If not found on specified tagletpath, try default classloader + tagletClass + = Class.forName(option[1]); + } + Method registerTagletMethod + = tagletClass.getDeclaredMethod("register", new Class[] { java.util.Map.class }); + + if (!registerTagletMethod.getReturnType().equals(Void.TYPE)) { + printError("Taglet class '" + option[1] + "' found, but register method doesn't return void."); + } + else if (registerTagletMethod.getExceptionTypes().length > 0) { + printError("Taglet class '" + option[1] + "' found, but register method contains throws clause."); + } + else if ((registerTagletMethod.getModifiers() & (Modifier.STATIC | Modifier.PUBLIC | Modifier.ABSTRACT)) != (Modifier.STATIC | Modifier.PUBLIC)) { + printError("Taglet class '" + option[1] + "' found, but register method isn't public static, or is abstract.."); + } + else { + Map tempMap = new HashMap(); + registerTagletMethod.invoke(null, new Object[] { tempMap }); + tagletLoaded = true; + String name = (String)tempMap.keySet().iterator().next(); + Taglet taglet = (Taglet)tempMap.get(name); + tagletMap.put(name, taglet); + mentionedTags.add(taglet); + } + } + catch (NoSuchMethodException e) { + printError("Taglet class '" + option[1] + "' found, but doesn't contain the register method."); + } + catch (SecurityException e) { + printError("Taglet class '" + option[1] + "' cannot be loaded: " + e.getMessage()); + } + catch (InvocationTargetException e) { + printError("Taglet class '" + option[1] + "' found, but register method throws exception: " + e.toString()); + } + catch (IllegalAccessException e) { + printError("Taglet class '" + option[1] + "' found, but there was a problem when accessing the register method: " + e.toString()); + } + catch (IllegalArgumentException e) { + printError("Taglet class '" + option[1] + "' found, but there was a problem when accessing the register method: " + e.toString()); + } + catch (ClassNotFoundException e) { + printError("Taglet class '" + option[1] + "' cannot be found."); + } + if (!tagletLoaded) { + return false; + } + } + else if ("-author".equals(optionTag)) { + AuthorTaglet.setTagletEnabled(true); + } + else if ("-version".equals(optionTag)) { + VersionTaglet.setTagletEnabled(true); + } + else if ("-nosince".equals(optionTag)) { + SinceTaglet.setTagletEnabled(false); + } + else if ("-nodeprecated".equals(optionTag)) { + DeprecatedTaglet.setTagletEnabled(false); + } + else if ("-authormail".equals(optionTag)) { + + if ("no-replace".equalsIgnoreCase(option[1])) { + AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NO_REPLACEMENT); + } + else if ("mailto-name".equalsIgnoreCase(option[1])) { + AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.MAILTO_NAME); + } + else if ("name-mailto-address".equalsIgnoreCase(option[1])) { + AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NAME_MAILTO_ADDRESS); + } + else if ("name-mangled-address".equalsIgnoreCase(option[1])) { + AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NAME_MANGLED_ADDRESS); + } + else { + printError("Invalid value for option '-authortag-email'. Allowed values are:" + + " no-replace, mailto-name, name-mailto-address, name-mangled-address."); + return false; + } + } + else if ("-mailmangledot".equals(optionTag)) { + AuthorTaglet.setDotReplacement(option[1]); + } + else if ("-mailmangleat".equals(optionTag)) { + AuthorTaglet.setAtReplacement(option[1]); + } + else if ("-docfilessubdirs".equals(optionTag)) { + docFilesSubdirsEnabled = true; + } + else if ("-excludedocfilessubdir".equals(optionTag)) { + StringTokenizer st = new StringTokenizer(option[1]); + while (st.hasMoreTokens()) { + excludeDocFilesSubDirs.add(st.nextToken()); + } + } + else if ("-nonavbar".equals(optionTag)) { + docTransletOptions.nonavbar = true; + } + else if ("-noindex".equals(optionTag)) { + docTransletOptions.noindex = true; + } + else if ("-notree".equals(optionTag)) { + docTransletOptions.notree = true; + } + else if ("-nocomment".equals(optionTag)) { + docTransletOptions.nocomment = true; + } + else if ("-nohelp".equals(optionTag)) { + docTransletOptions.nohelp = true; + } + else if ("-splitindex".equals(optionTag)) { + docTransletOptions.splitindex = true; + } + else if ("-linksource".equals(optionTag)) { + docTransletOptions.linksource = true; + } + else if ("-windowtitle".equals(optionTag)) { + docTransletOptions.windowtitle = option[1]; + } + else if ("-helpfile".equals(optionTag)) { + docTransletOptions.helpfile = new File(option[1]).toURL().toString(); + } + else if ("-stylesheetfile".equals(optionTag)) { + docTransletOptions.stylesheetfile = new File(option[1]).toURL().toString(); + } + else if ("-header".equals(optionTag)) { + docTransletOptions.header = option[1]; + } + else if ("-footer".equals(optionTag)) { + docTransletOptions.footer = option[1]; + } + else if ("-bottom".equals(optionTag)) { + docTransletOptions.bottom = option[1]; + } + else if ("-doctitle".equals(optionTag)) { + docTransletOptions.doctitle = option[1]; + } + else if ("-nodeprecatedlist".equals(optionTag)) { + docTransletOptions.nodeprecatedlist = true; + } + else if ("-uses".equals(optionTag)) { + docTransletOptions.uses = true; + } + else if ("-group".equals(optionTag)) { + if (!processGroupOption(option[1], option[2])) { + printError("Invalid package wildcard list in -group option \"" + option[1] + "\" " + option[2]); + return false; + } + } + else if ("-tag".equals(optionTag)) { + String tagSpec = option[1]; + boolean validTagSpec = false; + int ndx1 = tagSpec.indexOf(':'); + if (ndx1 < 0) { + Taglet taglet = (Taglet)tagletMap.get(tagSpec); + if (null == taglet) { + printError("There is no standard tag '" + tagSpec + "'."); + } + else { + if (mentionedTags.contains(taglet)) { + printError("Tag '" + tagSpec + "' has been added or moved before."); + } + else { + mentionedTags.add(taglet); + + // re-append taglet + tagletMap.remove(tagSpec); + tagletMap.put(tagSpec, taglet); + } + } + } + else { + int ndx2 = tagSpec.indexOf(':', ndx1 + 1); + if (ndx2 > ndx1 && ndx2 < tagSpec.length() - 1) { + String tagName = tagSpec.substring(0, ndx1); + String tagHead = null; + if (tagSpec.charAt(ndx2 + 1) == '\"') { + if (tagSpec.charAt(tagSpec.length() - 1) == '\"') { + tagHead = tagSpec.substring(ndx2 + 2, tagSpec.length() - 1); + validTagSpec = true; + } + } + else { + tagHead = tagSpec.substring(ndx2 + 1); + validTagSpec = true; + } + + boolean tagScopeOverview = false; + boolean tagScopePackages = false; + boolean tagScopeTypes = false; + boolean tagScopeConstructors = false; + boolean tagScopeMethods = false; + boolean tagScopeFields = false; + boolean tagDisabled = false; + + tag_option_loop: + for (int n=ndx1+1; n:Xaoptcmf:\"."); + } + } + } + + // Use current directory if target directory hasn't been set. + if (null == targetDirectory) { + targetDirectory = new File(System.getProperty("user.dir")); + } + if (null != targetContext) { + targetContext.setTargetDirectory(targetDirectory); + } + + // It is illegal to specify targets AND -xmlonly. + + if (xmlOnly && targets.size() > 0) { + + printError("You can only specify one of -xmlonly and a target format."); + return false; + } + + // If no target was specified and XML only was not + // requested, use HTML as default target. + + if (!xmlOnly && targets.size() == 0) { + targets.add(targetContext = htmlTargetContext); + } + + // Set the same target directory for all output. + + // FIXME: Allow separate target directories for different + // output formats. + + for (Iterator it = targets.iterator(); it.hasNext(); ) { + TargetContext t = (TargetContext)it.next(); + t.setTargetDirectory(targetDirectory); + } + + // Create temporary directory if necessary + + if (xmlOnly) { + + xmlTargetDirectory = targetDirectory; + } + else { + + File workingTopDirectory = new File(workingPath); + + workingDirectory = new File(workingTopDirectory, "gjdoc.tmp."+System.currentTimeMillis()); + + if (!workingDirectory.mkdir()) { + printError("Cannot create temporary directory at "+System.getProperty("java.io.tmpdir")); + return false; + } + + File xmlTempDirectory = new File(workingDirectory, "xmloutput"); + + if (!xmlTempDirectory.mkdir()) { + printError("Cannot create temporary directory for XML output at "+System.getProperty("java.io.tmpdir")); + return false; + } + + xmlTargetDirectory = xmlTempDirectory; + } + + // Create target directory if necessary + + if (!targetDirectory.exists()) { + printNotice("Creating destination directory: \"" + + targetDirectory + "\""); + if (!targetDirectory.mkdirs()) { + printError("Failed to create destination directory \"" + + targetDirectory + "\""); + return false; + } + } + + // Check for deprecation + + boolean hasDeprecatedClasses = false; + boolean hasDeprecatedInterfaces = false; + boolean hasDeprecatedExceptions = false; + boolean hasDeprecatedErrors = false; + boolean hasDeprecatedMethods = false; + boolean hasDeprecatedFields = false; + + { + ClassDoc[] classes = rootDoc.classes(); + for (int i = 0, ilim = classes.length; i < ilim; ++ i) { + ClassDoc c = classes[i]; + Tag[] deprecatedTags = c.tags("deprecated"); + if (null != deprecatedTags && 0 != deprecatedTags.length) { + if (c.isInterface()) { + hasDeprecatedInterfaces = true; + } + else if (c.isException()) { + hasDeprecatedExceptions = true; + } + else if (c.isError()) { + hasDeprecatedErrors = true; + } + else /*if (c.isOrdinaryClass())*/ { + hasDeprecatedClasses = true; + } + } + + MethodDoc[] methods = c.methods(); + for (int j = 0, jlim = methods.length; j < jlim; ++ j) { + MethodDoc m = methods[j]; + deprecatedTags = m.tags("deprecated"); + if (null != deprecatedTags && 0 != deprecatedTags.length) { + hasDeprecatedMethods = true; + } + } + + FieldDoc[] fields = c.fields(); + for (int j = 0, jlim = fields.length; j < jlim; ++ j) { + FieldDoc f = fields[j]; + deprecatedTags = f.tags("deprecated"); + if (null != deprecatedTags && 0 != deprecatedTags.length) { + hasDeprecatedFields = true; + } + } + } + } + + htmlRepairer = new HtmlRepairer(rootDoc, noHTMLWarn, noEmailWarn, + currentClass, currentMember, + false); + + collectUsage(); + + // Begin XML generation + + printNotice("Writing XML Index file..."); + + // Assign output stream + + setTargetFile("index.xml"); + + // Output XML document header + + println(0, ""); + println(""); + println(); + printOpenTag(0, "rootdoc xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\""); + + println(); + println(1, ""); + + if (rootDoc.firstSentenceTags().length > 0) { + printOpenTag(2, "firstSentenceTags", false); + outputTags(3, rootDoc.firstSentenceTags(), true, CONTEXT_PACKAGE); + printCloseTag(0, "firstSentenceTags"); + } + + if (rootDoc.inlineTags().length > 0) { + printOpenTag(2, "inlineTags"); + outputTags(3, rootDoc.inlineTags(), true, CONTEXT_PACKAGE); + printCloseTag(2, "inlineTags"); + } + + if (null != bottomNote) { + printOpenTag(1, "bottomnote"); + print(bottomNote); + printCloseTag(1, "bottomnote"); + } + + if (null != title) { + printOpenTag(1, "title"); + println(2, title); + printCloseTag(1, "title"); + } + + printOpenTag(1, "created"); + println(2, DateFormat.getDateInstance(DateFormat.LONG, Locale.US).format(new java.util.Date())); + printCloseTag(1, "created"); + + if (hasDeprecatedClasses) printAtomTag(1, "hasDeprecatedClasses"); + if (hasDeprecatedInterfaces) printAtomTag(1, "hasDeprecatedInterfaces"); + if (hasDeprecatedExceptions) printAtomTag(1, "hasDeprecatedExceptions"); + if (hasDeprecatedErrors) printAtomTag(1, "hasDeprecatedErrors"); + if (hasDeprecatedMethods) printAtomTag(1, "hasDeprecatedMethods"); + if (hasDeprecatedFields) printAtomTag(1, "hasDeprecatedFields"); + + // Output summary of all classes specified on command line + + println(); + println(1, ""); + ClassDoc[] specifiedClasses = rootDoc.specifiedClasses(); + for (int i=0, ilim=specifiedClasses.length; i"); + PackageDoc[] specifiedPackages = rootDoc.specifiedPackages(); + for (int i=0, ilim=specifiedPackages.length; i"); + { + Iterator packageGroupIt = packageGroups.iterator(); + while (packageGroupIt.hasNext()) { + PackageGroup packageGroup = (PackageGroup)packageGroupIt.next(); + SortedSet groupedPackages = packageGroup.getPackages(); + if (groupedPackages.isEmpty()) { + printWarning("Package group named '" + + packageGroup.getName() + "' didn't match any packages."); + } + else { + printOpenTag(1, "packagegroup name=\"" + packageGroup.getName() + "\""); + Iterator groupedPackageIt = groupedPackages.iterator(); + while (groupedPackageIt.hasNext()) { + PackageDoc groupedPackageDoc = (PackageDoc)groupedPackageIt.next(); + printAtomTag(2, "package name=\"" + groupedPackageDoc.name() + "\""); + } + printCloseTag(1, "packagegroup"); + } + } + packageGroups = null; + } + + // Output information on all packages for which documentation + // has been made available via the Doclet API + + println(); + println(1, ""); + PackageDoc[] packages = rootDoc.specifiedPackages(); + for (int i=0, ilim=packages.length; i"); + ClassDoc[] sumclasses = rootDoc.classes(); + for (int i=0, ilim=sumclasses.length; i"); + ClassDoc[] classes = rootDoc.classes(); + String prevPackageName = null; + for (int i = 0, ilim = classes.length; i < ilim; ++ i) { + ClassDoc c = classes[i]; + + if (isVerbose()) { + printNotice("Writing XML information for "+c.qualifiedName()+"..."); + } + else { + String packageName = c.containingPackage().name(); + if (null == prevPackageName || !packageName.equals(prevPackageName)) { + printNotice("Writing XML information for "+packageName+"..."); + prevPackageName = packageName; + } + } + + setTargetFile(c.qualifiedName().replace('/','.')+".xml"); + + println(""); + println(""); + + outputClassDoc(c); + + closeTargetFile(); + } + classes = null; + } + + // Copy DTD files to temporary directory + + // FIXME: try to solve this via jar: URLs. but this will + // probably break libxmlj compatibility (?) + + String[] resources = new String[] { + "gjdoc.dtd", + "gjdoc-alphaindex.dtd", + "dbcentx.mod", + "ent/iso-amsa.ent", + "ent/iso-amsb.ent", + "ent/iso-amsc.ent", + "ent/iso-amsn.ent", + "ent/iso-amso.ent", + "ent/iso-amsr.ent", + "ent/iso-box.ent", + "ent/iso-cyr1.ent", + "ent/iso-cyr2.ent", + "ent/iso-dia.ent", + "ent/iso-grk1.ent", + "ent/iso-grk2.ent", + "ent/iso-grk3.ent", + "ent/iso-grk4.ent", + "ent/iso-lat1.ent", + "ent/iso-lat2.ent", + "ent/iso-num.ent", + "ent/iso-pub.ent", + "ent/iso-tech.ent", + }; + + File tempDtdDirectory = new File(xmlTargetDirectory, "dtd"); + File tempDtdEntDirectory = new File(tempDtdDirectory, "ent"); + + if ((tempDtdDirectory.exists() || tempDtdDirectory.mkdir()) + && (tempDtdEntDirectory.exists() || tempDtdEntDirectory.mkdir())) { + for (int i = 0; i < resources.length; ++ i) { + copyResourceToFile("/dtd/" + resources[i], + new File(tempDtdDirectory, resources[i])); + } + } + else { + printError("Cannot create temporary directories for DTD data at " + tempDtdDirectory); + return false; + } + + // Copy package data-dir directory + + { + PackageDoc[] packages = rootDoc.specifiedPackages(); + for (int i=0, ilim=packages.length; irm -Rf directory + * + * @return true on success + */ + private static boolean deleteRecursive(File directory) { + + boolean success = true; + + File[] files = directory.listFiles(); + + for (int i=0, ilim=files.length; i"); + } + + /** + * Prints an open tag at the given indentation level. + */ + protected void printOpenTag(int level, String tag) { + printOpenTag(level, replaceCharsInTag(tag), true); + } + + /** + * Prints an open tag at the given indentation level and + * conditionally appends a newline (if not in tight mode). + */ + protected void printOpenTag(int level, String tag, boolean appendNewline) { + if (appendNewline && !compress) { + println(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">"); + } + else { + print(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">"); + } + } + + /** + * Prints a close tag at the given indentation level. + */ + protected void printCloseTag(int level, String tag) { + printCloseTag(level, tag, true); + } + + /** + * Prints a close tag at the given indentation level and + * conditionally appends a newline (if not in tight mode). + */ + protected void printCloseTag(int level, String tag, boolean appendNewline) { + if (appendNewline && !compress) { + println(level, ""); + } + else { + print(level, ""); + } + } + + public static int optionLength(String option) { + if ("-d".equals(option)) return 2; + else if ("-fixhtml".equals(option)) return 1; + else if ("-compress".equals(option)) return 1; + else if ("-nohtmlwarn".equals(option)) return 1; + else if ("-noemailwarn".equals(option)) return 1; + else if ("-indentstep".equals(option)) return 2; + else if ("-xslsheet".equals(option)) return 2; + else if ("-xsltdriver".equals(option)) return 2; + else if ("-postprocess".equals(option)) return 2; + else if ("-genhtml".equals(option)) return 1; + else if ("-geninfo".equals(option)) return 1; + else if ("-gendocbook".equals(option)) return 1; + else if ("-xmlonly".equals(option)) return 1; + else if ("-bottomnote".equals(option)) return 2; + else if ("-workpath".equals(option)) return 2; + else if ("-title".equals(option)) return 2; + else if ("-tagletpath".equals(option)) return 2; + else if ("-taglet".equals(option)) return 2; + else if ("-authormail".equals(option)) return 2; + else if ("-mailmangledot".equals(option)) return 2; + else if ("-mailmangleat".equals(option)) return 2; + else if ("-noindex".equals(option)) return 1; + else if ("-nocomment".equals(option)) return 1; + else if ("-notree".equals(option)) return 1; + else if ("-nohelp".equals(option)) return 1; + else if ("-nonavbar".equals(option)) return 1; + else if ("-splitindex".equals(option)) return 1; + else if ("-author".equals(option)) return 1; + else if ("-version".equals(option)) return 1; + else if ("-nosince".equals(option)) return 1; + else if ("-nodeprecated".equals(option)) return 1; + else if ("-linksource".equals(option)) return 1; + else if ("-windowtitle".equals(option)) return 2; + else if ("-helpfile".equals(option)) return 2; + else if ("-stylesheetfile".equals(option)) return 2; + else if ("-tag".equals(option)) return 2; + else if ("-header".equals(option)) return 2; + else if ("-footer".equals(option)) return 2; + else if ("-bottom".equals(option)) return 2; + else if ("-doctitle".equals(option)) return 2; + else if ("-nodeprecatedlist".equals(option)) return 1; + else if ("-uses".equals(option)) return 1; + else if ("-group".equals(option)) return 3; + + else return -1; + } + + public static boolean validOptions(String[][] options) { + return true; + } + + + /** + * Workaround for non well-formed comments: fix tag contents + * by replacing < with &lt;, + * > with &gt; and + * & with &amp;. + * + * @param tagContent String to process + * + * @return given String with all special characters replaced by + * HTML entities. + */ + private static String replaceCharsInTag(String tagContent) { + return + replaceString( + replaceString( + replaceString( + tagContent, + "<", "<" + ), + ">", ">" + ), + "&", "&" + ); + } + + /** + * Replaces all occurences of string needle within string + * haystack by string replacement. + * + * @param haystack The string to search and replace in. + * @param needle The string which is searched for. + * @param replacement The string by which every occurence of needle is replaced. + */ + private static String replaceString(String haystack, String needle, String replacement) { + int ndx = haystack.indexOf(needle); + if (ndx<0) + return haystack; + else + return haystack.substring(0, ndx) + replacement + + replaceString(haystack.substring(ndx+needle.length()), needle, replacement); + } + + protected void setTargetFile(String filename) throws IOException { + + OutputStream fileOut = new FileOutputStream(new File(xmlTargetDirectory, filename)); + out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(fileOut, "UTF8")));; + } + + protected void closeTargetFile() { + + out.flush(); + out.close(); + } + + private String cdata(String str) { + + if (null==str) { + return str; + } // end of if ((null==str) + + StringBuffer rc = new StringBuffer(); + for (int i=0; i=0x20 && c<=0xd7ff) || (c>=0xe000 && c<=0xfffd) || (c>=0x10000 && c<=0x10ffff)) { + rc.append(c); + } + else { + printWarning("Invalid Unicode character 0x"+Integer.toString(c, 16)+" in javadoc markup has been stripped."); + } // end of else + + } + return rc.toString(); + } + + static void copyResourceToFile(String resourceName, File target) throws IOException { + + InputStream in = Driver.class.getResourceAsStream(resourceName); + + if (null != in) { + + FileOutputStream out = new FileOutputStream(target); + int size; + byte[] buffer = new byte[512]; + while ((size = in.read(buffer)) >= 0) { + out.write(buffer, 0, size); + } + out.close(); + } + else { + + throw new IOException("Can't find resource named "+resourceName); + } + } + + private void printError(String error) { + if (null != rootDoc) { + rootDoc.printError(error); + } + else { + System.err.println("ERROR: "+error); + } + } + + private void printWarning(String warning) { + if (null != rootDoc) { + rootDoc.printWarning(warning); + } + else { + System.err.println("WARNING: "+warning); + } + } + + private void printNotice(String notice) { + if (null != rootDoc) { + rootDoc.printNotice(notice); + } + else { + System.err.println(notice); + } + } + + /** + * Copy the contents of the input directory to the output + * directory. The output directory must exist. + */ + private void copyPackageDataDir(GjdocPackageDoc packageDoc) throws IOException { + File docFilesSourceDirectory + = new File(packageDoc.packageDirectory(), "doc-files"); + File docFilesTargetDirectory + = new File(this.targetDirectory, + packageDoc.name().replace('.', File.separatorChar)); + if (docFilesSourceDirectory.exists()) { + printNotice("Copying files from " + docFilesSourceDirectory); + copyDirectory(docFilesSourceDirectory, docFilesTargetDirectory, + docFilesSubdirsEnabled, + excludeDocFilesSubDirs); + } + } + + /** + * Recursively copy the contents of the input directory to the + * output directory. The output directory must exist. + */ + private static void copyDirectory(File sourceDir, File targetDir, + boolean recursive, + Set excludeDirs) throws IOException { + if (!targetDir.exists() && !targetDir.mkdirs()) { + throw new IOException("Cannot create directory " + targetDir); + } + + File[] sourceFiles = sourceDir.listFiles(); + for (int i=0; i= 0) { + out.write(buf, 0, nread); + } + in.close(); + out.close(); + } + + private void createIndexByName() throws IOException { + // Create index + + // Collect index + + Map indexMap = new TreeMap(new Comparator() { + public int compare(Object o1, Object o2) { + return o1.toString().toLowerCase().compareTo(o2.toString().toLowerCase()); + } + }); + + // Add packages to index + + PackageDoc[] packages = rootDoc.specifiedPackages(); + for (int i=0, ilim=packages.length; i 0) { + signature.append(", "); + } + signature.append(parameters[k].typeName()); + } + signature.append(')'); + indexMap.put(signature.toString(), method); + } + } + + // Assign output stream + + setTargetFile("alphaindex.xml"); + + // Output XML document header + + println(0, ""); + println(""); + println(); + printOpenTag(0, "alphaindex xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\""); + + Iterator it = indexMap.keySet().iterator(); + + char previousCategoryLetter = '\0'; + boolean categoryOpen = false; + + while (it.hasNext()) { + String key = (String)it.next(); + Doc entry = (Doc)indexMap.get(key); + + char firstChar = Character.toUpperCase(key.charAt(0)); + if (firstChar != previousCategoryLetter) { + if (categoryOpen) { + printCloseTag(1, "category"); + } + printOpenTag(1, "category letter=\"" + firstChar + "\""); + categoryOpen = true; + previousCategoryLetter = firstChar; + } + + printOpenTag(2, "entry name=\"" + key + "\""); + if (entry instanceof PackageDoc) { + printAtomTag(3, "isPackage"); + } + else if (entry instanceof ClassDoc) { + printAtomTag(3, "isClass"); + ClassDoc centry = (ClassDoc)entry; + currentClass = centry; + printAtomTag(3, "containingPackage name=\"" + centry.containingPackage().name() + "\""); + if (null != centry.containingClass()) { + printAtomTag(3, "containingClass name=\"" + centry.containingClass().name() + "\""); + } + if (centry.isInterface()) { + printAtomTag(3, "isInterface"); + } + if (centry.isException()) { + printAtomTag(3, "isException"); + } + if (centry.isError()) { + printAtomTag(3, "isError"); + } + if (centry.isOrdinaryClass()) { + printAtomTag(3, "isOrdinaryClass"); + } + } + else if (entry instanceof ProgramElementDoc) { + ProgramElementDoc pentry = (ProgramElementDoc)entry; + currentClass = pentry.containingClass(); + printAtomTag(3, "containingPackage name=\"" + pentry.containingPackage().name() + "\""); + printAtomTag(3, "containingClass name=\"" + pentry.containingClass().name() + "\""); + if (pentry.isMethod()) { + printAtomTag(3, "isMethod"); + ExecutableMemberDoc mentry = (ExecutableMemberDoc)pentry; + printAtomTag(3, "signature full=\""+mentry.signature()+"\" flat=\""+mentry.flatSignature()+"\""); + printAtomTag(3, "method name=\"" + mentry.name() + "\""); + } + if (pentry.isField()) { + printAtomTag(3, "isField"); + } + } + + Tag[] tags = entry.firstSentenceTags(); + for (int i=0, ilim=tags.length; i0) { + printOpenTag(3, "firstSentenceTags", false); + outputTags(4, tag.firstSentenceTags(), false, CONTEXT_TYPE); + printCloseTag(3, "firstSentenceTags"); + } + } + + + printCloseTag(2, "entry"); + } + + if (categoryOpen) { + printCloseTag(1, "category"); + } + + printCloseTag(0, "alphaindex"); + + closeTargetFile(); + } + + private static class UsageType + { + public static final UsageType CLASS_DERIVED_FROM = new UsageType("class-derived-from"); + public static final UsageType FIELD_OF_TYPE = new UsageType("field-of-type"); + public static final UsageType METHOD_WITH_RETURN_TYPE = new UsageType("method-with-return-type"); + public static final UsageType METHOD_WITH_PARAMETER_TYPE = new UsageType("method-with-parameter-type"); + public static final UsageType METHOD_WITH_THROWN_TYPE = new UsageType("method-with-thrown-type"); + public static final UsageType CONSTRUCTOR_WITH_PARAMETER_TYPE = new UsageType("constructor-with-parameter-type"); + public static final UsageType CONSTRUCTOR_WITH_THROWN_TYPE = new UsageType("constructor-with-thrown-type"); + private String id; + + private UsageType(String id) + { + this.id = id; + } + + public String toString() { + return "UsageType{id=" + id + "}"; + } + + public String getId() { + return id; + } + } + + /** + * ClassDoc -> (PackageDoc -> (UsageType -> (Set of Doc))) + */ + private Map usedClassToPackagesMap = new HashMap(); + + private void addUsedBy(ClassDoc usedClass, UsageType usageType, Doc user, PackageDoc userPackage) + { + Map packageToUsageTypeMap = (Map)usedClassToPackagesMap.get(usedClass); + if (null == packageToUsageTypeMap) { + packageToUsageTypeMap = new HashMap(); + usedClassToPackagesMap.put(usedClass, packageToUsageTypeMap); + } + + Map usageTypeToUsersMap = (Map)packageToUsageTypeMap.get(userPackage); + if (null == usageTypeToUsersMap) { + usageTypeToUsersMap = new HashMap(); + packageToUsageTypeMap.put(userPackage, usageTypeToUsersMap); + } + + Set userSet = (Set)usageTypeToUsersMap.get(usageType); + if (null == userSet) { + userSet = new TreeSet(); // FIXME: we need the collator from Main here + usageTypeToUsersMap.put(usageType, userSet); + } + userSet.add(user); + } + + /** + * Create the cross reference database. + */ + private void collectUsage() { + + ClassDoc[] classes = rootDoc.classes(); + for (int i = 0, ilim = classes.length; i < ilim; ++ i) { + ClassDoc clazz = classes[i]; + + // classes derived from + for (ClassDoc superclass = clazz.superclass(); superclass != null; + superclass = superclass.superclass()) { + addUsedBy(superclass, UsageType.CLASS_DERIVED_FROM, clazz, clazz.containingPackage()); + } + + FieldDoc[] fields = clazz.fields(); + for (int j = 0, jlim = fields.length; j < jlim; ++ j) { + FieldDoc field = fields[j]; + + // fields of type + ClassDoc fieldType = field.type().asClassDoc(); + if (null != fieldType) { + addUsedBy(fieldType, UsageType.FIELD_OF_TYPE, + field, clazz.containingPackage()); + } + } + + MethodDoc[] methods = clazz.methods(); + for (int j = 0, jlim = methods.length; j < jlim; ++ j) { + MethodDoc method = methods[j]; + + // methods with return type + + ClassDoc returnType = method.returnType().asClassDoc(); + if (null != returnType) { + addUsedBy(returnType, UsageType.METHOD_WITH_RETURN_TYPE, + method, clazz.containingPackage()); + } + Parameter[] parameters = method.parameters(); + for (int k=0; k"); - } - */ - - protected void outputClassDoc(ClassDoc classDoc) - throws IOException - { - super.outputClassDoc(classDoc); - //outputSourcePosition(level, doc.position()); - } - - protected void outputFieldDocBody(int level, FieldDoc fieldDoc) { - super.outputFieldDocBody(level, fieldDoc); - //println(level, ""+fieldDoc.constantValueExpression()+""); - } - -} +/* gnu.classpath.tools.doclets.xmldoclet.Driver1_4 + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.doclets.xmldoclet; + +import com.sun.javadoc.*; +import java.io.IOException; + +/** + * A Doclet which retrieves all information presented by the Doclet + * API, dumping it to stdout in XML format. + * + * Supports Doclet API Version 1.4. + * + * @author Julian Scheid + */ +public class Driver1_4 extends Driver { + + /** + * Official Doclet entry point. + */ + public static boolean start(RootDoc root) { + + // Create a new XmlDoclet instance and delegate control. + return new Driver1_4().instanceStart(root); + } + + /* since 1.4 + private void outputSourcePosition(int level, SourcePosition sourcePosition) { + println(level, ""); + } + */ + + protected void outputClassDoc(ClassDoc classDoc) + throws IOException + { + super.outputClassDoc(classDoc); + //outputSourcePosition(level, doc.position()); + } + + protected void outputFieldDocBody(int level, FieldDoc fieldDoc) { + super.outputFieldDocBody(level, fieldDoc); + //println(level, ""+fieldDoc.constantValueExpression()+""); + } + +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java index df9be0ae583..175d4e864a1 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java @@ -1,674 +1,691 @@ -/* gnu.classpath.tools.doclets.xmldoclet.HtmlRepairer.java - Copyright (C) 2003 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.doclets.xmldoclet; - -import java.io.*; -import java.util.*; -import com.sun.javadoc.DocErrorReporter; -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.MemberDoc; - -/** - * Provides methods for tidying up HTML source. - * - * @author Julian Scheid - */ -public final class HtmlRepairer { - - private static class TagInfo { - - private Set parentTags = new HashSet(); - - public TagInfo(String parentTag) { - this.parentTags.add(parentTag); - } - - public TagInfo(String[] parentTagArr) { - for (int i=0; i element"); - } - } - - private void haveStartOrEndTag(String tag) { - - boolean _isLeadingTag = isLeadingTag; - isLeadingTag = false; - - tag = tag.trim(); - - boolean isEndTag = tag.startsWith("/"); - boolean isAtomTag = tag.endsWith("/"); - - if (isEndTag && isAtomTag) { - // got something like '' which is invalid. - // suppose a close tag was intended. - tag = tag.substring(0, tag.length()-1); - } - - if (tag.length() < 1) { - printWarning("Deleting broken tag"); - return; - } - - String tagName = tag.substring(isEndTag?1:0, isAtomTag?tag.length()-1:tag.length()); - String tagAttributes = ""; - - for (int i=0; i=0) { - tagAttributes = tagName.substring(i).trim(); - tagName = tagName.substring(0, i); - break; - } - } - - if (!isEndTag && tagName.indexOf('@')>0) { - if (!noEmailWarn) { - printWarning("Tag looks like email address: <"+tagName+">"); - } - output.append("<"+tag+">"); - return; - } - - tagName = tagName.toLowerCase(); - - if (_isLeadingTag && "p".equals(tagName) && !isEndTag && throwAwayLeadingPara) { - return; - } - - if ("p".equals(tagName) || "br".equals(tagName) || "hr".equals(tagName)) { - // throw away

    and
    - if (isEndTag) { - return; - } - // make sure every

    is a

    and every
    is a
    - else if (!isAtomTag) { - tag += "/"; - isAtomTag = true; - } - } - - if (isEndTag) { - - // check whether this close tag is on the stack - // if yes, close all tags up to this tag - if (tagStack.contains(tagName)) { - String popped; - do { - popped = (String)tagStack.pop(); - if (!popped.equals(tagName)) - printWarning("Inserting '"); - output.append(""); - } - while (!popped.equals(tagName)); - } - // if not, just throw it away - else { - printWarning("Deleting <"+tag+">"); - } - } - else { - - final int STATE_INITIAL = 1; - final int STATE_EXPECT_ATTRIBUTENAME = 2; - final int STATE_UNQUOTED_ATTRIBUTEVALUE = 3; - final int STATE_SINGLEQUOTE_ATTRIBUTEVALUE = 4; - final int STATE_DOUBLEQUOTE_ATTRIBUTEVALUE = 5; - final int STATE_EXPECT_ATTRIBUTEVALUE = 6; - final int STATE_EXPECT_EQUALSIGN = 7; - - int state = STATE_INITIAL; - - String newAttributes = ""; - String attributeName = null; - StringBuffer buf = new StringBuffer(); - - char[] attrsAsChars = tagAttributes.toCharArray(); - for (int i=0, ilim=attrsAsChars.length+1; i=0){ - continue; - } - else if (-1==c) { - continue; - } - else { - state = STATE_EXPECT_ATTRIBUTENAME; - buf.append((char)c); - } - break; - - case STATE_EXPECT_ATTRIBUTENAME: - if ('='==c) { - attributeName = buf.toString(); - buf.setLength(0); - state = STATE_EXPECT_ATTRIBUTEVALUE; - } - else if (-1==c) { - attributeName = buf.toString(); - buf.setLength(0); - printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\""); - } - else if (" \t\r\n".indexOf(c)>=0) { - state = STATE_EXPECT_EQUALSIGN; - } - else { - buf.append((char)c); - } - break; - - case STATE_EXPECT_EQUALSIGN: - if (" \t\r\n".indexOf(c)>=0){ - continue; - } - else if ('='==c) { - state = STATE_EXPECT_ATTRIBUTEVALUE; - attributeName = buf.toString(); - buf.setLength(0); - } - else { - attributeName = buf.toString(); - buf.setLength(0); - printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\""); - newAttributes += " "+attributeName+"=\""+attributeName+"\""; - buf.append((char)c); - state = STATE_EXPECT_ATTRIBUTENAME; - } - break; - - case STATE_EXPECT_ATTRIBUTEVALUE: - if (" \t\r\n".indexOf(c)>=0){ - continue; - } - else if ('\"'==c) { - state = STATE_DOUBLEQUOTE_ATTRIBUTEVALUE; - } - else if ('\''==c) { - state = STATE_SINGLEQUOTE_ATTRIBUTEVALUE; - } - else { - state = STATE_UNQUOTED_ATTRIBUTEVALUE; - buf.append((char)c); - } - break; - - case STATE_UNQUOTED_ATTRIBUTEVALUE: - if (-1==c || " \t\r\n".indexOf(c)>=0){ - state = STATE_INITIAL; - newAttributes += " "+attributeName + "=\"" + buf.toString() + "\""; - buf.setLength(0); - } - else { - buf.append((char)c); - } - break; - - case STATE_SINGLEQUOTE_ATTRIBUTEVALUE: - if ('\''==c) { - state = STATE_INITIAL; - newAttributes += " "+attributeName + "=\"" + buf.toString() + "\""; - buf.setLength(0); - } - else { - buf.append((char)c); - } - break; - - case STATE_DOUBLEQUOTE_ATTRIBUTEVALUE: - if ('\"'==c) { - state = STATE_INITIAL; - newAttributes += " "+attributeName + "=\"" + buf.toString() + "\""; - buf.setLength(0); - } - else { - buf.append((char)c); - } - break; - } - } - - - if (!isAtomTag) { - - // check whether this open tag is equal to the topmost - // entry on the stack; if yes, emit a close tag first - - // corrects stuff like '......'); - if (!tagStack.isEmpty() && tagStack.peek().equals(tagName)) { - printWarning("Inserting "); - output.append(""); - tagStack.pop(); - } - else { - processKnownChildTags(tagName, tagStack, output); - } - - // otherwise, we assume there are no close tags required - // before this open tag. - tagStack.push(tagName); - - output.append("<"+tagName+newAttributes+">"); - } - else { - output.append("<"+tagName+newAttributes+"/>"); - } - } - } - - private boolean processKnownChildTags(String tagName, Stack tagStack, StringBuffer output) { - - TagInfo tagInfo = (TagInfo)tagInfoMap.get(tagName); - if (null != tagInfo) { - - String parentTag = null; - for (Enumeration en = tagStack.elements(); en.hasMoreElements(); ) { - String tag = (String)en.nextElement(); - if (tagInfo.isLegalParentTag(tag)) { - parentTag = tag; - break; - } - } - if (parentTag != null) { - while (((String)tagStack.peek()) != parentTag) { - String poppedTagName = (String)tagStack.pop(); - output.append(""); - printWarning("Inserting "); - } - return true; - } - } - return false; - } - - private void flush() { - - // close all pending tags - while (!tagStack.isEmpty()) { - String tagName = (String)tagStack.pop(); - printWarning("Inserting "); - output.append(""); - } - } - - /** - * Takes HTML fragment and returns a well-formed XHTML - * equivalent. - * - * In the returned String, all tags are properly closed and - * nested. - * - * Currently, the returned String is not guaranteed to be - * well-formed. In particular there are no checks on the tag - * names, attribute names and entity names. - */ - public String getWellformedHTML(String text) { - - final int STATE_INITIAL = 1; - final int STATE_TAG_START = 2; - final int STATE_TAG = 3; - final int STATE_TAG_DOUBLEQUOTE = 4; - final int STATE_TAG_SINGLEQUOTE = 5; - final int STATE_AMP = 6; - - int state = STATE_INITIAL; - output.setLength(0); - - - StringBuffer buf = new StringBuffer(); - char[] textAsChars = text.toCharArray(); - - outer_loop: - for (int i=0, ilim=textAsChars.length+1; i0) { - haveText(buf.toString()); - buf.setLength(0); - } - } - else if ('>'==c) { - // assume this is a greater-than sign - buf.append(">"); - } - else if ('&'==c) { - state = STATE_AMP; - } - else if (-1==c) { - if (buf.length()>0) { - haveText(buf.toString()); - buf.setLength(0); - } - continue; - } - else { - buf.append((char)c); - } - break; - - case STATE_AMP: - if ('<'==c) { - buf.append("&"); - state = STATE_TAG_START; - if (buf.length()>0) { - haveText(buf.toString()); - buf.setLength(0); - } - } - else if ('>'==c) { - // assume this is a greater-than sign - buf.append("&"); - buf.append(">"); - state = STATE_INITIAL; - } - else if ('&'==c) { - buf.append("&"); - buf.append("&"); - state = STATE_INITIAL; - } - else if (-1==c) { - buf.append("&"); - haveText(buf.toString()); - buf.setLength(0); - state = STATE_INITIAL; - continue; - } - else { - // peek forward and see whether this is a valid entity. - if ('#'==c) { - buf.append("&"); - buf.append((char)c); - state = STATE_INITIAL; - continue outer_loop; - } - else if (Character.isLetter((char)c)) { - for (int i2=i+1; i2=0) { - //continue; - - // new: assume this is a less-sign - haveText("<"+c); - state = STATE_INITIAL; - } - else if ('/'==c) { - buf.append((char)c); - state = STATE_TAG; - } - else if ('<'==c) { - // assume this is a less-sign - haveText("<<"); - state = STATE_INITIAL; - } - else if ('>'==c) { - // assume this is a less-sign - haveText("<>"); - state = STATE_INITIAL; - } - //else if ('-'==c || '+'==c || '='==c || '\''==c || "0123456789".indexOf(c)>=0) { - else if (!Character.isLetter((char)c)) { - // assume this is a less-sign - haveText("<"+(char)c); - state = STATE_INITIAL; - } - else { - buf.append((char)c); - state = STATE_TAG; - } - break; - - case STATE_TAG: - if ('\"'==c) { - buf.append((char)c); - state = STATE_TAG_DOUBLEQUOTE; - } - else if ('\''==c) { - buf.append((char)c); - state = STATE_TAG_SINGLEQUOTE; - } - else if ('>'==c) { - state = STATE_INITIAL; - haveStartOrEndTag(buf.toString()); - buf.setLength(0); - } - else if ('<'==c) { - // notify user, missing greater-than sign - haveStartOrEndTag(buf.toString()); - buf.setLength(0); - } - else if (-1==c) { - printWarning("Unclosed tag at end-of-comment: <"+buf); - haveStartOrEndTag(buf.toString()); - buf.setLength(0); - } - else { - buf.append((char)c); - } - break; - - case STATE_TAG_DOUBLEQUOTE: - if ('\"'==c) { - buf.append((char)c); - state = STATE_TAG; - } - else if (-1==c) { - printWarning("Unclosed attribute value at end-of-comment."); - haveStartOrEndTag(buf.toString()+"\""); - } - else { - buf.append((char)c); - } - break; - - case STATE_TAG_SINGLEQUOTE: - if ('\''==c) { - buf.append((char)c); - state = STATE_TAG; - } - else if (-1==c) { - printWarning("Unclosed attribute value at end-of-comment."); - haveStartOrEndTag(buf.toString()+"'"); - } - else { - buf.append((char)c); - } - break; - } - } - - return output.toString(); - } - - private String getContext() { - if (null != contextClass) { - StringBuffer rc = new StringBuffer(); - rc.append(contextClass.qualifiedTypeName()); - if (null != contextMember) { - rc.append("."+contextMember.toString()); - } - return rc.toString(); - } - else { - return null; - } - } - - private void printWarning(String msg) { - if (null != warningReporter && !noWarn) { - String context = getContext(); - if (null != context) { - warningReporter.printWarning("In "+getContext()+": "+msg); - } - else { - warningReporter.printWarning("In overview page: "+msg); - } - } - } - - public String terminateText() { - output.setLength(0); - flush(); - return output.toString(); - } -} - +/* gnu.classpath.tools.doclets.xmldoclet.HtmlRepairer.java + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.doclets.xmldoclet; + +import java.io.*; +import java.util.*; +import com.sun.javadoc.DocErrorReporter; +import com.sun.javadoc.ClassDoc; +import com.sun.javadoc.MemberDoc; + +/** + * Provides methods for tidying up HTML source. + * + * @author Julian Scheid + */ +public final class HtmlRepairer { + + private static class TagInfo { + + private Set parentTags = new HashSet(); + + public TagInfo(String parentTag) { + this.parentTags.add(parentTag); + } + + public TagInfo(String[] parentTagArr) { + for (int i=0; i element"); + } + } + + private void haveStartOrEndTag(String tag) { + + boolean _isLeadingTag = isLeadingTag; + isLeadingTag = false; + + tag = tag.trim(); + + boolean isEndTag = tag.startsWith("/"); + boolean isAtomTag = tag.endsWith("/"); + + if (isEndTag && isAtomTag) { + // got something like '' which is invalid. + // suppose a close tag was intended. + tag = tag.substring(0, tag.length()-1); + } + + if (tag.length() < 1) { + printWarning("Deleting broken tag"); + return; + } + + String tagName = tag.substring(isEndTag?1:0, isAtomTag?tag.length()-1:tag.length()); + String tagAttributes = ""; + + for (int i=0; i=0) { + tagAttributes = tagName.substring(i).trim(); + tagName = tagName.substring(0, i); + break; + } + } + + if (!isEndTag && tagName.indexOf('@')>0) { + if (!noEmailWarn) { + printWarning("Tag looks like email address: <"+tagName+">"); + } + output.append("<"+tag+">"); + return; + } + + tagName = tagName.toLowerCase(); + + if (_isLeadingTag && "p".equals(tagName) && !isEndTag && throwAwayLeadingPara) { + return; + } + + if ("p".equals(tagName) || "br".equals(tagName) || "hr".equals(tagName)) { + // throw away

    and
    + if (isEndTag) { + return; + } + // make sure every

    is a

    and every
    is a
    + else if (!isAtomTag) { + tag += "/"; + isAtomTag = true; + } + } + + if (isEndTag) { + + // check whether this close tag is on the stack + // if yes, close all tags up to this tag + if (tagStack.contains(tagName)) { + String popped; + do { + popped = (String)tagStack.pop(); + if (!popped.equals(tagName)) + printWarning("Inserting '"); + output.append(""); + } + while (!popped.equals(tagName)); + } + // if not, just throw it away + else { + printWarning("Deleting <"+tag+">"); + } + } + else { + + final int STATE_INITIAL = 1; + final int STATE_EXPECT_ATTRIBUTENAME = 2; + final int STATE_UNQUOTED_ATTRIBUTEVALUE = 3; + final int STATE_SINGLEQUOTE_ATTRIBUTEVALUE = 4; + final int STATE_DOUBLEQUOTE_ATTRIBUTEVALUE = 5; + final int STATE_EXPECT_ATTRIBUTEVALUE = 6; + final int STATE_EXPECT_EQUALSIGN = 7; + + int state = STATE_INITIAL; + + String newAttributes = ""; + String attributeName = null; + StringBuffer buf = new StringBuffer(); + + char[] attrsAsChars = tagAttributes.toCharArray(); + for (int i=0, ilim=attrsAsChars.length+1; i=0){ + continue; + } + else if (-1==c) { + continue; + } + else { + state = STATE_EXPECT_ATTRIBUTENAME; + buf.append((char)c); + } + break; + + case STATE_EXPECT_ATTRIBUTENAME: + if ('='==c) { + attributeName = buf.toString(); + buf.setLength(0); + state = STATE_EXPECT_ATTRIBUTEVALUE; + } + else if (-1==c) { + attributeName = buf.toString(); + buf.setLength(0); + printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\""); + } + else if (" \t\r\n".indexOf(c)>=0) { + state = STATE_EXPECT_EQUALSIGN; + } + else { + buf.append((char)c); + } + break; + + case STATE_EXPECT_EQUALSIGN: + if (" \t\r\n".indexOf(c)>=0){ + continue; + } + else if ('='==c) { + state = STATE_EXPECT_ATTRIBUTEVALUE; + attributeName = buf.toString(); + buf.setLength(0); + } + else { + attributeName = buf.toString(); + buf.setLength(0); + printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\""); + newAttributes += " "+attributeName+"=\""+attributeName+"\""; + buf.append((char)c); + state = STATE_EXPECT_ATTRIBUTENAME; + } + break; + + case STATE_EXPECT_ATTRIBUTEVALUE: + if (" \t\r\n".indexOf(c)>=0){ + continue; + } + else if ('\"'==c) { + state = STATE_DOUBLEQUOTE_ATTRIBUTEVALUE; + } + else if ('\''==c) { + state = STATE_SINGLEQUOTE_ATTRIBUTEVALUE; + } + else { + state = STATE_UNQUOTED_ATTRIBUTEVALUE; + buf.append((char)c); + } + break; + + case STATE_UNQUOTED_ATTRIBUTEVALUE: + if (-1==c || " \t\r\n".indexOf(c)>=0){ + state = STATE_INITIAL; + newAttributes += " "+attributeName + "=\"" + buf.toString() + "\""; + buf.setLength(0); + } + else { + buf.append((char)c); + } + break; + + case STATE_SINGLEQUOTE_ATTRIBUTEVALUE: + if ('\''==c) { + state = STATE_INITIAL; + newAttributes += " "+attributeName + "=\"" + buf.toString() + "\""; + buf.setLength(0); + } + else { + buf.append((char)c); + } + break; + + case STATE_DOUBLEQUOTE_ATTRIBUTEVALUE: + if ('\"'==c) { + state = STATE_INITIAL; + newAttributes += " "+attributeName + "=\"" + buf.toString() + "\""; + buf.setLength(0); + } + else { + buf.append((char)c); + } + break; + } + } + + + if (!isAtomTag) { + + // check whether this open tag is equal to the topmost + // entry on the stack; if yes, emit a close tag first + + // corrects stuff like '......'); + if (!tagStack.isEmpty() && tagStack.peek().equals(tagName)) { + printWarning("Inserting "); + output.append(""); + tagStack.pop(); + } + else { + processKnownChildTags(tagName, tagStack, output); + } + + // otherwise, we assume there are no close tags required + // before this open tag. + tagStack.push(tagName); + + output.append("<"+tagName+newAttributes+">"); + } + else { + output.append("<"+tagName+newAttributes+"/>"); + } + } + } + + private boolean processKnownChildTags(String tagName, Stack tagStack, StringBuffer output) { + + TagInfo tagInfo = (TagInfo)tagInfoMap.get(tagName); + if (null != tagInfo) { + + String parentTag = null; + for (Enumeration en = tagStack.elements(); en.hasMoreElements(); ) { + String tag = (String)en.nextElement(); + if (tagInfo.isLegalParentTag(tag)) { + parentTag = tag; + break; + } + } + if (parentTag != null) { + while (((String)tagStack.peek()) != parentTag) { + String poppedTagName = (String)tagStack.pop(); + output.append(""); + printWarning("Inserting "); + } + return true; + } + } + return false; + } + + private void flush() { + + // close all pending tags + while (!tagStack.isEmpty()) { + String tagName = (String)tagStack.pop(); + printWarning("Inserting "); + output.append(""); + } + } + + /** + * Takes HTML fragment and returns a well-formed XHTML + * equivalent. + * + * In the returned String, all tags are properly closed and + * nested. + * + * Currently, the returned String is not guaranteed to be + * well-formed. In particular there are no checks on the tag + * names, attribute names and entity names. + */ + public String getWellformedHTML(String text) { + + final int STATE_INITIAL = 1; + final int STATE_TAG_START = 2; + final int STATE_TAG = 3; + final int STATE_TAG_DOUBLEQUOTE = 4; + final int STATE_TAG_SINGLEQUOTE = 5; + final int STATE_AMP = 6; + + int state = STATE_INITIAL; + output.setLength(0); + + + StringBuffer buf = new StringBuffer(); + char[] textAsChars = text.toCharArray(); + + outer_loop: + for (int i=0, ilim=textAsChars.length+1; i0) { + haveText(buf.toString()); + buf.setLength(0); + } + } + else if ('>'==c) { + // assume this is a greater-than sign + buf.append(">"); + } + else if ('&'==c) { + state = STATE_AMP; + } + else if (-1==c) { + if (buf.length()>0) { + haveText(buf.toString()); + buf.setLength(0); + } + continue; + } + else { + buf.append((char)c); + } + break; + + case STATE_AMP: + if ('<'==c) { + buf.append("&"); + state = STATE_TAG_START; + if (buf.length()>0) { + haveText(buf.toString()); + buf.setLength(0); + } + } + else if ('>'==c) { + // assume this is a greater-than sign + buf.append("&"); + buf.append(">"); + state = STATE_INITIAL; + } + else if ('&'==c) { + buf.append("&"); + buf.append("&"); + state = STATE_INITIAL; + } + else if (-1==c) { + buf.append("&"); + haveText(buf.toString()); + buf.setLength(0); + state = STATE_INITIAL; + continue; + } + else { + // peek forward and see whether this is a valid entity. + if ('#'==c) { + buf.append("&"); + buf.append((char)c); + state = STATE_INITIAL; + continue outer_loop; + } + else if (Character.isLetter((char)c)) { + for (int i2=i+1; i2=0) { + //continue; + + // new: assume this is a less-sign + haveText("<"+c); + state = STATE_INITIAL; + } + else if ('/'==c) { + buf.append((char)c); + state = STATE_TAG; + } + else if ('<'==c) { + // assume this is a less-sign + haveText("<<"); + state = STATE_INITIAL; + } + else if ('>'==c) { + // assume this is a less-sign + haveText("<>"); + state = STATE_INITIAL; + } + //else if ('-'==c || '+'==c || '='==c || '\''==c || "0123456789".indexOf(c)>=0) { + else if (!Character.isLetter((char)c)) { + // assume this is a less-sign + haveText("<"+(char)c); + state = STATE_INITIAL; + } + else { + buf.append((char)c); + state = STATE_TAG; + } + break; + + case STATE_TAG: + if ('\"'==c) { + buf.append((char)c); + state = STATE_TAG_DOUBLEQUOTE; + } + else if ('\''==c) { + buf.append((char)c); + state = STATE_TAG_SINGLEQUOTE; + } + else if ('>'==c) { + state = STATE_INITIAL; + haveStartOrEndTag(buf.toString()); + buf.setLength(0); + } + else if ('<'==c) { + // notify user, missing greater-than sign + haveStartOrEndTag(buf.toString()); + buf.setLength(0); + } + else if (-1==c) { + printWarning("Unclosed tag at end-of-comment: <"+buf); + haveStartOrEndTag(buf.toString()); + buf.setLength(0); + } + else { + buf.append((char)c); + } + break; + + case STATE_TAG_DOUBLEQUOTE: + if ('\"'==c) { + buf.append((char)c); + state = STATE_TAG; + } + else if (-1==c) { + printWarning("Unclosed attribute value at end-of-comment."); + haveStartOrEndTag(buf.toString()+"\""); + } + else { + buf.append((char)c); + } + break; + + case STATE_TAG_SINGLEQUOTE: + if ('\''==c) { + buf.append((char)c); + state = STATE_TAG; + } + else if (-1==c) { + printWarning("Unclosed attribute value at end-of-comment."); + haveStartOrEndTag(buf.toString()+"'"); + } + else { + buf.append((char)c); + } + break; + } + } + + return output.toString(); + } + + private String getContext() { + if (null != contextClass) { + StringBuffer rc = new StringBuffer(); + rc.append(contextClass.qualifiedTypeName()); + if (null != contextMember) { + rc.append("."+contextMember.toString()); + } + return rc.toString(); + } + else { + return null; + } + } + + private void printWarning(String msg) { + if (null != warningReporter && !noWarn) { + String context = getContext(); + if (null != context) { + warningReporter.printWarning("In "+getContext()+": "+msg); + } + else { + warningReporter.printWarning("In overview page: "+msg); + } + } + } + + public String terminateText() { + output.setLength(0); + flush(); + return output.toString(); + } +} + diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java index 72dd9f6a6bc..6fdb8cb4875 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java @@ -1,86 +1,103 @@ -/* gnu.classpath.tools.doclets.xmldoclet.TargetContext - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.doclets.xmldoclet; - -import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; - -import java.net.URL; - -import java.util.List; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; - -import gnu.classpath.tools.doclets.xmldoclet.doctranslet.DocTranslet; - -/** - * Stores any XSL transformation and postprocessing-specific - * information given by the user on the doclet command line. - * - * @author Julian Scheid - */ -public class TargetContext { - - /** - * The DocTranslet to use for processing doclet output. - */ - private DocTranslet docTranslet; - - /** - * Directory to write final output to. - */ - private File targetDirectory; - - /** - * Directory where XSLT output will be written to. If an XSLT - * sheet was specified, but no postprocessing driver was given, - * this is the target directory specified by the user. Otherwise, - * this is a temporary directory. - */ - private File xsltTargetDirectory; - - - public TargetContext(DocTranslet docTranslet, File targetDirectory) { - this.docTranslet = docTranslet; - this.targetDirectory = targetDirectory; - } - - public File getTargetDirectory() { - return targetDirectory; - } - - public void setTargetDirectory(File targetDirectory) { - this.targetDirectory = targetDirectory; - } - - public DocTranslet getDocTranslet() { - return docTranslet; - } - - public void setDocTranslet(DocTranslet docTranslet) { - this.docTranslet = docTranslet; - } -} +/* gnu.classpath.tools.doclets.xmldoclet.TargetContext + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.doclets.xmldoclet; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +import java.net.URL; + +import java.util.List; +import java.util.Iterator; +import java.util.Map; +import java.util.HashMap; + +import gnu.classpath.tools.doclets.xmldoclet.doctranslet.DocTranslet; + +/** + * Stores any XSL transformation and postprocessing-specific + * information given by the user on the doclet command line. + * + * @author Julian Scheid + */ +public class TargetContext { + + /** + * The DocTranslet to use for processing doclet output. + */ + private DocTranslet docTranslet; + + /** + * Directory to write final output to. + */ + private File targetDirectory; + + /** + * Directory where XSLT output will be written to. If an XSLT + * sheet was specified, but no postprocessing driver was given, + * this is the target directory specified by the user. Otherwise, + * this is a temporary directory. + */ + private File xsltTargetDirectory; + + + public TargetContext(DocTranslet docTranslet, File targetDirectory) { + this.docTranslet = docTranslet; + this.targetDirectory = targetDirectory; + } + + public File getTargetDirectory() { + return targetDirectory; + } + + public void setTargetDirectory(File targetDirectory) { + this.targetDirectory = targetDirectory; + } + + public DocTranslet getDocTranslet() { + return docTranslet; + } + + public void setDocTranslet(DocTranslet docTranslet) { + this.docTranslet = docTranslet; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java index 573ca368c6a..3a8cabceb23 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.xmldoclet.doctranslet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java index b25d77ef38f..1992d166249 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.xmldoclet.doctranslet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java index e672c628e51..bfb3f7697bd 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.xmldoclet.doctranslet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java index 0c6813082ea..8bf65835898 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.xmldoclet.doctranslet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java index 50a9681e1b8..f6eb679f84b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.doclets.xmldoclet.doctranslet; diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java index 92a1fba27be..b4e394cec54 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java @@ -1,49 +1,66 @@ -/* gnu.classpath.tools.doclets.xmldoclet.doctranslet.OutputFileInfo - Copyright (C) 2003 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.doclets.xmldoclet.doctranslet; - -/** - * Holds information about a file to be generated by the DocTranslet. - */ -public class OutputFileInfo { - - private String name; - private String source; - private String sheet; - private String comment; - private String info; - - public OutputFileInfo(String name, String source, String sheet, String comment, String info) { - this.name = name; - this.source = source; - this.sheet = sheet; - this.comment = comment; - this.info = info; - } - - public String getName() { return name; } - public String getSource() { return source; } - public String getSheet() { return sheet; } - public String getComment() { return comment; } - public String getInfo() { return info; } - - public String toString() { return "OutputFileInfo{name="+name+",source="+source+",sheet="+sheet+",comment="+comment+",info="+info+"}"; } -} +/* gnu.classpath.tools.doclets.xmldoclet.doctranslet.OutputFileInfo + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.doclets.xmldoclet.doctranslet; + +/** + * Holds information about a file to be generated by the DocTranslet. + */ +public class OutputFileInfo { + + private String name; + private String source; + private String sheet; + private String comment; + private String info; + + public OutputFileInfo(String name, String source, String sheet, String comment, String info) { + this.name = name; + this.source = source; + this.sheet = sheet; + this.comment = comment; + this.info = info; + } + + public String getName() { return name; } + public String getSource() { return source; } + public String getSheet() { return sheet; } + public String getComment() { return comment; } + public String getInfo() { return info; } + + public String toString() { return "OutputFileInfo{name="+name+",source="+source+",sheet="+sheet+",comment="+comment+",info="+info+"}"; } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java index 4a638e25426..2ec5af477bc 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java index 8c23e989acd..4bfac862f53 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java index fee68006f40..b1012247164 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java index 79abf3dc6ee..6dfe821bc50 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java index 2920e89f235..b3fd83c7339 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java @@ -16,7 +16,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + 02111-1307 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java index f114485c19b..06785ae0f17 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java index 06f39a4fa1b..3dddf43d26c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java index 7d8e4bc5c54..da365d98329 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java index 163051380ff..86680799e37 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java index a72c53e43f2..129689bc9ae 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java @@ -1,104 +1,121 @@ -/* gnu.classpath.tools.gjdoc.ErrorReporter - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.gjdoc; - -import com.sun.javadoc.*; -import java.io.*; -import java.util.*; -import java.lang.reflect.*; - -/** - * Simple implementation of a DocErrorReporter: writes - * to System.err. - */ -public class ErrorReporter implements DocErrorReporter { - - private PrintStream out; - - /** - * Keeps track of the number of errors occured - * during generation. - */ - private int errorCount=0; - - /** - * Keeps track of the number of warnings occured - * during generation. - */ - private int warningCount=0; - - /* - * When true, no notices will be emitted. - */ - private boolean quiet = false; - - /* - * When true, no warnings will be emitted. - */ - private boolean noWarn = false; - - public ErrorReporter() - { - this.out = System.err; - } - - // Print error message, increment error count. - public void printError(java.lang.String msg) { - out.println("ERROR: "+msg); - ++errorCount; - } - - // Print error message, increment error count. - public void printFatal(java.lang.String msg) { - out.println("FATAL: "+msg); - System.exit(10); - } - - // Print a message. - public void printNotice(java.lang.String msg) { - if (!quiet) { - out.println(msg); - } - } - - // Print warning message, increment warning count. - public void printWarning(java.lang.String msg) { - if (!noWarn) { - out.println("WARNING: "+msg); - ++warningCount;; - } - } - - public int getErrorCount() { - return errorCount; - } - - public int getWarningCount() { - return warningCount; - } - - /** - * Specify whether notices should be printed. - */ - public void setQuiet(boolean quiet) { - this.quiet = quiet; - } -} +/* gnu.classpath.tools.gjdoc.ErrorReporter + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.gjdoc; + +import com.sun.javadoc.*; +import java.io.*; +import java.util.*; +import java.lang.reflect.*; + +/** + * Simple implementation of a DocErrorReporter: writes + * to System.err. + */ +public class ErrorReporter implements DocErrorReporter { + + private PrintStream out; + + /** + * Keeps track of the number of errors occured + * during generation. + */ + private int errorCount=0; + + /** + * Keeps track of the number of warnings occured + * during generation. + */ + private int warningCount=0; + + /* + * When true, no notices will be emitted. + */ + private boolean quiet = false; + + /* + * When true, no warnings will be emitted. + */ + private boolean noWarn = false; + + public ErrorReporter() + { + this.out = System.err; + } + + // Print error message, increment error count. + public void printError(java.lang.String msg) { + out.println("ERROR: "+msg); + ++errorCount; + } + + // Print error message, increment error count. + public void printFatal(java.lang.String msg) { + out.println("FATAL: "+msg); + System.exit(10); + } + + // Print a message. + public void printNotice(java.lang.String msg) { + if (!quiet) { + out.println(msg); + } + } + + // Print warning message, increment warning count. + public void printWarning(java.lang.String msg) { + if (!noWarn) { + out.println("WARNING: "+msg); + ++warningCount;; + } + } + + public int getErrorCount() { + return errorCount; + } + + public int getWarningCount() { + return warningCount; + } + + /** + * Specify whether notices should be printed. + */ + public void setQuiet(boolean quiet) { + this.quiet = quiet; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java index 7dcdd25d215..f177c1531b6 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java index 8d5b66f819b..341797611ce 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java index 3a3e38f20f3..e0c74cea1a8 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java index 65020d7b7d1..a49be2f9ec3 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java index 773c5fd3b44..95b706acd00 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java index 3728630bcae..f5a507bdb08 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java index 167c5154c7c..ac92dba86a5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java index cbbc8f4f7dd..0c30a48e8b7 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java index aae2462bbf3..07817bcb906 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java index 8654a224991..34f3b28545b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java index d0b28d62742..2f37e445cf8 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java index 2d9567e66c4..499d43e31e2 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java index 9132270bc31..133077d06f4 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java index 4984ead855c..c0ea48ea7bd 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java index 5569d4b014c..030d4ae315d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java @@ -16,7 +16,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + 02111-1307 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java index 19353cc015c..a5588ff46cc 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java index b60a0b6e2fb..21640d2feef 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java @@ -16,7 +16,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + 02111-1307 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java index f126c21aec3..971cdef5285 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java index 14516109966..a4408fc76ae 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java index 605d1321e8d..93f487912f1 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java index 597d73b9160..d3e243ede98 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java index 320ccfd20a8..d51ce239adf 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java index eb3417d42c2..f062b2a8dcc 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java @@ -1,115 +1,132 @@ -/* gnu.classpath.tools.gjdoc.TemporaryStore - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.gjdoc; - -/** - * Useful for passing big objects that are no longer needed by the - * calling method, reducing memory usage.

    - * - * Consider the following problem: - * 

    - *   public class A {
- *     public static void foo() {
- *       long[] hugeArray = new long[1000000]; // takes around 8 MB
- *       // ... fill hugeArray with some information ...
- *       bar(hugeArray);
- *       // ... hugeArray is no more required at this point
- *     }
- *     public static void bar(long[] arr) {
- *       // ... process contents of arr ...
- *       arr = null;
- *       System.gc();      // NOTE: will not collect arr!
- *       // ... do something memory-intensive where arr is not needed
- *     }
- *  }
- *
    - * - * In method bar(), the array cannot be garbage - * collected because the local variable hugeArray in - * method foo() still holds a reference to the array. - *

    - * - * When calling bar(new long[1000000]); in - * arr the array can be collected in - * bar(), but that way it can't be initialized in - * foo(). A local variable is needed for - * initialization, but the variable can't be cleared before it is - * passed to bar()!

    - * - * TemporaryStore is the solution for this - * dilemma. The modified method foo() which uses a - * TemporaryStore object would look like this: - * - * 

    - *     public static void foo() {
- *       long[] hugeArray = new long[1000000]; // takes around 7 MB
- *       // ... fill hugeArray with some very important information ...
- *       TemporaryStore tstore = new TemporaryStore(hugeArray);
- *       hugeArray = null;
- *       bar((long[])tstore.getAndClear());
- *     }
- *
    - * - * When control flow is transferred to bar(), - * foo() will hold no more references to the array - * and so it can be garbage collected in bar(). - * - */ -public class TemporaryStore { - - private Object storedObject; - - /** - * Temporarily store the given object for passing it to a - * different method.

    - * - * The method constructing a new TemporaryStore object should - * clear all other references to the stored object, so that - * this TemporaryStore is the only object referencing it. - * - * @param storedObject the object to store temporarily - * - */ - public TemporaryStore(Object storedObject) { - this.storedObject = storedObject; - } - - /** - * Return the stored object after clearing the reference to it. - *

    - * - * When the user of this class followed the recommendations in - * the documentation of @link{TemporaryStore(Object)}, the - * returned reference will be the only reference to the stored - * object after this method returns. If the returned reference - * is passed in a method call, the called method will hold the - * only reference to the stored object and can release it by - * nulling the corresponding parameter. - * - * @return the object which was passed to the constructor. - * - */ - public Object getAndClear() { - Object rc = this.storedObject; - this.storedObject = null; - return rc; - } -} +/* gnu.classpath.tools.gjdoc.TemporaryStore + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.gjdoc; + +/** + * Useful for passing big objects that are no longer needed by the + * calling method, reducing memory usage.

    + * + * Consider the following problem: + * 

    + *   public class A {
+ *     public static void foo() {
+ *       long[] hugeArray = new long[1000000]; // takes around 8 MB
+ *       // ... fill hugeArray with some information ...
+ *       bar(hugeArray);
+ *       // ... hugeArray is no more required at this point
+ *     }
+ *     public static void bar(long[] arr) {
+ *       // ... process contents of arr ...
+ *       arr = null;
+ *       System.gc();      // NOTE: will not collect arr!
+ *       // ... do something memory-intensive where arr is not needed
+ *     }
+ *  }
+ *
    + * + * In method bar(), the array cannot be garbage + * collected because the local variable hugeArray in + * method foo() still holds a reference to the array. + *

    + * + * When calling bar(new long[1000000]); in + * arr the array can be collected in + * bar(), but that way it can't be initialized in + * foo(). A local variable is needed for + * initialization, but the variable can't be cleared before it is + * passed to bar()!

    + * + * TemporaryStore is the solution for this + * dilemma. The modified method foo() which uses a + * TemporaryStore object would look like this: + * + * 

    + *     public static void foo() {
+ *       long[] hugeArray = new long[1000000]; // takes around 7 MB
+ *       // ... fill hugeArray with some very important information ...
+ *       TemporaryStore tstore = new TemporaryStore(hugeArray);
+ *       hugeArray = null;
+ *       bar((long[])tstore.getAndClear());
+ *     }
+ *
    + * + * When control flow is transferred to bar(), + * foo() will hold no more references to the array + * and so it can be garbage collected in bar(). + * + */ +public class TemporaryStore { + + private Object storedObject; + + /** + * Temporarily store the given object for passing it to a + * different method.

    + * + * The method constructing a new TemporaryStore object should + * clear all other references to the stored object, so that + * this TemporaryStore is the only object referencing it. + * + * @param storedObject the object to store temporarily + * + */ + public TemporaryStore(Object storedObject) { + this.storedObject = storedObject; + } + + /** + * Return the stored object after clearing the reference to it. + *

    + * + * When the user of this class followed the recommendations in + * the documentation of @link{TemporaryStore(Object)}, the + * returned reference will be the only reference to the stored + * object after this method returns. If the returned reference + * is passed in a method call, the called method will hold the + * only reference to the stored object and can release it by + * nulling the corresponding parameter. + * + * @return the object which was passed to the constructor. + * + */ + public Object getAndClear() { + Object rc = this.storedObject; + this.storedObject = null; + return rc; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java index 6d7ee820c8a..f8f19630aad 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java index df0091de08a..b48236af016 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java index d1d832ce529..bd866b3c1b8 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java index 68d2c4d8b66..7d364a17210 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java index a66a85e8911..a0b4cf0d2ca 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java index 4524ab169bf..097b1ff869b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java index 8f0ba79e6ee..14381dff537 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java index 6293602b881..00f599bb2c2 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java @@ -1,27 +1,44 @@ -/* gnu.classpath.tools.gjdoc.WritableType - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.gjdoc; - -public interface WritableType extends Cloneable { - - public void setDimension(String dimension); - public Object clone() throws CloneNotSupportedException; -} +/* gnu.classpath.tools.gjdoc.WritableType + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.gjdoc; + +public interface WritableType extends Cloneable { + + public void setDimension(String dimension); + public Object clone() throws CloneNotSupportedException; +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java index bf9e3ff1c5c..ed2cb24bac8 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java index 9e9e13c99f2..6411cdac70c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java index 4b0a993e5ef..90ae8920387 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java index 97cdf221eb2..519ab828730 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java index 27fe2cf1f22..7b3312e9192 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java index e44551d059e..28ba32f0123 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java index 00bbfccbcad..7314fa9bca7 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java index 91c4441ca3a..c7fbee838e2 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java index a5eac4d98e7..17129e25555 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java index 503421ed4d1..27ed3b308c5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java index b745de41a27..008cee64a2b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java index e4f86f65747..c01dc6a407b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java index 4ef75c642d7..4119dd9d10a 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java index bbe30b29568..ccdeed99547 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java index 56d32308336..a6dfef16935 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java index ad9709277a7..1b8e35a7fce 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java index 3078b4c585c..78f8590c10d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java index cf378dba4f8..0735ff64139 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java index 56217cc02d4..667eb615a93 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java index bfc1a0ad39e..c6828f4ec18 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java index 23f9659076b..e5b1e2532c3 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java index acd020de2bb..ef9f76e8790 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java index 847e2951a1a..ba24cc39230 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java index 99093f7cb0c..f22dffb366d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java index baaf65de642..caa9ae907ff 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java index c31ff884f73..18639adda43 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java index 94c54c25d30..e1d089f235e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java index a268b965e2a..0f51f90dbb7 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java index 563cb1b0dc2..1d4b0fbb72d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java index 660806d599f..6a0f3dc20cd 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java index 647ac77faea..6594b49678e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java index e183482aaf1..51f3cd22d59 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java index d6cf3224b32..2d8df5ea734 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java index bb84a5547e7..315265e93d5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java index 350027ea276..7a3d69e5b6d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java index d57b862c9b3..dbddecb4143 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java index eaf24994e61..9ba697c0be9 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java index 44e50751f09..b78315ed2f4 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java index c315166d0df..dc85eb65c47 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java index 77c33b4fe6a..181bb68e276 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java index c8681177b7d..6375b163dfd 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java index 520380c3408..6108a97bf39 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java index e14a469c22e..6cdb0c9cce0 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java index c3d8ab234dc..c7db2550d5b 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java index 3351b8ef7c4..41bb0fc2be0 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java index af51cf3dea2..132cd35f46c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java index 0aedf12f0de..bebd0ce5170 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java index 14e5edf039e..8f9def918d0 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java index 47f9ea68d60..55c8b996594 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java index 8c06ee27a9d..46f0cc5346c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java index e5421c061bf..9a912b95591 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java index f84970717a6..9eedd66172f 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java b/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java index a7da7c4aa15..70e238ec7a3 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java +++ b/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ /** Java2xhtml.java Version 0.9 * Produces an XHTML file from Java source code with syntax highlighting, diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java index 22278eba84c..4b4d250469c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java @@ -58,21 +58,21 @@ public class ClassWrapper ClassWrapper superClass; - ArrayList interfaceClasses; + ArrayList interfaceClasses; // The virtual table for this class. - ArrayList vtable; + ArrayList vtable; // A set of all the bridge method targets we've found. - HashSet bridgeTargets; + HashSet bridgeTargets; // A set of all the method names in this class. - HashSet methodNames = new HashSet(); + HashSet methodNames = new HashSet(); // This maps a method name + descriptor, e.g. "method()V", to the // name chosen for the method. This is used when computing the // names of bridge method targets. - HashMap methodNameMap = new HashMap(); + HashMap methodNameMap = new HashMap(); public ClassWrapper(Main classpath) { @@ -81,7 +81,7 @@ public class ClassWrapper public boolean hasNativeMethod() { - Iterator i = methods.iterator(); + Iterator i = methods.iterator(); while (i.hasNext()) { MethodNode method = (MethodNode) i.next(); @@ -104,7 +104,7 @@ public class ClassWrapper return false; } - private void linkSupers() throws IOException + void linkSupers() throws IOException { if (superName == null) { @@ -115,7 +115,7 @@ public class ClassWrapper { superClass = classpath.getClass(superName); assert interfaceClasses == null; - interfaceClasses = new ArrayList(); + interfaceClasses = new ArrayList(); for (int i = 0; i < interfaces.size(); ++i) { String ifname = (String) interfaces.get(i); @@ -131,7 +131,7 @@ public class ClassWrapper { for (int i = vtable.size() - 1; i >= 0; --i) { - MethodNode base = (MethodNode) vtable.get(i); + MethodNode base = vtable.get(i); if (MethodHelper.overrides(method, base)) return i; } @@ -140,7 +140,7 @@ public class ClassWrapper private void addInterfaceMethods(ClassWrapper iface) { - Iterator i = iface.methods.iterator(); + Iterator i = iface.methods.iterator(); while (i.hasNext()) { MethodNode im = (MethodNode) i.next(); @@ -159,7 +159,7 @@ public class ClassWrapper { if (base.interfaceClasses == null) return; - Iterator i = base.interfaceClasses.iterator(); + Iterator i = base.interfaceClasses.iterator(); while (i.hasNext()) { ClassWrapper iface = (ClassWrapper) i.next(); @@ -169,7 +169,7 @@ public class ClassWrapper private void addLocalMethods() { - Iterator i = methods.iterator(); + Iterator i = methods.iterator(); while (i.hasNext()) { MethodNode meth = (MethodNode) i.next(); @@ -191,16 +191,16 @@ public class ClassWrapper if (superClass != null) { superClass.makeVtable(); - vtable = new ArrayList(superClass.vtable); - bridgeTargets = new HashSet(superClass.bridgeTargets); - methodNameMap = new HashMap(superClass.methodNameMap); + vtable = new ArrayList(superClass.vtable); + bridgeTargets = new HashSet(superClass.bridgeTargets); + methodNameMap = new HashMap(superClass.methodNameMap); } else { // Object. - vtable = new ArrayList(); - bridgeTargets = new HashSet(); - methodNameMap = new HashMap(); + vtable = new ArrayList(); + bridgeTargets = new HashSet(); + methodNameMap = new HashMap(); } addLocalMethods(); addInterfaces(this); @@ -211,7 +211,7 @@ public class ClassWrapper // methods by definition override a method from the superclass -- // and we have to consider the superclass' header as an // unchangeable entity. - Iterator i = methods.iterator(); + Iterator i = methods.iterator(); while (i.hasNext()) { MethodNode m = (MethodNode) i.next(); @@ -234,7 +234,7 @@ public class ClassWrapper private void printFields(CniPrintStream out) { - Iterator i = fields.iterator(); + Iterator i = fields.iterator(); ClassWrapper self = superClass; while (i.hasNext()) { @@ -251,7 +251,7 @@ public class ClassWrapper // A given method is either static, overrides a super method, or // is already in vtable order. - Iterator i = methods.iterator(); + Iterator i = methods.iterator(); while (i.hasNext()) { MethodNode m = (MethodNode) i.next(); @@ -266,15 +266,15 @@ public class ClassWrapper } } - private void printTextList(PrintStream out, int what, ArrayList textList) + private void printTextList(PrintStream out, int what, ArrayList textList) { if (textList == null) return; - Iterator i = textList.iterator(); + Iterator i = textList.iterator(); boolean first = true; while (i.hasNext()) { - Text item = (Text) i.next(); + Text item = i.next(); if (item.type == what) { if (first) @@ -296,7 +296,7 @@ public class ClassWrapper } // This prints the body of a class to a CxxPrintStream. - private void printContents(CniPrintStream out, ArrayList textList) + private void printContents(CniPrintStream out, ArrayList textList) throws IOException { printTextList(out, Text.PREPEND, textList); @@ -338,7 +338,7 @@ public class ClassWrapper { linkSupers(); - ArrayList textList = classpath.getClassTextList(name); + ArrayList textList = classpath.getClassTextList(name); out.println("// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-"); out.println(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java index 315fd8ae326..52e6e539da7 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java @@ -55,7 +55,7 @@ public class CniPrintStream boolean sawArray; // All the classes referenced by this header. - HashSet allClasses = new HashSet(); + HashSet allClasses = new HashSet(); String[] previousPackage = new String[0]; @@ -245,7 +245,7 @@ public class CniPrintStream out.println(); } - String[] classes = (String[]) allClasses.toArray(new String[0]); + String[] classes = allClasses.toArray(new String[0]); Arrays.sort(classes); boolean first = true; diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java index bbdda9249a1..9b5dc2c3611 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java @@ -103,7 +103,7 @@ public class CniStubPrinter out.println("#include <" + klass.name + ".h>"); out.println(); - Iterator i = klass.methods.iterator(); + Iterator i = klass.methods.iterator(); boolean first = true; while (i.hasNext()) { diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java index 15bcec2630b..0b69d311658 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java @@ -49,7 +49,7 @@ import java.util.ArrayList; public class GcjhMain extends Main { - ArrayList commands = new ArrayList(); + ArrayList commands = new ArrayList(); public GcjhMain() { diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java index ba44a571133..bbede8ea0c3 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java @@ -59,11 +59,13 @@ public class JniIncludePrinter } private void writeFields(ClassWrapper klass, JniPrintStream out) + throws IOException { + klass.linkSupers(); boolean wroteAny = false; for (; klass != null; klass = klass.superClass) { - Iterator i = klass.fields.iterator(); + Iterator i = klass.fields.iterator(); while (i.hasNext()) { FieldNode field = (FieldNode) i.next(); @@ -138,7 +140,7 @@ public class JniIncludePrinter out.println("#endif"); out.println(); - Iterator i = klass.methods.iterator(); + Iterator i = klass.methods.iterator(); while (i.hasNext()) { MethodNode method = (MethodNode) i.next(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniPrintStream.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniPrintStream.java index a0461f475fd..96f9e7d1aa7 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniPrintStream.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniPrintStream.java @@ -54,7 +54,7 @@ public class JniPrintStream Main classpath; // This is used to determine whether a method has an overload. - HashMap methodNameMap = new HashMap(); + HashMap methodNameMap = new HashMap(); public JniPrintStream(Main classpath, OutputStream out, ClassWrapper klass) { @@ -65,7 +65,7 @@ public class JniPrintStream private void computeOverloads(ClassWrapper klass) { - Iterator i = klass.methods.iterator(); + Iterator i = klass.methods.iterator(); while (i.hasNext()) { MethodNode method = (MethodNode) i.next(); @@ -73,11 +73,11 @@ public class JniPrintStream continue; if (methodNameMap.containsKey(method.name)) { - Integer val = (Integer) methodNameMap.get(method.name); - methodNameMap.put(method.name, new Integer(val.intValue() + 1)); + Integer val = methodNameMap.get(method.name); + methodNameMap.put(method.name, Integer.valueOf(val.intValue() + 1)); } else - methodNameMap.put(method.name, new Integer(1)); + methodNameMap.put(method.name, Integer.valueOf(1)); } } diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java index d4b34fc2067..41b90b017db 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java @@ -87,7 +87,7 @@ public class JniStubPrinter out.print(klass.name.replace('/', '_')); out.println(".h>"); - Iterator i = klass.methods.iterator(); + Iterator i = klass.methods.iterator(); while (i.hasNext()) { MethodNode method = (MethodNode) i.next(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java index b281197c5e9..73e2c627caa 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java @@ -152,10 +152,10 @@ public class Keywords "xor_eq" }; - private static final HashSet keywords; + private static final HashSet keywords; static { - keywords = new HashSet(); + keywords = new HashSet(); for (int i = 0; i < words.length; ++i) keywords.add(words[i]); } diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java index bfca4444645..15fd52c8a05 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java @@ -96,10 +96,10 @@ public class Main boolean force; // Map class names to class wrappers. - HashMap classMap = new HashMap(); + HashMap classMap = new HashMap(); // Map class names to lists of Text objects. - HashMap textMap = new HashMap(); + HashMap> textMap = new HashMap>(); void readCommandFile(String textFileName) throws OptionException { @@ -114,7 +114,7 @@ public class Main } BufferedReader reader = new BufferedReader(new InputStreamReader(fis)); String currentClass = null; - ArrayList currentValues = null; + ArrayList currentValues = null; while (true) { String line; @@ -142,7 +142,7 @@ public class Main textMap.put(currentClass, currentValues); } currentClass = value; - currentValues = new ArrayList(); + currentValues = new ArrayList(); continue; } if (currentClass == null) @@ -165,7 +165,7 @@ public class Main } } - void scanDirectory(File dir, final HashSet results) + void scanDirectory(File dir, final HashSet results) { File[] files = dir.listFiles(new FileFilter() { @@ -317,15 +317,15 @@ public class Main return result; } - private void writeHeaders(HashMap klasses, Printer printer) + private void writeHeaders(HashMap klasses, Printer printer) throws IOException { - Iterator i = klasses.entrySet().iterator(); + Iterator> i = klasses.entrySet().iterator(); while (i.hasNext()) { - Map.Entry e = (Map.Entry) i.next(); - File file = (File) e.getKey(); - ClassWrapper klass = (ClassWrapper) e.getValue(); + Map.Entry e = i.next(); + File file = e.getKey(); + ClassWrapper klass = e.getValue(); if (verbose) System.err.println("[writing " + klass + " as " + file + "]"); printer.printClass(file, klass); @@ -368,7 +368,7 @@ public class Main // First we load all of the files. That way if // there are references between the files we will // be loading the set that the user asked for. - HashSet klasses = new HashSet(); + HashSet klasses = new HashSet(); if (allDirectory != null) scanDirectory(new File(allDirectory), klasses); // Add the command-line arguments. We use the type of @@ -385,8 +385,8 @@ public class Main } } - Iterator i = klasses.iterator(); - HashMap results = new HashMap(); + Iterator i = klasses.iterator(); + HashMap results = new HashMap(); while (i.hasNext()) { // Let user specify either kind of class name or a @@ -419,9 +419,9 @@ public class Main writeHeaders(results, printer); } - public ArrayList getClassTextList(String name) + public ArrayList getClassTextList(String name) { - return (ArrayList) textMap.get(name); + return textMap.get(name); } private ClassWrapper readClass(InputStream is) throws IOException diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java index e12e47c540e..8743f9a84f4 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java @@ -64,7 +64,7 @@ public class MethodHelper { if ((meth.access & Opcodes.ACC_BRIDGE) == 0) return null; - Iterator i = meth.instructions.iterator(); + Iterator i = meth.instructions.iterator(); while (i.hasNext()) { AbstractInsnNode insn = (AbstractInsnNode) i.next(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java index ea61eece751..8eec4cc6051 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java @@ -55,11 +55,11 @@ import java.util.StringTokenizer; public class PathOptionGroup extends OptionGroup { - ArrayList classpath = new ArrayList(); + ArrayList classpath = new ArrayList(); - ArrayList bootclasspath = new ArrayList(); + ArrayList bootclasspath = new ArrayList(); - void setPath(ArrayList list, String path) + void setPath(ArrayList list, String path) { list.clear(); StringTokenizer st = new StringTokenizer(path, File.pathSeparator); @@ -69,7 +69,7 @@ public class PathOptionGroup } } - void addExtDirs(ArrayList list, String path) + void addExtDirs(ArrayList list, String path) { StringTokenizer tok = new StringTokenizer(path, File.pathSeparator); while (tok.hasMoreTokens()) @@ -133,15 +133,15 @@ public class PathOptionGroup public URLClassLoader getLoader() throws MalformedURLException { - ArrayList urls = new ArrayList(); + ArrayList urls = new ArrayList(); classpath.addAll(bootclasspath); - Iterator i = classpath.iterator(); + Iterator i = classpath.iterator(); while (i.hasNext()) { - String f = (String) i.next(); + String f = i.next(); urls.add(new File(f).toURL()); } - URL[] urlArray = (URL[]) urls.toArray(new URL[0]); + URL[] urlArray = urls.toArray(new URL[0]); return new URLClassLoader(urlArray); } } diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java index 255946711db..251e2199e0d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java @@ -17,7 +17,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java index 176a09598d2..244b469133e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java @@ -17,7 +17,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java index 70793cf6cd3..270f6eaf806 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java @@ -17,7 +17,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java index 0d77d1a787e..42f291b4fb5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java @@ -17,7 +17,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java index cf4d67f0cc0..c3e363c8da1 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java @@ -17,7 +17,23 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java index 28f4d193144..204bb3be719 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java @@ -17,7 +17,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java index 650468d9465..ecac907657d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java @@ -17,7 +17,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java index 300d60947d7..28eb8d42c56 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java @@ -16,8 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; @@ -25,7 +41,7 @@ package gnu.classpath.tools.rmic; * Thrown by the underlying compiler used by RMIC when it fails to compile a * file. * - * @author Dalibor Topic + * @author Dalibor Topic (robilad@kaffe.org) */ public class RMICException extends Exception diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java index b526bbb9f75..8d1a1e805ba 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java @@ -22,8 +22,18 @@ making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination. -*/ + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java index 60eb854ca4c..db71b21effe 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java @@ -17,7 +17,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; public interface RmicBackend diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java index 20ab8c15637..a6f642b7997 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java @@ -22,8 +22,18 @@ Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination. -*/ +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java index bddf5f78377..e3568e93340 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java @@ -17,7 +17,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java index c51925fa6b9..3737334a458 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java @@ -17,7 +17,23 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.rmic; diff --git a/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java b/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java index a8c526c82ef..ba586170e52 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java @@ -16,8 +16,24 @@ You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + 02111-1307 USA. + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ package gnu.classpath.tools.serialver; diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java index d3bb3719b92..fd6e924f18c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java @@ -1,276 +1,293 @@ -/* gnu.classpath.tools.taglets.AuthorTaglet - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.taglets; - -import java.util.Map; - -import java.util.regex.Pattern; -import java.util.regex.Matcher; - -import com.sun.tools.doclets.Taglet; - -import com.sun.javadoc.Tag; - -/** - * The default Taglet which handles Author information. - * - * @author Julian Scheid (julian@sektor37.de) - */ -public class AuthorTaglet implements Taglet { - - /** - * Enum class which denotes whether and how to replace email - * addresses in author tags. - */ - public static class EmailReplacement { - private EmailReplacement() {} - - /** - * Specifies that email addresses should not be replaced. - */ - public static final EmailReplacement NO_REPLACEMENT = new EmailReplacement(); - - /** - * Specifies that author tag text matching "Real Name - * (user@domain.tld)" is converted to "<a - * href="mailto:user@domain.tld">Real Name</a>. - */ - public static final EmailReplacement MAILTO_NAME = new EmailReplacement(); - - /** - * Specifies that author tag text matching "Real Name - * (user@domain.tld)" is converted to "Real Name (<a - * href="mailto:user@domain.tld">user@domain.tld</a>). - */ - public static final EmailReplacement NAME_MAILTO_ADDRESS = new EmailReplacement(); - - /** - * Specifies that author tag text matching "Real Name - * (user@domain.tld)" is converted to "Real Name (user AT - * domain DOT tld)", where the "AT" and "DOT" replacement are - * specified by AuthorTaglet.emailAtReplacement and - * AuthorTaglet.emailDotReplacement. - */ - public static final EmailReplacement NAME_MANGLED_ADDRESS = new EmailReplacement(); - } - - private static EmailReplacement emailReplacementType = EmailReplacement.NO_REPLACEMENT; - private static String atReplacement = " at "; - private static String dotReplacement = " dot "; - - private static final String NAME = "author"; - private static final String SINGLE_HEADER = "Author:"; - private static final String MULTI_HEADER = "Authors:"; - - private static boolean enabled = true; - - /** - * Matches . (dot). - */ - private static final Pattern dotPattern = Pattern.compile("[.]"); - - /** - * Matches @ (at sign). - */ - private static final Pattern atPattern = Pattern.compile("[@]"); - - /** - * Matches Real Name (user@domain.tld). - */ - private static final Pattern authorEmailPattern - = Pattern.compile("^" - + "\\s*" // optional whitespace - + "(" // group #1 start (real name) - + "(?:[^\t\r\n ]|\\()+" // first name - + "(?:\\s+(?:[^\t\r\n ]|\\()+)*" // additional names - + ")" // group #1 end - + "\\s*" // optional whitespace - + "[(<]" // opening paren - + "\\s*" // optional whitespace - + "(" // group #2 start (email address) - + "(" // group #3 start (email user) - + "[A-z0-9_\\-\\.]+" // username - + ")" // group #3 end - + "[@]" // at sign - + "[A-z0-9_\\-]+(?:[.][A-z0-9_\\-]+)+[A-z]" // domain - + ")" // group #2 end - + "\\s*" // optional whitespace - + "(?:\\)|>)" // closing paren - + "$"); - - public String getName() { - return NAME; - } - - public boolean inField() { - return true; - } - - public boolean inConstructor() { - return true; - } - - public boolean inMethod() { - return true; - } - - public boolean inOverview() { - return true; - } - - public boolean inPackage() { - return true; - } - - public boolean inType() { - return true; - } - - public boolean isInlineTag() { - return false; - } - - public static void register(Map tagletMap) { - AuthorTaglet authorTaglet = new AuthorTaglet(); - tagletMap.put(authorTaglet.getName(), authorTaglet); - } - - public String toString(Tag tag) { - if (enabled) { - return toString(new Tag[] { tag }); - } - else { - return null; - } - } - - public String toString(Tag[] tags) { - if (!enabled || tags.length == 0) { - return null; - } - else { - boolean haveValidTag = false; - for (int i = 0; i < tags.length && !haveValidTag; ++i) { - if (tags[i].text().length() > 0) { - haveValidTag = true; - } - } - - if (haveValidTag) { - StringBuffer result = new StringBuffer(); - result.append("
    "); - result.append("
    "); - if (tags.length == 1) { - result.append(SINGLE_HEADER); - } - else { - result.append(MULTI_HEADER); - } - result.append("
    "); - for (int i = 0; i < tags.length; i++) { - result.append("
    "); - result.append(replaceEmail(tags[i].text())); - result.append("
    "); - } - result.append("
    "); - return result.toString(); - } - else { - return null; - } - } - } - - /** - * Reformat the tag text according to {@link #emailReplacementType}. - */ - private String replaceEmail(String text) { - - if (EmailReplacement.NO_REPLACEMENT == emailReplacementType) { - return text; - } - else { - Matcher matcher = authorEmailPattern.matcher(text); - if (matcher.matches()) { - String realName = matcher.group(1); - String emailAddress = matcher.group(2); - if (EmailReplacement.MAILTO_NAME == emailReplacementType) { - return "" + realName + ""; - } - else if (EmailReplacement.NAME_MAILTO_ADDRESS == emailReplacementType) { - return realName + " (" + emailAddress + ")"; - } - else if (EmailReplacement.NAME_MANGLED_ADDRESS == emailReplacementType) { - Matcher dotMatcher = dotPattern.matcher(emailAddress); - Matcher atMatcher = atPattern.matcher(dotMatcher.replaceAll(dotReplacement)); - String mangledAddress = atMatcher.replaceAll(atReplacement); - return realName + " (" + mangledAddress + ")"; - } - else { - // this shouldn't happen - return text; - } - } - else { - return text; - } - } - } - - /** - * Set the email replacement type. - */ - public static void setEmailReplacementType(EmailReplacement emailReplacementType) - { - if (null == emailReplacementType) { - throw new NullPointerException(); - } - AuthorTaglet.emailReplacementType = emailReplacementType; - } - - /** - * Set the HTML text by which the @ (at sign) in email - * addresses should be replaced if the email replacement type is - * NAME_MANGLED_ADDRESS. - */ - public static void setAtReplacement(String atReplacement) - { - AuthorTaglet.atReplacement = atReplacement; - } - - /** - * Set the HTML text by which the . (dot) in email - * addresses should be replaced if the email replacement type is - * NAME_MANGLED_ADDRESS. - */ - public static void setDotReplacement(String dotReplacement) - { - AuthorTaglet.dotReplacement = dotReplacement; - } - - /** - * Enables/disables this taglet. - */ - public static void setTagletEnabled(boolean enabled) - { - AuthorTaglet.enabled = enabled; - } -} +/* gnu.classpath.tools.taglets.AuthorTaglet + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.taglets; + +import java.util.Map; + +import java.util.regex.Pattern; +import java.util.regex.Matcher; + +import com.sun.tools.doclets.Taglet; + +import com.sun.javadoc.Tag; + +/** + * The default Taglet which handles Author information. + * + * @author Julian Scheid (julian@sektor37.de) + */ +public class AuthorTaglet implements Taglet { + + /** + * Enum class which denotes whether and how to replace email + * addresses in author tags. + */ + public static class EmailReplacement { + private EmailReplacement() {} + + /** + * Specifies that email addresses should not be replaced. + */ + public static final EmailReplacement NO_REPLACEMENT = new EmailReplacement(); + + /** + * Specifies that author tag text matching "Real Name + * (user@domain.tld)" is converted to "<a + * href="mailto:user@domain.tld">Real Name</a>. + */ + public static final EmailReplacement MAILTO_NAME = new EmailReplacement(); + + /** + * Specifies that author tag text matching "Real Name + * (user@domain.tld)" is converted to "Real Name (<a + * href="mailto:user@domain.tld">user@domain.tld</a>). + */ + public static final EmailReplacement NAME_MAILTO_ADDRESS = new EmailReplacement(); + + /** + * Specifies that author tag text matching "Real Name + * (user@domain.tld)" is converted to "Real Name (user AT + * domain DOT tld)", where the "AT" and "DOT" replacement are + * specified by AuthorTaglet.emailAtReplacement and + * AuthorTaglet.emailDotReplacement. + */ + public static final EmailReplacement NAME_MANGLED_ADDRESS = new EmailReplacement(); + } + + private static EmailReplacement emailReplacementType = EmailReplacement.NO_REPLACEMENT; + private static String atReplacement = " at "; + private static String dotReplacement = " dot "; + + private static final String NAME = "author"; + private static final String SINGLE_HEADER = "Author:"; + private static final String MULTI_HEADER = "Authors:"; + + private static boolean enabled = true; + + /** + * Matches . (dot). + */ + private static final Pattern dotPattern = Pattern.compile("[.]"); + + /** + * Matches @ (at sign). + */ + private static final Pattern atPattern = Pattern.compile("[@]"); + + /** + * Matches Real Name (user@domain.tld). + */ + private static final Pattern authorEmailPattern + = Pattern.compile("^" + + "\\s*" // optional whitespace + + "(" // group #1 start (real name) + + "(?:[^\t\r\n ]|\\()+" // first name + + "(?:\\s+(?:[^\t\r\n ]|\\()+)*" // additional names + + ")" // group #1 end + + "\\s*" // optional whitespace + + "[(<]" // opening paren + + "\\s*" // optional whitespace + + "(" // group #2 start (email address) + + "(" // group #3 start (email user) + + "[A-z0-9_\\-\\.]+" // username + + ")" // group #3 end + + "[@]" // at sign + + "[A-z0-9_\\-]+(?:[.][A-z0-9_\\-]+)+[A-z]" // domain + + ")" // group #2 end + + "\\s*" // optional whitespace + + "(?:\\)|>)" // closing paren + + "$"); + + public String getName() { + return NAME; + } + + public boolean inField() { + return true; + } + + public boolean inConstructor() { + return true; + } + + public boolean inMethod() { + return true; + } + + public boolean inOverview() { + return true; + } + + public boolean inPackage() { + return true; + } + + public boolean inType() { + return true; + } + + public boolean isInlineTag() { + return false; + } + + public static void register(Map tagletMap) { + AuthorTaglet authorTaglet = new AuthorTaglet(); + tagletMap.put(authorTaglet.getName(), authorTaglet); + } + + public String toString(Tag tag) { + if (enabled) { + return toString(new Tag[] { tag }); + } + else { + return null; + } + } + + public String toString(Tag[] tags) { + if (!enabled || tags.length == 0) { + return null; + } + else { + boolean haveValidTag = false; + for (int i = 0; i < tags.length && !haveValidTag; ++i) { + if (tags[i].text().length() > 0) { + haveValidTag = true; + } + } + + if (haveValidTag) { + StringBuffer result = new StringBuffer(); + result.append("
    "); + result.append("
    "); + if (tags.length == 1) { + result.append(SINGLE_HEADER); + } + else { + result.append(MULTI_HEADER); + } + result.append("
    "); + for (int i = 0; i < tags.length; i++) { + result.append("
    "); + result.append(replaceEmail(tags[i].text())); + result.append("
    "); + } + result.append("
    "); + return result.toString(); + } + else { + return null; + } + } + } + + /** + * Reformat the tag text according to {@link #emailReplacementType}. + */ + private String replaceEmail(String text) { + + if (EmailReplacement.NO_REPLACEMENT == emailReplacementType) { + return text; + } + else { + Matcher matcher = authorEmailPattern.matcher(text); + if (matcher.matches()) { + String realName = matcher.group(1); + String emailAddress = matcher.group(2); + if (EmailReplacement.MAILTO_NAME == emailReplacementType) { + return "" + realName + ""; + } + else if (EmailReplacement.NAME_MAILTO_ADDRESS == emailReplacementType) { + return realName + " (" + emailAddress + ")"; + } + else if (EmailReplacement.NAME_MANGLED_ADDRESS == emailReplacementType) { + Matcher dotMatcher = dotPattern.matcher(emailAddress); + Matcher atMatcher = atPattern.matcher(dotMatcher.replaceAll(dotReplacement)); + String mangledAddress = atMatcher.replaceAll(atReplacement); + return realName + " (" + mangledAddress + ")"; + } + else { + // this shouldn't happen + return text; + } + } + else { + return text; + } + } + } + + /** + * Set the email replacement type. + */ + public static void setEmailReplacementType(EmailReplacement emailReplacementType) + { + if (null == emailReplacementType) { + throw new NullPointerException(); + } + AuthorTaglet.emailReplacementType = emailReplacementType; + } + + /** + * Set the HTML text by which the @ (at sign) in email + * addresses should be replaced if the email replacement type is + * NAME_MANGLED_ADDRESS. + */ + public static void setAtReplacement(String atReplacement) + { + AuthorTaglet.atReplacement = atReplacement; + } + + /** + * Set the HTML text by which the . (dot) in email + * addresses should be replaced if the email replacement type is + * NAME_MANGLED_ADDRESS. + */ + public static void setDotReplacement(String dotReplacement) + { + AuthorTaglet.dotReplacement = dotReplacement; + } + + /** + * Enables/disables this taglet. + */ + public static void setTagletEnabled(boolean enabled) + { + AuthorTaglet.enabled = enabled; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java index 16ed3d5b0ad..f76e77965aa 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.taglets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java index bb0d9a74d7c..6f744a9f21d 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java @@ -1,106 +1,123 @@ -/* gnu.classpath.tools.taglets.CopyrightTaglet - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.taglets; - -import java.util.Map; - -import com.sun.tools.doclets.Taglet; - -import com.sun.javadoc.Tag; - -/** - * A simple Taglet which handles Copyright information. - */ -public class CopyrightTaglet implements Taglet { - - private static final String NAME = "copyright"; - private static final String HEADER = "Copyright:"; - - public String getName() { - return NAME; - } - - public boolean inField() { - return true; - } - - public boolean inConstructor() { - return true; - } - - public boolean inMethod() { - return true; - } - - public boolean inOverview() { - return true; - } - - public boolean inPackage() { - return true; - } - - public boolean inType() { - return true; - } - - public boolean isInlineTag() { - return false; - } - - public static void register(Map tagletMap) { - CopyrightTaglet copyrightTaglet = new CopyrightTaglet(); - tagletMap.put(copyrightTaglet.getName(), copyrightTaglet); - } - - public String toString(Tag tag) { - return toString(new Tag[] { tag }); - } - - public String toString(Tag[] tags) { - if (tags.length == 0) { - return null; - } - else { - boolean haveValidTag = false; - for (int i = 0; i < tags.length && !haveValidTag; ++i) { - if (tags[i].text().length() > 0) { - haveValidTag = true; - } - } - - if (haveValidTag) { - StringBuffer result = new StringBuffer(); - result.append("
    "); - for (int i = 0; i < tags.length; i++) { - if (tags[i].text().length() > 0) { - result.append("
    Copyright © " + tags[i].text() + "
    "); - } - } - result.append("
    "); - return result.toString(); - } - else { - return null; - } - } - } -} +/* gnu.classpath.tools.taglets.CopyrightTaglet + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.taglets; + +import java.util.Map; + +import com.sun.tools.doclets.Taglet; + +import com.sun.javadoc.Tag; + +/** + * A simple Taglet which handles Copyright information. + */ +public class CopyrightTaglet implements Taglet { + + private static final String NAME = "copyright"; + private static final String HEADER = "Copyright:"; + + public String getName() { + return NAME; + } + + public boolean inField() { + return true; + } + + public boolean inConstructor() { + return true; + } + + public boolean inMethod() { + return true; + } + + public boolean inOverview() { + return true; + } + + public boolean inPackage() { + return true; + } + + public boolean inType() { + return true; + } + + public boolean isInlineTag() { + return false; + } + + public static void register(Map tagletMap) { + CopyrightTaglet copyrightTaglet = new CopyrightTaglet(); + tagletMap.put(copyrightTaglet.getName(), copyrightTaglet); + } + + public String toString(Tag tag) { + return toString(new Tag[] { tag }); + } + + public String toString(Tag[] tags) { + if (tags.length == 0) { + return null; + } + else { + boolean haveValidTag = false; + for (int i = 0; i < tags.length && !haveValidTag; ++i) { + if (tags[i].text().length() > 0) { + haveValidTag = true; + } + } + + if (haveValidTag) { + StringBuffer result = new StringBuffer(); + result.append("
    "); + for (int i = 0; i < tags.length; i++) { + if (tags[i].text().length() > 0) { + result.append("
    Copyright © " + tags[i].text() + "
    "); + } + } + result.append("
    "); + return result.toString(); + } + else { + return null; + } + } + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java index ba406a6ebad..aae4ad357b1 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java @@ -1,115 +1,132 @@ -/* gnu.classpath.tools.taglets.DeprecatedTaglet - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.taglets; - -import java.util.Map; - -import com.sun.tools.doclets.Taglet; - -import com.sun.javadoc.Tag; - -/** - * The default Taglet which handles deprecated information. - * - * @author Julian Scheid (julian@sektor37.de) - */ -public class DeprecatedTaglet implements Taglet { - - private static final String NAME = "deprecated"; - private static final String HEADER = "Deprecated:"; - - private static boolean enabled = true; - - public String getName() { - return NAME; - } - - public boolean inField() { - return true; - } - - public boolean inConstructor() { - return true; - } - - public boolean inMethod() { - return true; - } - - public boolean inOverview() { - return true; - } - - public boolean inPackage() { - return true; - } - - public boolean inType() { - return true; - } - - public boolean isInlineTag() { - return false; - } - - public static void register(Map tagletMap) { - DeprecatedTaglet deprecatedTaglet = new DeprecatedTaglet(); - tagletMap.put(deprecatedTaglet.getName(), deprecatedTaglet); - } - - public String toString(Tag tag) { - if (enabled) { - return toString(new Tag[] { tag }); - } - else { - return null; - } - } - - public String toString(Tag[] tags) { - if (!enabled || tags.length == 0) { - return null; - } - else { - - StringBuffer result = new StringBuffer(); - result.append("
    "); - result.append(HEADER); - result.append("
    "); - result.append("
    "); - for (int i = 0; i < tags.length; i++) { - result.append("
    "); - result.append(tags[i].text()); - result.append("
    "); - } - result.append("
    "); - return result.toString(); - } - } - - /** - * Enables/disables this taglet. - */ - public static void setTagletEnabled(boolean enabled) - { - DeprecatedTaglet.enabled = enabled; - } -} +/* gnu.classpath.tools.taglets.DeprecatedTaglet + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.taglets; + +import java.util.Map; + +import com.sun.tools.doclets.Taglet; + +import com.sun.javadoc.Tag; + +/** + * The default Taglet which handles deprecated information. + * + * @author Julian Scheid (julian@sektor37.de) + */ +public class DeprecatedTaglet implements Taglet { + + private static final String NAME = "deprecated"; + private static final String HEADER = "Deprecated:"; + + private static boolean enabled = true; + + public String getName() { + return NAME; + } + + public boolean inField() { + return true; + } + + public boolean inConstructor() { + return true; + } + + public boolean inMethod() { + return true; + } + + public boolean inOverview() { + return true; + } + + public boolean inPackage() { + return true; + } + + public boolean inType() { + return true; + } + + public boolean isInlineTag() { + return false; + } + + public static void register(Map tagletMap) { + DeprecatedTaglet deprecatedTaglet = new DeprecatedTaglet(); + tagletMap.put(deprecatedTaglet.getName(), deprecatedTaglet); + } + + public String toString(Tag tag) { + if (enabled) { + return toString(new Tag[] { tag }); + } + else { + return null; + } + } + + public String toString(Tag[] tags) { + if (!enabled || tags.length == 0) { + return null; + } + else { + + StringBuffer result = new StringBuffer(); + result.append("
    "); + result.append(HEADER); + result.append("
    "); + result.append("
    "); + for (int i = 0; i < tags.length; i++) { + result.append("
    "); + result.append(tags[i].text()); + result.append("
    "); + } + result.append("
    "); + return result.toString(); + } + } + + /** + * Enables/disables this taglet. + */ + public static void setTagletEnabled(boolean enabled) + { + DeprecatedTaglet.enabled = enabled; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java index 7e18cdcac6d..34eac2badef 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java @@ -1,140 +1,157 @@ -/* gnu.classpath.tools.taglets.GenericTaglet - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.taglets; - -import java.util.Map; - -import com.sun.tools.doclets.Taglet; - -import com.sun.javadoc.Tag; - -/** - * A taglet which can be configured at runtime. - * - * @author Julian Scheid (julian@sektor37.de) - */ -public class GenericTaglet implements Taglet { - - private String name = "since"; - private String header = "Since:"; - - private boolean scopeOverview; - private boolean scopePackage; - private boolean scopeType; - private boolean scopeConstructor; - private boolean scopeMethod; - private boolean scopeField; - - private boolean enabled = true; - - public GenericTaglet(String name, - String header, - boolean scopeOverview, - boolean scopePackage, - boolean scopeType, - boolean scopeConstructor, - boolean scopeMethod, - boolean scopeField) - { - this.name = name; - this.header = header; - this.scopeOverview = scopeOverview; - this.scopePackage = scopePackage; - this.scopeType = scopeType; - this.scopeConstructor = scopeConstructor; - this.scopeMethod = scopeMethod; - this.scopeField = scopeField; - } - - public String getName() { - return name; - } - - public boolean inField() { - return scopeField; - } - - public boolean inConstructor() { - return scopeConstructor; - } - - public boolean inMethod() { - return scopeMethod; - } - - public boolean inOverview() { - return scopeOverview; - } - - public boolean inPackage() { - return scopePackage; - } - - public boolean inType() { - return scopeType; - } - - public boolean isInlineTag() { - return false; - } - - public void register(Map tagletMap) { - tagletMap.put(getName(), this); - } - - public String toString(Tag tag) { - if (enabled) { - return toString(new Tag[] { tag }); - } - else { - return null; - } - } - - public String toString(Tag[] tags) { - if (!enabled || tags.length == 0) { - return null; - } - else { - - StringBuffer result = new StringBuffer(); - result.append("
    "); - result.append(header); - result.append("
    "); - result.append("
    "); - for (int i = 0; i < tags.length; i++) { - result.append("
    "); - result.append(tags[i].text()); - result.append("
    "); - } - result.append("
    "); - return result.toString(); - } - } - - /** - * Enables/disables this taglet. - */ - public void setTagletEnabled(boolean enabled) - { - this.enabled = enabled; - } -} +/* gnu.classpath.tools.taglets.GenericTaglet + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.taglets; + +import java.util.Map; + +import com.sun.tools.doclets.Taglet; + +import com.sun.javadoc.Tag; + +/** + * A taglet which can be configured at runtime. + * + * @author Julian Scheid (julian@sektor37.de) + */ +public class GenericTaglet implements Taglet { + + private String name = "since"; + private String header = "Since:"; + + private boolean scopeOverview; + private boolean scopePackage; + private boolean scopeType; + private boolean scopeConstructor; + private boolean scopeMethod; + private boolean scopeField; + + private boolean enabled = true; + + public GenericTaglet(String name, + String header, + boolean scopeOverview, + boolean scopePackage, + boolean scopeType, + boolean scopeConstructor, + boolean scopeMethod, + boolean scopeField) + { + this.name = name; + this.header = header; + this.scopeOverview = scopeOverview; + this.scopePackage = scopePackage; + this.scopeType = scopeType; + this.scopeConstructor = scopeConstructor; + this.scopeMethod = scopeMethod; + this.scopeField = scopeField; + } + + public String getName() { + return name; + } + + public boolean inField() { + return scopeField; + } + + public boolean inConstructor() { + return scopeConstructor; + } + + public boolean inMethod() { + return scopeMethod; + } + + public boolean inOverview() { + return scopeOverview; + } + + public boolean inPackage() { + return scopePackage; + } + + public boolean inType() { + return scopeType; + } + + public boolean isInlineTag() { + return false; + } + + public void register(Map tagletMap) { + tagletMap.put(getName(), this); + } + + public String toString(Tag tag) { + if (enabled) { + return toString(new Tag[] { tag }); + } + else { + return null; + } + } + + public String toString(Tag[] tags) { + if (!enabled || tags.length == 0) { + return null; + } + else { + + StringBuffer result = new StringBuffer(); + result.append("
    "); + result.append(header); + result.append("
    "); + result.append("
    "); + for (int i = 0; i < tags.length; i++) { + result.append("
    "); + result.append(tags[i].text()); + result.append("
    "); + } + result.append("
    "); + return result.toString(); + } + } + + /** + * Enables/disables this taglet. + */ + public void setTagletEnabled(boolean enabled) + { + this.enabled = enabled; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java index 2e67d65191f..5f8726aa048 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.taglets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java index dac68a8c46a..aa1e1149165 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java @@ -1,144 +1,161 @@ -/* gnu.classpath.tools.taglets.SinceTaglet - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.taglets; - -import java.util.Map; - -import com.sun.tools.doclets.Taglet; - -import com.sun.javadoc.Tag; - -import gnu.classpath.tools.doclets.InlineTagRenderer; - -/** - * The default Taglet which handles since information. - * - * @author Julian Scheid (julian@sektor37.de) - */ -public class SinceTaglet implements GnuExtendedTaglet { - - private static final String NAME = "since"; - private static final String HEADER = "Since:"; - - private static boolean enabled = true; - - private InlineTagRenderer inlineTagRenderer; - - public SinceTaglet(InlineTagRenderer inlineTagRenderer) - { - this.inlineTagRenderer = inlineTagRenderer; - } - - public String getName() { - return NAME; - } - - public boolean inField() { - return true; - } - - public boolean inConstructor() { - return true; - } - - public boolean inMethod() { - return true; - } - - public boolean inOverview() { - return true; - } - - public boolean inPackage() { - return true; - } - - public boolean inType() { - return true; - } - - public boolean isInlineTag() { - return false; - } - - public String toString(Tag tag) { - // should raise assertion - if (enabled) { - return toString(new Tag[] { tag }); - } - else { - return null; - } - } - - public String toString(Tag[] tags) { - // should raise assertion - return toString(tags, null); - } - - public String toString(Tag tag, TagletContext context) - { - return null; - } - - public String toString(Tag[] tags, TagletContext context) - { - if (!enabled || tags.length == 0) { - return null; - } - else { - boolean haveValidTag = false; - for (int i = 0; i < tags.length && !haveValidTag; ++i) { - if (tags[i].text().length() > 0) { - haveValidTag = true; - } - } - - if (haveValidTag) { - StringBuffer result = new StringBuffer(); - result.append("
    "); - result.append("
    "); - result.append(HEADER); - result.append("
    "); - for (int i = 0; i < tags.length; ++i) { - if (tags[i].text().length() > 0) { - result.append("
    "); - result.append(inlineTagRenderer.renderInlineTags(tags[i].inlineTags(), context)); - result.append("
    "); - } - } - result.append("
    "); - return result.toString(); - } - else { - return null; - } - } - } - - /** - * Enables/disables this taglet. - */ - public static void setTagletEnabled(boolean enabled) - { - SinceTaglet.enabled = enabled; - } -} +/* gnu.classpath.tools.taglets.SinceTaglet + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.taglets; + +import java.util.Map; + +import com.sun.tools.doclets.Taglet; + +import com.sun.javadoc.Tag; + +import gnu.classpath.tools.doclets.InlineTagRenderer; + +/** + * The default Taglet which handles since information. + * + * @author Julian Scheid (julian@sektor37.de) + */ +public class SinceTaglet implements GnuExtendedTaglet { + + private static final String NAME = "since"; + private static final String HEADER = "Since:"; + + private static boolean enabled = true; + + private InlineTagRenderer inlineTagRenderer; + + public SinceTaglet(InlineTagRenderer inlineTagRenderer) + { + this.inlineTagRenderer = inlineTagRenderer; + } + + public String getName() { + return NAME; + } + + public boolean inField() { + return true; + } + + public boolean inConstructor() { + return true; + } + + public boolean inMethod() { + return true; + } + + public boolean inOverview() { + return true; + } + + public boolean inPackage() { + return true; + } + + public boolean inType() { + return true; + } + + public boolean isInlineTag() { + return false; + } + + public String toString(Tag tag) { + // should raise assertion + if (enabled) { + return toString(new Tag[] { tag }); + } + else { + return null; + } + } + + public String toString(Tag[] tags) { + // should raise assertion + return toString(tags, null); + } + + public String toString(Tag tag, TagletContext context) + { + return null; + } + + public String toString(Tag[] tags, TagletContext context) + { + if (!enabled || tags.length == 0) { + return null; + } + else { + boolean haveValidTag = false; + for (int i = 0; i < tags.length && !haveValidTag; ++i) { + if (tags[i].text().length() > 0) { + haveValidTag = true; + } + } + + if (haveValidTag) { + StringBuffer result = new StringBuffer(); + result.append("
    "); + result.append("
    "); + result.append(HEADER); + result.append("
    "); + for (int i = 0; i < tags.length; ++i) { + if (tags[i].text().length() > 0) { + result.append("
    "); + result.append(inlineTagRenderer.renderInlineTags(tags[i].inlineTags(), context)); + result.append("
    "); + } + } + result.append("
    "); + return result.toString(); + } + else { + return null; + } + } + } + + /** + * Enables/disables this taglet. + */ + public static void setTagletEnabled(boolean enabled) + { + SinceTaglet.enabled = enabled; + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java index cf706b6a95c..ff26747e2d9 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java @@ -1,3 +1,40 @@ +/* TagletContext.java - + Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + package gnu.classpath.tools.taglets; import com.sun.javadoc.Doc; diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java index 0f194ae102e..cfc393886f4 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java @@ -16,7 +16,24 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package gnu.classpath.tools.taglets; diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java index e4eddb822c6..fadb972ea87 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java @@ -1,136 +1,153 @@ -/* gnu.classpath.tools.taglets.VersionTaglet - Copyright (C) 2001 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. */ - -package gnu.classpath.tools.taglets; - -import java.util.Map; - -import com.sun.tools.doclets.Taglet; - -import com.sun.javadoc.Tag; - -/** - * The default Taglet which handles version information. - * - * @author Julian Scheid (julian@sektor37.de) - */ -public class VersionTaglet implements Taglet { - - private static final String NAME = "version"; - private static final String HEADER = "Version:"; - - private static boolean enabled = true; - - public String getName() { - return NAME; - } - - public boolean inField() { - return true; - } - - public boolean inConstructor() { - return true; - } - - public boolean inMethod() { - return true; - } - - public boolean inOverview() { - return true; - } - - public boolean inPackage() { - return true; - } - - public boolean inType() { - return true; - } - - public boolean isInlineTag() { - return false; - } - - public static void register(Map tagletMap) { - VersionTaglet versionTaglet = new VersionTaglet(); - tagletMap.put(versionTaglet.getName(), versionTaglet); - } - - public String toString(Tag tag) { - if (enabled) { - return toString(new Tag[] { tag }); - } - else { - return null; - } - } - - public String toString(Tag[] tags) { - if (!enabled || tags.length == 0) { - return null; - } - else { - boolean haveValidTag = false; - for (int i = 0; i < tags.length && !haveValidTag; ++i) { - if (tags[i].text().length() > 0) { - haveValidTag = true; - } - } - - if (haveValidTag) { - - StringBuffer result = new StringBuffer(); - result.append("
    "); - result.append("
    "); - result.append("
    "); - result.append(HEADER); - result.append("
    "); - boolean firstEntry = true; - for (int i = 0; i < tags.length; i++) { - if (tags[i].text().length() > 0) { - if (!firstEntry) { - result.append(", "); - } - else { - firstEntry = false; - } - result.append(tags[i].text()); - } - } - result.append("
    "); - result.append(""); - return result.toString(); - } - else { - return null; - } - } - } - - /** - * Enables/disables this taglet. - */ - public static void setTagletEnabled(boolean enabled) - { - VersionTaglet.enabled = enabled; - } -} +/* gnu.classpath.tools.taglets.VersionTaglet + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.classpath.tools.taglets; + +import java.util.Map; + +import com.sun.tools.doclets.Taglet; + +import com.sun.javadoc.Tag; + +/** + * The default Taglet which handles version information. + * + * @author Julian Scheid (julian@sektor37.de) + */ +public class VersionTaglet implements Taglet { + + private static final String NAME = "version"; + private static final String HEADER = "Version:"; + + private static boolean enabled = true; + + public String getName() { + return NAME; + } + + public boolean inField() { + return true; + } + + public boolean inConstructor() { + return true; + } + + public boolean inMethod() { + return true; + } + + public boolean inOverview() { + return true; + } + + public boolean inPackage() { + return true; + } + + public boolean inType() { + return true; + } + + public boolean isInlineTag() { + return false; + } + + public static void register(Map tagletMap) { + VersionTaglet versionTaglet = new VersionTaglet(); + tagletMap.put(versionTaglet.getName(), versionTaglet); + } + + public String toString(Tag tag) { + if (enabled) { + return toString(new Tag[] { tag }); + } + else { + return null; + } + } + + public String toString(Tag[] tags) { + if (!enabled || tags.length == 0) { + return null; + } + else { + boolean haveValidTag = false; + for (int i = 0; i < tags.length && !haveValidTag; ++i) { + if (tags[i].text().length() > 0) { + haveValidTag = true; + } + } + + if (haveValidTag) { + + StringBuffer result = new StringBuffer(); + result.append("
    "); + result.append("
    "); + result.append("
    "); + result.append(HEADER); + result.append("
    "); + boolean firstEntry = true; + for (int i = 0; i < tags.length; i++) { + if (tags[i].text().length() > 0) { + if (!firstEntry) { + result.append(", "); + } + else { + firstEntry = false; + } + result.append(tags[i].text()); + } + } + result.append("
    "); + result.append(""); + return result.toString(); + } + else { + return null; + } + } + } + + /** + * Enables/disables this taglet. + */ + public static void setTagletEnabled(boolean enabled) + { + VersionTaglet.enabled = enabled; + } +} diff --git a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h b/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h index 8ed5bc28c06..9a4b2567eb4 100644 --- a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h +++ b/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h @@ -7,6 +7,8 @@ #pragma interface #include +#include + extern "Java" { namespace gnu @@ -33,7 +35,7 @@ class gnu::javax::print::ipp::attribute::RequestedAttributes : public ::java::la public: RequestedAttributes(::java::lang::String *); void addValue(::java::lang::String *); - ::java::util::List * getValues(); + JArray< ::java::lang::String * > * getValues(); ::java::lang::Class * getCategory(); ::java::lang::String * getName(); ::java::lang::String * toString(); diff --git a/libjava/gnu/javax/swing/text/html/css/Selector.h b/libjava/gnu/javax/swing/text/html/css/Selector.h index 1f7103e976e..ba2ba7b5d95 100644 --- a/libjava/gnu/javax/swing/text/html/css/Selector.h +++ b/libjava/gnu/javax/swing/text/html/css/Selector.h @@ -37,7 +37,7 @@ class gnu::javax::swing::text::html::css::Selector : public ::java::lang::Object public: Selector(::java::lang::String *); - virtual jboolean matches(JArray< ::java::lang::String * > *, JArray< ::java::util::Map * > *); + virtual jboolean matches(JArray< ::java::lang::String * > *, ::java::util::List *); virtual jint getSpecificity(); virtual ::java::lang::String * toString(); private: diff --git a/libjava/gnu/xml/stream/FilteredStreamReader.h b/libjava/gnu/xml/stream/FilteredStreamReader.h index 77c92e8598e..c762fb38b03 100644 --- a/libjava/gnu/xml/stream/FilteredStreamReader.h +++ b/libjava/gnu/xml/stream/FilteredStreamReader.h @@ -6,7 +6,7 @@ #pragma interface -#include +#include extern "Java" { namespace gnu @@ -32,7 +32,7 @@ extern "Java" } } -class gnu::xml::stream::FilteredStreamReader : public ::javax::xml::stream::util::ReaderDelegate +class gnu::xml::stream::FilteredStreamReader : public ::javax::xml::stream::util::StreamReaderDelegate { public: // actually package-private @@ -42,7 +42,7 @@ public: virtual jint next(); virtual jint nextTag(); public: // actually package-private - ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::ReaderDelegate)))) reader; + ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::StreamReaderDelegate)))) reader; ::javax::xml::stream::StreamFilter * filter; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/stream/NamespaceImpl.h b/libjava/gnu/xml/stream/NamespaceImpl.h index 136154c99a5..a90777aeebe 100644 --- a/libjava/gnu/xml/stream/NamespaceImpl.h +++ b/libjava/gnu/xml/stream/NamespaceImpl.h @@ -23,6 +23,10 @@ extern "Java" { namespace xml { + namespace namespace$ + { + class QName; + } namespace stream { class Location; @@ -35,16 +39,21 @@ class gnu::xml::stream::NamespaceImpl : public ::gnu::xml::stream::XMLEventImpl { public: // actually protected - NamespaceImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *); + NamespaceImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *, jboolean); public: virtual jint getEventType(); virtual ::java::lang::String * getPrefix(); virtual ::java::lang::String * getNamespaceURI(); + virtual jboolean isSpecified(); + virtual ::javax::xml::namespace$::QName * getName(); + virtual ::java::lang::String * getDTDType(); + virtual ::java::lang::String * getValue(); virtual jboolean isDefaultNamespaceDeclaration(); virtual void writeAsEncodedUnicode(::java::io::Writer *); public: // actually protected ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) prefix; ::java::lang::String * uri; + jboolean specified; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/stream/XIncludeFilter.h b/libjava/gnu/xml/stream/XIncludeFilter.h index 794eaa71c47..e920ac69553 100644 --- a/libjava/gnu/xml/stream/XIncludeFilter.h +++ b/libjava/gnu/xml/stream/XIncludeFilter.h @@ -6,7 +6,7 @@ #pragma interface -#include +#include #include extern "Java" @@ -69,7 +69,7 @@ extern "Java" } } -class gnu::xml::stream::XIncludeFilter : public ::javax::xml::stream::util::ReaderDelegate +class gnu::xml::stream::XIncludeFilter : public ::javax::xml::stream::util::StreamReaderDelegate { public: // actually package-private @@ -111,7 +111,7 @@ public: // actually package-private static ::java::lang::String * getParameter(::java::lang::String *, ::java::lang::String *); static ::java::lang::String * XINCLUDE_NS_URI; static const jint SHOW_FLAGS = 221; - ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::ReaderDelegate)))) systemId; + ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::StreamReaderDelegate)))) systemId; jboolean namespaceAware; jboolean validating; jboolean expandERefs; diff --git a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h index d2059574347..245332ed0e7 100644 --- a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h +++ b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h @@ -96,6 +96,7 @@ private: void writeEncoded(::java::lang::String *, jboolean); void writeEncodedWithRestrictedChars(::java::lang::String *, jboolean); jboolean isName(::java::lang::String *); + jboolean isPrefix(::java::lang::String *); jboolean isNCName(::java::lang::String *); jboolean isChars(::java::lang::String *); jboolean isURI(::java::lang::String *); diff --git a/libjava/javax/security/auth/kerberos/KerberosTicket.h b/libjava/javax/security/auth/kerberos/KerberosTicket.h index 44c35b4c78d..d92309354c2 100644 --- a/libjava/javax/security/auth/kerberos/KerberosTicket.h +++ b/libjava/javax/security/auth/kerberos/KerberosTicket.h @@ -69,6 +69,7 @@ private: void checkDestroyed(); public: virtual ::java::lang::String * toString(); + virtual jint getSessionKeyType(); private: static const jlong serialVersionUID = 7395334370157380539LL; static const jint FORWARDABLE = 1; diff --git a/libjava/javax/security/auth/kerberos/KeyImpl.h b/libjava/javax/security/auth/kerberos/KeyImpl.h index 39998ba2219..4aa9563135b 100644 --- a/libjava/javax/security/auth/kerberos/KeyImpl.h +++ b/libjava/javax/security/auth/kerberos/KeyImpl.h @@ -35,6 +35,7 @@ public: ::java::lang::String * getAlgorithm(); JArray< jbyte > * getEncoded(); ::java::lang::String * getFormat(); + ::java::lang::String * toString(); ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) algorithm; jint type; JArray< jbyte > * key; diff --git a/libjava/javax/swing/text/html/HTMLWriter.h b/libjava/javax/swing/text/html/HTMLWriter.h index 321b58d1020..63684b7933b 100644 --- a/libjava/javax/swing/text/html/HTMLWriter.h +++ b/libjava/javax/swing/text/html/HTMLWriter.h @@ -66,7 +66,7 @@ private: ::java::lang::String * escapeCharHtmlEntity(jchar); ::java::io::Writer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) outWriter; ::javax::swing::text::html::HTMLDocument * htmlDoc; - ::java::util::HashSet * openEmbededTagHashSet; + ::java::util::HashSet * openEmbeddedTagHashSet; ::java::lang::String * new_line_str; JArray< jchar > * html_entity_char_arr; JArray< ::java::lang::String * > * html_entity_escape_str_arr; diff --git a/libjava/javax/swing/text/html/MinimalHTMLWriter.h b/libjava/javax/swing/text/html/MinimalHTMLWriter.h index c46afec29b5..a44b170055d 100644 --- a/libjava/javax/swing/text/html/MinimalHTMLWriter.h +++ b/libjava/javax/swing/text/html/MinimalHTMLWriter.h @@ -71,7 +71,7 @@ private: void writeStyle(::javax::swing::text::Style *); jboolean hasText(::javax::swing::text::Element *); ::javax::swing::text::StyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) doc; - ::java::util::Stack * tagStack; + ::java::util::Deque * tagStack; jboolean inFontTag__; public: static ::java::lang::Class class$; diff --git a/libjava/javax/swing/text/html/StyleSheet.h b/libjava/javax/swing/text/html/StyleSheet.h index 3c9bbffdb19..57ebf9e3bf9 100644 --- a/libjava/javax/swing/text/html/StyleSheet.h +++ b/libjava/javax/swing/text/html/StyleSheet.h @@ -57,7 +57,7 @@ public: private: ::javax::swing::text::Style * getResolvedStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *); ::javax::swing::text::Style * resolveStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *); - ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::util::Map * > *); + ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::util::List *); public: virtual ::javax::swing::text::Style * getRule(::java::lang::String *); virtual void addRule(::java::lang::String *); diff --git a/libjava/javax/xml/stream/XMLEventFactory.h b/libjava/javax/xml/stream/XMLEventFactory.h index 493ceef3db1..d64a2859be1 100644 --- a/libjava/javax/xml/stream/XMLEventFactory.h +++ b/libjava/javax/xml/stream/XMLEventFactory.h @@ -49,7 +49,6 @@ public: // actually protected XMLEventFactory(); public: static ::javax::xml::stream::XMLEventFactory * newInstance(); -public: // actually package-private static ::javax::xml::stream::XMLEventFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *); private: static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint); diff --git a/libjava/javax/xml/stream/XMLOutputFactory.h b/libjava/javax/xml/stream/XMLOutputFactory.h index 362fac935f4..ad20deb70d9 100644 --- a/libjava/javax/xml/stream/XMLOutputFactory.h +++ b/libjava/javax/xml/stream/XMLOutputFactory.h @@ -16,7 +16,6 @@ extern "Java" namespace stream { class XMLEventWriter; - class XMLInputFactory; class XMLOutputFactory; class XMLStreamWriter; } @@ -35,10 +34,10 @@ public: // actually protected XMLOutputFactory(); public: static ::javax::xml::stream::XMLOutputFactory * newInstance(); + static ::javax::xml::stream::XMLOutputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *); private: static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint); public: - static ::javax::xml::stream::XMLInputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *); virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::Writer *) = 0; virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *) = 0; virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *, ::java::lang::String *) = 0; diff --git a/libjava/javax/xml/stream/events/Namespace.h b/libjava/javax/xml/stream/events/Namespace.h index 470b22bc46c..7c05ab8cf44 100644 --- a/libjava/javax/xml/stream/events/Namespace.h +++ b/libjava/javax/xml/stream/events/Namespace.h @@ -39,6 +39,10 @@ public: virtual ::java::lang::String * getPrefix() = 0; virtual ::java::lang::String * getNamespaceURI() = 0; virtual jboolean isDefaultNamespaceDeclaration() = 0; + virtual ::javax::xml::namespace$::QName * getName() = 0; + virtual ::java::lang::String * getValue() = 0; + virtual ::java::lang::String * getDTDType() = 0; + virtual jboolean isSpecified() = 0; virtual jint getEventType() = 0; virtual ::javax::xml::stream::Location * getLocation() = 0; virtual jboolean isStartElement() = 0; diff --git a/libjava/javax/xml/stream/util/StreamReaderDelegate.h b/libjava/javax/xml/stream/util/StreamReaderDelegate.h new file mode 100644 index 00000000000..86864cb5718 --- /dev/null +++ b/libjava/javax/xml/stream/util/StreamReaderDelegate.h @@ -0,0 +1,95 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __javax_xml_stream_util_StreamReaderDelegate__ +#define __javax_xml_stream_util_StreamReaderDelegate__ + +#pragma interface + +#include +#include + +extern "Java" +{ + namespace javax + { + namespace xml + { + namespace namespace$ + { + class NamespaceContext; + class QName; + } + namespace stream + { + class Location; + class XMLStreamReader; + namespace util + { + class StreamReaderDelegate; + } + } + } + } +} + +class javax::xml::stream::util::StreamReaderDelegate : public ::java::lang::Object +{ + +public: + StreamReaderDelegate(); + StreamReaderDelegate(::javax::xml::stream::XMLStreamReader *); + virtual void setParent(::javax::xml::stream::XMLStreamReader *); + virtual ::javax::xml::stream::XMLStreamReader * getParent(); + virtual jint next(); + virtual jint nextTag(); + virtual ::java::lang::String * getElementText(); + virtual void require(jint, ::java::lang::String *, ::java::lang::String *); + virtual jboolean hasNext(); + virtual void close(); + virtual ::java::lang::String * getNamespaceURI(::java::lang::String *); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); + virtual jboolean isStartElement(); + virtual jboolean isEndElement(); + virtual jboolean isCharacters(); + virtual jboolean isWhiteSpace(); + virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *); + virtual jint getAttributeCount(); + virtual ::javax::xml::namespace$::QName * getAttributeName(jint); + virtual ::java::lang::String * getAttributePrefix(jint); + virtual ::java::lang::String * getAttributeNamespace(jint); + virtual ::java::lang::String * getAttributeLocalName(jint); + virtual ::java::lang::String * getAttributeType(jint); + virtual ::java::lang::String * getAttributeValue(jint); + virtual jboolean isAttributeSpecified(jint); + virtual jint getNamespaceCount(); + virtual ::java::lang::String * getNamespacePrefix(jint); + virtual ::java::lang::String * getNamespaceURI(jint); + virtual jint getEventType(); + virtual ::java::lang::String * getText(); + virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint); + virtual JArray< jchar > * getTextCharacters(); + virtual jint getTextStart(); + virtual jint getTextLength(); + virtual ::java::lang::String * getEncoding(); + virtual jboolean hasText(); + virtual ::javax::xml::stream::Location * getLocation(); + virtual ::javax::xml::namespace$::QName * getName(); + virtual ::java::lang::String * getLocalName(); + virtual jboolean hasName(); + virtual ::java::lang::String * getNamespaceURI(); + virtual ::java::lang::String * getPrefix(); + virtual ::java::lang::String * getVersion(); + virtual jboolean isStandalone(); + virtual jboolean standaloneSet(); + virtual ::java::lang::String * getCharacterEncodingScheme(); + virtual ::java::lang::String * getPITarget(); + virtual ::java::lang::String * getPIData(); + virtual ::java::lang::Object * getProperty(::java::lang::String *); +private: + ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent; +public: + static ::java::lang::Class class$; +}; + +#endif // __javax_xml_stream_util_StreamReaderDelegate__ diff --git a/libjava/sources.am b/libjava/sources.am index 1ccc7b91e0f..4539abd4601 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -7624,7 +7624,7 @@ classpath/javax/xml/stream/events/StartDocument.java \ classpath/javax/xml/stream/events/StartElement.java \ classpath/javax/xml/stream/events/XMLEvent.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/XMLEventConsumer.java \ classpath/javax/xml/transform/ErrorListener.java \