harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r884518 [1/8] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/ depends/jars/ make/ modules/accessibility/make/ modules/accessibility/src/main/java/javax/accessibility/ modules/applet/src/main/java/org/apache/harmony/applet/...
Date Thu, 26 Nov 2009 11:12:56 GMT
Author: hindessm
Date: Thu Nov 26 11:12:49 2009
New Revision: 884518

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

Added:
    harmony/enhanced/classlib/branches/java6/modules/accessibility/make/findbugs-exclude-filter.xml
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/accessibility/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/make/findbugs-exclude-filter.xml
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/jndi/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/branches/java6/modules/lang-management/make/findbugs-exclude-filter.xml
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/lang-management/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/SneakyThrow.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/SneakyThrow.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/OutputStreamTesterTest.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/OutputStreamTesterTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/WriterTesterTest.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/WriterTesterTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/nio/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/nio/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/nio/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/nio/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/nio/channels/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/nio/channels/
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/nio/channels/FileChannelWin32OnlyTest.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/org/apache/harmony/nio/tests/java/nio/channels/FileChannelWin32OnlyTest.java
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesProviderTest.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesProviderTest.java
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/resources/config/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/config/
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/resources/config/META-INF/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/config/META-INF/
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/resources/config/META-INF/services/
      - copied from r884013, harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/config/META-INF/services/
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/resources/config/META-INF/services/java.util.prefs.PreferencesFactory
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/config/META-INF/services/java.util.prefs.PreferencesFactory
    harmony/enhanced/classlib/branches/java6/modules/rmi/make/findbugs-exclude-filter.xml
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/modules/rmi/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/CharSinkTester.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/support/src/test/java/org/apache/harmony/testframework/CharSinkTester.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/CharWrapperTester.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/support/src/test/java/org/apache/harmony/testframework/CharWrapperTester.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/SinkTester.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/support/src/test/java/org/apache/harmony/testframework/SinkTester.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/WrapperTester.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/support/src/test/java/org/apache/harmony/testframework/WrapperTester.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Streams.java
      - copied unchanged from r884013, harmony/enhanced/classlib/trunk/support/src/test/java/tests/support/Streams.java
Removed:
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelWin32OnlyTest.java
Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/LICENSE
    harmony/enhanced/classlib/branches/java6/depends/build/rules.mak
    harmony/enhanced/classlib/branches/java6/depends/build/rules.mk
    harmony/enhanced/classlib/branches/java6/depends/jars/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/depends-common.xml   (props changed)
    harmony/enhanced/classlib/branches/java6/make/depends.properties
    harmony/enhanced/classlib/branches/java6/make/properties.xml
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java
    harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java
    harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java
    harmony/enhanced/classlib/branches/java6/modules/archive/make/findbugs-exclude-filter.xml
    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/Manifest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipcache.c
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipsup.c
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/windows/makefile
    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/org/apache/harmony/auth/internal/kerberos/v5/KrbClient.java
    harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Tables.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/gifdecoder.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/XBlitter.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/XGraphics2D.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/include/org_apache_harmony_awt_gl_linux_XGraphics2D.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/ArrayPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PrimitiveWrapperPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PropertyChangeSupport.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.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/XMLDecoder.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/Command.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.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/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/inst_agt.c
    harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/instrument.c
    harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSContext.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSNameParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ProviderConstants.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/SList.java
    harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/java/lang/management/MemoryType.java
    harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
    harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/logging/META-INF/MANIFEST.MF
    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/Logger.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedOutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedReader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedWriter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/CharArrayReader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/FilterOutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/InputStreamReader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/LineNumberReader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/OutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/OutputStreamWriter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintWriter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringReader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/Writer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StrictMath.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketPermission.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLEncoder.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ArrayList.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Timer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/hyzip/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/hyzip/shared/zipcache.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/hyzip/shared/zipsup.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/hyzip/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/file.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/makefile
    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/BufferedReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.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/ArrayListTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/unix/org/apache/harmony/luni/tests/java/net/UnixSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.zos.s390.ibm
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.zos.s390x.ibm
    harmony/enhanced/classlib/branches/java6/modules/nio/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DoubleBuffer.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/FloatBuffer.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectionKeyImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/iohelp.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/prefs/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/Preferences.java
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/org/apache/harmony/prefs/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/ServiceUIDialog.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/MessageDigest.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Policy.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/ProtectionDomain.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureClassLoader2Test.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/tests/api/java/security/PermissionCollectionTest.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/PermissionCollection_ImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/sound/src/main/java/javax/sound/sampled/AudioFormat.java
    harmony/enhanced/classlib/branches/java6/modules/sound/src/main/java/org/apache/harmony/sound/utils/ProviderService.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/XmlReaderImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/Collator.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/SimpleDateFormat.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/org/apache/harmony/text/BidiRun.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_PermissionCollection.java

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 11:12:49 2009
@@ -1 +1,2 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-824035
+/harmony/enhanced/classlib/trunk:713674-735919,765923-884286
+/harmony/enhanced/classlib/trunk/working_classlib:884014-884286

Modified: harmony/enhanced/classlib/branches/java6/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/LICENSE?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/LICENSE (original)
+++ harmony/enhanced/classlib/branches/java6/LICENSE Thu Nov 26 11:12:49 2009
@@ -326,10 +326,10 @@
 
 
 
-License Notice for Bouncy Castle version 1.41
+License Notice for Bouncy Castle version 1.44
 =============================================
 
-Copyright (c) 2000 - 2008 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2009 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mak?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mak Thu Nov 26 11:12:49 2009
@@ -49,7 +49,6 @@
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
 	/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
 	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
-	$(COMMENT) \
 	-subsystem:windows -out:$@ \
 	-map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
         -manifestfile:$(LIBPATH)$(*F).manifest \

Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mk?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mk Thu Nov 26 11:12:49 2009
@@ -63,7 +63,7 @@
 		mv $@.dbg $(DBGPATH)$(@F).dbg
 endif
 ifeq ($(HY_OS),zos)
-	mv $(basename $(DLLNAME))$(HY_LINKLIB_SUFFIX) $(LIBPATH)
+	mv $(notdir $(basename $(DLLNAME)))$(HY_LINKLIB_SUFFIX) $(LIBPATH)
 endif
 
 $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 26 11:12:49 2009
@@ -13,3 +13,4 @@
 bsf-3.0-beta3
 icu4j_4.2.1
 axis2-1.3
+bcprov-jdk15-144

Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 11:12:49 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-824035
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-884286

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Thu Nov 26 11:12:49 2009
@@ -95,11 +95,11 @@
 
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
 
-bcprov.ver=bcprov-jdk15-141
+bcprov.ver=bcprov-jdk15-144
 bcprov.dir=${depends.jars}/${bcprov.ver}
 bcprov.jar=${bcprov.dir}/bcprov.jar
 bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.jar
-bcprov.md5=f7cd7e1dcfe4b84d820b3a0937dc13f4
+bcprov.md5=0d6f0b31730db6fd1f8360cf1f7666d4
 
 icu4j.ver=icu4j_4.2.1
 icu4j.dir=${depends.jars}/${icu4j.ver}

Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Thu Nov 26 11:12:49 2009
@@ -702,9 +702,22 @@
             <property name="test.module.dir" value="${target.dir}/@{module}" />
             <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
             <property name="test.resources.dir" value="${test.module.dir}/resources" />
-            <property name="test.exclude.file" value="${work.dir}/@{module}/test.exclude" />
+            <property name="module.work.dir" location="${work.dir}/@{module}" />
+            <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
+
+            <property name="module.temp.dir"
+                      location="${work.dir}/@{module}/temp" />
+            <property name="junit.tempdir"
+                      location="${module.temp.dir}/ant" />
+            <property name="junit.java.io.tmpdir"
+                      location="${module.temp.dir}/tmpdir" />
+            <property name="junit.user.home"
+                      location="${module.temp.dir}/user" />
             
             <mkdir dir="${tests.output}" /> 
+            <mkdir dir="${junit.tempdir}" />
+            <mkdir dir="${junit.java.io.tmpdir}" />
+            <mkdir dir="${junit.user.home}" />
 
             <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
             <junit fork="yes" 
@@ -715,9 +728,12 @@
                    failureproperty="test.failures" 
                    showoutput="on" 
                    dir="${work.dir}/@{module}" 
-                   tempdir="${work.dir}"
+                   tempdir="${junit.tempdir}"
                    jvm="${test.jre.home}/bin/java">
 
+                <jvmarg line="-Djava.io.tmpdir=${junit.java.io.tmpdir}" />
+                <jvmarg line="-Duser.home=${junit.user.home}" />
+
                 <classpath>
                     <fileset dir="${target.dir}">
                         <include name="*.jar" />
@@ -754,6 +770,9 @@
                 <formatter type="xml" />
             </junit>
 
+            <delete dir="${module.temp.dir}"
+                    includeemptydirs="true" failonerror="false" />
+
             <antcall target="touch-failures-file">
                 <param name="module" value="@{module}" />
             </antcall>

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java Thu Nov 26 11:12:49 2009
@@ -17,10 +17,12 @@
 
 package javax.accessibility;
 
+@SuppressWarnings("nls")
 public interface AccessibleAction {
-    static final String TOGGLE_EXPAND = new String("toggle expand"); //$NON-NLS-1$
-    static final String INCREMENT = new String("increment"); //$NON-NLS-1$
-    static final String DECREMENT = new String("decrement"); //$NON-NLS-1$
+    // Calls to new String(String) here are required - see HARMONY-6008
+    static final String TOGGLE_EXPAND = new String("toggle expand");
+    static final String INCREMENT = new String("increment");
+    static final String DECREMENT = new String("decrement");
 
     int getAccessibleActionCount();
 

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java Thu Nov 26 11:12:49 2009
@@ -27,29 +27,30 @@
 
 import javax.swing.event.SwingPropertyChangeSupport;
 
+@SuppressWarnings("nls")
 public abstract class AccessibleContext{
-    public static final String ACCESSIBLE_NAME_PROPERTY = "AccessibleName"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_DESCRIPTION_PROPERTY = "AccessibleDescription"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_STATE_PROPERTY = "AccessibleState"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_VALUE_PROPERTY = "AccessibleValue"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_SELECTION_PROPERTY = "AccessibleSelection"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_CARET_PROPERTY = "AccessibleCaret"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_VISIBLE_DATA_PROPERTY = "AccessibleVisibleData"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_CHILD_PROPERTY = "AccessibleChild"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY = "AccessibleActiveDescendant"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_CAPTION_CHANGED = "accessibleTableCaptionChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_SUMMARY_CHANGED = "accessibleTableSummaryChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_MODEL_CHANGED = "accessibleTableModelChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_ROW_HEADER_CHANGED = "accessibleTableRowHeaderChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED = "accessibleTableRowDescriptionChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED = "accessibleTableColumnHeaderChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED = "accessibleTableColumnDescriptionChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_ACTION_PROPERTY = "accessibleActionProperty"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_HYPERTEXT_OFFSET = "AccessibleHypertextOffset"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TEXT_PROPERTY = "AccessibleText"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_INVALIDATE_CHILDREN = "accessibleInvalidateChildren"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED = "accessibleTextAttributesChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_COMPONENT_BOUNDS_CHANGED = "accessibleComponentBoundsChanged"; //$NON-NLS-1$
+    public static final String ACCESSIBLE_NAME_PROPERTY = "AccessibleName";
+    public static final String ACCESSIBLE_DESCRIPTION_PROPERTY = "AccessibleDescription";
+    public static final String ACCESSIBLE_STATE_PROPERTY = "AccessibleState";
+    public static final String ACCESSIBLE_VALUE_PROPERTY = "AccessibleValue";
+    public static final String ACCESSIBLE_SELECTION_PROPERTY = "AccessibleSelection";
+    public static final String ACCESSIBLE_CARET_PROPERTY = "AccessibleCaret";
+    public static final String ACCESSIBLE_VISIBLE_DATA_PROPERTY = "AccessibleVisibleData";
+    public static final String ACCESSIBLE_CHILD_PROPERTY = "AccessibleChild";
+    public static final String ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY = "AccessibleActiveDescendant";
+    public static final String ACCESSIBLE_TABLE_CAPTION_CHANGED = "accessibleTableCaptionChanged";
+    public static final String ACCESSIBLE_TABLE_SUMMARY_CHANGED = "accessibleTableSummaryChanged";
+    public static final String ACCESSIBLE_TABLE_MODEL_CHANGED = "accessibleTableModelChanged";
+    public static final String ACCESSIBLE_TABLE_ROW_HEADER_CHANGED = "accessibleTableRowHeaderChanged";
+    public static final String ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED = "accessibleTableRowDescriptionChanged";
+    public static final String ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED = "accessibleTableColumnHeaderChanged";
+    public static final String ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED = "accessibleTableColumnDescriptionChanged";
+    public static final String ACCESSIBLE_ACTION_PROPERTY = "accessibleActionProperty";
+    public static final String ACCESSIBLE_HYPERTEXT_OFFSET = "AccessibleHypertextOffset";
+    public static final String ACCESSIBLE_TEXT_PROPERTY = "AccessibleText";
+    public static final String ACCESSIBLE_INVALIDATE_CHILDREN = "accessibleInvalidateChildren";
+    public static final String ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED = "accessibleTextAttributesChanged";
+    public static final String ACCESSIBLE_COMPONENT_BOUNDS_CHANGED = "accessibleComponentBoundsChanged";
 
     protected Accessible accessibleParent;
     protected String accessibleName;

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java Thu Nov 26 11:12:49 2009
@@ -18,31 +18,33 @@
 package javax.accessibility;
 
 
+@SuppressWarnings("nls")
 public class AccessibleRelation extends AccessibleBundle {
-    public static final String LABEL_FOR = new String("labelFor"); //$NON-NLS-1$
-    public static final String LABELED_BY = new String("labeledBy"); //$NON-NLS-1$
-    public static final String MEMBER_OF = new String("memberOf"); //$NON-NLS-1$
-    public static final String CONTROLLER_FOR = new String("controllerFor"); //$NON-NLS-1$
-    public static final String CONTROLLED_BY = new String("controlledBy"); //$NON-NLS-1$
-    public static final String FLOWS_TO = "flowsTo"; //$NON-NLS-1$
-    public static final String FLOWS_FROM = "flowsFrom"; //$NON-NLS-1$
-    public static final String SUBWINDOW_OF = "subwindowOf"; //$NON-NLS-1$
-    public static final String PARENT_WINDOW_OF = "parentWindowOf"; //$NON-NLS-1$
-    public static final String EMBEDS = "embeds"; //$NON-NLS-1$
-    public static final String EMBEDDED_BY = "embeddedBy"; //$NON-NLS-1$
-    public static final String CHILD_NODE_OF = "childNodeOf"; //$NON-NLS-1$
-    public static final String LABEL_FOR_PROPERTY = "labelForProperty"; //$NON-NLS-1$
-    public static final String LABELED_BY_PROPERTY = "labeledByProperty"; //$NON-NLS-1$
-    public static final String MEMBER_OF_PROPERTY = "memberOfProperty"; //$NON-NLS-1$
-    public static final String CONTROLLER_FOR_PROPERTY = "controllerForProperty"; //$NON-NLS-1$
-    public static final String CONTROLLED_BY_PROPERTY = "controlledByProperty"; //$NON-NLS-1$
-    public static final String FLOWS_TO_PROPERTY = "flowsToProperty"; //$NON-NLS-1$
-    public static final String FLOWS_FROM_PROPERTY = "flowsFromProperty"; //$NON-NLS-1$
-    public static final String SUBWINDOW_OF_PROPERTY = "subwindowOfProperty"; //$NON-NLS-1$
-    public static final String PARENT_WINDOW_OF_PROPERTY = "parentWindowOfProperty"; //$NON-NLS-1$
-    public static final String EMBEDS_PROPERTY = "embedsProperty"; //$NON-NLS-1$
-    public static final String EMBEDDED_BY_PROPERTY = "embeddedByProperty"; //$NON-NLS-1$
-    public static final String CHILD_NODE_OF_PROPERTY = "childNodeOfProperty"; //$NON-NLS-1$
+    // Calls to new String(String) here are required - see HARMONY-6008
+    public static final String LABEL_FOR = new String("labelFor");
+    public static final String LABELED_BY = new String("labeledBy");
+    public static final String MEMBER_OF = new String("memberOf");
+    public static final String CONTROLLER_FOR = new String("controllerFor");
+    public static final String CONTROLLED_BY = new String("controlledBy");
+    public static final String FLOWS_TO = "flowsTo";
+    public static final String FLOWS_FROM = "flowsFrom";
+    public static final String SUBWINDOW_OF = "subwindowOf";
+    public static final String PARENT_WINDOW_OF = "parentWindowOf";
+    public static final String EMBEDS = "embeds";
+    public static final String EMBEDDED_BY = "embeddedBy";
+    public static final String CHILD_NODE_OF = "childNodeOf";
+    public static final String LABEL_FOR_PROPERTY = "labelForProperty";
+    public static final String LABELED_BY_PROPERTY = "labeledByProperty";
+    public static final String MEMBER_OF_PROPERTY = "memberOfProperty";
+    public static final String CONTROLLER_FOR_PROPERTY = "controllerForProperty";
+    public static final String CONTROLLED_BY_PROPERTY = "controlledByProperty";
+    public static final String FLOWS_TO_PROPERTY = "flowsToProperty";
+    public static final String FLOWS_FROM_PROPERTY = "flowsFromProperty";
+    public static final String SUBWINDOW_OF_PROPERTY = "subwindowOfProperty";
+    public static final String PARENT_WINDOW_OF_PROPERTY = "parentWindowOfProperty";
+    public static final String EMBEDS_PROPERTY = "embedsProperty";
+    public static final String EMBEDDED_BY_PROPERTY = "embeddedByProperty";
+    public static final String CHILD_NODE_OF_PROPERTY = "childNodeOfProperty";
 
     private Object[] targets;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java Thu Nov 26 11:12:49 2009
@@ -22,110 +22,111 @@
 @Deprecated
 public class AccessibleResourceBundle extends ListResourceBundle {
     // Localized values representing the accessible roles and states of the accessible components.
+    @SuppressWarnings("nls")
     private final Object[][] contents = {
-        {"alert", "alert"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"column_header", "column header"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"canvas", "canvas"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"combobox", "combobox"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"desktopIcon", "desktop icon"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"internalFrame", "internal frame"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"desktopPane", "desktop pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"optionPane", "option pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"window", "window"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"frame", "frame"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"dialog", "dialog"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"colorChooser", "color chooser"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"directoryPane", "directory pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"fileChooser", "file chooser"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"filler", "filler"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"hyperlink", "hyperlink"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"icon", "icon"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"label", "label"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"rootPane", "root pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"glassPane", "glass pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"layeredPane", "layered pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"list", "list"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"listItem", "list item"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"menuBar", "menu bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"popupMenu", "popup menu"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"menu", "menu"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"menuItem", "menu item"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"separator", "separator"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pageTabList", "page tab list"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pageTab", "page tab"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"panel", "panel"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"progressBar", "progress"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"passwordText", "password"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pushButton", "push button"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"toggleButton", "toggle button"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"checkBox", "check box"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"radioButton", "radio button"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"rowHeader", "row header"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"scrollPane", "scroll pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"scrollBar", "scroller"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"viewport", "viewport"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"slider", "slider"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"splitPane", "split pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"table", "table"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"text", "text"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"tree", "tree"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"toolBar", "tool bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"toolTip", "tool tip"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"awtComponent", "AWT component"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"swingComponent", "Swing component"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"unknown", "unknown"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"statusBar", "status bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"dateEditor", "date editor"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"spinBox", "spinner"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"fontChooser", "font chooser"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"groupBox", "group"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"header", "header"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"footer", "footer"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"paragraph", "paragraph"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"ruler", "ruler"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"editBar", "edit bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"progressMonitor", "progress monitor"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"labelFor", "label for"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"labeledBy", "labeled by"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"memberOf", "member of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"controllerFor", "controller for"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"controlledBy", "controlled by"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"flowsTo", "flows to"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"flowsFrom", "flows from"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"subwindowOf", "sub-window of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"parentWindowOf", "parent window of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"embeds", "embeds"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"embeddedBy", "embedded by"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"childNodeOf", "child node of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"active", "active"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pressed", "pressed"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"armed", "armed"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"busy", "busy"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"checked", "checked"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"editable", "editable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"expandable", "expandable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"collapsed", "collapsed"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"expanded", "expanded"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"enabled", "enabled"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"focusable", "focusable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"focused", "focused"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"iconified", "iconified"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"modal", "modal"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"opaque", "opaque"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"resizable", "resizable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"multiSelectable", "multi-selectable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"selectable", "selectable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"selected", "selected"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"showing", "showing"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"visible", "visible"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"vertical", "vertical"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"horizontal", "horizontal"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"singleLine", "singleLine"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"multiLine", "multi line"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"transient", "transient"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"managesDescendants", "manages descendants"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"indeterminate", "indeterminate"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"truncated", "truncated"}, //$NON-NLS-1$ //$NON-NLS-2$
+        {"alert", "alert"},
+        {"column_header", "column header"},
+        {"canvas", "canvas"},
+        {"combobox", "combobox"},
+        {"desktopIcon", "desktop icon"},
+        {"internalFrame", "internal frame"},
+        {"desktopPane", "desktop pane"},
+        {"optionPane", "option pane"},
+        {"window", "window"},
+        {"frame", "frame"},
+        {"dialog", "dialog"},
+        {"colorChooser", "color chooser"},
+        {"directoryPane", "directory pane"},
+        {"fileChooser", "file chooser"},
+        {"filler", "filler"},
+        {"hyperlink", "hyperlink"},
+        {"icon", "icon"},
+        {"label", "label"},
+        {"rootPane", "root pane"},
+        {"glassPane", "glass pane"},
+        {"layeredPane", "layered pane"},
+        {"list", "list"},
+        {"listItem", "list item"},
+        {"menuBar", "menu bar"},
+        {"popupMenu", "popup menu"},
+        {"menu", "menu"},
+        {"menuItem", "menu item"},
+        {"separator", "separator"},
+        {"pageTabList", "page tab list"},
+        {"pageTab", "page tab"},
+        {"panel", "panel"},
+        {"progressBar", "progress"},
+        {"passwordText", "password"},
+        {"pushButton", "push button"},
+        {"toggleButton", "toggle button"},
+        {"checkBox", "check box"},
+        {"radioButton", "radio button"},
+        {"rowHeader", "row header"},
+        {"scrollPane", "scroll pane"},
+        {"scrollBar", "scroller"},
+        {"viewport", "viewport"},
+        {"slider", "slider"},
+        {"splitPane", "split pane"},
+        {"table", "table"},
+        {"text", "text"},
+        {"tree", "tree"},
+        {"toolBar", "tool bar"},
+        {"toolTip", "tool tip"},
+        {"awtComponent", "AWT component"},
+        {"swingComponent", "Swing component"},
+        {"unknown", "unknown"},
+        {"statusBar", "status bar"},
+        {"dateEditor", "date editor"},
+        {"spinBox", "spinner"},
+        {"fontChooser", "font chooser"},
+        {"groupBox", "group"},
+        {"header", "header"},
+        {"footer", "footer"},
+        {"paragraph", "paragraph"},
+        {"ruler", "ruler"},
+        {"editBar", "edit bar"},
+        {"progressMonitor", "progress monitor"},
+        {"labelFor", "label for"},
+        {"labeledBy", "labeled by"},
+        {"memberOf", "member of"},
+        {"controllerFor", "controller for"},
+        {"controlledBy", "controlled by"},
+        {"flowsTo", "flows to"},
+        {"flowsFrom", "flows from"},
+        {"subwindowOf", "sub-window of"},
+        {"parentWindowOf", "parent window of"},
+        {"embeds", "embeds"},
+        {"embeddedBy", "embedded by"},
+        {"childNodeOf", "child node of"},
+        {"active", "active"},
+        {"pressed", "pressed"},
+        {"armed", "armed"},
+        {"busy", "busy"},
+        {"checked", "checked"},
+        {"editable", "editable"},
+        {"expandable", "expandable"},
+        {"collapsed", "collapsed"},
+        {"expanded", "expanded"},
+        {"enabled", "enabled"},
+        {"focusable", "focusable"},
+        {"focused", "focused"},
+        {"iconified", "iconified"},
+        {"modal", "modal"},
+        {"opaque", "opaque"},
+        {"resizable", "resizable"},
+        {"multiSelectable", "multi-selectable"},
+        {"selectable", "selectable"},
+        {"selected", "selected"},
+        {"showing", "showing"},
+        {"visible", "visible"},
+        {"vertical", "vertical"},
+        {"horizontal", "horizontal"},
+        {"singleLine", "singleLine"},
+        {"multiLine", "multi line"},
+        {"transient", "transient"},
+        {"managesDescendants", "manages descendants"},
+        {"indeterminate", "indeterminate"},
+        {"truncated", "truncated"},
     };
 
     @Override

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java Thu Nov 26 11:12:49 2009
@@ -21,69 +21,70 @@
 
 package javax.accessibility;
 
+@SuppressWarnings("nls")
 public class AccessibleRole extends AccessibleBundle {
-    public static final AccessibleRole ALERT = new AccessibleRole("alert"); //$NON-NLS-1$
-    public static final AccessibleRole COLUMN_HEADER = new AccessibleRole("columnHeader"); //$NON-NLS-1$
-    public static final AccessibleRole CANVAS = new AccessibleRole("canvas"); //$NON-NLS-1$
-    public static final AccessibleRole COMBO_BOX = new AccessibleRole("combobox"); //$NON-NLS-1$
-    public static final AccessibleRole DESKTOP_ICON = new AccessibleRole("desktopIcon"); //$NON-NLS-1$
-    public static final AccessibleRole INTERNAL_FRAME = new AccessibleRole("internalFrame"); //$NON-NLS-1$
-    public static final AccessibleRole DESKTOP_PANE = new AccessibleRole("desktopPane"); //$NON-NLS-1$
-    public static final AccessibleRole OPTION_PANE = new AccessibleRole("optionPane"); //$NON-NLS-1$
-    public static final AccessibleRole WINDOW = new AccessibleRole("window"); //$NON-NLS-1$
-    public static final AccessibleRole FRAME = new AccessibleRole("frame"); //$NON-NLS-1$
-    public static final AccessibleRole DIALOG = new AccessibleRole("dialog"); //$NON-NLS-1$
-    public static final AccessibleRole COLOR_CHOOSER = new AccessibleRole("colorChooser"); //$NON-NLS-1$
-    public static final AccessibleRole DIRECTORY_PANE = new AccessibleRole("directoryPane"); //$NON-NLS-1$
-    public static final AccessibleRole FILE_CHOOSER = new AccessibleRole("fileChooser"); //$NON-NLS-1$
-    public static final AccessibleRole FILLER = new AccessibleRole("filler"); //$NON-NLS-1$
-    public static final AccessibleRole HYPERLINK = new AccessibleRole("hyperlink"); //$NON-NLS-1$
-    public static final AccessibleRole ICON = new AccessibleRole("icon"); //$NON-NLS-1$
-    public static final AccessibleRole LABEL = new AccessibleRole("label"); //$NON-NLS-1$
-    public static final AccessibleRole ROOT_PANE = new AccessibleRole("rootPane"); //$NON-NLS-1$
-    public static final AccessibleRole GLASS_PANE = new AccessibleRole("glassPane"); //$NON-NLS-1$
-    public static final AccessibleRole LAYERED_PANE = new AccessibleRole("layeredPane"); //$NON-NLS-1$
-    public static final AccessibleRole LIST = new AccessibleRole("list"); //$NON-NLS-1$
-    public static final AccessibleRole LIST_ITEM = new AccessibleRole("listItem"); //$NON-NLS-1$
-    public static final AccessibleRole MENU_BAR = new AccessibleRole("menuBar"); //$NON-NLS-1$
-    public static final AccessibleRole POPUP_MENU = new AccessibleRole("popupMenu"); //$NON-NLS-1$
-    public static final AccessibleRole MENU = new AccessibleRole("menu"); //$NON-NLS-1$
-    public static final AccessibleRole MENU_ITEM = new AccessibleRole("menuItem"); //$NON-NLS-1$
-    public static final AccessibleRole SEPARATOR = new AccessibleRole("separator"); //$NON-NLS-1$
-    public static final AccessibleRole PAGE_TAB_LIST = new AccessibleRole("pageTabList"); //$NON-NLS-1$
-    public static final AccessibleRole PAGE_TAB = new AccessibleRole("pageTab"); //$NON-NLS-1$
-    public static final AccessibleRole PANEL = new AccessibleRole("panel"); //$NON-NLS-1$
-    public static final AccessibleRole PROGRESS_BAR = new AccessibleRole("progressBar"); //$NON-NLS-1$
-    public static final AccessibleRole PASSWORD_TEXT = new AccessibleRole("passwordText"); //$NON-NLS-1$
-    public static final AccessibleRole PUSH_BUTTON = new AccessibleRole("pushButton"); //$NON-NLS-1$
-    public static final AccessibleRole TOGGLE_BUTTON = new AccessibleRole("toggleButton"); //$NON-NLS-1$
-    public static final AccessibleRole CHECK_BOX = new AccessibleRole("checkBox"); //$NON-NLS-1$
-    public static final AccessibleRole RADIO_BUTTON = new AccessibleRole("radioButton"); //$NON-NLS-1$
-    public static final AccessibleRole ROW_HEADER = new AccessibleRole("rowHeader"); //$NON-NLS-1$
-    public static final AccessibleRole SCROLL_PANE = new AccessibleRole("scrollPane"); //$NON-NLS-1$
-    public static final AccessibleRole SCROLL_BAR = new AccessibleRole("scrollBar"); //$NON-NLS-1$
-    public static final AccessibleRole VIEWPORT = new AccessibleRole("viewport"); //$NON-NLS-1$
-    public static final AccessibleRole SLIDER = new AccessibleRole("slider"); //$NON-NLS-1$
-    public static final AccessibleRole SPLIT_PANE = new AccessibleRole("splitPane"); //$NON-NLS-1$
-    public static final AccessibleRole TABLE = new AccessibleRole("table"); //$NON-NLS-1$
-    public static final AccessibleRole TEXT = new AccessibleRole("text"); //$NON-NLS-1$
-    public static final AccessibleRole TREE = new AccessibleRole("tree"); //$NON-NLS-1$
-    public static final AccessibleRole TOOL_BAR = new AccessibleRole("toolBar"); //$NON-NLS-1$
-    public static final AccessibleRole TOOL_TIP = new AccessibleRole("toolTip"); //$NON-NLS-1$
-    public static final AccessibleRole AWT_COMPONENT = new AccessibleRole("awtComponent"); //$NON-NLS-1$
-    public static final AccessibleRole SWING_COMPONENT = new AccessibleRole("swingComponent"); //$NON-NLS-1$
-    public static final AccessibleRole UNKNOWN = new AccessibleRole("unknown"); //$NON-NLS-1$
-    public static final AccessibleRole STATUS_BAR = new AccessibleRole("statusBar"); //$NON-NLS-1$
-    public static final AccessibleRole DATE_EDITOR = new AccessibleRole("dateEditor"); //$NON-NLS-1$
-    public static final AccessibleRole SPIN_BOX = new AccessibleRole("spinBox"); //$NON-NLS-1$
-    public static final AccessibleRole FONT_CHOOSER = new AccessibleRole("fontChooser"); //$NON-NLS-1$
-    public static final AccessibleRole GROUP_BOX = new AccessibleRole("groupBox"); //$NON-NLS-1$
-    public static final AccessibleRole HEADER = new AccessibleRole("header"); //$NON-NLS-1$
-    public static final AccessibleRole FOOTER = new AccessibleRole("footer"); //$NON-NLS-1$
-    public static final AccessibleRole PARAGRAPH = new AccessibleRole("paragraph"); //$NON-NLS-1$
-    public static final AccessibleRole RULER = new AccessibleRole("ruler"); //$NON-NLS-1$
-    public static final AccessibleRole EDITBAR = new AccessibleRole("editBar"); //$NON-NLS-1$
-    public static final AccessibleRole PROGRESS_MONITOR = new AccessibleRole("progressMonitor"); //$NON-NLS-1$
+    public static final AccessibleRole ALERT = new AccessibleRole("alert");
+    public static final AccessibleRole COLUMN_HEADER = new AccessibleRole("columnHeader");
+    public static final AccessibleRole CANVAS = new AccessibleRole("canvas");
+    public static final AccessibleRole COMBO_BOX = new AccessibleRole("combobox");
+    public static final AccessibleRole DESKTOP_ICON = new AccessibleRole("desktopIcon");
+    public static final AccessibleRole INTERNAL_FRAME = new AccessibleRole("internalFrame");
+    public static final AccessibleRole DESKTOP_PANE = new AccessibleRole("desktopPane");
+    public static final AccessibleRole OPTION_PANE = new AccessibleRole("optionPane");
+    public static final AccessibleRole WINDOW = new AccessibleRole("window");
+    public static final AccessibleRole FRAME = new AccessibleRole("frame");
+    public static final AccessibleRole DIALOG = new AccessibleRole("dialog");
+    public static final AccessibleRole COLOR_CHOOSER = new AccessibleRole("colorChooser");
+    public static final AccessibleRole DIRECTORY_PANE = new AccessibleRole("directoryPane");
+    public static final AccessibleRole FILE_CHOOSER = new AccessibleRole("fileChooser");
+    public static final AccessibleRole FILLER = new AccessibleRole("filler");
+    public static final AccessibleRole HYPERLINK = new AccessibleRole("hyperlink");
+    public static final AccessibleRole ICON = new AccessibleRole("icon");
+    public static final AccessibleRole LABEL = new AccessibleRole("label");
+    public static final AccessibleRole ROOT_PANE = new AccessibleRole("rootPane");
+    public static final AccessibleRole GLASS_PANE = new AccessibleRole("glassPane");
+    public static final AccessibleRole LAYERED_PANE = new AccessibleRole("layeredPane");
+    public static final AccessibleRole LIST = new AccessibleRole("list");
+    public static final AccessibleRole LIST_ITEM = new AccessibleRole("listItem");
+    public static final AccessibleRole MENU_BAR = new AccessibleRole("menuBar");
+    public static final AccessibleRole POPUP_MENU = new AccessibleRole("popupMenu");
+    public static final AccessibleRole MENU = new AccessibleRole("menu");
+    public static final AccessibleRole MENU_ITEM = new AccessibleRole("menuItem");
+    public static final AccessibleRole SEPARATOR = new AccessibleRole("separator");
+    public static final AccessibleRole PAGE_TAB_LIST = new AccessibleRole("pageTabList");
+    public static final AccessibleRole PAGE_TAB = new AccessibleRole("pageTab");
+    public static final AccessibleRole PANEL = new AccessibleRole("panel");
+    public static final AccessibleRole PROGRESS_BAR = new AccessibleRole("progressBar");
+    public static final AccessibleRole PASSWORD_TEXT = new AccessibleRole("passwordText");
+    public static final AccessibleRole PUSH_BUTTON = new AccessibleRole("pushButton");
+    public static final AccessibleRole TOGGLE_BUTTON = new AccessibleRole("toggleButton");
+    public static final AccessibleRole CHECK_BOX = new AccessibleRole("checkBox");
+    public static final AccessibleRole RADIO_BUTTON = new AccessibleRole("radioButton");
+    public static final AccessibleRole ROW_HEADER = new AccessibleRole("rowHeader");
+    public static final AccessibleRole SCROLL_PANE = new AccessibleRole("scrollPane");
+    public static final AccessibleRole SCROLL_BAR = new AccessibleRole("scrollBar");
+    public static final AccessibleRole VIEWPORT = new AccessibleRole("viewport");
+    public static final AccessibleRole SLIDER = new AccessibleRole("slider");
+    public static final AccessibleRole SPLIT_PANE = new AccessibleRole("splitPane");
+    public static final AccessibleRole TABLE = new AccessibleRole("table");
+    public static final AccessibleRole TEXT = new AccessibleRole("text");
+    public static final AccessibleRole TREE = new AccessibleRole("tree");
+    public static final AccessibleRole TOOL_BAR = new AccessibleRole("toolBar");
+    public static final AccessibleRole TOOL_TIP = new AccessibleRole("toolTip");
+    public static final AccessibleRole AWT_COMPONENT = new AccessibleRole("awtComponent");
+    public static final AccessibleRole SWING_COMPONENT = new AccessibleRole("swingComponent");
+    public static final AccessibleRole UNKNOWN = new AccessibleRole("unknown");
+    public static final AccessibleRole STATUS_BAR = new AccessibleRole("statusBar");
+    public static final AccessibleRole DATE_EDITOR = new AccessibleRole("dateEditor");
+    public static final AccessibleRole SPIN_BOX = new AccessibleRole("spinBox");
+    public static final AccessibleRole FONT_CHOOSER = new AccessibleRole("fontChooser");
+    public static final AccessibleRole GROUP_BOX = new AccessibleRole("groupBox");
+    public static final AccessibleRole HEADER = new AccessibleRole("header");
+    public static final AccessibleRole FOOTER = new AccessibleRole("footer");
+    public static final AccessibleRole PARAGRAPH = new AccessibleRole("paragraph");
+    public static final AccessibleRole RULER = new AccessibleRole("ruler");
+    public static final AccessibleRole EDITBAR = new AccessibleRole("editBar");
+    public static final AccessibleRole PROGRESS_MONITOR = new AccessibleRole("progressMonitor");
 
     protected AccessibleRole(final String key) {
         this.key = key;

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java Thu Nov 26 11:12:49 2009
@@ -21,36 +21,37 @@
 
 package javax.accessibility;
 
+@SuppressWarnings("nls")
 public class AccessibleState extends AccessibleBundle {
-    public static final AccessibleState ACTIVE = new AccessibleState("active"); //$NON-NLS-1$
-    public static final AccessibleState PRESSED = new AccessibleState("pressed"); //$NON-NLS-1$
-    public static final AccessibleState ARMED = new AccessibleState("armed"); //$NON-NLS-1$
-    public static final AccessibleState BUSY = new AccessibleState("busy"); //$NON-NLS-1$
-    public static final AccessibleState CHECKED = new AccessibleState("checked"); //$NON-NLS-1$
-    public static final AccessibleState EDITABLE = new AccessibleState("editable"); //$NON-NLS-1$
-    public static final AccessibleState EXPANDABLE = new AccessibleState("expandable"); //$NON-NLS-1$
-    public static final AccessibleState COLLAPSED = new AccessibleState("collapsed"); //$NON-NLS-1$
-    public static final AccessibleState EXPANDED = new AccessibleState("expanded"); //$NON-NLS-1$
-    public static final AccessibleState ENABLED = new AccessibleState("enabled"); //$NON-NLS-1$
-    public static final AccessibleState FOCUSABLE = new AccessibleState("focusable"); //$NON-NLS-1$
-    public static final AccessibleState FOCUSED = new AccessibleState("focused"); //$NON-NLS-1$
-    public static final AccessibleState ICONIFIED = new AccessibleState("iconified"); //$NON-NLS-1$
-    public static final AccessibleState MODAL = new AccessibleState("modal"); //$NON-NLS-1$
-    public static final AccessibleState OPAQUE = new AccessibleState("opaque"); //$NON-NLS-1$
-    public static final AccessibleState RESIZABLE = new AccessibleState("resizable"); //$NON-NLS-1$
-    public static final AccessibleState MULTISELECTABLE = new AccessibleState("multiSelectable"); //$NON-NLS-1$
-    public static final AccessibleState SELECTABLE = new AccessibleState("selectable"); //$NON-NLS-1$
-    public static final AccessibleState SELECTED = new AccessibleState("selected"); //$NON-NLS-1$
-    public static final AccessibleState SHOWING = new AccessibleState("showing"); //$NON-NLS-1$
-    public static final AccessibleState VISIBLE = new AccessibleState("visible"); //$NON-NLS-1$
-    public static final AccessibleState VERTICAL = new AccessibleState("vertical"); //$NON-NLS-1$
-    public static final AccessibleState HORIZONTAL = new AccessibleState("horizontal"); //$NON-NLS-1$
-    public static final AccessibleState SINGLE_LINE = new AccessibleState("singleLine"); //$NON-NLS-1$
-    public static final AccessibleState MULTI_LINE = new AccessibleState("multiLine"); //$NON-NLS-1$
-    public static final AccessibleState TRANSIENT = new AccessibleState("transient"); //$NON-NLS-1$
-    public static final AccessibleState MANAGES_DESCENDANTS = new AccessibleState("managesDescendants"); //$NON-NLS-1$
-    public static final AccessibleState INDETERMINATE = new AccessibleState("indeterminate"); //$NON-NLS-1$
-    public static final AccessibleState TRUNCATED = new AccessibleState("truncated"); //$NON-NLS-1$
+    public static final AccessibleState ACTIVE = new AccessibleState("active");
+    public static final AccessibleState PRESSED = new AccessibleState("pressed");
+    public static final AccessibleState ARMED = new AccessibleState("armed");
+    public static final AccessibleState BUSY = new AccessibleState("busy");
+    public static final AccessibleState CHECKED = new AccessibleState("checked");
+    public static final AccessibleState EDITABLE = new AccessibleState("editable");
+    public static final AccessibleState EXPANDABLE = new AccessibleState("expandable");
+    public static final AccessibleState COLLAPSED = new AccessibleState("collapsed");
+    public static final AccessibleState EXPANDED = new AccessibleState("expanded");
+    public static final AccessibleState ENABLED = new AccessibleState("enabled");
+    public static final AccessibleState FOCUSABLE = new AccessibleState("focusable");
+    public static final AccessibleState FOCUSED = new AccessibleState("focused");
+    public static final AccessibleState ICONIFIED = new AccessibleState("iconified");
+    public static final AccessibleState MODAL = new AccessibleState("modal");
+    public static final AccessibleState OPAQUE = new AccessibleState("opaque");
+    public static final AccessibleState RESIZABLE = new AccessibleState("resizable");
+    public static final AccessibleState MULTISELECTABLE = new AccessibleState("multiSelectable");
+    public static final AccessibleState SELECTABLE = new AccessibleState("selectable");
+    public static final AccessibleState SELECTED = new AccessibleState("selected");
+    public static final AccessibleState SHOWING = new AccessibleState("showing");
+    public static final AccessibleState VISIBLE = new AccessibleState("visible");
+    public static final AccessibleState VERTICAL = new AccessibleState("vertical");
+    public static final AccessibleState HORIZONTAL = new AccessibleState("horizontal");
+    public static final AccessibleState SINGLE_LINE = new AccessibleState("singleLine");
+    public static final AccessibleState MULTI_LINE = new AccessibleState("multiLine");
+    public static final AccessibleState TRANSIENT = new AccessibleState("transient");
+    public static final AccessibleState MANAGES_DESCENDANTS = new AccessibleState("managesDescendants");
+    public static final AccessibleState INDETERMINATE = new AccessibleState("indeterminate");
+    public static final AccessibleState TRUNCATED = new AccessibleState("truncated");
 
     protected AccessibleState(final String key) {
         this.key = key;

Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java Thu Nov 26 11:12:49 2009
@@ -54,11 +54,11 @@
     }
 
     void remove(Document doc) {
-        documents.remove(new Integer(doc.id));
+        documents.remove(Integer.valueOf(doc.id));
     }
 
     void dispose(int id) {
-        Proxy p = allProxies.get(new Integer(id));
+        Proxy p = allProxies.get(Integer.valueOf(id));
         if (p == null) {
             return;
         }
@@ -70,7 +70,7 @@
     Document getDocument(URL docBase, int docId) {
         synchronized(documents) {
             Document doc;
-            Integer objDocId = new Integer(docId);
+            Integer objDocId = Integer.valueOf(docId);
             doc = documents.get(objDocId);
             if (doc == null) {
                 doc = new Document(this, docBase, docId);
@@ -99,28 +99,28 @@
     }
     
     void start(int id) {
-        Proxy p = allProxies.get(new Integer(id));
+        Proxy p = allProxies.get(Integer.valueOf(id));
         if (p != null) {
             p.start();
         }
     }
     
     void stop(int id) {
-        Proxy p = allProxies.get(new Integer(id));
+        Proxy p = allProxies.get(Integer.valueOf(id));
         if (p != null) {
             p.stop();
         }
     }
     
     void init(int id) {
-        Proxy p = allProxies.get(new Integer(id));
+        Proxy p = allProxies.get(Integer.valueOf(id));
         if (p != null) {
             p.init();
         }
     }
     
     void destroy(int id) {
-        Proxy p = allProxies.get(new Integer(id));
+        Proxy p = allProxies.get(Integer.valueOf(id));
         if (p != null) {
             p.destroy();
         }
@@ -139,11 +139,11 @@
     }
 
     void add(Proxy p) {
-        allProxies.put(new Integer(p.params.id), p);
+        allProxies.put(Integer.valueOf(p.params.id), p);
     }
     
     void remove(Proxy p) {
-        allProxies.remove(new Integer(p.params.id));
+        allProxies.remove(Integer.valueOf(p.params.id));
     }
     
     void dump() {

Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java Thu Nov 26 11:12:49 2009
@@ -39,8 +39,8 @@
     private final Panel placeholder;
     private final Label status;
     
-    private final int appletId = 1;
-    private final int documentId = 2;
+    private static final int appletId = 1;
+    private static final int documentId = 2;
     
     private URL codeBase;
     private String className;

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/make/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/make/findbugs-exclude-filter.xml?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/make/findbugs-exclude-filter.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/make/findbugs-exclude-filter.xml Thu Nov 26 11:12:49 2009
@@ -69,5 +69,12 @@
 		<Bug code="EI2" />
 	</Match>
 
+	<!-- Intended to compare strings as == here. -->
+	<Match>
+		<Class name="org.apache.harmony.archive.util.Util" />
+		<Method name="asciiEqualsIgnoreCase" />
+		<Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ" />
+	</Match>
+
 </FindBugsFilter>
 

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=884518&r1=884517&r2=884518&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 Thu Nov 26 11:12:49 2009
@@ -339,11 +339,15 @@
         }
         try {
             InputStream is = super.getInputStream(manifestEntry);
-            byte[] buffer = getAllBytesFromStreamAndClose(is);
             if (verifier != null) {
-                verifier.addMetaEntry(manifestEntry.getName(), buffer);
+                verifier.addMetaEntry(manifestEntry.getName(), getAllBytesFromStreamAndClose(is));
+                is = super.getInputStream(manifestEntry);
+            }
+            try {
+                manifest = new Manifest(is, verifier != null);
+            } finally {
+                is.close();
             }
-            manifest = new Manifest(buffer, verifier != null);
             manifestEntry = null;  // Can discard the entry now.
         } catch (NullPointerException e) {
             manifestEntry = null;

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java Thu Nov 26 11:12:49 2009
@@ -115,13 +115,6 @@
         }
         read(is);
     }
-    
-    Manifest(byte[] buf, boolean readChunks) throws IOException {
-        if (readChunks) {
-            chunks = new HashMap<String, Chunk>();
-        }
-        initFromBytes(buf);
-    }
 
     /**
      * Resets the both the main attributes as well as the entry attributes
@@ -233,13 +226,6 @@
             buf[buf.length - 1] = '\n';
         }
 
-        initFromBytes(buf);
-    }
-
-    void initFromBytes(byte[] buf) throws IOException {
-        if (buf.length == 0) {
-            return;
-        }
         // Attributes.Name.MANIFEST_VERSION is not used for
         // the second parameter for RI compatibility
         im = new InitManifest(buf, mainAttributes, null);

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipcache.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipcache.c?rev=884518&r1=884517&r2=884518&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipcache.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipcache.c Thu Nov 26 11:12:49 2009
@@ -473,9 +473,9 @@
 
   if (zce->chunkActiveDir == dirEntry)
     {
-      if (entry =
+      if ((entry =
           (HyZipFileEntry *) zipCache_reserveEntry (chunk, sizeof (*entry),
-                                                    nameSize + 1))
+                                                    nameSize + 1)))
         {
           /* add to end of existing entry */
           zce->chunkActiveDir->fileList->entryCount++;



Mime
View raw message