Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 11556 invoked from network); 26 Apr 2009 12:30:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Apr 2009 12:30:38 -0000 Received: (qmail 42891 invoked by uid 500); 26 Apr 2009 12:30:38 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 42816 invoked by uid 500); 26 Apr 2009 12:30:37 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 42799 invoked by uid 99); 26 Apr 2009 12:30:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Apr 2009 12:30:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Apr 2009 12:30:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 969B623889CF; Sun, 26 Apr 2009 12:30:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r768698 [1/18] - in /harmony/enhanced/classlib/branches/java6: ./ modules/annotation/src/main/java/java/lang/annotation/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/main/java/java/util/zip/ modules/auth/src/main/java/co... Date: Sun, 26 Apr 2009 12:30:06 -0000 To: commits@harmony.apache.org From: qiuxx@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090426123013.969B623889CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: qiuxx Date: Sun Apr 26 12:30:01 2009 New Revision: 768698 URL: http://svn.apache.org/viewvc?rev=768698&view=rev Log: Merge updates from classlib trunk@768151 since r765922 Added: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockTreeMap.xml - copied unchanged from r768151, harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/MockTreeMap.xml harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockTreeMapClass.java - copied unchanged from r768151, harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockTreeMapClass.java harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryNotificationInfoTest.java - copied unchanged from r768151, harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryNotificationInfoTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/unix/org/apache/harmony/luni/tests/java/io/UnixSocketTest.java - copied unchanged from r768151, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/unix/org/apache/harmony/luni/tests/java/io/UnixSocketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinSocketTest.java - copied unchanged from r768151, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinSocketTest.java Modified: harmony/enhanced/classlib/branches/java6/ (props changed) harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Annotation.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Documented.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/ElementType.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Inherited.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Pack200.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Adler32.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CRC32.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CheckedInputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CheckedOutputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Checksum.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/DataFormatException.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Deflater.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/DeflaterOutputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/GZIPInputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/GZIPOutputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Inflater.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipEntry.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipException.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipFile.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipInputStream.java harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/AuthPermission.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/DestroyFailedException.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Destroyable.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/PrivateCredentialPermission.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Subject.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/callback/Callback.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/callback/CallbackHandler.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/callback/PasswordCallback.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/callback/UnsupportedCallbackException.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/login/LoginException.java harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/x500/X500Principal.java harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/ (props changed) harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ (props changed) harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/BadPaddingException.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/Cipher.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/CipherSpi.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/KeyAgreement.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/KeyGenerator.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/Mac.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/MacSpi.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/NullCipher.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/SealedObject.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/SecretKey.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/SecretKeyFactory.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/ShortBufferException.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/interfaces/DHKey.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/PSource.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/java/lang/management/MemoryNotificationInfo.java harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/java/lang/management/MemoryUsage.java harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ConsoleHandler.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/ErrorManager.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/FileHandler.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Filter.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Formatter.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Handler.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogRecord.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Logger.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingMXBean.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LoggingPermission.java harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/MemoryHandler.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Class.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ClassLoader.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Compiler.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Object.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Package.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Runtime.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/StackTraceElement.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/System.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Thread.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ThreadGroup.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Throwable.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ref/Reference.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ref/SoftReference.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ref/WeakReference.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/reflect/Array.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/reflect/Constructor.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/reflect/Field.java harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/reflect/Method.java harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86.drl harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86_64.drl harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Properties.java harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Scanner.java harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/WriterTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/FormatterTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/BigDecimal.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/BigInteger.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/BitLevel.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Conversion.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Division.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Elementary.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Logical.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/MathContext.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Multiplication.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Primality.java harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/RoundingMode.java harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java harmony/enhanced/classlib/branches/java6/modules/regex/.settings/org.eclipse.jdt.core.prefs harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/AbstractSet.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/IntArrHash.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Lexer.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/MatchResult.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Matcher.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Pattern.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/PatternSyntaxException.java harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/SequenceSet.java harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java harmony/enhanced/classlib/branches/java6/modules/text/make/exclude.common harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java Propchange: harmony/enhanced/classlib/branches/java6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Apr 26 12:30:01 2009 @@ -1 +1 @@ -/harmony/enhanced/classlib/trunk:713674-735919 +/harmony/enhanced/classlib/trunk:713674-735919,765923-768151 Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Annotation.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Annotation.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Annotation.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Annotation.java Sun Apr 26 12:30:01 2009 @@ -18,52 +18,108 @@ package java.lang.annotation; /** - *

- * The interface implemented by all annotations. This interface is NOT an - * annotation itself and any interface that extends this one is NOT an - * annotation either. - *

- * + * Defines the interface implemented by all annotations. Note that the interface + * itself is not an annotation, and neither is an interface that simply + * extends this one. Only the compiler is able to create proper annotation + * types. + * * @since 1.5 */ public interface Annotation { /** - *

* Returns the type of this annotation. - *

- * - * @return A Class instance. + * + * @return A {@code Class} instance representing the annotation type. */ Class annotationType(); /** - *

* Determines whether or not this annotation is equivalent to the annotation - * passed. - *

+ * passed. This is determined according to the following rules: * - * @param obj The object to compare to. - * @return true if obj is equal to this, - * otherwise false. + *
    + *
  • + * Two annotations {@code x} and {@code y} are equal if and only if + * they are members of the same annotation type and all the member + * values of {@code x} are equal to the corresponding member values + * of {@code y}. + *
    • + *
  • + * The equality of primitive member values {@code x} and {@code y} + * is determined (in a way similar to) using the corresponding + * wrapper classes. For example, + * {@code Integer.valueOf(x).equals(Integer.valueOf(y)} is used for + * {@code int} values. Note: The behavior is identical to the + * {@code ==} operator for all but the floating point type, so the + * implementation may as well use {@code ==} in these cases for + * performance reasons. Only for the {@code float} and {@code double} + * types the result will be slightly different: {@code NaN} is equal + * to {@code NaN}, and {@code -0.0} is equal to {@code 0.0}, both of + * which is normally not the case. + *
    • + *
  • + * The equality of two array member values {@code x} and {@code y} + * is determined using the corresponding {@code equals(x, y)} + * helper function in {@link java.util.Arrays}. + *
    • + *
  • + * The hash code for all other member values is determined by simply + * calling their {@code equals()} method. + *
    • + *
+ * + * @param obj + * The object to compare to. + * + * @return {@code true} if {@code obj} is equal to this annotation, + * {@code false} otherwise. */ boolean equals(Object obj); /** - *

- * Returns the hash value of this annotation. - *

+ * Returns the hash code of this annotation. The hash code is determined + * according to the following rules: * - * @return The hash value. + *
    + *
  • + * The hash code of an annotation is the sum of the hash codes of + * its annotation members. + *
    • + *
  • + * The hash code of an annotation member is calculated as {@code + * (0x7f * n.hashCode()) ^ v.hashCode())}, where {@code n} is the + * name of the member (as a {@code String}) and {@code v} its value. + *
    • + *
  • + * The hash code for a primitive member value is determined using + * the corresponding wrapper type. For example, {@code + * Integer.valueOf(v).hashCode()} is used for an {@code int} value + * {@code v}. + *
    • + *
  • + * The hash code for an array member value {@code v} is determined + * using the corresponding {@code hashCode(v)} helper function in + * {@link java.util.Arrays}. + *
    • + *
  • + * The hash code for all other member values is determined by simply + * calling their {@code hashCode} method. + *
    • + *
+ * + * @return the hash code. */ int hashCode(); /** - *

- * Returns a String representation of this annotation. - *

+ * Returns a {@code String} representation of this annotation. It is not + * strictly defined what the representation has to look like, but it usually + * consists of the name of the annotation, preceded by a "@". If the + * annotation contains field members, their names and values are also + * included in the result. * - * @return The String that represents this annotation. + * @return the {@code String} that represents this annotation. */ String toString(); } Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java Sun Apr 26 12:30:01 2009 @@ -18,10 +18,11 @@ package java.lang.annotation; /** - *

- * Indicates that an annotation in a class file is incorrectly formatted. - *

- * + * Indicates that an annotation in the binary representation of a class is + * syntactically incorrect and the annotation parser is unable to process it. + * This exception is unlikely to ever occur, given that the code has been + * compiled by an ordinary Java compiler. + * * @since 1.5 */ public class AnnotationFormatError extends Error { @@ -29,36 +30,34 @@ private static final long serialVersionUID = -4256701562333669892L; /** - *

* Constructs an instance with the message provided. - *

- * - * @param message The details of the error. + * + * @param message + * the details of the error. */ public AnnotationFormatError(String message) { super(message); } /** - *

* Constructs an instance with a message and a cause. - *

- * - * @param message The details of the error. - * @param cause The cause of the error or null if none. + * + * @param message + * the details of the error. + * @param cause + * the cause of the error or {@code null} if none. */ public AnnotationFormatError(String message, Throwable cause) { super(message, cause); } /** - *

- * Constructs an instance with a cause. If the cause is NOT - * null, then cause.toString() is used as the + * Constructs an instance with a cause. If the cause is not + * {@code null}, then {@code cause.toString()} is used as the * error's message. - *

- * - * @param cause The cause of the error or null if none. + * + * @param cause + * the cause of the error or {@code null} if none. */ public AnnotationFormatError(Throwable cause) { super(cause == null ? null : cause.toString(), cause); Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java Sun Apr 26 12:30:01 2009 @@ -22,11 +22,9 @@ import org.apache.harmony.annotation.internal.nls.Messages; /** - *

* Indicates that an annotation type has changed since it was compiled or * serialized. - *

- * + * * @since 1.5 */ public class AnnotationTypeMismatchException extends RuntimeException { @@ -38,12 +36,14 @@ private String foundType; /** - *

* Constructs an instance for the given type element and the type found. - *

- * - * @param element The annotation type element. - * @param foundType The invalid type that was found. + * + * @param element + * the annotation type element. + * @param foundType + * the invalid type that was found. This is actually the textual + * type description found in the binary class representation, + * so it may not be human-readable. */ public AnnotationTypeMismatchException(Method element, String foundType) { super(Messages.getString("annotation.1", element, foundType)); //$NON-NLS-1$ @@ -52,22 +52,18 @@ } /** - *

- * The method object for the invalid type. - *

- * - * @return A {@link Method} instance. + * Returns the method object for the invalid type. + * + * @return a {@link Method} instance. */ public Method element() { return element; } /** - *

- * The invalid type. - *

- * - * @return A String describing the invalid data. + * Returns the invalid type. + * + * @return a string describing the invalid data. */ public String foundType() { return foundType; Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Documented.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Documented.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Documented.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Documented.java Sun Apr 26 12:30:01 2009 @@ -18,11 +18,9 @@ package java.lang.annotation; /** - *

- * A meta-annotation used to indicate that a type's annotation are documented - * and part of the public API. - *

- * + * Defines a meta-annotation for indicating that an annotation is documented and + * considered part of the public API. + * * @since 1.5 */ @Documented Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/ElementType.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/ElementType.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/ElementType.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/ElementType.java Sun Apr 26 12:30:01 2009 @@ -18,59 +18,43 @@ package java.lang.annotation; /** - *

- * An enumeration of element types. - *

- * + * Defines an enumeration for Java program elements. It is used in conjunction + * with the {@link Target} meta-annotation to restrict the use of an annotation + * to certain program elements. + * * @since 1.5 */ public enum ElementType { /** - *

* Class, interface or enum declaration. - *

*/ TYPE, /** - *

* Field declaration. - *

*/ FIELD, /** - *

* Method declaration. - *

*/ METHOD, /** - *

* Parameter declaration. - *

*/ PARAMETER, /** - *

* Constructor declaration. - *

*/ CONSTRUCTOR, /** - *

* Local variable declaration. - *

*/ LOCAL_VARIABLE, /** - *

* Annotation type declaration. - *

*/ ANNOTATION_TYPE, /** - *

* Package declaration. - *

*/ PACKAGE } Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java Sun Apr 26 12:30:01 2009 @@ -20,12 +20,10 @@ import org.apache.harmony.annotation.internal.nls.Messages; /** - *

* Indicates that an element of an annotation type was accessed that was added * after the type was compiled or serialized. This does not apply to new * elements that have default values. - *

- * + * * @since 1.5 */ public class IncompleteAnnotationException extends RuntimeException { @@ -37,13 +35,13 @@ private String elementName; /** - *

* Constructs an instance with the incomplete annotation type and the name * of the element that's missing. - *

- * - * @param annotationType The annotation type. - * @param elementName The name of the incomplete element. + * + * @param annotationType + * the annotation type. + * @param elementName + * the name of the incomplete element. */ public IncompleteAnnotationException( Class annotationType, String elementName) { @@ -53,22 +51,18 @@ } /** - *

- * The annotation type. - *

- * - * @return A Class instance. + * Returns the annotation type. + * + * @return a Class instance. */ public Class annotationType() { return annotationType; } /** - *

- * The incomplete element's name. - *

- * - * @return The name of the element. + * Returns the incomplete element's name. + * + * @return the name of the element. */ public String elementName() { return elementName; Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Inherited.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Inherited.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Inherited.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Inherited.java Sun Apr 26 12:30:01 2009 @@ -18,11 +18,9 @@ package java.lang.annotation; /** - *

- * A meta-annotation used to indicate that an annotation is automatically + * Defines a meta-annotation for indicating that an annotation is automatically * inherited. - *

- * + * * @since 1.5 */ @Documented Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java Sun Apr 26 12:30:01 2009 @@ -18,11 +18,10 @@ package java.lang.annotation; /** - *

- * A meta-annotation used to determine the scope of retention for an annotation. - * The default value is {@link RetentionPolicy#RUNTIME}. - *

- * + * Defines a meta-annotation for determining the scope of retention for an + * annotation. If the retention annotation is not set {@code + * RetentionPolicy.CLASS} is used as default retention. + * * @since 1.5 */ @Documented Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java Sun Apr 26 12:30:01 2009 @@ -18,31 +18,25 @@ package java.lang.annotation; /** - *

- * An enumeration for annotation retention policies. - *

- * + * Defines an enumeration for annotation retention policies. Used in conjunction + * with the {@link Retention} annotation to specify an annotation's time-to-live + * in the overall development life cycle. + * * @since 1.5 */ public enum RetentionPolicy { /** - *

* Annotation is only available in the source code. - *

*/ SOURCE, /** - *

* Annotation is available in the source code and in the class file, but not * at runtime. This is the default policy. - *

*/ CLASS, /** - *

* Annotation is available in the source code, the class file and is * available at runtime. - *

*/ RUNTIME } Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java Sun Apr 26 12:30:01 2009 @@ -18,11 +18,9 @@ package java.lang.annotation; /** - *

- * A meta-annotation used to determine what {@link ElementType}s an annotation - * can be applied to. - *

- * + * Defines a meta-annotation for determining what {@link ElementType}s an + * annotation can be applied to. + * * @since 1.5 */ @Documented Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java Sun Apr 26 12:30:01 2009 @@ -26,65 +26,161 @@ import org.apache.harmony.archive.util.Util; /** - * The Attributes class is used to store values for Manifest entries. Attributes - * keys are generally instances of Attributes.Name. Values associated with - * Attributes keys are of type String. + * The {@code Attributes} class is used to store values for manifest entries. + * Attribute keys are generally instances of {@code Attributes.Name}. Values + * associated with attribute keys are of type {@code String}. */ public class Attributes implements Cloneable, Map { + /** + * The {@code Attributes} as name/value pairs. Maps the attribute names (as + * {@link Attributes.Name}) of a JAR file manifest to arbitrary values. The + * attribute names thus are obtained from the {@link Manifest} for + * convenience. + */ protected Map map; + /** + * The name part of the name/value pairs constituting an attribute as + * defined by the specification of the JAR manifest. May be composed of the + * following ASCII signs as defined in the EBNF below: + * + * 
+     * name       = alphanum *headerchar
+     * headerchar = alphanum | - | _
+     * alphanum   = {A-Z} | {a-z} | {0-9}
+     *
+ */ public static class Name { private final byte[] name; private int hashCode; + /** + * The class path (a main attribute). + */ public static final Name CLASS_PATH = new Name("Class-Path"); //$NON-NLS-1$ + /** + * The version of the manifest file (a main attribute). + */ public static final Name MANIFEST_VERSION = new Name("Manifest-Version"); //$NON-NLS-1$ + /** + * The main class's name (for stand-alone applications). + */ public static final Name MAIN_CLASS = new Name("Main-Class"); //$NON-NLS-1$ + /** + * Defines the signature version of the JAR file. + */ public static final Name SIGNATURE_VERSION = new Name( "Signature-Version"); //$NON-NLS-1$ + /** + * The {@code Content-Type} manifest attribute. + */ public static final Name CONTENT_TYPE = new Name("Content-Type"); //$NON-NLS-1$ + /** + * The {@code Sealed} manifest attribute which may have the value + * {@code true} for sealed archives. + */ public static final Name SEALED = new Name("Sealed"); //$NON-NLS-1$ + /** + * The {@code Implementation-Title} attribute whose value is a string + * that defines the title of the extension implementation. + */ public static final Name IMPLEMENTATION_TITLE = new Name( "Implementation-Title"); //$NON-NLS-1$ + /** + * The {@code Implementation-Version} attribute defining the version of + * the extension implementation. + */ public static final Name IMPLEMENTATION_VERSION = new Name( "Implementation-Version"); //$NON-NLS-1$ + /** + * The {@code Implementation-Vendor} attribute defining the organization + * that maintains the extension implementation. + */ public static final Name IMPLEMENTATION_VENDOR = new Name( "Implementation-Vendor"); //$NON-NLS-1$ + /** + * The {@code Specification-Title} attribute defining the title of the + * extension specification. + */ public static final Name SPECIFICATION_TITLE = new Name( "Specification-Title"); //$NON-NLS-1$ + /** + * The {@code Specification-Version} attribute defining the version of + * the extension specification. + */ public static final Name SPECIFICATION_VERSION = new Name( "Specification-Version"); //$NON-NLS-1$ + /** + * The {@code Specification-Vendor} attribute defining the organization + * that maintains the extension specification. + */ public static final Name SPECIFICATION_VENDOR = new Name( "Specification-Vendor"); //$NON-NLS-1$ + /** + * The {@code Extension-List} attribute defining the extensions that are + * needed by the applet. + */ public static final Name EXTENSION_LIST = new Name("Extension-List"); //$NON-NLS-1$ + /** + * The {@code Extension-Name} attribute which defines the unique name of + * the extension. + */ public static final Name EXTENSION_NAME = new Name("Extension-Name"); //$NON-NLS-1$ + /** + * The {@code Extension-Installation} attribute. + */ public static final Name EXTENSION_INSTALLATION = new Name( "Extension-Installation"); //$NON-NLS-1$ + /** + * The {@code Implementation-Vendor-Id} attribute specifies the vendor + * of an extension implementation if the applet requires an + * implementation from a specific vendor. + */ public static final Name IMPLEMENTATION_VENDOR_ID = new Name( "Implementation-Vendor-Id"); //$NON-NLS-1$ + /** + * The {@code Implementation-URL} attribute specifying a URL that can be + * used to obtain the most recent version of the extension if the + * required version is not already installed. + */ public static final Name IMPLEMENTATION_URL = new Name( "Implementation-URL"); //$NON-NLS-1$ static final Name NAME = new Name("Name"); + /** + * A String which must satisfy the following EBNF grammar to specify an + * additional attribute: + * + * 
+         * name       = alphanum *headerchar
+         * headerchar = alphanum | - | _
+         * alphanum   = {A-Z} | {a-z} | {0-9}
+         *
+ * + * @param s + * The Attribute string. + * @exception IllegalArgumentException + * if the string does not satisfy the EBNF grammar. + */ public Name(String s) { int i = s.length(); if (i == 0 || i > Manifest.LINE_LENGTH_LIMIT - 2) { @@ -114,6 +210,11 @@ return name; } + /** + * Returns this attribute name. + * + * @return the attribute name. + */ @Override public String toString() { try { @@ -123,6 +224,14 @@ } } + /** + * returns whether the argument provided is the same as the attribute + * name. + * + * @return if the attribute names correspond. + * @param object + * An attribute name to be compared with this name. + */ @Override public boolean equals(Object object) { if (object == null || object.getClass() != getClass() @@ -133,6 +242,11 @@ return Util.equalsIgnoreCase(name, ((Name) object).name); } + /** + * Computes a hash code of the name. + * + * @return the hash value computed from the name. + */ @Override public int hashCode() { if (hashCode == 0) { @@ -151,18 +265,18 @@ } /** - * Constructs an Attributes instance + * Constructs an {@code Attributes} instance. */ public Attributes() { map = new HashMap(); } /** - * Constructs an Attributes instance obtaining keys and values from the - * parameter Attributes, attrib + * Constructs an {@code Attributes} instance obtaining keys and values from + * the parameter {@code attrib}. * * @param attrib - * The Attributes to obtain entries from. + * The attributes to obtain entries from. */ @SuppressWarnings("unchecked") public Attributes(Attributes attrib) { @@ -170,97 +284,97 @@ } /** - * Constructs an Attributes instance with initial capacity of size size + * Constructs an {@code Attributes} instance with initial capacity of size + * {@code size}. * * @param size - * Initial size of this Attributes instance. + * Initial size of this {@code Attributes} instance. */ public Attributes(int size) { map = new HashMap(size); } /** - * Removes all key/value pairs from this Attributes. - * + * Removes all key/value pairs from this {@code Attributes}. */ public void clear() { map.clear(); } /** - * Determines whether this Attributes contains the specified key - * + * Determines whether this {@code Attributes} contains the specified key. * * @param key * The key to search for. - * @return true if the key is found, false otherwise + * @return {@code true} if the key is found, {@code false} otherwise. */ public boolean containsKey(Object key) { return map.containsKey(key); } /** - * Determines whether this Attributes contains the specified value + * Determines whether this {@code Attributes} contains the specified value. * * @param value - * The value to search for. - * @return true if the value is found, false otherwise + * the value to search for. + * @return {@code true} if the value is found, {@code false} otherwise. */ public boolean containsValue(Object value) { return map.containsValue(value); } /** - * Returns a set containing MapEntry's for each of the key/value pairs - * contained in this Attributes. + * Returns a set containing map entries for each of the key/value pair + * contained in this {@code Attributes}. * - * @return a set of MapEntry's + * @return a set of Map.Entry's */ public Set> entrySet() { return map.entrySet(); } /** - * Returns the value associated with the parameter key + * Returns the value associated with the parameter key. * * @param key - * The key to search for. - * @return Object associated with key, or null if key does not exist. + * the key to search for. + * @return Object associated with key, or {@code null} if key does not + * exist. */ public Object get(Object key) { return map.get(key); } /** - * Determines whether this Attributes contains any keys + * Determines whether this {@code Attributes} contains any keys. * - * @return true if one or more keys exist, false otherwise + * @return {@code true} if one or more keys exist, {@code false} otherwise. */ public boolean isEmpty() { return map.isEmpty(); } /** - * Returns a Set containing all the keys found in this Attributes. + * Returns a {@code Set} containing all the keys found in this {@code + * Attributes}. * - * @return a Set of all keys + * @return a {@code Set} of all keys. */ public Set keySet() { return map.keySet(); } /** - * Store value in this Attributes and associate it with key. + * Stores key/value pairs in this {@code Attributes}. * * @param key - * The key to associate with value. + * the key to associate with value. * @param value - * The value to store in this Attributes - * @return The value being stored - * + * the value to store in this {@code Attributes}. + * @return the value being stored. * @exception ClassCastException - * when key is not an Attributes.Name or value is not a - * String + * when key is not an {@code Attributes.Name} or value is not + * a {@code String}. */ @SuppressWarnings("cast") // Require cast to force ClassCastException @@ -269,10 +383,12 @@ } /** - * Store all the key.value pairs in the argument in this Attributes. + * Stores all the key/value pairs in the argument in this {@code + * Attributes}. * * @param attrib - * the associations to store (must be of type Attributes). + * the associations to store (must be of type {@code + * Attributes}). */ public void putAll(Map attrib) { if (attrib == null || !(attrib instanceof Attributes)) { @@ -282,29 +398,33 @@ } /** - * Deletes the key/value pair with key key from this Attributes. + * Deletes the key/value pair with key {@code key} from this {@code + * Attributes}. * * @param key - * The key to remove - * @return the values associated with the removed key, null if not present. + * the key to remove. + * @return the values associated with the removed key, {@code null} if not + * present. */ public Object remove(Object key) { return map.remove(key); } /** - * Returns the number of key.value pairs associated with this Attributes. + * Returns the number of key/value pairs associated with this {@code + * Attributes}. * - * @return the size of this Attributes + * @return the size of this {@code Attributes}. */ public int size() { return map.size(); } /** - * Returns a Collection of all the values present in this Attributes. - * - * @return a Collection of all values present + * Returns a collection of all the values present in this {@code + * Attributes}. + * + * @return a collection of all values present. */ public Collection values() { return map.values(); @@ -324,9 +444,9 @@ } /** - * Returns the hashCode of this Attributes + * Returns the hash code of this {@code Attributes}. * - * @return the hashCode of this Object. + * @return the hash code of this object. */ @Override public int hashCode() { @@ -334,10 +454,14 @@ } /** - * Determines if this Attributes and the parameter Attributes are equal. Two - * Attributes instances are equal if they contain the same keys and values. - * - * @return true if the Attributes are equals, false otherwise + * Determines if this {@code Attributes} and the parameter {@code + * Attributes} are equal. Two {@code Attributes} instances are equal if they + * contain the same keys and values. + * + * @param obj + * the object with which this {@code Attributes} is compared. + * @return {@code true} if the {@code Attributes} are equal, {@code false} + * otherwise. */ @Override public boolean equals(Object obj) { @@ -351,37 +475,39 @@ } /** - * Returns the value associated with the parameter Attributes.Name key. + * Returns the value associated with the parameter {@code Attributes.Name} + * key. * * @param name - * The key to obtain the value for. - * @return the String associated with name, or null if name is not a valid - * key + * the key to obtain the value for. + * @return the {@code String} associated with name, or {@code null} if name + * is not a valid key. */ public String getValue(Attributes.Name name) { return (String) map.get(name); } /** - * Returns the String associated with the parameter name. + * Returns the string associated with the parameter name. * * @param name - * The key to obtain the value for. - * @return the String associated with name, or null if name is not a valid - * key + * the key to obtain the value for. + * @return the string associated with name, or {@code null} if name is not a + * valid key. */ public String getValue(String name) { return (String) map.get(new Attributes.Name(name)); } /** - * Stores value val against key name in this Attributes + * Stores the value {@code val} associated with the key {@code name} in this + * {@code Attributes}. * * @param name - * The key to store against. + * the key to store. * @param val - * The value to store in this Attributes - * @return the Value being stored + * the value to store in this {@code Attributes}. + * @return the value being stored. */ public String putValue(String name, String val) { return (String) map.put(new Attributes.Name(name), val); Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java Sun Apr 26 12:30:01 2009 @@ -31,8 +31,9 @@ import javax.security.auth.x500.X500Principal; /** - * JarEntry represents an entry in a JAR file. - * + * Represents a single file in a JAR archive together with the manifest + * attributes and digital signatures associated with it. + * * @see JarFile * @see JarInputStream */ @@ -49,17 +50,17 @@ private boolean isFactoryChecked = false; /** - * Create a new JarEntry named name + * Creates a new {@code JarEntry} named name. * * @param name - * The name of the new JarEntry + * The name of the new {@code JarEntry}. */ public JarEntry(String name) { super(name); } /** - * Create a new JarEntry using the values obtained from entry. + * Creates a new {@code JarEntry} using the values obtained from entry. * * @param entry * The ZipEntry to obtain values from. @@ -69,12 +70,13 @@ } /** - * Returns the Attributes object associated with this entry or null if none - * exists. + * Returns the {@code Attributes} object associated with this entry or + * {@code null} if none exists. * - * @return java.util.jar.Attributes Attributes for this entry - * @exception java.io.IOException - * If an error occurs obtaining the Attributes + * @return the {@code Attributes} for this entry. + * @exception IOException + * If an error occurs obtaining the {@code Attributes}. + * @see Attributes */ public Attributes getAttributes() throws IOException { if (attributes != null || parentJar == null) { @@ -88,10 +90,13 @@ } /** - * Returns an array of Certificate Objects associated with this entry or - * null if none exist. + * Returns an array of {@code Certificate} Objects associated with this + * entry or {@code null} if none exists. Make sure that the everything is + * read from the input stream before calling this method, or else the method + * returns {@code null}. * - * @return java.security.cert.Certificate[] Certificates for this entry + * @return the certificate for this entry. + * @see java.security.cert.Certificate */ public Certificate[] getCertificates() { if (null == parentJar) { @@ -109,10 +114,11 @@ } /** - * Create a new JarEntry using the values obtained from je. + * Create a new {@code JarEntry} using the values obtained from the + * argument. * * @param je - * The JarEntry to obtain values from + * The {@code JarEntry} to obtain values from. */ public JarEntry(JarEntry je) { super(je); @@ -122,12 +128,13 @@ } /** - * Returns the code signers for the jar entry. If there is no such code - * signers, returns null. Only when the jar entry has been completely - * verified by reading till the end of the jar entry, can the method be - * called. Or else the method will return null. + * Returns the code signers for the digital signatures associated with the + * JAR file. If there is no such code signer, it returns {@code null}. Make + * sure that the everything is read from the input stream before calling + * this method, or else the method returns {@code null}. * - * @return the code signers for the jar entry. + * @return the code signers for the JAR entry. + * @see CodeSigner */ public CodeSigner[] getCodeSigners() { if (null == signers) { Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java Sun Apr 26 12:30:01 2009 @@ -28,18 +28,18 @@ private static final long serialVersionUID = 7159778400963954473L; /** - * Constructs a new instance of this class with its walkback filled in. + * Constructs a new {@code JarException} instance. */ public JarException() { super(); } /** - * Constructs a new instance of this class with its walkback and message - * filled in. - * + * Constructs a new {@code JarException} instance with the specified + * message. + * * @param detailMessage - * String The detail message for the exception. + * the detail message for the exception. */ public JarException(String detailMessage) { super(detailMessage); Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java Sun Apr 26 12:30:01 2009 @@ -28,13 +28,17 @@ import org.apache.harmony.archive.util.Util; /** - * JarFile is used to read jar entries and their associated data from jar files. + * {@code JarFile} is used to read jar entries and their associated data from + * jar files. * * @see JarInputStream * @see JarEntry */ public class JarFile extends ZipFile { + /** + * The MANIFEST file name. + */ public static final String MANIFEST_NAME = "META-INF/MANIFEST.MF"; //$NON-NLS-1$ static final String META_DIR = "META-INF/"; //$NON-NLS-1$ @@ -120,26 +124,26 @@ } /** - * Create a new JarFile using the contents of file. + * Create a new {@code JarFile} using the contents of the specified file. * * @param file - * java.io.File - * @exception java.io.IOException - * If the file cannot be read. + * the JAR file as {@link File}. + * @throws IOException + * If the file cannot be read. */ public JarFile(File file) throws IOException { this(file, true); } /** - * Create a new JarFile using the contents of file. + * Create a new {@code JarFile} using the contents of the specified file. * * @param file - * java.io.File + * the JAR file as {@link File}. * @param verify - * verify a signed jar file - * @exception java.io.IOException - * If the file cannot be read. + * if this JAR file is signed whether it must be verified. + * @throws IOException + * If the file cannot be read. */ public JarFile(File file, boolean verify) throws IOException { super(file); @@ -150,16 +154,17 @@ } /** - * Create a new JarFile using the contents of file. + * Create a new {@code JarFile} using the contents of file. * * @param file - * java.io.File + * the JAR file as {@link File}. * @param verify - * verify a signed jar file + * if this JAR filed is signed whether it must be verified. * @param mode - * the mode to use, either OPEN_READ or OPEN_READ | OPEN_DELETE - * @exception java.io.IOException - * If the file cannot be read. + * the mode to use, either {@link ZipFile#OPEN_READ OPEN_READ} or + * {@link ZipFile#OPEN_DELETE OPEN_DELETE}. + * @throws IOException + * If the file cannot be read. */ public JarFile(File file, boolean verify, int mode) throws IOException { super(file, mode); @@ -170,12 +175,13 @@ } /** - * Create a new JarFile from the contents of the file specified by filename. + * Create a new {@code JarFile} from the contents of the file specified by + * filename. * * @param filename - * java.lang.String - * @exception java.io.IOException - * If fileName cannot be opened for reading. + * the file name referring to the JAR file. + * @throws IOException + * if file name cannot be opened for reading. */ public JarFile(String filename) throws IOException { this(filename, true); @@ -183,14 +189,15 @@ } /** - * Create a new JarFile from the contents of the file specified by filename. + * Create a new {@code JarFile} from the contents of the file specified by + * {@code filename}. * * @param filename - * java.lang.String + * the file name referring to the JAR file. * @param verify - * verify a signed jar file - * @exception java.io.IOException - * If fileName cannot be opened for reading. + * if this JAR filed is signed whether it must be verified. + * @throws IOException + * If file cannot be opened or read. */ public JarFile(String filename, boolean verify) throws IOException { super(filename); @@ -201,11 +208,12 @@ } /** - * Return an enumeration containing the JarEntrys contained in this JarFile. + * Return an enumeration containing the {@code JarEntrys} contained in this + * {@code JarFile}. * - * @return java.util.Enumeration - * @exception java.lang.IllegalStateException - * If this JarFile has been closed. + * @return the {@code Enumeration} containing the JAR entries. + * @throws IllegalStateException + * if this {@code JarFile} is closed. */ @Override public Enumeration entries() { @@ -233,21 +241,27 @@ } /** - * Return the JarEntry specified by name or null if no such entry exists. + * Return the {@code JarEntry} specified by its name or {@code null} if no + * such entry exists. * * @param name - * the name of the entry in the jar file - * @return java.util.jar.JarEntry + * the name of the entry in the JAR file. + * @return the JAR entry defined by the name. */ public JarEntry getJarEntry(String name) { return (JarEntry) getEntry(name); } /** - * Returns the Manifest object associated with this JarFile or null if no - * manifest entry exists. + * Returns the {@code Manifest} object associated with this {@code JarFile} + * or {@code null} if no MANIFEST entry exists. * - * @return java.util.jar.Manifest + * @return the MANIFEST. + * @throws IOException + * if an error occurs reading the MANIFEST file. + * @throws IllegalStateException + * if the jar file is closed. + * @see Manifest */ public Manifest getManifest() throws IOException { if (manifest != null) { @@ -318,13 +332,14 @@ } /** - * Return an InputStream for reading the decompressed contents of ze. + * Return an {@code InputStream} for reading the decompressed contents of + * ZIP entry. * * @param ze - * the ZipEntry to read from - * @return java.io.InputStream - * @exception java.io.IOException - * If an error occurred while creating the InputStream. + * the ZIP entry to be read. + * @return the input stream to read from. + * @throws IOException + * if an error occurred while creating the input stream. */ @Override public InputStream getInputStream(ZipEntry ze) throws IOException { @@ -361,11 +376,12 @@ } /** - * Return the JarEntry specified by name or null if no such entry exists + * Return the {@code JarEntry} specified by name or {@code null} if no such + * entry exists. * * @param name - * the name of the entry in the jar file - * @return java.util.jar.JarEntry + * the name of the entry in the JAR file. + * @return the ZIP entry extracted. */ @Override public ZipEntry getEntry(String name) { Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java Sun Apr 26 12:30:01 2009 @@ -26,6 +26,12 @@ import org.apache.harmony.luni.util.Util; +/** + * The input stream from which the JAR file to be read may be fetched. It is + * used like the {@code ZipInputStream}. + * + * @see ZipInputStream + */ public class JarInputStream extends ZipInputStream { private Manifest manifest; @@ -43,7 +49,15 @@ private OutputStream verStream; /** - * Constructs a new JarInputStream from stream + * Constructs a new {@code JarInputStream} from an input stream. + * + * @param stream + * the input stream containing the JAR file. + * @param verify + * if the file should be verified with a {@code JarVerifier}. + * @throws IOException + * If an error occurs reading entries from the input stream. + * @see ZipInputStream#ZipInputStream(InputStream) */ public JarInputStream(InputStream stream, boolean verify) throws IOException { @@ -85,32 +99,55 @@ } } + /** + * Constructs a new {@code JarInputStream} from an input stream. + * + * @param stream + * the input stream containing the JAR file. + * @throws IOException + * If an error occurs reading entries from the input stream. + * @see ZipInputStream#ZipInputStream(InputStream) + */ public JarInputStream(InputStream stream) throws IOException { this(stream, true); } /** - * Returns the Manifest object associated with this JarInputStream or null - * if no manifest entry exists. + * Returns the {@code Manifest} object associated with this {@code + * JarInputStream} or {@code null} if no manifest entry exists. * - * @return java.util.jar.Manifest + * @return the MANIFEST specifying the contents of the JAR file. */ public Manifest getManifest() { return manifest; } /** - * Returns the next JarEntry contained in this stream or null if no more - * entries are present. + * Returns the next {@code JarEntry} contained in this stream or {@code + * null} if no more entries are present. * - * @return java.util.jar.JarEntry - * @exception java.io.IOException - * If an error occurs while reading the entry + * @return the next JAR entry. + * @throws IOException + * if an error occurs while reading the entry. */ public JarEntry getNextJarEntry() throws IOException { return (JarEntry) getNextEntry(); } + /** + * Reads up to {@code length} of decompressed data and stores it in + * {@code buffer} starting at {@code offset}. + * + * @param buffer + * Buffer to store into + * @param offset + * offset in buffer to store at + * @param length + * number of bytes to store + * @return Number of uncompressed bytes read + * @throws IOException + * if an IOException occurs. + */ @Override public int read(byte[] buffer, int offset, int length) throws IOException { if (mEntry != null) { @@ -143,12 +180,12 @@ } /** - * Returns the next ZipEntry contained in this stream or null if no more - * entries are present. + * Returns the next {@code ZipEntry} contained in this stream or {@code + * null} if no more entries are present. * - * @return java.util.zip.ZipEntry - * @exception java.io.IOException - * If an error occurs while reading the entry + * @return the next extracted ZIP entry. + * @throws IOException + * if an error occurs while reading the entry. */ @Override public ZipEntry getNextEntry() throws IOException { Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java Sun Apr 26 12:30:01 2009 @@ -23,23 +23,24 @@ import java.util.zip.ZipOutputStream; /** - * The JarOutputStream is used to output data in JarFile format. + * The {@code JarOutputStream} is used to write data in the {@code JarFile} + * format to an arbitrary output stream */ public class JarOutputStream extends ZipOutputStream { private Manifest manifest; /** - * Constructs a new JarOutputStream using os as the underlying stream. - * Manifest information for the JarFile to be written is obtained from the - * parameter Manifest, mf. + * Constructs a new {@code JarOutputStream} using an output stream. The + * content of the {@code Manifest} must match the JAR entry information + * written subsequently to the stream. * * @param os - * The OutputStream to write to + * the {@code OutputStream} to write to * @param mf - * The Manifest to output for this Jar. - * @exception IOException - * If an error occurs creating the JarOutputStream + * the {@code Manifest} to output for this JAR file. + * @throws IOException + * if an error occurs creating the {@code JarOutputStream}. */ public JarOutputStream(OutputStream os, Manifest mf) throws IOException { super(os); @@ -54,12 +55,13 @@ } /** - * Constructs a new JarOutputStream using os as the underlying stream. + * Constructs a new {@code JarOutputStream} using an arbitrary output + * stream. * * @param os - * The OutputStream to write to - * @exception IOException - * If an error occurs creating the JarOutputStream + * the {@code OutputStream} to write to. + * @throws IOException + * if an error occurs creating the {@code JarOutputStream}. */ @SuppressWarnings("unused") public JarOutputStream(OutputStream os) throws IOException { @@ -67,14 +69,14 @@ } /** - * Writes the specified entry to the underlying stream. The previous entry - * is closed if it is still open. - * + * Writes the specified ZIP entry to the underlying stream. The previous + * entry is closed if it is still open. * * @param ze - * The ZipEntry to write - * @exception IOException - * If an error occurs writing the entry + * the {@code ZipEntry} to write to. + * @throws IOException + * if an error occurs writing to the entry. + * @see ZipEntry */ @Override public void putNextEntry(ZipEntry ze) throws IOException { Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java?rev=768698&r1=768697&r2=768698&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java Sun Apr 26 12:30:01 2009 @@ -39,18 +39,16 @@ /** * Non-public class used by {@link JarFile} and {@link JarInputStream} to manage - * the verification of signed jars. JarFile and - * JarInputStream objects will be expected to have a - * JarVerifier instance member which can be used to carry out the - * tasks associated with verifying a signed jar. These tasks would typically - * include: + * the verification of signed JARs. {@code JarFile} and {@code JarInputStream} + * objects are expected to have a {@code JarVerifier} instance member which + * can be used to carry out the tasks associated with verifying a signed JAR. + * These tasks would typically include: *
    *
  • verification of all signed signature files - *
  • confirmation that all signed data was signed only by the party or - * parties specified in the signature block data - *
  • verification that the contents of all signature files (i.e. - * .SF files) agree with the jar entries information found in the - * jar manifest. + *
  • confirmation that all signed data was signed only by the party or parties + * specified in the signature block data + *
  • verification that the contents of all signature files (i.e. {@code .SF} + * files) agree with the JAR entries information found in the JAR manifest. *
*/ class JarVerifier { @@ -134,24 +132,24 @@ } /** - * Constructs and answers with a new instance of JarVerifier. + * Constructs and returns a new instance of {@code JarVerifier}. * * @param name - * the name of the jar file being verified. + * the name of the JAR file being verified. */ JarVerifier(String name) { jarName = name; } /** - * Called for each new jar entry read in from the input stream. This method - * constructs and returns a new {@link VerifierEntry} which contains the - * certificates used to sign the entry and its hash value as specified in - * the jar manifest. + * Invoked for each new JAR entry read operation from the input + * stream. This method constructs and returns a new {@link VerifierEntry} + * which contains the certificates used to sign the entry and its hash value + * as specified in the JAR MANIFEST format. * * @param name - * the name of an entry in a jar file which is not in the - * META-INF directory. + * the name of an entry in a JAR file which is not in the + * {@code META-INF} directory. * @return a new instance of {@link VerifierEntry} which can be used by * callers as an {@link OutputStream}. */ @@ -224,16 +222,16 @@ } /** - * Add a new meta entry to the internal collection of data held on each jar - * entry in the META-INF directory including the manifest - * file itself. Files associated with the signing of a jar would also be + * Add a new meta entry to the internal collection of data held on each JAR + * entry in the {@code META-INF} directory including the manifest + * file itself. Files associated with the signing of a JAR would also be * added to this collection. * * @param name - * the name of the file located in the META-INF + * the name of the file located in the {@code META-INF} * directory. * @param buf - * the file bytes for the file called name. + * the file bytes for the file called {@code name}. * @see #removeMetaEntries() */ void addMetaEntry(String name, byte[] buf) { @@ -241,19 +239,19 @@ } /** - * If the associated jar file is signed, check on the validity of all of the + * If the associated JAR file is signed, check on the validity of all of the * known signatures. * - * @return true if the associated jar is signed and an - * internal check verifies the validity of the signature(s). - * false if the associated jar file has no entries at - * all in its META-INF directory. This situation is - * indicative of an invalid jar file. + * @return {@code true} if the associated JAR is signed and an internal + * check verifies the validity of the signature(s). {@code false} if + * the associated JAR file has no entries at all in its {@code + * META-INF} directory. This situation is indicative of an invalid + * JAR file. *

- * Will also return true if the jar file is not signed. - *

+ * Will also return {@code true} if the JAR file is not + * signed. * @throws SecurityException - * if the jar file is signed and it is determined that a + * if the JAR file is signed and it is determined that a * signature block file contains an invalid signature for the * corresponding signature file. */ @@ -301,7 +299,7 @@ new ByteArrayInputStream(sBlockBytes)); /* * Recursive call in loading security provider related class which - * is in a signed jar. + * is in a signed JAR. */ if (null == metaEntries) { return; @@ -434,11 +432,11 @@ /** * Returns all of the {@link java.security.cert.Certificate} instances that - * were used to verify the signature on the jar entry called - * name. + * were used to verify the signature on the JAR entry called + * {@code name}. * * @param name - * the name of a jar entry. + * the name of a JAR entry. * @return an array of {@link java.security.cert.Certificate}. */ Certificate[] getCertificates(String name) { @@ -451,7 +449,7 @@ /** * Remove all entries from the internal collection of data held about each - * jar entry in the META-INF directory. + * JAR entry in the {@code META-INF} directory. * * @see #addMetaEntry(String, byte[]) */ @@ -460,23 +458,21 @@ } /** - * Returns a Vector of all of the + * Returns a {@code Vector} of all of the * {@link java.security.cert.Certificate}s that are associated with the * signing of the named signature file. * * @param signatureFileName - * the name of a signature file + * the name of a signature file. * @param certificates - * a Map of all of the certificate chains - * discovered so far while attempting to verify the jar that - * contains the signature file signatureFileName. - * This object will have been previously set in the course of one - * or more calls to + * a {@code Map} of all of the certificate chains discovered so + * far while attempting to verify the JAR that contains the + * signature file {@code signatureFileName}. This object is + * previously set in the course of one or more calls to * {@link #verifyJarSignatureFile(String, String, String, Map, Map)} - * where it was passed in as the last argument. - * @return all of the Certificate entries for the signer of - * the jar whose actions led to the creation of the named signature - * file. + * where it was passed as the last argument. + * @return all of the {@code Certificate} entries for the signer of the JAR + * whose actions led to the creation of the named signature file. */ public static Vector getSignerCertificates( String signatureFileName, Map certificates) {