GNU Classpath import (libgcj-snapshot-20100921).

2010-10-12 Andrew John Hughes <ahughes@redhat.com> Import GNU Classpath (libgcj-snapshot-20100921). * libjava/Makefile.in: Regenerated. * libjava/javax/swing/text/html/StyleSheet.h, * libjava/javax/swing/text/html/MinimalHTMLWriter.h, * libjava/javax/swing/text/html/HTMLWriter.h, * libjava/javax/xml/stream/XMLEventFactory.h, * libjava/javax/xml/stream/XMLOutputFactory.h, * libjava/javax/xml/stream/events/Namespace.h, * libjava/javax/xml/stream/util/StreamReaderDelegate.h, * libjava/javax/security/auth/kerberos/KeyImpl.h, * libjava/javax/security/auth/kerberos/KerberosTicket.h: Regenerated. * libjava/classpath/Makefile.in, * libjava/classpath/depcomp, * libjava/classpath/scripts/Makefile.in, * libjava/classpath/resource/Makefile.in, * libjava/classpath/tools/Makefile.in: Regenerated. Use libtool from top-level config directory. * libjava/classpath/tools/classes/gnu/classpath/tools/StringToolkit.class, * libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml.class, * libjava/classpath/tools/classes/gnu/classpath/tools/java2xhtml/Java2xhtml$State.class, * libjava/classpath/tools/classes/gnu/classpath/tools/IOToolkit.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$OptionProcessor.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportClassFile.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocProxy.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BlockSourceComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree$FileNode.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/IgnoredFileParseException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TextTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$Context.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/InheritDocTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FunctionComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/AdditionExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Type.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NegateExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantDouble.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/EqualExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantChar.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Evaluator.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/DivisionExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantInteger.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantShort.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantLong.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantByte.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnaryExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantFloat.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ModuloExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantString.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NotExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/AndExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Context.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantNull.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/LessThanExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/BinaryExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/ConstantExpression.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportNotFound.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParamTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Timer.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourceComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/CommentComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionPackage.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/StaticBlockComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ValueTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SeeTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TemporaryStore.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportReflectionClass.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/BracketClose.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParameterImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ScheduledClass.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl$ResolvedImportPackageFile.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SlashSlashCommentComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ErrorReporter.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MemberDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DirectoryTree.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Debug.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/DocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/MethodDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TimerDoclet$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageDocImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ThrowsTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/EmptyStatementComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/LinkTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/AbstractTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ParseException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Whitespace.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ImportComponent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/SourcePositionImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/JavadocWrapper.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/TypeVariableImpl.class, * libjava/classpath/tools/classes/gnu/classpath/tools/NotifyingInputStreamReader.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniPrintStream.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class, * libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/HashFinder.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/WrapUnWrapper.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/MethodGenerator.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceRmicCompiler.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class, * libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class, * libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class, * libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class, * libjava/classpath/tools/classes/gnu/classpath/tools/MalformedInputEvent.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletConfigurationException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$InterfaceRelation.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTag.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/TargetContext.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet$DocErrorReporterOutputStream.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$UsageType.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/Driver$NullErrorReporter.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer$TagInfo.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionColonSeparated.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$UsageType.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionString.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/CssClass.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$TreeNode.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/InvalidPackageWildcardException.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionFlag.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageMatcher.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/StandardTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOptionFile.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/DocletOption.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$IndexKey.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionGroup.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTagletPath.class, * libjava/classpath/tools/classes/gnu/classpath/tools/doclets/PackageGroup.class, * libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader$JarStreamInfo.class, * libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader$FileStreamInfo.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CodeTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/GenericTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/ValueTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/AuthorTaglet$EmailReplacement.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/DeprecatedTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/SinceTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/AuthorTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/TagletContext.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/VersionTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/taglets/CopyrightTaglet.class, * libjava/classpath/tools/classes/gnu/classpath/tools/FileSystemClassLoader.class, * libjava/classpath/tools/classes/com/sun/tools/javadoc/Main.class: Regenerated. * libjava/classpath/doc/Makefile.in, * libjava/classpath/doc/api/Makefile.in, * libjava/classpath/doc/texinfo.tex, * libjava/classpath/external/Makefile.in, * libjava/classpath/external/jsr166/Makefile.in, * libjava/classpath/external/sax/Makefile.in, * libjava/classpath/external/w3c_dom/Makefile.in, * libjava/classpath/external/relaxngDatatype/Makefile.in, * libjava/classpath/include/Makefile.in: Regenerated. * libjava/classpath/m4/lib-prefix.m4, * libjava/classpath/m4/lib-link.m4, * libjava/classpath/m4/lib-ld.m4: Removed. * libjava/classpath/native/jni/classpath/Makefile.in, * libjava/classpath/native/jni/gstreamer-peer/Makefile.in, * libjava/classpath/native/jni/midi-dssi/Makefile.in, * libjava/classpath/native/jni/Makefile.in, * libjava/classpath/native/jni/gconf-peer/Makefile.in, * libjava/classpath/native/jni/java-io/Makefile.in, * libjava/classpath/native/jni/native-lib/Makefile.in, * libjava/classpath/native/jni/native-lib/cpnet.c, * libjava/classpath/native/jni/java-util/Makefile.in, * libjava/classpath/native/jni/java-lang/Makefile.in, * libjava/classpath/native/jni/midi-alsa/Makefile.in, * libjava/classpath/native/jni/java-nio/Makefile.in, * libjava/classpath/native/jni/java-net/Makefile.in, * libjava/classpath/native/jni/java-math/Makefile.in, * libjava/classpath/native/jni/xmlj/Makefile.in, * libjava/classpath/native/jni/qt-peer/Makefile.in, * libjava/classpath/native/jni/gtk-peer/Makefile.in, * libjava/classpath/native/Makefile.in, * libjava/classpath/native/jawt/Makefile.in, * libjava/classpath/native/fdlibm/Makefile.in, * libjava/classpath/native/plugin/Makefile.in, * libjava/classpath/lib/java/util/regex/Matcher.class, * libjava/classpath/lib/java/util/TreeMap$3.class, * libjava/classpath/lib/java/util/Scanner.class, * libjava/classpath/lib/Makefile.in, * libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class, * libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class, * libjava/classpath/lib/org/omg/CORBA/portable/InputStream.class, * libjava/classpath/lib/org/omg/CORBA/portable/ObjectImpl.class, * libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class, * libjava/classpath/lib/org/omg/CORBA/LocalObject.class, * libjava/classpath/lib/org/omg/CORBA_2_3/portable/InputStream.class, * libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynValueStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynEnumStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynUnionStub.class, * libjava/classpath/lib/org/omg/DynamicAny/_DynFixedStub.class, * libjava/classpath/lib/org/ietf/jgss/GSSManager.class, * libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class, * libjava/classpath/lib/gnu/xml/stream/XIncludeFilter.class, * libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class, * libjava/classpath/lib/gnu/xml/stream/XMLEventFactoryImpl.class, * libjava/classpath/lib/gnu/xml/stream/XMLEventAllocatorImpl.class, * libjava/classpath/lib/gnu/xml/stream/XMLStreamWriterImpl.class, * libjava/classpath/lib/gnu/java/locale/LocaleData.class, * libjava/classpath/lib/gnu/javax/swing/text/html/css/Selector.class, * libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class, * libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OperationsSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/SidesDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobId.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobMoreInfo.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/StatusMessage.class, * libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class, * libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class, * libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class, * libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class, * libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class, * libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class, * libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class, * libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class, * libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class, * libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache.class, * libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class, * libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class, * libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class, * libjava/classpath/lib/javax/swing/text/html/TableView$RowView.class, * libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.class, * libjava/classpath/lib/javax/swing/text/html/MultiStyle.class, * libjava/classpath/lib/javax/swing/text/html/ImageView.class, * libjava/classpath/lib/javax/swing/text/html/TableView$CellView.class, * libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet.class, * libjava/classpath/lib/javax/swing/text/html/ImageView$1.class, * libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class, * libjava/classpath/lib/javax/swing/text/html/TableView.class, * libjava/classpath/lib/javax/swing/text/html/StyleSheet.class, * libjava/classpath/lib/javax/swing/text/html/ObjectView.class, * libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class, * libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class, * libjava/classpath/lib/javax/swing/undo/StateEdit.class, * libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class, * libjava/classpath/lib/javax/xml/stream/events/Namespace.class, * libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class, * libjava/classpath/lib/javax/xml/stream/util/StreamReaderDelegate.class, * libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class, * libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class, * libjava/classpath/lib/javax/security/auth/kerberos/KeyImpl.class, * libjava/classpath/missing, * libjava/classpath/aclocal.m4, * libjava/classpath/examples/Makefile.in, * libjava/classpath/install-sh, * libjava/gnu/xml/stream/FilteredStreamReader.h, * libjava/gnu/xml/stream/XMLStreamWriterImpl.h, * libjava/gnu/xml/stream/NamespaceImpl.h, * libjava/gnu/xml/stream/XIncludeFilter.h, * libjava/gnu/javax/swing/text/html/css/Selector.h, * libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h, * libjava/sources.am: Regenerated. 2010-05-27 Andrew John Hughes <ahughes@redhat.com> * configure.ac: Disable plugin by default and warn about unmaintained status when enabled. 2010-05-04 Andrew John Hughes <ahughes@redhat.com> * configure.ac: Call AC_PROG_JAVA_WORKS and AC_PROG_JAVAC_WORKS in place of AC_PROG_JAVA and AC_PROG_JAVAC respectively, as this is the real test we want. * m4/ac_prog_java.m4: (AC_PROG_JAVA): Don't include AC_PROG_JAVA_WORKS. * m4/ac_prog_java_works.m4: (AC_PROG_JAVA_WORKS): Require AC_PROG_JAVA and be defined only once. Require AC_PROG_JAVAC_WORKS for compilation of test class. Remove inclusion of AC_PROG_JAVAC. (AC_TRY_COMPILE_JAVA): Require AC_PROG_JAVAC_WORKS rather than AC_PROG_JAVAC. Be defined only once. * m4/ac_prog_javac.m: (AC_PROG_JAVAC): Be defined only once. Don't include AC_PROG_JAVAC_WORKS. * m4/ac_prog_javac_works.m4: (AC_PROG_JAVAC_WORKS): Be defined only once. Require AC_PROG_JAVAC. 2010-05-04 Andrew Haley <aph@redhat.com> * lib/gen-classlist.sh.in: Use absolute pathnames for all the directory names in the output file. 2010-05-04 Andrew John Hughes <ahughes@redhat.com> * m4/ac_prog_javac.m4: Capture all output from javac --version to avoid excess output. Make sure no appears when javac is not gcj. 2010-05-04 Andrew John Hughes <ahughes@redhat.com> * configure.ac: Add output to GMP directory detection and only perform when compiling GMP. 2010-05-04 Mike Stump <mikestump@comcast.net> * configure.ac: Allow prefix, libdir and includedir of GMP to be specified via --with-gmp, --with-gmp-include and --with-gmp-lib. 2010-04-28 Andrew John Hughes <ahughes@redhat.com> * gnu/javax/print/ipp/IppPrintService.java: (printerAttr): Add generic typing. (printServiceAttributeListener): Likewise. (flavors): Likewise. (printerUris): Likewise. (IppPrintService(URI uri, String username, String password)): Use generic types in initialising listener set. (getPrinterAttributes()): Add generic types. Remove cast. (getPrinterAttributeSet(Class<T>)): Return a set containing attributes of type T. Now creates a new set and checks that all elements of the original set can be cast and added to this new set. (getPrinterDefaultAttribute(Class<? extends Attribute>)): Add generic types. (processResponse()): Add generic types. (getAttribute(Class<T>)): Use generic types corresponding to parent interface. (getSupportedAttributeCategories()): Use generic types. (getSupportedAttributeValues()): Likewise. (handleSupportedAttributeValuesResponse(IppResponse,Class<? extends Attribute>)): Likewise. (isAttributeCategorySupported(Class<? extends Attribute>)): Likewise. * gnu/javax/print/ipp/IppResponse.java: (parseResponse(InputStream)): Use generic types. (parseAttributes(Map<Class<? extends Attribute>, Set<Attribute>, DataInputStream)): Likewise. (addAttribute(Map<Class<? extends Attribute>, Set<Attribute>>, Attribute): Likewise. (IppResponse(URI, short)): Create lists with appropriate type parameters. (getJobAttributes()): Use generic return type. (getOperationAttributes()): Likewise. (getPrinterAttributes()): Likewise. (getUnsupportedAttributes()): Likewise. * gnu/javax/print/ipp/attribute/supported/CompressionSupported.java: (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/MediaSupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. * gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java, (getAssociatedAttributeArray(Set<Attribute>)): Use superclass Attribute as set type parameter and cast when looping over it. 2010-04-28 Andrew John Hughes <ahughes@redhat.com> * gnu/javax/print/ipp/IppUtilities.java: (INTEGER_CLASS_ARRAY): Use generic typing. (TEXT_CLASS_ARRAY): Likewise. (classesByName): Likewise. (instanceByClass): Likewise. (getClass(String)): Remove cast. Return generic type. (getSupportedAttrName(Class<? extends Attribute>)): Remove cast. Add generic type to parameter. (getSupportedCategory(Class<?> extends Attribute>)): Likewise. (getEnumAttribute(String,Object)): Add missing generic types on Class. (getIntegerAttribute(String,int)): Likewise and on Constructor. (getTextAttribute(String,byte,byte[])): Likewise. 2010-04-27 Andrew John Hughes <ahughes@redhat.com> * gnu/javax/print/ipp/IppRequest.java: (write(RequestedAttributes)): Fix for change in return value of RequestedAttributes.getValues(). * gnu/javax/print/ipp/attribute/DetailedStatusMessage.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/DocumentAccessError.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/RequestedAttributes.java: (RequestedAttributes()): Use appropriate generic type with attributes ArrayList. (getValues()): Return an array-based snapshot of the current state of attributes rather than providing direct mutable access to it. * gnu/javax/print/ipp/attribute/StatusMessage.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/UnknownAttribute.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/MediaDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/defaults/SidesDefault.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/AttributesCharset.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobId.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobMoreInfo.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobPrinterUri.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobStateMessage.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/job/JobUri.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/DocumentFormat.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java: (getCategory()): Fix return value. * gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java: (getCategory()): Fix return value. 2010-04-27 Andrew John Hughes <ahughes@redhat.com> * gnu/javax/print/CupsIppOperation.java, * gnu/javax/print/CupsMediaMapping.java, * gnu/javax/print/CupsPrintService.java, * gnu/javax/print/CupsPrintServiceLookup.java, * gnu/javax/print/CupsServer.java, * gnu/javax/print/PrintAttributeException.java, * gnu/javax/print/PrintFlavorException.java, * gnu/javax/print/PrintUriException.java, * gnu/javax/print/PrinterDialog.java, * gnu/javax/print/ipp/DocPrintJobImpl.java, * gnu/javax/print/ipp/IppDelimiterTag.java, * gnu/javax/print/ipp/IppException.java, * gnu/javax/print/ipp/IppMultiDocPrintService.java, * gnu/javax/print/ipp/IppRequest.java, * gnu/javax/print/ipp/IppResponse.java, * gnu/javax/print/ipp/IppStatusCode.java, * gnu/javax/print/ipp/IppUtilities.java, * gnu/javax/print/ipp/IppValueTag.java, * gnu/javax/print/ipp/MultiDocPrintJobImpl.java, * gnu/javax/print/ipp/attribute/CharsetSyntax.java, * gnu/javax/print/ipp/attribute/DefaultValueAttribute.java, * gnu/javax/print/ipp/attribute/DetailedStatusMessage.java, * gnu/javax/print/ipp/attribute/DocumentAccessError.java, * gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.java, * gnu/javax/print/ipp/attribute/RequestedAttributes.java, * gnu/javax/print/ipp/attribute/StatusMessage.java, * gnu/javax/print/ipp/attribute/UnknownAttribute.java, * gnu/javax/print/ipp/attribute/defaults/CopiesDefault.java, * gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.java, * gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.java, * gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.java, * gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.java, * gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.java, * gnu/javax/print/ipp/attribute/defaults/MediaDefault.java, * gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.java, * gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.java, * gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.java, * gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.java, * gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.java, * gnu/javax/print/ipp/attribute/defaults/SidesDefault.java, * gnu/javax/print/ipp/attribute/job/AttributesCharset.java, * gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.java, * gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java, * gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java, * gnu/javax/print/ipp/attribute/job/JobId.java, * gnu/javax/print/ipp/attribute/job/JobMoreInfo.java, * gnu/javax/print/ipp/attribute/job/JobPrinterUri.java, * gnu/javax/print/ipp/attribute/job/JobStateMessage.java, * gnu/javax/print/ipp/attribute/job/JobUri.java, * gnu/javax/print/ipp/attribute/printer/CharsetConfigured.java, * gnu/javax/print/ipp/attribute/printer/DocumentFormat.java, * gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.java, * gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.java, * gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.java, * gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.java, * gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.java, * gnu/javax/print/ipp/attribute/printer/PrinterUpTime.java: Normalise whitespace; replace tabs with spaces and removing trailing whitespace. 2010-04-27 Andrew John Hughes <ahughes@redhat.com> * gnu/javax/print/ipp/IppPrintService.java: Fix whitespace. Use correct generic type for printerAttr map. (getPrinterAttributeSet(Class<? extends Attribute>)): Add appropriate generic type. * gnu/javax/print/ipp/attribute/supported/CharsetSupported.java: Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/CompressionSupported.java: Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<CompressionSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.java: Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/FinishingsSupported.java: Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<FinishingsSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.java: Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.java: Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.java: Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.java: Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<JobSheetsSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/MediaSupported.java: Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<MediaSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.java: Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<MultipleDocumentHandlingSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.java, Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/OperationsSupported.java, Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.java, Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<OrientationRequestedSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/PageRangesSupported.java, Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.java, Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<PrintQualitySupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.java, Fix whitespace. (getCategory()): Fix return type. (getAssociatedAttributeArray(Set<PrinterResolutionSupported>)): Add generic type to set and use for-each loop. * gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.java, Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/SidesSupported.java, Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.java, Fix whitespace. (getCategory()): Fix return type. * gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.java, Fix whitespace. (getCategory()): Fix return type. 2010-04-27 Andrew Haley <aph@redhat.com> * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty list. 2010-04-27 Andrew Haley <aph@redhat.com> * gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle IppValueTag.UNKNOWN. * gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes): Handle RequestedAttributes. * gnu/javax/print/ipp/IppPrintService.java (processResponse): Add DocFlavor.SERVICE_FORMATTED.PAGEABLE and DocFlavor.SERVICE_FORMATTED.PRINTABLE. 2010-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libgcj/38251 * tools/Makefile.am (dist-hook): Prune .svn directories in asm and classes copies. * tools/Makefile.in: Regenerate. Revert: 2008-11-05 Andrew Haley <aph@redhat.com> * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude .svn direcories. 2010-01-30 Andrew John Hughes <ahughes@redhat.com> * doc/www.gnu.org/home.wml: Add newer JAPI results. 2010-01-30 Andrew John Hughes <ahughes@redhat.com> PR classpath/41686 * javax/security/auth/kerberos/KerberosTicket.java: Fix formatting. (toString()): Add full implementation. (getSessionKeyType()): Implemented. * javax/security/auth/kerberos/KeyImpl.java: (toString()): Implemented. 2010-01-30 Andrew John Hughes <ahughes@redhat.com> * autogen.sh: Allow libtool 2.* through. * configure.ac: Updated via autoupdate. * m4/lib-ld.m4, * m4/lib-link.m4, * m4/lib-prefix.m4: Drop old libtool macros which result in build failure. 2010-01-18 Andreas Tobler <andreast@fgznet.ch> * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. * tools/Makefile.in: Regenerate. 2010-01-12 Jeroen Frijters <jeroen@frijters.net> * java/util/zip/Inflater. java (inflate(byte[],int,int)): Fix for #41696. 2009-11-18 Andrew Haley <aph@redhat.com> * java/util/TreeMap.java (anonymous class.size()): Debogosify. anonymous class.clear(): Likewise. 2009-10-22 Andrew Haley <aph@redhat.com> * native/jni/native-lib/cpnet.c (cpnet_addMembership): Fix aliasing warning. (cpnet_dropMembership): Likewise. 2009-10-22 Richard Guenther <rguenther@suse.de> PR cp-tools/39177 * tools/gnu/classpath/tools/jar/Creator.java (writeCommandLineEntries): Do not use uninitialized manifest. * tools/classes/gnu/classpath/tools/jar/Creator.class: Re-generated. 2009-07-08 Chris Burdess <dog@gnu.org> PR xml/40663: * javax/xml/stream/XMLEventFactory.java, * javax/xml/stream/XMLInputFactory.java, * javax/xml/stream/XMLOutputFactory.java, * javax/xml/stream/events/Namespace.java: Update API to match final version of StAX. * javax/xml/stream/util/ReaderDelegate.java: Removed. * javax/xml/stream/util/StreamReaderDelegate.java: Added (renamed from ReaderDelegate) * gnu/xml/stream/FilteredStreamReader.java, * gnu/xml/stream/NamespaceImpl.java, * gnu/xml/stream/XIncludeFilter.java, * gnu/xml/stream/XMLEventAllocatorImpl.java, * gnu/xml/stream/XMLEventFactoryImpl.java: Update implementation to match final version of StAX API. 2009-07-06 Ludovic Claude <ludovic.claude@laposte.net> PR xml/40653: * gnu/xml/stream/XMLStreamWriterImpl.java: Weaken testing of namespace prefix to match reference implementation and spec. 2009-07-07 Andrew John Hughes <ahughes@redhat.com> PR classpath/40630 * java/util/Scanner.java: (myCoreNext(boolean, Pattern)): Set tmp2 to null if the string is empty (i.e. we are at the end of the file). * java/util/regex/Matcher.java: (toMatchResult()): Check that match is non-null before attempting to clone it. 2009-07-07 Andrew John Hughes <ahughes@redhat.com> * java/util/Scanner.java, * java/util/regex/Matcher.java: Replace tab characters with spaces. 2009-03-29 Mark Wielaard <mark@klomp.org> * doc/www.gnu.org/faq/faq.wml: Fix link to cp-hacking.html. 2009-03-29 Mark Wielaard <mark@klomp.org> * m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty. 2009-03-26 Andrew John Hughes <ahughes@redhat.com> PR classpath/39408: * tools/gnu/classpath/tools/javah/ClassWrapper.java: (linkSupers()): Make package-private. * tools/gnu/classpath/tools/javah/JniIncludePrinter.java: (writeFields(ClassWrapper, JniPrintStream)): Link in data from superclass before searching for fields. 2009-03-20 Andrew John Hughes <ahughes@redhat.com> * tools/gnu/classpath/tools/javah/ClassWrapper.java, * tools/gnu/classpath/tools/javah/CniPrintStream.java, * tools/gnu/classpath/tools/javah/CniStubPrinter.java, * tools/gnu/classpath/tools/javah/GcjhMain.java, * tools/gnu/classpath/tools/javah/JniIncludePrinter.java, * tools/gnu/classpath/tools/javah/JniPrintStream.java, * tools/gnu/classpath/tools/javah/JniStubPrinter.java, * tools/gnu/classpath/tools/javah/Keywords.java, * tools/gnu/classpath/tools/javah/Main.java, * tools/gnu/classpath/tools/javah/MethodHelper.java, * tools/gnu/classpath/tools/javah/PathOptionGroup.java: Fix generic issues in gjavah. 2009-03-17 Andrew John Hughes <ahughes@redhat.com> * tools/gnu/classpath/tools/FileSystemClassLoader.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java, * tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java, * tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java, * tools/gnu/classpath/tools/gjdoc/ErrorReporter.java, * tools/gnu/classpath/tools/gjdoc/TemporaryStore.java, * tools/gnu/classpath/tools/gjdoc/WritableType.java, * tools/gnu/classpath/tools/taglets/AuthorTaglet.java, * tools/gnu/classpath/tools/taglets/CopyrightTaglet.java, * tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java, * tools/gnu/classpath/tools/taglets/GenericTaglet.java, * tools/gnu/classpath/tools/taglets/SinceTaglet.java, * tools/gnu/classpath/tools/taglets/VersionTaglet.java: Switch to UNIX line endings. 2009-03-17 Andrew John Hughes <ahughes@redhat.com> * tools/com/sun/tools/javadoc/Main.java, * tools/gnu/classpath/tools/FileSystemClassLoader.java, * tools/gnu/classpath/tools/IOToolkit.java, * tools/gnu/classpath/tools/MalformedInputEvent.java, * tools/gnu/classpath/tools/MalformedInputListener.java, * tools/gnu/classpath/tools/NotifyingInputStreamReader.java, * tools/gnu/classpath/tools/StringToolkit.java, * tools/gnu/classpath/tools/doclets/AbstractDoclet.java, * tools/gnu/classpath/tools/doclets/DocletConfigurationException.java, * tools/gnu/classpath/tools/doclets/DocletOption.java, * tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java, * tools/gnu/classpath/tools/doclets/DocletOptionFile.java, * tools/gnu/classpath/tools/doclets/DocletOptionFlag.java, * tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java, * tools/gnu/classpath/tools/doclets/DocletOptionString.java, * tools/gnu/classpath/tools/doclets/InlineTagRenderer.java, * tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java, * tools/gnu/classpath/tools/doclets/PackageGroup.java, * tools/gnu/classpath/tools/doclets/PackageMatcher.java, * tools/gnu/classpath/tools/doclets/StandardTaglet.java, * tools/gnu/classpath/tools/doclets/TagletPrinter.java, * tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java, * tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java, * tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java, * tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java, * tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java, * tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java, * tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java, * tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java, * tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java, * tools/gnu/classpath/tools/gjdoc/Debug.java, * tools/gnu/classpath/tools/gjdoc/DirectoryTree.java, * tools/gnu/classpath/tools/gjdoc/DocImpl.java, * tools/gnu/classpath/tools/gjdoc/ErrorReporter.java, * tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java, * tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java, * tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java, * tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java, * tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java, * tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java, * tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java, * tools/gnu/classpath/tools/gjdoc/Main.java, * tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java, * tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java, * tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java, * tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ParameterImpl.java, * tools/gnu/classpath/tools/gjdoc/ParseException.java, * tools/gnu/classpath/tools/gjdoc/Parser.java, * tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java, * tools/gnu/classpath/tools/gjdoc/RootDocImpl.java, * tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java, * tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java, * tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java, * tools/gnu/classpath/tools/gjdoc/TagContainer.java, * tools/gnu/classpath/tools/gjdoc/TagImpl.java, * tools/gnu/classpath/tools/gjdoc/TemporaryStore.java, * tools/gnu/classpath/tools/gjdoc/TextTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java, * tools/gnu/classpath/tools/gjdoc/Timer.java, * tools/gnu/classpath/tools/gjdoc/TimerDoclet.java, * tools/gnu/classpath/tools/gjdoc/TypeImpl.java, * tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java, * tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java, * tools/gnu/classpath/tools/gjdoc/WritableType.java, * tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java, * tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java, * tools/gnu/classpath/tools/gjdoc/expr/Context.java, * tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java, * tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java, * tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Expression.java, * tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java, * tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Type.java, * tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java, * tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java, * tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java, * tools/gnu/classpath/tools/rmic/CompilationError.java, * tools/gnu/classpath/tools/rmic/Generator.java, * tools/gnu/classpath/tools/rmic/GiopIo.java, * tools/gnu/classpath/tools/rmic/HashFinder.java, * tools/gnu/classpath/tools/rmic/Main.java, * tools/gnu/classpath/tools/rmic/MethodGenerator.java, * tools/gnu/classpath/tools/rmic/RMICException.java, * tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java, * tools/gnu/classpath/tools/rmic/RmicBackend.java, * tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java, * tools/gnu/classpath/tools/rmic/Variables.java, * tools/gnu/classpath/tools/rmic/WrapUnWrapper.java, * tools/gnu/classpath/tools/serialver/SerialVer.java, * tools/gnu/classpath/tools/taglets/AuthorTaglet.java, * tools/gnu/classpath/tools/taglets/CodeTaglet.java, * tools/gnu/classpath/tools/taglets/CopyrightTaglet.java, * tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java, * tools/gnu/classpath/tools/taglets/GenericTaglet.java, * tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java, * tools/gnu/classpath/tools/taglets/SinceTaglet.java, * tools/gnu/classpath/tools/taglets/TagletContext.java, * tools/gnu/classpath/tools/taglets/ValueTaglet.java, * tools/gnu/classpath/tools/taglets/VersionTaglet.java: Fix license headers to GPLv2+Classpath exception. 2009-03-09 Andrew John Hughes <ahughes@redhat.com> * gnu/javax/swing/text/html/css/Selector.java: Use CPStringBuilder. Use typed list of maps rather than an array for type safety. * javax/swing/text/html/HTMLEditorKit.java, * javax/swing/text/html/HTMLWriter.java: Add generic typing where appropriate. * javax/swing/text/html/ImageView.java: Remove unused AttributeSet variables. * javax/swing/text/html/MinimalHTMLWriter.java: Switch to an ArrayDeque to avoid unnecessary internal synchronisation on a private variable. Add generic typing. * javax/swing/text/html/MultiAttributeSet.java: Add generic typing. * javax/swing/text/html/MultiStyle.java: Add generic typing, make class package-private as not part of the standard classes. * javax/swing/text/html/ObjectView.java, * javax/swing/text/html/StyleSheet.java: Add generic typing. * javax/swing/text/html/TableView.java: Remove unused variable. * javax/swing/tree/DefaultMutableTreeNode.java: Add generic typing, mute warnings where necessary. * javax/swing/tree/FixedHeightLayoutCache.java: Add generic typing. * javax/swing/tree/TreeNode.java: Mute warnings where necessary. * javax/swing/tree/VariableHeightLayoutCache.java, * javax/swing/undo/StateEdit.java, * javax/swing/undo/UndoableEditSupport.java, * org/ietf/jgss/GSSManager.java: Add generic typing. 2009-02-14 Andrew John Hughes <ahughes@redhat.com> * org/omg/CORBA/LocalObject.java, * org/omg/CORBA/portable/Delegate.java, * org/omg/CORBA/portable/InputStream.java, * org/omg/CORBA/portable/ObjectImpl.java, * org/omg/CORBA_2_3/portable/InputStream.java, * org/omg/CORBA_2_3/portable/OutputStream.java, * org/omg/DynamicAny/_DynAnyFactoryStub.java, * org/omg/DynamicAny/_DynAnyStub.java, * org/omg/DynamicAny/_DynArrayStub.java, * org/omg/DynamicAny/_DynEnumStub.java, * org/omg/DynamicAny/_DynFixedStub.java, * org/omg/DynamicAny/_DynSequenceStub.java, * org/omg/DynamicAny/_DynStructStub.java, * org/omg/DynamicAny/_DynUnionStub.java, * org/omg/DynamicAny/_DynValueStub.java, * org/omg/PortableServer/_ServantActivatorStub.java, * org/omg/PortableServer/_ServantLocatorStub.java: Turn off warnings where Class is used; forced to use raw type for API compatibility. 2009-02-06 Andrew John Hughes <ahughes@redhat.com> * NEWS: Add stub for 0.99. * configure.ac: Bump to 0.99. * doc/www.gnu.org/announce/20090205.wml, * doc/www.gnu.org/downloads/downloads.wml, * doc/www.gnu.org/newsitems.txt: Update website. 2009-02-05 Andrew John Hughes <ahughes@redhat.com> * NEWS: Add VM updates. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165383 138bc75d-0d04-0410-961f-82ee72b054a4
author: gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> 2010-10-12 15:55:12 +0000
committer: gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> 2010-10-12 15:55:12 +0000
commit: d8bc803082928434d39c7ab25b322f7066603de6 (patch)
tree: ed04a07a98f6d83830e25c996a838f7e5b3b109b /libjava/classpath/gnu/javax/print/ipp/attribute
parent: e67bda386ddfbe740ecbb7c336f76360a393386b (diff)
download: ppe42-gcc-d8bc803082928434d39c7ab25b322f7066603de6.tar.gz
ppe42-gcc-d8bc803082928434d39c7ab25b322f7066603de6.zip
58 files changed, 838 insertions, 835 deletions
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;
 
 /**
- * <code>CharsetSyntax</code> is the abstract base class of all attribute 
+ * <code>CharsetSyntax</code> 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 - &gt; Name-default -&gt; 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 <code>DetailedStatusMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>DocumentAccessError</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 
 /**
- * <code>NaturalLanguageSyntax</code> is the abstract base class of all 
- * attribute classes which provide a natural language (US-ASCII) 
+ * <code>NaturalLanguageSyntax</code> 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;
 /**
  * <code>RequestedAttributes</code> 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<String> attributes;
 
   /**
-   * Creates a <code>RequestedAttributes</code> object with 
+   * Creates a <code>RequestedAttributes</code> 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<String>();
     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 <code>DocumentFormat</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>StatusMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>UnknownAttribute</code> 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 <code>UnknownAttribute</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>CopiesDefault</code> provides the default value
  * for the copies attribute.
- * 
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public final class CopiesDefault extends IntegerSyntax
   implements DefaultValueAttribute
 {
-    
+
   /**
    * Creates a <code>CopiesDefault</code> 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 <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -89,7 +89,7 @@ public final class CopiesDefault extends IntegerSyntax
    *
    * @return The class <code>CopiesDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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.
    * <p>May return null if no value exists in JPS API.</p>
-   * 
+   *
    * @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;
 /**
  * <code>DocumentFormatDefault</code> 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 <code>DocumentFormatDefault</code> object with the 
+   * Creates a <code>DocumentFormatDefault</code> 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 <code>DocumentFormatDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>FinishingsDefault</code> 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 <code>FinishingsDefault</code> object.
-   * 
+   *
    * @param value the value
    */
   protected FinishingsDefault(int value)
@@ -204,7 +204,7 @@ public final class FinishingsDefault extends EnumSyntax
    *
    * @return the class <code>FinishingsDefault</code> itself
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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). 
+
+  /**
+   * Job should be processed as second-shift
+   * (after close of business).
    */
-  public static final JobHoldUntilDefault SECOND_SHIFT = 
+  public static final JobHoldUntilDefault SECOND_SHIFT =
     new JobHoldUntilDefault("second-shift", null);
-  
-  /**  
-   * Job should be processed as third-shift 
-   * (after midnight). 
+
+  /**
+   * Job should be processed as third-shift
+   * (after midnight).
    */
-  public static final JobHoldUntilDefault THIRD_SHIFT = 
-    new JobHoldUntilDefault("third-shift", null); 
+  public static final JobHoldUntilDefault THIRD_SHIFT =
+    new JobHoldUntilDefault("third-shift", null);
 
   /**
-   * Creates a <code>JobHoldUntilDefault</code> object with the 
+   * Creates a <code>JobHoldUntilDefault</code> 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 <code>JobHoldUntilDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobPriorityDefault</code> object.
    *
@@ -74,7 +74,7 @@ public final class JobPriorityDefault extends IntegerSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -90,7 +90,7 @@ public final class JobPriorityDefault extends IntegerSyntax
    *
    * @return The class <code>JobPriorityDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobSheetsDefault</code> object with the 
+   * Creates a <code>JobSheetsDefault</code> 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 <code>JobSheetsDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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.
    * <p>May return null if no value exists in JPS API.</p>
-   * 
+   *
    * @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 <code>MediaDefault</code> object with the 
+   * Creates a <code>MediaDefault</code> 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 <code>MediaDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>MultipleDocumentHandlingDefault</code> 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 <code>MultipleDocumentHandlingDefault</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected MultipleDocumentHandlingDefault(int value)
@@ -102,7 +102,7 @@ public final class MultipleDocumentHandlingDefault extends EnumSyntax
    *
    * @return The class <code>MultipleDocumentHandlingDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>NumberUpDefault</code> 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 <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -85,7 +85,7 @@ public final class NumberUpDefault extends IntegerSyntax
    *
    * @return The class <code>NumberUpDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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.
    * <p>May return null if no value exists in JPS API.</p>
-   * 
+   *
    * @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 <code>OrientationRequestedDefault</code> attribute provides 
+ * The <code>OrientationRequestedDefault</code> 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 <code>OrientationRequestedDefault</code> object.
-   * 
+   *
    * @param value the value
    */
   protected OrientationRequestedDefault(int value)
@@ -94,7 +94,7 @@ public final class OrientationRequestedDefault extends EnumSyntax
    *
    * @return The class <code>OrientationRequestedDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>PrintQualityDefault</code> 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 <code>PrintQualityDefault</code> 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 <code>PrintQualityDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>PrinterResolutionDefault</code> attribute provides 
+ * The <code>PrinterResolutionDefault</code> 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 <code>ResolutionSyntax</code> 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 <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> 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 <code>PrinterResolutionDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>SidesDefault</code> 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 <code>SidesDefault</code> object.
    *
@@ -101,7 +101,7 @@ public final class SidesDefault extends EnumSyntax
    *
    * @return The class <code>SidesDefault</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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.
  * <p>
- * 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.<br>
  * All clients and IPP objects must support the 'utf-8' charset.
  * </p>
- * 
+ *
  * @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 <code>AttributesCharset</code> object.
-   * 
+   *
    * @param value the charset string value.
    */
   public AttributesCharset(String value)
@@ -76,7 +76,7 @@ public final class AttributesCharset extends CharsetSyntax
    *
    * @return The class <code>AttributesCharset</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
  * <p>
  * 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.
  * </p>
- * 
+ *
  * @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 <code>AttributesNaturalLanguage</code> object.
-   * 
+   *
    * @param value the language string value.
    */
   public AttributesNaturalLanguage(String value)
@@ -78,7 +78,7 @@ public final class AttributesNaturalLanguage extends NaturalLanguageSyntax
    *
    * @return The class <code>AttributesNaturalLanguage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobDetailedStatusMessages</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobDocumentAccessErrors</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobId</code> 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 <code>JobId</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobMoreInfo</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobPrinterUri</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobStateMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobUri</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>CharsetConfigured</code> object.
-   * 
+   *
    * @param value the charset string value.
    */
   public CharsetConfigured(String value)
@@ -68,7 +68,7 @@ public final class CharsetConfigured extends CharsetSyntax
    *
    * @return The class <code>CharsetConfigured</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 
 /**
  * <code>DocumentFormatSupported</code> 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 <code>DocumentFormat</code> object with the 
+   * Creates a <code>DocumentFormat</code> 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 <code>DocumentFormat</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>MultipleOperationTimeOut</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>NaturalLanguageConfigured</code> object.
-   * 
+   *
    * @param value the charset string value.
    */
   public NaturalLanguageConfigured(String value)
@@ -68,7 +68,7 @@ public final class NaturalLanguageConfigured extends NaturalLanguageSyntax
    *
    * @return The class <code>NaturalLanguageConfigured</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> 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 <code>PrinterCurrentTime</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>PrinterDriverInstaller</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>PrinterStateMessage</code> object with the 
+   * Creates a <code>PrinterStateMessage</code> 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 <code>PrinterStateMessage</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>PrinterUpTime</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>CharsetSupported</code> object.
-   * 
+   *
    * @param value the charset string value.
    */
   public CharsetSupported(String value)
@@ -69,7 +70,7 @@ public final class CharsetSupported extends CharsetSyntax
    *
    * @return The class <code>CharsetSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>CompressionSupported</code> 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 <code>CompressionSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected CompressionSupported(int value)
@@ -90,7 +91,7 @@ public final class CompressionSupported extends EnumSyntax
    *
    * @return The class <code>CompressionSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> 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;
 
 /**
  * <code>DocumentFormatSupported</code> 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 <code>DocumentFormatSupported</code> object with the 
+   * Creates a <code>DocumentFormatSupported</code> 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 <code>DocumentFormatSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>FinishingsSupported</code> 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 
+   * Bind the document(s) with one or more staples (wire stitches) along
    * the top edge.
    */
-  public static final FinishingsSupported EDGE_STITCH_TOP = 
+  public static final FinishingsSupported EDGE_STITCH_TOP =
     new FinishingsSupported(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 FinishingsSupported EDGE_STITCH_RIGHT = 
+  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 bottom edge.
    */
-  public static final FinishingsSupported EDGE_STITCH_BOTTOM = 
+  public static final FinishingsSupported EDGE_STITCH_BOTTOM =
     new FinishingsSupported(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 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 <code>FinishingsSupported</code> object.
-   * 
+   *
    * @param value the value
    */
   protected FinishingsSupported(int value)
@@ -221,7 +222,7 @@ public final class FinishingsSupported extends EnumSyntax
    *
    * @return the class <code>FinishingsSupported</code> itself
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> 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 <code>GeneratedNaturalLanguageSupported</code> object.
-   * 
+   *
    * @param value the charset string value.
    */
   public GeneratedNaturalLanguageSupported(String value)
@@ -70,7 +71,7 @@ public final class GeneratedNaturalLanguageSupported
    *
    * @return The class <code>GeneratedNaturalLanguageSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>IppVersionsSupported</code> 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 <code>IppVersionsSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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). 
+
+  /**
+   * Job should be processed as second-shift
+   * (after close of business).
    */
-  public static final JobHoldUntilSupported SECOND_SHIFT = 
+  public static final JobHoldUntilSupported SECOND_SHIFT =
     new JobHoldUntilSupported("second-shift", null);
-  
-  /**  
-   * Job should be processed as third-shift 
-   * (after midnight). 
+
+  /**
+   * Job should be processed as third-shift
+   * (after midnight).
    */
-  public static final JobHoldUntilSupported THIRD_SHIFT = 
-    new JobHoldUntilSupported("third-shift", null); 
+  public static final JobHoldUntilSupported THIRD_SHIFT =
+    new JobHoldUntilSupported("third-shift", null);
 
   /**
-   * Creates a <code>JobHoldUntilSupported</code> object with the 
+   * Creates a <code>JobHoldUntilSupported</code> 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 <code>JobHoldUntilSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>JobSheetsSupported</code> object with the 
+   * Creates a <code>JobSheetsSupported</code> 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 <code>JobSheetsSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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.
    * <p>May return null if no value exists in JPS API.</p>
-   * 
+   *
    * @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<Attribute> set)
   {
-    JobSheetsSupported tmp;
-    ArrayList result = new ArrayList();      
-    Iterator it = set.iterator();
+    ArrayList<JobSheets> result = new ArrayList<JobSheets>();
     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 <code>MediaSupported</code> object with the 
+   * Creates a <code>MediaSupported</code> 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 <code>MediaSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> set)
   {
-    MediaSupported tmp;
     Media tmp2;
-    ArrayList result = new ArrayList();          
-    Iterator it = set.iterator();
-    while (it.hasNext())
+    ArrayList<Media> result = new ArrayList<Media>();
+    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;
 /**
  * <code>MultipleDocumentHandlingSupported</code> 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 <code>MultipleDocumentHandlingSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected MultipleDocumentHandlingSupported(int value)
@@ -105,7 +106,7 @@ public final class MultipleDocumentHandlingSupported extends EnumSyntax
    *
    * @return The class <code>MultipleDocumentHandlingSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> 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;
 
 /**
  * <code>MultipleDocumentJobsSupported</code> 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 <code>MultipleDocumentJobsSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected MultipleDocumentJobsSupported(int value)
@@ -79,7 +80,7 @@ public class MultipleDocumentJobsSupported extends EnumSyntax
    *
    * @return The class <code>MultipleDocumentJobsSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
  * <code>OperationsSupported</code> 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 <code>OperationsSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected OperationsSupported(int value)
@@ -186,7 +187,7 @@ public final class OperationsSupported extends EnumSyntax
    *
    * @return The class <code>OperationsSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>OrientationRequestedSupported</code> attribute provides 
+ * The <code>OrientationRequestedSupported</code> 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 <code>OrientationRequestedSupported</code> object.
-   * 
+   *
    * @param value the value
    */
   protected OrientationRequestedSupported(int value)
@@ -97,7 +98,7 @@ public final class OrientationRequestedSupported extends EnumSyntax
    *
    * @return The class <code>OrientationRequestedSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> 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;
 
-
 /**
  * <code>PageRangesSupported</code> 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 <code>PageRangesSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected PageRangesSupported(int value)
@@ -79,7 +79,7 @@ public final class PageRangesSupported extends EnumSyntax
    *
    * @return The class <code>PageRangesSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>PrintQualitySupported</code> 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 <code>PrintQualitySupported</code> 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 <code>PrintQualitySupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> 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 <code>PrinterResolutionSupported</code> attribute provides 
+ * The <code>PrinterResolutionSupported</code> 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 <code>PrinterResolutionSupported</code> object with the 
+   * Creates a <code>PrinterResolutionSupported</code> 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 <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> 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 <code>PrinterResolutionSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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<Attribute> 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 <code>PrinterUriSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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;
 /**
  * <code>SidesSupported</code> 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 <code>SidesSupported</code> object.
    *
@@ -98,7 +99,7 @@ public final class SidesSupported extends EnumSyntax
    *
    * @return The class <code>SidesSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>UriAuthenticationSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   public UriAuthenticationSupported(int value)
@@ -102,7 +103,7 @@ public final class UriAuthenticationSupported extends EnumSyntax
    *
    * @return The class <code>UriAuthenticationSupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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 <code>UriSecuritySupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   public UriSecuritySupported(int value)
@@ -87,7 +88,7 @@ public final class UriSecuritySupported extends EnumSyntax
    *
    * @return The class <code>UriSecuritySupported</code> itself.
    */
-  public Class getCategory()
+  public Class<? extends Attribute> 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.
author	gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4>	2010-10-12 15:55:12 +0000
committer	gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4>	2010-10-12 15:55:12 +0000
commit	d8bc803082928434d39c7ab25b322f7066603de6 (patch)
tree	ed04a07a98f6d83830e25c996a838f7e5b3b109b /libjava/classpath/gnu/javax/print/ipp/attribute
parent	e67bda386ddfbe740ecbb7c336f76360a393386b (diff)
download	ppe42-gcc-d8bc803082928434d39c7ab25b322f7066603de6.tar.gz ppe42-gcc-d8bc803082928434d39c7ab25b322f7066603de6.zip