harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r927401 [1/3] - in /harmony/enhanced/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/archive/src/main/java/java/util/jar/ classlib/modules/archive/src/main/java/java/util/zip/ classlib/modules/archive/src...
Date Thu, 25 Mar 2010 13:48:26 GMT
Author: hindessm
Date: Thu Mar 25 13:48:22 2010
New Revision: 927401

URL: http://svn.apache.org/viewvc?rev=927401&view=rev
Log:
Merge updates from classlib trunk@927388.

Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/classlib/   (props changed)
    harmony/enhanced/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/branches/java6/classlib/make/depends-common.xml   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/jar/Pack200.java
    harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java
    harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
    harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java
    harmony/enhanced/branches/java6/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
    harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
    harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLDecoder.java
    harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
    harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
    harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
    harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java
    harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
    harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
    harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
    harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOImage.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOParam.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageReadParam.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageWriteParam.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageWriter.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/metadata/IIOMetadata.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/metadata/IIOMetadataFormatImpl.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/metadata/IIOMetadataNode.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGQTable.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/IIOServiceProvider.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderWriterSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ImageWriterSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/FileCacheImageInputStream.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/FileCacheImageOutputStream.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/FileImageInputStream.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/FileImageOutputStream.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/MemoryCacheImageInputStream.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/MemoryCacheImageOutputStream.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/metadata/IIOMetadataUtils.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/ImageType.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageWriter.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageWriter.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/spi/FileIISSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/spi/FileIOSSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/spi/InputStreamIISSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/spi/OutputStreamIOSSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/spi/RAFIISSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/spi/RAFIOSSpi.java
    harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/stream/RandomAccessMemoryCache.java
    harmony/enhanced/branches/java6/classlib/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java
    harmony/enhanced/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
    harmony/enhanced/branches/java6/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/make/findbugs-exclude-filter.xml
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/Math.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/StrictMath.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/net/URI.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/Currency.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/fdlibm.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/gp.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hymagic.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hysocket.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hyvmls.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni_types.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmpi.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmri.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti_types.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmi.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmizip.h   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/cbigint.c
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/netif.c
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/socket.c
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/README.txt
    harmony/enhanced/branches/java6/classlib/modules/pack200/depends/manifests/asm-3.1/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
    harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/parser/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/text/src/main/java/java/text/NumberFormat.java
    harmony/enhanced/branches/java6/common_resources/   (props changed)
    harmony/enhanced/branches/java6/drlvm/   (props changed)
    harmony/enhanced/branches/java6/jdktools/   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jdktools/build.xml
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-926569
+/harmony/enhanced/trunk:810871-927388

Propchange: harmony/enhanced/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,5 +1,5 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-926091
+/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
-/harmony/enhanced/trunk/classlib:926318-926569
+/harmony/enhanced/trunk/classlib:810871-927388
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/trunk/classlib/depends/libs:926318-926569
+/harmony/enhanced/trunk/classlib/depends/libs:926318-927388

Propchange: harmony/enhanced/branches/java6/classlib/make/depends-common.xml
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/jar/Pack200.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/jar/Pack200.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/jar/Pack200.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/jar/Pack200.java Thu Mar 25 13:48:22 2010
@@ -25,6 +25,8 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.SortedMap;
 
+import org.apache.harmony.archive.internal.nls.Messages;
+
 /**
  * Class factory for {@link Pack200.Packer} and {@link Pack200.Unpacker}.
  */
@@ -64,7 +66,7 @@ public abstract class Pack200 {
                             return ClassLoader.getSystemClassLoader()
                                     .loadClass(className).newInstance();
                         } catch (Exception e) {
-                            throw new Error("Can't load class " + className, e);
+                            throw new Error(Messages.getString("archive.3E",className), e); //$NON-NLS-1$
                         }
                     }
                 });
@@ -92,7 +94,7 @@ public abstract class Pack200 {
                             return ClassLoader.getSystemClassLoader()
                                     .loadClass(className).newInstance();
                         } catch (Exception e) {
-                            throw new Error("Can't load class " + className, e);
+                            throw new Error(Messages.getString("archive.3E",className), e); //$NON-NLS-1$
                         }
                     }
                 });

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java Thu Mar 25 13:48:22 2010
@@ -350,7 +350,7 @@ public class Inflater {
             int nbytes, long handle);
 
     /**
-     * Sets the current input to to be decrompressed. This method should only be
+     * Sets the current input to be decompressed. This method should only be
      * called if {@code needsInput()} returns {@code true}.
      *
      * @param buf

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java Thu Mar 25 13:48:22 2010
@@ -247,7 +247,7 @@ public class InflaterInputStream extends
     }
 
     /**
-     * Returns 0 when when this stream has exhausted its input; and 1 otherwise.
+     * Returns 0 when this stream has exhausted its input; and 1 otherwise.
      * A result of 1 does not guarantee that further bytes can be returned,
      * with or without blocking.
      *

Modified: harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties (original)
+++ harmony/enhanced/branches/java6/classlib/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties Thu Mar 25 13:48:22 2010
@@ -77,3 +77,4 @@ archive.3A=Central Directory Entry not f
 archive.3B=in ZipEntry.readIntLE(RandomAccessFile)
 archive.3C=in ZipEntry.readShortLE(InputStream)
 archive.3D=in ZipEntry.readIntLE(InputStream)
+archive.3E=Cannot load class {0}

Modified: harmony/enhanced/branches/java6/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java Thu Mar 25 13:48:22 2010
@@ -103,11 +103,13 @@ public class SubjectDomainCombiner imple
             Principal[] p = s.toArray(new Principal[s.size()]);
 
             for (cur = 0; cur < currentDomains.length; cur++) {
-                ProtectionDomain newPD;
-                newPD = new ProtectionDomain(currentDomains[cur].getCodeSource(),
-                        currentDomains[cur].getPermissions(), currentDomains[cur]
-                                .getClassLoader(), p);
-                pd[cur] = newPD;
+                if (currentDomains[cur] != null) {
+                    ProtectionDomain newPD;
+                    newPD = new ProtectionDomain(currentDomains[cur].getCodeSource(),
+                            currentDomains[cur].getPermissions(), currentDomains[cur]
+                                    .getClassLoader(), p);
+                    pd[cur] = newPD;
+                }
             }
         }
 

Modified: harmony/enhanced/branches/java6/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java Thu Mar 25 13:48:22 2010
@@ -115,6 +115,9 @@ public class SubjectDomainCombinerTest e
         // test case: check inherited domains
         pd = combiner.combine(null, new ProtectionDomain[] { domain });
         assertSame("Inherited domain", domain, pd[0]);
+
+        //Regression for HARMONY-1129
+        assertNotNull(new SubjectDomainCombiner(new Subject()).combine(new ProtectionDomain[] {null}, new ProtectionDomain[] {null}));
     }
 
     public final void testSecurityException() {

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java Thu Mar 25 13:48:22 2010
@@ -173,7 +173,7 @@ public class BorderLayout implements Lay
         toolkit.lockAWT();
         try {
             if (comp == null) {
-                throw new NullPointerException("Component is null");
+                throw new NullPointerException(Messages.getString("awt.185"));
             }
             if ((constraints == null) || (constraints instanceof String)) {
                 addLayoutComponent((String) constraints, comp);

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java Thu Mar 25 13:48:22 2010
@@ -131,7 +131,7 @@ public abstract class GlyphVector implem
     public abstract int getGlyphCode(int glyphIndex);
 
     public int getGlyphCharIndex(int glyphIndex){
-        // default implemetation one-to-one
+        // default implementation one-to-one
         return glyphIndex;
     }
 

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java Thu Mar 25 13:48:22 2010
@@ -22,12 +22,14 @@
 
 package java.awt.image;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public class ByteLookupTable extends LookupTable {
     private byte data[][];
     public ByteLookupTable(int offset, byte[] data) {
         super(offset, 1);
         if (data.length < 1)
-            throw new IllegalArgumentException("Length of data should not be less then one");
+            throw new IllegalArgumentException(Messages.getString("awt.29E"));
         this.data = new byte[1][data.length];
         // The data array stored as a reference
         this.data[0] = data;

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java Thu Mar 25 13:48:22 2010
@@ -156,7 +156,7 @@ public abstract class DecodingImageSourc
     }
 
     /**
-     * Checks if the consumer is in the list and returns it it is there
+     * Checks if the consumer is in the list and returns it if it is there
      * @param consumersList - list of consumers
      * @param ic - consumer
      * @return consumer if found, null otherwise

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties Thu Mar 25 13:48:22 2010
@@ -341,8 +341,8 @@ awt.202=shrinkRightLimit must be a posit
 awt.203=Offset limit should be greater than current position
 awt.204=Determinant is zero
 awt.205=Invalid type of Arc: {0}
-awt.206=Flatness is less then zero
-awt.207=Limit is less then zero
+awt.206=Flatness is less than zero
+awt.207=Limit is less than zero
 awt.208=Path is null
 awt.209=Invalid winding rule value
 awt.20A=First segment should be SEG_MOVETO type
@@ -384,7 +384,7 @@ awt.22D=This transferType ( {0} ) is not
 awt.22E=w or h is less than or equal to zero
 awt.22F=The product of w and h is greater than Integer.MAX_VALUE
 awt.230=dataType is not one of the supported data types
-awt.231=Number of bands must be more then 0
+awt.231=Number of bands must be more than 0
 awt.232=Offset should be not less than zero
 awt.233=Number of components should be positive
 awt.234=Width or Height equals zero
@@ -490,6 +490,9 @@ awt.298=dataBuffer is too small
 awt.299=Font file can not be read
 awt.29A=Neither Printable nor Pageable specified
 awt.29B=Printer not found
+awt.29C=Cursor Image is null
+awt.29D=Cannot make opengl context current
+awt.29E=Length of data should not be less than one
 
 awt.err.00=file dialog {0} error!
 awt.err.01=error: {0}

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java Thu Mar 25 13:48:22 2010
@@ -128,7 +128,7 @@ public interface NativeWindow {
 
     /**
      * Changes window Z-order to place this window under, If w is null
-     * places places this window on the top. Z-order is per parent.
+     * places this window on the top. Z-order is per parent.
      * Toplevels a children of desktop in terms of Z-order.
      * @param w - window to place under.
      */

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java Thu Mar 25 13:48:22 2010
@@ -95,7 +95,7 @@ public class LinuxCursorFactory extends 
         int width = img.getWidth(null);
         int height = img.getHeight(null);
         BufferedImage bufImg = Utils.getBufferedImage(img);
-        if(bufImg == null) throw new NullPointerException("Cursor Image is null");
+        if(bufImg == null) throw new NullPointerException(Messages.getString("awt.29C"));
 
         //must convert image into TYPE_BYTE_BINARY format of depth 1
         BufferedImage bmpSrc = convertTo1Bit(bufImg);

Modified: harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java Thu Mar 25 13:48:22 2010
@@ -33,6 +33,7 @@ import org.apache.harmony.awt.ContextSto
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.awt.image.VolatileImage;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public class WGLGraphicsConfiguration
         extends WinGraphicsConfiguration
@@ -260,7 +261,7 @@ public class WGLGraphicsConfiguration
 
             if (wgl.wglMakeCurrent(hdc, oglContext) == 0) {
                 w32.ReleaseDC(drawable, hdc);
-                throw new IllegalStateException("Cannot make opengl context current");
+                throw new IllegalStateException(Messages.getString("awt.29D"));
             }
 
             if(oshdc == 0) {

Modified: harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLDecoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLDecoder.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLDecoder.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLDecoder.java Thu Mar 25 13:48:22 2010
@@ -84,7 +84,7 @@ public class XMLDecoder {
                     inJavaElem = true;
                 } else {
                     listener.exceptionThrown(new Exception(
-                            "unknown root element: " + qName));
+                            Messages.getString("beans.72", qName)));
                 }
                 return;
             }
@@ -477,7 +477,7 @@ public class XMLDecoder {
             } else if ("short".equals(tag)) {
                 return Short.valueOf(value);
             } else {
-                throw new Exception("Unknown tag of basic type: " + tag);
+                throw new Exception(Messages.getString("beans.71", tag));
             }
         }
 
@@ -639,12 +639,12 @@ public class XMLDecoder {
         }
 
         if (readObjIndex >= readObjs.size()) {
-            throw new ArrayIndexOutOfBoundsException("no more objects to read");
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("beans.70"));
         }
         Elem elem = readObjs.get(readObjIndex);
         if (!elem.isClosed) {
             // bad element, error occurred while parsing
-            throw new ArrayIndexOutOfBoundsException("no more objects to read");
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("beans.70"));
         }
         readObjIndex++;
         return elem.result;

Modified: harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java Thu Mar 25 13:48:22 2010
@@ -31,6 +31,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 /**
  * <code>XMLEncoder</code> extends <code>Encoder</code> to write out the
  * encoded statements and expressions in xml format. The xml can be read by
@@ -234,7 +236,7 @@ public class XMLEncoder extends Encoder 
 			out.println("</short>");
 		} else {
 			getExceptionListener().exceptionThrown(
-					new Exception("Unknown basic object: " + obj));
+                                       new Exception(Messages.getString("beans.73", obj)));
 		}
 	}
 

Modified: harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java Thu Mar 25 13:48:22 2010
@@ -692,7 +692,7 @@ public class BeanContextServicesSupport 
             }
             if (bcssChild == null) {
                 throw new IllegalArgumentException(
-                        "not a child of this context");
+                        Messages.getString("beans.65"));
             }
 
             // try local service
@@ -828,7 +828,7 @@ public class BeanContextServicesSupport 
             }
             if (bcssChild == null) {
                 throw new IllegalArgumentException(
-                        "not a child of this context");
+                        Messages.getString("beans.65"));
             }
 
             releaseServiceWithoutCheck(child, bcssChild, requestor, service,
@@ -920,7 +920,7 @@ public class BeanContextServicesSupport 
                 }
                 if (bcssProvider.getServiceProvider() != serviceProvider) {
                     throw new IllegalArgumentException(
-                            "not the service provider registered with this context");
+                            Messages.getString("beans.66"));
                 }
 
                 services.remove(serviceClass);

Modified: harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Thu Mar 25 13:48:22 2010
@@ -219,7 +219,7 @@ public class BeanContextSupport extends 
     @SuppressWarnings("unchecked")
     public boolean add(Object child) {
         if (child == null) {
-            throw new IllegalArgumentException("null child");
+            throw new IllegalArgumentException(Messages.getString("beans.67"));
         }
 
         BeanContextChild proxy = null;
@@ -233,14 +233,14 @@ public class BeanContextSupport extends 
             // check serializing state
             if (serializing) {
                 throw new IllegalStateException(
-                        "cannot update children during serialization");
+                        Messages.getString("beans.68"));
             }
 
             // validate
             boolean valid = validatePendingAdd(child);
             if (!valid) {
                 throw new IllegalStateException(
-                        "Validation failed to add the child");
+                        Messages.getString("beans.69"));
             }
 
             // find the proxy, if there's one
@@ -248,7 +248,7 @@ public class BeanContextSupport extends 
                 proxy = ((BeanContextProxy) child).getBeanContextProxy();
                 if (proxy == null) {
                     throw new NullPointerException(
-                            "null BeanContextChild proxy");
+                            Messages.getString("beans.6A"));
                 }
             }
             BeanContextChild beanContextChild = getChildBeanContextChild(child);
@@ -276,7 +276,7 @@ public class BeanContextSupport extends 
                         }
                     }
                     throw new IllegalStateException(
-                            "failed to update child's beanContext property");
+                            Messages.getString("beans.6B"));
                 }
                 // ensure no duplicate listener
                 beanContextChild.removePropertyChangeListener("beanContext",
@@ -592,14 +592,14 @@ public class BeanContextSupport extends 
         if (child instanceof BeanContextChild) {
             if (child instanceof BeanContextProxy) {
                 throw new IllegalArgumentException(
-                        "Illegal to impl both BeanContextChild and BeanContextProxy");
+                        Messages.getString("beans.6C"));
             }
             return (BeanContextChild) child;
         }
         if (child instanceof BeanContextProxy) {
             if (child instanceof BeanContextChild) {
                 throw new IllegalArgumentException(
-                        "Illegal to impl both BeanContextChild and BeanContextProxy");
+                        Messages.getString("beans.6C"));
             }
             return ((BeanContextProxy) child).getBeanContextProxy();
         }
@@ -706,7 +706,7 @@ public class BeanContextSupport extends 
             throw new NullPointerException();
         }
         if (!contains(child)) {
-            throw new IllegalArgumentException("Not a child of this context");
+            throw new IllegalArgumentException(Messages.getString("beans.6D"));
         }
 
         return ClassLoader.getSystemResource(resourceName);
@@ -721,7 +721,7 @@ public class BeanContextSupport extends 
             throw new NullPointerException();
         }
         if (!contains(child)) {
-            throw new IllegalArgumentException("Not a child of this context");
+            throw new IllegalArgumentException(Messages.getString("beans.6D"));
         }
 
         return ClassLoader.getSystemResourceAsStream(resourceName);
@@ -890,7 +890,7 @@ public class BeanContextSupport extends 
                         beanContextChild.setBeanContext(getBeanContextPeer());
                     } catch (PropertyVetoException e) {
                         throw new IOException(
-                                "failed to update child's beanContext property");
+                                Messages.getString("beans.6B"));
                     }
                     // ensure no duplicate listener
                     beanContextChild.removePropertyChangeListener(
@@ -936,7 +936,7 @@ public class BeanContextSupport extends 
      */
     protected boolean remove(Object child, boolean setChildBC) {
         if (child == null) {
-            throw new IllegalArgumentException("null child");
+            throw new IllegalArgumentException(Messages.getString("beans.67"));
         }
 
         Object peer = null;
@@ -950,14 +950,14 @@ public class BeanContextSupport extends 
             // check serializing state
             if (serializing) {
                 throw new IllegalStateException(
-                        "cannot update children during serialization");
+                        Messages.getString("beans.68"));
             }
 
             // validate
             boolean valid = validatePendingRemove(child);
             if (!valid) {
                 throw new IllegalStateException(
-                        "Validation failed to remove the child");
+                        Messages.getString("beans.6E"));
             }
 
             // set child's beanContext property
@@ -973,7 +973,7 @@ public class BeanContextSupport extends 
                     beanContextChild.addPropertyChangeListener("beanContext",
                             nonSerPCL);
                     throw new IllegalStateException(
-                            "failed to update child's beanContext property");
+                            Messages.getString("beans.6B"));
                 }
             }
 
@@ -1215,7 +1215,7 @@ public class BeanContextSupport extends 
 
             // what if count not equals to serializable?
             if (count != serializable) {
-                throw new IOException("children changed during serialization!");
+                throw new IOException(Messages.getString("beans.6F"));
             }
         } finally {
             serializing = origSer;

Modified: harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties (original)
+++ harmony/enhanced/branches/java6/classlib/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties Thu Mar 25 13:48:22 2010
@@ -116,3 +116,18 @@ beans.61=Indexed write method is not com
 beans.62=Cannot decide which method to call to match {0}
 beans.63=The type of element is mismatch with the type of array
 beans.64=Method not found: {0}
+beans.65=not a child of this context
+beans.66=not the service provider registered with this context
+beans.67=null child
+beans.68=cannot update children during serialization
+beans.69=Validation failed to add the child
+beans.6A=null BeanContextChild proxy
+beans.6B=failed to update child's beanContext property
+beans.6C=Illegal to impl both BeanContextChild and BeanContextProxy
+beans.6D=Not a child of this context
+beans.6E=Validation failed to remove the child
+beans.6F=children changed during serialization!
+beans.70=no more objects to read
+beans.71=Unknown tag of basic type: {0}
+beans.72=Unknown root element: {0}
+beans.73=Unknown basic object: {0}

Propchange: harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java Thu Mar 25 13:48:22 2010
@@ -61,7 +61,7 @@ import org.apache.harmony.security.fortr
  * <ul>
  * {@code Cipher c = Cipher.getInstance("AES/CBC/PKCS5Padding");}
  * </ul>
- * When a block cipher is requested in in stream cipher mode, the number of bits
+ * When a block cipher is requested in stream cipher mode, the number of bits
  * to be processed at a time can be optionally specified by appending it to the
  * mode name. e.g. <i>"AES/CFB8/NoPadding"</i>. If no number is specified, a
  * provider specific default value is used.

Modified: harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java Thu Mar 25 13:48:22 2010
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import javax.crypto.NullCipher;
 import java.security.GeneralSecurityException;
+import org.apache.harmony.crypto.internal.nls.Messages;
 
 /**
  * This class wraps an {@code InputStream} and a cipher so that {@code read()}
@@ -138,7 +139,7 @@ public class CipherInputStream extends F
      * @param len
      *            the maximum number of bytes to read.
      * @return the number of bytes filled into buffer {@code b}, or {@code -1}
-     *         of the of the stream is reached.
+     *         if the end of the stream is reached.
      * @throws IOException
      *             if an error occurs.
      * @throws NullPointerException
@@ -147,7 +148,7 @@ public class CipherInputStream extends F
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
         if (in == null) {
-            throw new NullPointerException("Underlying input stream is null");
+            throw new NullPointerException(Messages.getString("crypto.47"));
         }
 
         int read_b;

Modified: harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java Thu Mar 25 13:48:22 2010
@@ -283,7 +283,7 @@ public class ExemptionMechanism {
      * @throws InvalidKeyException
      *             if the key cannot be used to initialize this mechanism.
      * @throws InvalidAlgorithmParameterException
-     *             the the parameters cannot be used to initialize this
+     *             if the parameters cannot be used to initialize this
      *             mechanism.
      * @throws ExemptionMechanismException
      *             if error(s) occur during initialization.

Modified: harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java Thu Mar 25 13:48:22 2010
@@ -123,7 +123,7 @@ public abstract class ExemptionMechanism
      * @throws InvalidKeyException
      *             if the key cannot be used to initialize this mechanism.
      * @throws InvalidAlgorithmParameterException
-     *             the the parameters cannot be used to initialize this
+     *             if the parameters cannot be used to initialize this
      *             mechanism.
      * @throws ExemptionMechanismException
      *             if error(s) occur during initialization.

Modified: harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties (original)
+++ harmony/enhanced/branches/java6/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties Thu Mar 25 13:48:22 2010
@@ -85,3 +85,4 @@ crypto.43=encoding input is null\!
 crypto.44=Wrap
 crypto.45=Unwrap
 crypto.46=GetKeySize
+crypto.47=Underlying input stream is null

Modified: harmony/enhanced/branches/java6/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java Thu Mar 25 13:48:22 2010
@@ -114,7 +114,7 @@ public class SecretKeySpecTest extends T
 
         try {
             new SecretKeySpec(key, -1, key.length, algorithm);
-            fail("An ArrayIndexOutOfBoundsxception should be thrown "
+            fail("An ArrayIndexOutOfBoundsException should be thrown "
                     + "in the case of negative offset.");
         } catch (IllegalArgumentException e) {
             fail("Not expected IllegalArgumentException was thrown.");
@@ -124,7 +124,7 @@ public class SecretKeySpecTest extends T
         // Regression test for HARMONY-6347
         try {
             new SecretKeySpec(key, -1, key.length+2, algorithm);
-            fail("An ArrayIndexOutOfBoundsxception should be thrown "
+            fail("An ArrayIndexOutOfBoundsException should be thrown "
                     + "in the case of negative offset.");
         } catch (IllegalArgumentException e) {
             fail("Not expected IllegalArgumentException was thrown.");

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOImage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOImage.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOImage.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOImage.java Thu Mar 25 13:48:22 2010
@@ -24,6 +24,7 @@ import java.awt.image.RenderedImage;
 import java.awt.image.Raster;
 import java.awt.image.BufferedImage;
 import java.util.List;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 public class IIOImage {
 
@@ -34,7 +35,7 @@ public class IIOImage {
 
     public IIOImage(RenderedImage image, List<? extends BufferedImage> thumbnails, IIOMetadata metadata) {
         if (image == null) {
-            throw new IllegalArgumentException("image should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.27"));
         }
         this.raster = null;
         this.image = image;
@@ -44,7 +45,7 @@ public class IIOImage {
 
     public IIOImage(Raster raster, List<? extends BufferedImage> thumbnails, IIOMetadata metadata) {
         if (raster == null) {
-            throw new IllegalArgumentException("raster should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.5F"));
         }
         this.image = null;
         this.raster = raster;
@@ -58,7 +59,7 @@ public class IIOImage {
 
     public void setRenderedImage(RenderedImage image) {
         if (image == null) {
-            throw new IllegalArgumentException("image should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.27"));
         }
         raster = null;
         this.image = image;
@@ -74,7 +75,7 @@ public class IIOImage {
 
     public void setRaster(Raster raster) {
         if (raster == null) {
-            throw new IllegalArgumentException("raster should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.5F"));
         }
         image = null;
         this.raster = raster;
@@ -88,7 +89,7 @@ public class IIOImage {
         if (thumbnails != null) {
             return thumbnails.get(index);
         }
-        throw new IndexOutOfBoundsException("no thumbnails were set");
+        throw new IndexOutOfBoundsException(Messages.getString("imageio.60"));
     }
 
     public List<? extends BufferedImage> getThumbnails() {

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOParam.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOParam.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOParam.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/IIOParam.java Thu Mar 25 13:48:22 2010
@@ -20,6 +20,7 @@
 package javax.imageio;
 
 import java.awt.*;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 public abstract class IIOParam {
     protected Rectangle sourceRegion;
@@ -38,24 +39,24 @@ public abstract class IIOParam {
     public void setSourceRegion(Rectangle sourceRegion) {
         if (sourceRegion != null) {
             if (sourceRegion.x < 0) {
-                throw new IllegalArgumentException("x < 0");
+                throw new IllegalArgumentException(Messages.getString("imageio.15"));
             }
             if (sourceRegion.y < 0) {
-                throw new IllegalArgumentException("y < 0");
+                throw new IllegalArgumentException(Messages.getString("imageio.16"));
             }
             if (sourceRegion.width <= 0) {
-                throw new IllegalArgumentException("width <= 0");
+                throw new IllegalArgumentException(Messages.getString("imageio.17"));
             }
             if (sourceRegion.height <= 0) {
-                throw new IllegalArgumentException("height <= 0");
+                throw new IllegalArgumentException(Messages.getString("imageio.18"));
             }
 
             if (sourceRegion.width <= subsamplingXOffset) {
-                throw new IllegalArgumentException("width <= subsamplingXOffset");
+                throw new IllegalArgumentException(Messages.getString("imageio.19"));
             }
 
             if (sourceRegion.height <= subsamplingYOffset) {
-                throw new IllegalArgumentException("height <= subsamplingXOffset");
+                throw new IllegalArgumentException(Messages.getString("imageio.1A"));
             }
             //-- clone it to avoid unexpected modifications
             this.sourceRegion = (Rectangle) sourceRegion.clone();
@@ -78,25 +79,25 @@ public abstract class IIOParam {
                                  int subsamplingYOffset) {
 
         if (sourceXSubsampling <= 0) {
-            throw new IllegalArgumentException("sourceXSubsampling <= 0");
+            throw new IllegalArgumentException(Messages.getString("imageio.1B"));
         }
         if (sourceYSubsampling <= 0) {
-            throw new IllegalArgumentException("sourceYSubsampling <= 0");
+            throw new IllegalArgumentException(Messages.getString("imageio.1C"));
         }
 
         if ((subsamplingXOffset < 0) || (subsamplingXOffset >= sourceXSubsampling)) {
-            throw new IllegalArgumentException("subsamplingXOffset is wrong");
+            throw new IllegalArgumentException(Messages.getString("imageio.1D"));
         }
 
         if ((subsamplingYOffset < 0) || (subsamplingYOffset >= sourceYSubsampling)) {
-            throw new IllegalArgumentException("subsamplingYOffset is wrong");
+            throw new IllegalArgumentException(Messages.getString("imageio.1E"));
         }
 
         //-- does region contain pixels
         if (sourceRegion != null) {
             if (sourceRegion.width <= subsamplingXOffset ||
                     sourceRegion.height <= subsamplingYOffset) {
-                throw new IllegalArgumentException("there are no pixels in region");
+                throw new IllegalArgumentException(Messages.getString("imageio.1F"));
             }
         }
 
@@ -128,12 +129,12 @@ public abstract class IIOParam {
         } else {
             for (int i = 0; i < sourceBands.length; i++) {
                 if (sourceBands[i] < 0) {
-                    throw new IllegalArgumentException("negative value");
+                    throw new IllegalArgumentException(Messages.getString("imageio.20"));
                 }
                 
                 for (int j = i + 1; j < sourceBands.length; j++) {
                     if (sourceBands[i] == sourceBands[j]) {
-                        throw new IllegalArgumentException("duplicate value");
+                        throw new IllegalArgumentException(Messages.getString("imageio.21"));
                     }
                 }
             }
@@ -156,7 +157,7 @@ public abstract class IIOParam {
 
     public void setDestinationOffset(Point destinationOffset) {
         if (destinationOffset == null) {
-            throw new IllegalArgumentException("destinationOffset == null!");
+            throw new IllegalArgumentException(Messages.getString("imageio.22"));
         }
         
         this.destinationOffset = (Point) destinationOffset.clone();
@@ -186,7 +187,7 @@ public abstract class IIOParam {
         final IIOParamController controller = getController();
         
         if (controller == null) {
-            throw new IllegalStateException("controller wasn't set");
+            throw new IllegalStateException(Messages.getString("imageio.23"));
         }
         
         return controller.activate(this);

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java Thu Mar 25 13:48:22 2010
@@ -27,11 +27,13 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Arrays;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.net.URL;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 public final class ImageIO {
 
@@ -69,7 +71,7 @@ public final class ImageIO {
             throws IOException {
 
         if (input == null) {
-            throw new IllegalArgumentException("input source cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.4C"));
         }
 
         Iterator<ImageInputStreamSpi> it = registry.getServiceProviders(ImageInputStreamSpi.class, true);
@@ -86,7 +88,7 @@ public final class ImageIO {
     public static ImageOutputStream createImageOutputStream(Object output)
             throws IOException {
         if (output == null) {
-            throw new IllegalArgumentException("output destination cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.4D"));
         }
 
         Iterator<ImageOutputStreamSpi> it = registry.getServiceProviders(ImageOutputStreamSpi.class, true);
@@ -101,19 +103,33 @@ public final class ImageIO {
         return null;
     }
 
-    public static String[] getReaderFormatNames() throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static String[] getReaderFormatNames() {
+        ArrayList<String> FormatNames = new ArrayList<String>();
+
+        Iterator<ImageReaderSpi> it = registry.getServiceProviders(ImageReaderSpi.class, true);
+        while (it.hasNext()) {
+            ImageReaderSpi spi = it.next();
+            FormatNames.addAll(Arrays.asList(spi.getFormatNames()));
+        }
+
+        return (String[])FormatNames.toArray(new String[FormatNames.size()]);
     }
 
-    public static String[] getReaderMIMETypes() throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static String[] getReaderMIMETypes() {
+        ArrayList<String> MIMETypes = new ArrayList<String>();
+
+        Iterator<ImageReaderSpi> it = registry.getServiceProviders(ImageReaderSpi.class, true);
+        while (it.hasNext()) {
+            ImageReaderSpi spi = it.next();
+            MIMETypes.addAll(Arrays.asList(spi.getMIMETypes()));
+        }
+
+        return (String[])MIMETypes.toArray(new String[MIMETypes.size()]);
     }
 
     public static Iterator<ImageReader> getImageReaders(Object input) {
         if (input == null) {
-            throw new NullPointerException("input cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.4E"));
         }
 
         Iterator<ImageReaderSpi> it = registry.getServiceProviders(ImageReaderSpi.class,
@@ -124,7 +140,7 @@ public final class ImageIO {
 
     public static Iterator<ImageReader> getImageReadersByFormatName(String formatName) {
         if (formatName == null) {
-            throw new NullPointerException("format name cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.4F"));
         }
 
         Iterator<ImageReaderSpi> it = registry.getServiceProviders(ImageReaderSpi.class,
@@ -135,7 +151,7 @@ public final class ImageIO {
 
     public static Iterator<ImageReader> getImageReadersBySuffix(String fileSuffix) {
         if (fileSuffix == null) {
-            throw new NullPointerException("suffix cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.50"));
         }
         Iterator<ImageReaderSpi> it = registry.getServiceProviders(ImageReaderSpi.class,
                 new SuffixFilter(fileSuffix), true);
@@ -150,19 +166,33 @@ public final class ImageIO {
                 new MIMETypeFilter(MIMEType), true));
     }
 
-    public static String[] getWriterFormatNames() throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static String[] getWriterFormatNames() {
+        ArrayList<String> FormatNames = new ArrayList<String>();
+
+        Iterator<ImageWriterSpi> it = registry.getServiceProviders(ImageWriterSpi.class, true);
+        while (it.hasNext()) {
+            ImageWriterSpi spi = it.next();
+            FormatNames.addAll(Arrays.asList(spi.getFormatNames()));
+        }
+
+        return (String[])FormatNames.toArray(new String[FormatNames.size()]);
     }
 
-    public static String[] getWriterMIMETypes() throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static String[] getWriterMIMETypes() {
+        ArrayList<String> MIMETypes = new ArrayList<String>();
+
+        Iterator<ImageWriterSpi> it = registry.getServiceProviders(ImageWriterSpi.class, true);
+        while (it.hasNext()) {
+            ImageWriterSpi spi = it.next();
+            MIMETypes.addAll(Arrays.asList(spi.getMIMETypes()));
+        }
+
+        return (String[])MIMETypes.toArray(new String[MIMETypes.size()]);
     }
 
     public static Iterator<ImageWriter> getImageWritersByFormatName(String formatName) {
         if (formatName == null) {
-            throw new NullPointerException("format name cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.4F"));
         }
 
         Iterator<ImageWriterSpi> it = registry.getServiceProviders(ImageWriterSpi.class,
@@ -173,7 +203,7 @@ public final class ImageIO {
 
     public static Iterator<ImageWriter> getImageWritersBySuffix(String fileSuffix) {
         if (fileSuffix == null) {
-            throw new NullPointerException("suffix cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.50"));
         }
         Iterator<ImageWriterSpi> it = registry.getServiceProviders(ImageWriterSpi.class,
                 new SuffixFilter(fileSuffix), true);
@@ -200,11 +230,11 @@ public final class ImageIO {
     public static Iterator<ImageWriter> getImageWriters(ImageTypeSpecifier type,
                                            String formatName) {
         if (type == null) {
-            throw new NullPointerException("type cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.51"));
         }
 
         if (formatName == null) {
-            throw new NullPointerException("format name cannot be NULL");
+            throw new NullPointerException(Messages.getString("imageio.4F"));
         }
 
         Iterator<ImageWriterSpi> it = registry.getServiceProviders(ImageWriterSpi.class,
@@ -221,7 +251,7 @@ public final class ImageIO {
 
     public static BufferedImage read(File input) throws IOException {
         if (input == null) {
-            throw new IllegalArgumentException("input == null!");
+            throw new IllegalArgumentException(Messages.getString("imageio.52"));
         }
 
         ImageInputStream stream = createImageInputStream(input);
@@ -230,7 +260,7 @@ public final class ImageIO {
 
     public static BufferedImage read(InputStream input) throws IOException {
         if (input == null) {
-            throw new IllegalArgumentException("input == null!");
+            throw new IllegalArgumentException(Messages.getString("imageio.52"));
         }
 
         ImageInputStream stream = createImageInputStream(input);
@@ -239,7 +269,7 @@ public final class ImageIO {
 
     public static BufferedImage read(URL input) throws IOException {
         if (input == null) {
-            throw new IllegalArgumentException("input == null!");
+            throw new IllegalArgumentException(Messages.getString("imageio.52"));
         }
 
         InputStream stream = input.openStream();
@@ -251,7 +281,7 @@ public final class ImageIO {
 
     public static BufferedImage read(ImageInputStream stream) throws IOException {
         if (stream == null) {
-            throw new IllegalArgumentException("stream == null!");
+            throw new IllegalArgumentException(Messages.getString("imageio.0A"));
         }
 
         Iterator<ImageReader> imageReaders = getImageReaders(stream);
@@ -279,13 +309,13 @@ public final class ImageIO {
             throws IOException {
 
         if (im == null) {
-            throw new IllegalArgumentException("image cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.53"));
         }
         if (formatName == null) {
-            throw new IllegalArgumentException("format name cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.4F"));
         }
         if (output == null) {
-            throw new IllegalArgumentException("output cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.54"));
         }
 
         Iterator<ImageWriter> it = getImageWriters(ImageTypeSpecifier.createFromRenderedImage(im), formatName);
@@ -306,7 +336,7 @@ public final class ImageIO {
             throws IOException {
 
         if (output == null) {
-            throw new IllegalArgumentException("output cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.54"));
         }
 
         if (output.exists()) {
@@ -325,7 +355,7 @@ public final class ImageIO {
             throws IOException {
 
         if (output == null) {
-            throw new IllegalArgumentException("output cannot be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.54"));
         }
 
         ImageOutputStream ios = createImageOutputStream(output);
@@ -394,7 +424,7 @@ public final class ImageIO {
 
         public MIMETypeFilter(final String mimeType) {
             if (mimeType == null) {
-                throw new NullPointerException("MIMEType cannot be NULL");
+                throw new NullPointerException(Messages.getString("imageio.55"));
             }
             
             this.mimeType = mimeType;
@@ -451,7 +481,7 @@ public final class ImageIO {
         }
 
         public void remove() {
-            throw new UnsupportedOperationException("Use deregisterServiceprovider instead of Iterator.remove()");
+            throw new UnsupportedOperationException(Messages.getString("imageio.56"));
         }
     }
 
@@ -479,7 +509,7 @@ public final class ImageIO {
         }
 
         public void remove() {
-            throw new UnsupportedOperationException("Use deregisterServiceprovider instead of Iterator.remove()");
+            throw new UnsupportedOperationException(Messages.getString("imageio.56"));
         }
     }
 }

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageReadParam.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageReadParam.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageReadParam.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageReadParam.java Thu Mar 25 13:48:22 2010
@@ -21,6 +21,7 @@ package javax.imageio;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 /**
  * @author Sergey I. Salishev
@@ -85,7 +86,7 @@ public class ImageReadParam extends IIOP
 
     public void setSourceRenderSize(Dimension size) throws UnsupportedOperationException {
         if (!canSetSourceRenderSize) {
-            throw new UnsupportedOperationException("can't set source renderer size");
+            throw new UnsupportedOperationException(Messages.getString("imageio.29"));
         }
         sourceRenderSize = size;        
     }

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java Thu Mar 25 13:48:22 2010
@@ -27,6 +27,7 @@ import java.awt.image.RenderedImage;
 import java.awt.color.ColorSpace;
 
 import org.apache.harmony.luni.util.NotImplementedException;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 public class ImageTypeSpecifier {
     
@@ -35,13 +36,13 @@ public class ImageTypeSpecifier {
 
     public ImageTypeSpecifier(ColorModel colorModel, SampleModel sampleModel) {
         if (colorModel == null) {
-            throw new IllegalArgumentException("color model should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.24"));
         }
         if (sampleModel == null) {
-            throw new IllegalArgumentException("sample model should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.25"));
         }
         if (!colorModel.isCompatibleSampleModel(sampleModel)) {
-            throw new IllegalArgumentException("color and sample models are not compatible");
+            throw new IllegalArgumentException(Messages.getString("imageio.26"));
         }
 
         this.colorModel = colorModel;
@@ -50,7 +51,7 @@ public class ImageTypeSpecifier {
 
     public ImageTypeSpecifier(RenderedImage renderedImage) {
         if (renderedImage == null) {
-            throw new IllegalArgumentException("image should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.27"));
         }
         this.colorModel = renderedImage.getColorModel();
         this.sampleModel = renderedImage.getSampleModel();
@@ -119,7 +120,7 @@ public class ImageTypeSpecifier {
 
     public static ImageTypeSpecifier createFromRenderedImage(RenderedImage image) {
         if (null == image) {
-            throw new IllegalArgumentException("image should not be NULL");
+            throw new IllegalArgumentException(Messages.getString("imageio.27"));
         }
         return new ImageTypeSpecifier(image);
     }
@@ -150,7 +151,7 @@ public class ImageTypeSpecifier {
 
     public SampleModel getSampleModel(int width, int height) {
         if ((long)width*height > Integer.MAX_VALUE) {
-            throw new IllegalArgumentException("width * height > Integer.MAX_VALUE");
+            throw new IllegalArgumentException(Messages.getString("imageio.28"));
         }
         return sampleModel.createCompatibleSampleModel(width, height);
     }

Modified: harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageWriteParam.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageWriteParam.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageWriteParam.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageWriteParam.java Thu Mar 25 13:48:22 2010
@@ -21,6 +21,7 @@ package javax.imageio;
 
 import java.util.Locale;
 import java.awt.*;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 public class ImageWriteParam extends IIOParam {
 
@@ -57,7 +58,7 @@ public class ImageWriteParam extends IIO
         if (canWriteProgressive()) {
             return progressiveMode;
         }
-        throw new UnsupportedOperationException("progressive mode is not supported");
+        throw new UnsupportedOperationException(Messages.getString("imageio.33"));
     }
 
     public boolean canWriteProgressive() {
@@ -67,11 +68,11 @@ public class ImageWriteParam extends IIO
     public void setProgressiveMode(int mode) {
         if (canWriteProgressive()) {
             if (mode < MODE_DISABLED || mode > MODE_COPY_FROM_METADATA || mode == MODE_EXPLICIT) {
-                throw new IllegalArgumentException("mode is not supported");
+                throw new IllegalArgumentException(Messages.getString("imageio.34"));
             }
             this.progressiveMode = mode;
         }
-        throw new UnsupportedOperationException("progressive mode is not supported");
+        throw new UnsupportedOperationException(Messages.getString("imageio.33"));
     }
 
     public boolean canOffsetTiles() {
@@ -88,19 +89,19 @@ public class ImageWriteParam extends IIO
 
     private final void checkWriteCompressed() {
         if (!canWriteCompressed()) {
-            throw new UnsupportedOperationException("Compression not supported.");
+            throw new UnsupportedOperationException(Messages.getString("imageio.35"));
         }
     }
 
     private final void checkCompressionMode() {
         if (getCompressionMode() != MODE_EXPLICIT) {
-            throw new IllegalStateException("Compression mode not MODE_EXPLICIT!");
+            throw new IllegalStateException(Messages.getString("imageio.36"));
         }
     }
 
     private final void checkCompressionType() {
         if (getCompressionTypes() != null && getCompressionType() == null) {
-            throw new IllegalStateException("No compression type set!");
+            throw new IllegalStateException(Messages.getString("imageio.37"));
         }
     }
 
@@ -128,7 +129,7 @@ public class ImageWriteParam extends IIO
         checkCompressionMode();
         checkCompressionType();
         if (quality < 0 || quality > 1) {
-            throw new IllegalArgumentException("Quality out-of-bounds!");
+            throw new IllegalArgumentException(Messages.getString("imageio.38"));
         }
         return -1.0f;
     }
@@ -164,7 +165,7 @@ public class ImageWriteParam extends IIO
 
         String compressionType = getCompressionType();
         if (compressionType == null) {
-            throw new IllegalStateException("No compression type set!");
+            throw new IllegalStateException(Messages.getString("imageio.37"));
         }
         return compressionType;
 
@@ -172,19 +173,19 @@ public class ImageWriteParam extends IIO
 
     private final void checkTiling() {
         if (!canWriteTiles()) {
-            throw new UnsupportedOperationException("Tiling not supported!");
+            throw new UnsupportedOperationException(Messages.getString("imageio.39"));
         }
     }
 
     private final void checkTilingMode() {
         if (getTilingMode() != MODE_EXPLICIT) {
-            throw new IllegalStateException("Tiling mode not MODE_EXPLICIT!");
+            throw new IllegalStateException(Messages.getString("imageio.3A"));
         }
     }
 
     private final void checkTilingParams() {
         if (!tilingSet) {
-            throw new IllegalStateException("Tiling parameters not set!");
+            throw new IllegalStateException(Messages.getString("imageio.3B"));
         }
     }
 
@@ -263,7 +264,7 @@ public class ImageWriteParam extends IIO
                 break;
             }
             default: {
-                throw new IllegalArgumentException("Illegal value for mode!");
+                throw new IllegalArgumentException(Messages.getString("imageio.3C"));
             }
         }
     }
@@ -273,7 +274,7 @@ public class ImageWriteParam extends IIO
         checkCompressionMode();
         checkCompressionType();
         if (quality < 0 || quality > 1) {
-            throw new IllegalArgumentException("Quality out-of-bounds!");
+            throw new IllegalArgumentException(Messages.getString("imageio.38"));
         }
         compressionQuality = quality;
     }
@@ -287,7 +288,7 @@ public class ImageWriteParam extends IIO
         } else {
             String[] compressionTypes = getCompressionTypes();
             if (compressionTypes == null) {
-                throw new UnsupportedOperationException("No settable compression types");
+                throw new UnsupportedOperationException(Messages.getString("imageio.3D"));
             }
 
             for (int i = 0; i < compressionTypes.length; i++) {
@@ -298,7 +299,7 @@ public class ImageWriteParam extends IIO
             }
 
             // Compression type is not in the list.
-            throw new IllegalArgumentException("Unknown compression type!");
+            throw new IllegalArgumentException(Messages.getString("imageio.3E"));
         }
     }
 
@@ -307,11 +308,11 @@ public class ImageWriteParam extends IIO
         checkTilingMode();
 
         if (!canOffsetTiles() && (tileGridXOffset != 0 || tileGridYOffset != 0)) {
-            throw new UnsupportedOperationException("Can't offset tiles!");
+            throw new UnsupportedOperationException(Messages.getString("imageio.3F"));
         }
 
         if (tileWidth <=0 || tileHeight <= 0) {
-            throw new IllegalArgumentException("tile dimensions are non-positive!");
+            throw new IllegalArgumentException(Messages.getString("imageio.40"));
         }
 
         Dimension preferredTileSizes[] = getPreferredTileSizes();
@@ -323,7 +324,7 @@ public class ImageWriteParam extends IIO
                         tileWidth < minSize.width || tileWidth > maxSize.width ||
                         tileHeight < minSize.height || tileHeight > maxSize.height
                 ) {
-                    throw new IllegalArgumentException("Illegal tile size!");
+                    throw new IllegalArgumentException(Messages.getString("imageio.41"));
                 }
             }
         }
@@ -362,7 +363,7 @@ public class ImageWriteParam extends IIO
                 break;
             }
             default: {
-                throw new IllegalArgumentException("Illegal value for mode!");
+                throw new IllegalArgumentException(Messages.getString("imageio.3C"));
             }
         }
     }



Mime
View raw message