You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/03/24 01:01:37 UTC
svn commit: r926871 - in /harmony/enhanced/trunk/classlib: ./ make/
modules/archive/src/main/java/java/util/zip/
modules/auth/src/main/java/common/javax/security/auth/
modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/...
Author: hindessm
Date: Wed Mar 24 00:01:34 2010
New Revision: 926871
URL: http://svn.apache.org/viewvc?rev=926871&view=rev
Log:
Merge the changes that Oliver and I inadvertently committed to the old
classlib tree.
Modified:
harmony/enhanced/trunk/classlib/ (props changed)
harmony/enhanced/trunk/classlib/make/depends-common.xml (props changed)
harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java
harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
harmony/enhanced/trunk/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java
harmony/enhanced/trunk/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java
harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java
harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java
harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Callable.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Executor.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Executors.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Future.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/ (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/ (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AbstractQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicBooleanTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicIntegerTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicLongArrayTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicLongTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicReferenceTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ConcurrentHashMapTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CountDownLatchTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CyclicBarrierTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/DelayQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ExchangerTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ExecutorsTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/FutureTaskTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/JSR166TestCase.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/LinkedListTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/LockSupportTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/PriorityQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ScheduledExecutorTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/SemaphoreTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/SynchronousQueueTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/SystemTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ThreadLocalTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ThreadTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/TimeUnitTest.java (props changed)
harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java
harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
harmony/enhanced/trunk/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
harmony/enhanced/trunk/classlib/modules/jmx/META-INF/ (props changed)
harmony/enhanced/trunk/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java
harmony/enhanced/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
harmony/enhanced/trunk/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/ (props changed)
harmony/enhanced/trunk/classlib/modules/luni/make/findbugs-exclude-filter.xml
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/Math.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/StrictMath.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/net/URI.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/util/Currency.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/fdlibm.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/gp.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hymagic.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hysocket.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hyvmls.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni_types.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmpi.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmri.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti_types.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmi.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmizip.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/launcher/shared/main.c
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/OSMemory.c (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/OSMemory.h (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/cbigint.c
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/netif.c
harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/socket.c
harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java
harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java
harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java
harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/ (props changed)
harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/README.txt
harmony/enhanced/trunk/classlib/modules/nio_char/src/main/native/niochar/windows/hyniochar.def (props changed)
harmony/enhanced/trunk/classlib/modules/pack200/depends/manifests/asm-3.1/ (props changed)
harmony/enhanced/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
harmony/enhanced/trunk/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java (props changed)
harmony/enhanced/trunk/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java (props changed)
harmony/enhanced/trunk/classlib/modules/suncompat/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoderImpl.java (props changed)
harmony/enhanced/trunk/classlib/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java (props changed)
harmony/enhanced/trunk/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java (props changed)
harmony/enhanced/trunk/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/parser/ (props changed)
harmony/enhanced/trunk/classlib/modules/text/src/main/java/java/text/NumberFormat.java
Propchange: harmony/enhanced/trunk/classlib/
------------------------------------------------------------------------------
svn:mergeinfo = /harmony/enhanced/classlib/trunk:926318-926838
Propchange: harmony/enhanced/trunk/classlib/make/depends-common.xml
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java (original)
+++ harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/Inflater.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java (original)
+++ harmony/enhanced/trunk/classlib/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java (original)
+++ harmony/enhanced/trunk/classlib/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java Wed Mar 24 00:01:34 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/trunk/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/trunk/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java (original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/font/GlyphVector.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java (original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DecodingImageSource.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java (original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java Wed Mar 24 00:01:34 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.
*/
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Future.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AbstractQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicBooleanTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicIntegerTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicLongArrayTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicLongTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicReferenceTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CountDownLatchTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/CyclicBarrierTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/DelayQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ExchangerTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ExecutorsTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/FutureTaskTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/JSR166TestCase.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/LinkedListTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/LockSupportTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/PriorityQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ScheduledExecutorTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/SemaphoreTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/SynchronousQueueTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/SystemTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ThreadLocalTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/ThreadTest.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/concurrent/src/test/java/TimeUnitTest.java
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java (original)
+++ harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/Cipher.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java (original)
+++ harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java Wed Mar 24 00:01:34 2010
@@ -139,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
Modified: harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java (original)
+++ harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanism.java Wed Mar 24 00:01:34 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/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java (original)
+++ harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java Wed Mar 24 00:01:34 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/trunk/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/trunk/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java Wed Mar 24 00:01:34 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.");
Propchange: harmony/enhanced/trunk/classlib/modules/jmx/META-INF/
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java Wed Mar 24 00:01:34 2010
@@ -511,8 +511,7 @@ public class LdapNameTest extends TestCa
* </p>
* <p>
* Here we are testing the constructor, this method should accept a
- * String notice here that here that we are testing the the special
- * character "<".
+ * String. Notice here that we are testing the special character "<".
* </p>
* <p>
* The expected result is an Exception.
@@ -556,8 +555,7 @@ public class LdapNameTest extends TestCa
* </p>
* <p>
* Here we are testing the constructor, this method should accept a
- * String notice here that here that we are testing the the special
- * character "\".
+ * String. Notice here that we are testing the special character "\".
* </p>
* <p>
* The expected result is an Exception.
@@ -591,8 +589,7 @@ public class LdapNameTest extends TestCa
* </p>
* <p>
* Here we are testing the constructor, this method should accept a
- * String notice here that here that we are testing the the special
- * character "+".
+ * String. Notice here that we are testing the special character "+".
* </p>
* <p>
* The expected result is an instance of the class.
@@ -661,7 +658,7 @@ public class LdapNameTest extends TestCa
* </p>
* <p>
* Here we are testing the constructor, this method should accept a
- * String notice here that here that we are testing the special case
+ * String. Notice here that we are testing the special case
* in which the name is quoted and the meta characters in it are ignored.
* </p>
* <p>
@@ -786,7 +783,7 @@ public class LdapNameTest extends TestCa
* </p>
* <p>
* Here we are testing the constructor, this method should accept a
- * String notice here that here that we are testing the special case
+ * String. Notice here that we are testing the special case
* in which the name contains \\*, \\%, \\_
* </p>
* <p>
Modified: harmony/enhanced/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java (original)
+++ harmony/enhanced/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java Wed Mar 24 00:01:34 2010
@@ -1508,7 +1508,7 @@ public class ManagementUtils {
/**
* Convenience method that returns a boolean indication of whether or not
- * concrete instances of the the supplied interface type
+ * concrete instances of the supplied interface type
* <code>mxbeanInterface</code> should also be implementors of the
* interface <code>javax.management.NotificationEmitter</code>.
*
Propchange: harmony/enhanced/trunk/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/luni/make/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/make/findbugs-exclude-filter.xml?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/make/findbugs-exclude-filter.xml (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/make/findbugs-exclude-filter.xml Wed Mar 24 00:01:34 2010
@@ -84,7 +84,7 @@
</Match>
<!--
- OK to compare Strings using using == or != in the String class itself
+ OK to compare Strings using == or != in the String class itself
-->
<Match>
<Class name="java.lang.String" />
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java Wed Mar 24 00:01:34 2010
@@ -47,7 +47,7 @@ public class CharArrayReader extends Rea
/**
* Constructs a CharArrayReader on the char array {@code buf}. The size of
- * the reader is set to the length of the buffer and the object to to read
+ * the reader is set to the length of the buffer and the object to read
* from is set to {@code buf}.
*
* @param buf
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java Wed Mar 24 00:01:34 2010
@@ -18,7 +18,7 @@
package java.io;
/**
- * Signals a problem during the serialization or or deserialization of an
+ * Signals a problem during the serialization or deserialization of an
* object. Possible reasons include:
* <ul>
* <li>The SUIDs of the class loaded by the VM and the serialized class info do
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java Wed Mar 24 00:01:34 2010
@@ -125,6 +125,7 @@ public class ObjectStreamField implement
}
this.name = name;
this.typeString = signature.replace('.', '/').intern();
+ defaultResolve();
this.isDeserialized = true;
}
@@ -337,34 +338,13 @@ public class ObjectStreamField implement
// primitive type declared in a serializable class
typeString = String.valueOf(getTypeCode());
}
+
if (typeString.length() == 1) {
- switch (typeString.charAt(0)) {
- case 'I':
- type = Integer.TYPE;
- return;
- case 'B':
- type = Byte.TYPE;
- return;
- case 'C':
- type = Character.TYPE;
- return;
- case 'S':
- type = Short.TYPE;
- return;
- case 'Z':
- type = Boolean.TYPE;
- return;
- case 'J':
- type = Long.TYPE;
- return;
- case 'F':
- type = Float.TYPE;
- return;
- case 'D':
- type = Double.TYPE;
- return;
+ if (defaultResolve()) {
+ return;
}
}
+
String className = typeString.replace('/', '.');
if (className.charAt(0) == 'L') {
// remove L and ;
@@ -380,7 +360,7 @@ public class ObjectStreamField implement
}
/**
- * Indicats whether this field is unshared.
+ * Indicates whether this field is unshared.
*
* @return {@code true} if this field is unshared, {@code false} otherwise.
*/
@@ -391,4 +371,40 @@ public class ObjectStreamField implement
void setUnshared(boolean unshared) {
this.unshared = unshared;
}
+
+ /**
+ * Resolves typeString into type. Returns true if the type is primitive
+ * and false otherwise.
+ */
+ private boolean defaultResolve() {
+ switch (typeString.charAt(0)) {
+ case 'I':
+ type = Integer.TYPE;
+ return true;
+ case 'B':
+ type = Byte.TYPE;
+ return true;
+ case 'C':
+ type = Character.TYPE;
+ return true;
+ case 'S':
+ type = Short.TYPE;
+ return true;
+ case 'Z':
+ type = Boolean.TYPE;
+ return true;
+ case 'J':
+ type = Long.TYPE;
+ return true;
+ case 'F':
+ type = Float.TYPE;
+ return true;
+ case 'D':
+ type = Double.TYPE;
+ return true;
+ default:
+ type = Object.class;
+ return false;
+ }
+ }
}
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/Math.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/Math.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/Math.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/Math.java Wed Mar 24 00:01:34 2010
@@ -397,7 +397,7 @@ public final class Math {
* the numerator of the operation.
* @param y
* the denominator of the operation.
- * @return the IEEE754 floating point reminder of of {@code x/y}.
+ * @return the IEEE754 floating point reminder of {@code x/y}.
*/
public static native double IEEEremainder(double x, double y);
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/StrictMath.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/StrictMath.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/StrictMath.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/lang/StrictMath.java Wed Mar 24 00:01:34 2010
@@ -400,7 +400,7 @@ public final class StrictMath {
* the numerator of the operation.
* @param y
* the denominator of the operation.
- * @return the IEEE754 floating point reminder of of {@code x/y}.
+ * @return the IEEE754 floating point reminder of {@code x/y}.
*/
public static native double IEEEremainder(double x, double y);
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/net/URI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/net/URI.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/net/URI.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/net/URI.java Wed Mar 24 00:01:34 2010
@@ -1011,8 +1011,8 @@ public final class URI implements Compar
/*
* Takes two strings that may contain hex sequences like %F1 or %2b and
- * compares them, ignoring case for the hex values hex values must always
- * occur in pairs like above
+ * compares them, ignoring case for the hex values. Hex values must always
+ * occur in pairs as above
*/
private boolean equalsHexCaseInsensitive(String first, String second) {
if (first.indexOf('%') != second.indexOf('%')) {
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/util/Currency.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/util/Currency.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/util/Currency.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/java/util/Currency.java Wed Mar 24 00:01:34 2010
@@ -115,7 +115,7 @@ public final class Currency implements S
* Returns the symbol for this currency in the given {@code Locale}.
* <p>
* If the locale doesn't have any countries (e.g.
- * {@code Locale.JAPANESE, new Locale("en","")}), the the ISO
+ * {@code Locale.JAPANESE, new Locale("en","")}), then the ISO
* 4217 currency code is returned.
* <p>
* First the locale's resource bundle is checked, if the locale has the same currency,
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java Wed Mar 24 00:01:34 2010
@@ -287,7 +287,7 @@ public class PlainDatagramSocketImpl ext
public void setOption(int optID, Object val) throws SocketException {
/*
* for datagram sockets on some platforms we have to set both the
- * REUSEADDR AND REUSEPORT so for REUSEADDR set this option option which
+ * REUSEADDR AND REUSEPORT so for REUSEADDR set this option which
* tells the VM to set the two values as appropriate for the platform
*/
if (optID == SocketOptions.SO_REUSEADDR) {
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java Wed Mar 24 00:01:34 2010
@@ -42,7 +42,7 @@ public final class FloatingPointParser {
* Takes a String and an integer exponent. The String should hold a positive
* integer value (or zero). The exponent will be used to calculate the
* floating point number by taking the positive integer the String
- * represents and multiplying by 10 raised to the power of the of the
+ * represents and multiplying by 10 raised to the power of the
* exponent. Returns the closest double value to the real number
*
* @param s
@@ -60,7 +60,7 @@ public final class FloatingPointParser {
* Takes a String and an integer exponent. The String should hold a positive
* integer value (or zero). The exponent will be used to calculate the
* floating point number by taking the positive integer the String
- * represents and multiplying by 10 raised to the power of the of the
+ * represents and multiplying by 10 raised to the power of the
* exponent. Returns the closest float value to the real number
*
* @param s
@@ -80,7 +80,7 @@ public final class FloatingPointParser {
* space and trailing zeroes eliminated. The exponent of the
* StringExponentPair will be used to calculate the floating point number by
* taking the positive integer the String represents and multiplying by 10
- * raised to the power of the of the exponent.
+ * raised to the power of the exponent.
*
* @param s
* the String that will be parsed to a floating point
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/fdlibm.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/gp.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hymagic.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hysocket.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hyvmls.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni_types.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmpi.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmri.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti_types.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmi.h
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmizip.h
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/launcher/shared/main.c?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/native/launcher/shared/main.c (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/native/launcher/shared/main.c Wed Mar 24 00:01:34 2010
@@ -1152,7 +1152,7 @@ addDirsToPath (int count, char *newPathT
* now set the new path, and in case of !Windows, execv() to
* restart. Don't free newPath, as the docs say that the
* string becomes part of the environment, which sounds nutty
- * but at worst, it's a leak of of one string under windows
+ * but at worst, it's a leak of one string under windows
*/
#if defined(WIN32)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/OSMemory.c
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/OSMemory.h
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/cbigint.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/cbigint.c?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/cbigint.c (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/cbigint.c Wed Mar 24 00:01:34 2010
@@ -718,7 +718,7 @@ timesTenToTheEHighPrecision (U_64 * resu
result[length++] = overflow;
} while (--e);
*/
- /* Replace the current implementaion which performs a
+ /* Replace the current implementation which performs a
* "multiplication" by 10 e number of times with an actual
* multiplication. 10e19 is the largest exponent to the power of ten
* that will fit in a 64-bit integer, and 10e9 is the largest exponent to
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/netif.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/netif.c?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/netif.c (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/netif.c Wed Mar 24 00:01:34 2010
@@ -190,7 +190,8 @@ Java_java_net_NetworkInterface_getNetwor
}
}
- /* now create the NetworkInterface object for this interface and then add it it ot the arrary that will be returned */
+ /* now create the NetworkInterface object for this interface and
+ then add it to the array that will be returned */
currentInterface =
(*env)->NewObject (env, networkInterfaceClass, methodID, name,
displayName, addresses,
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/socket.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/socket.c?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/socket.c (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/main/native/luni/shared/socket.c Wed Mar 24 00:01:34 2010
@@ -890,7 +890,7 @@ setByteSocketOption (JNIEnv * env, hysoc
* @param env pointer to the JNI library
* @param socketP pointer to the hysocket to query
*
- * @return the index for the interface interface bound to the multicast socket
+ * @return the index for the interface bound to the multicast socket
* @exception SocketException if an error occurs during the call
*/
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java Wed Mar 24 00:01:34 2010
@@ -315,7 +315,7 @@ public class FieldTest extends junit.fra
// The test will attempt to use pass an object to set for object, byte,
// short, ..., float and double fields
- // and pass a byte to to setByte for byte, short, ..., float and double
+ // and pass a byte to setByte for byte, short, ..., float and double
// fields and so on.
// It will also test if IllegalArgumentException is thrown when the
// field does not exist in the given object and that
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java Wed Mar 24 00:01:34 2010
@@ -506,7 +506,7 @@ public class ProxySelectorTest extends T
assertNotNull(proxyList2);
assertEquals(1, proxyList2.size());
Proxy proxy2 = (Proxy) proxyList2.get(0);
- // Default implemention doesn't change the proxy list
+ // Default implementation doesn't change the proxy list
assertEquals(proxy1, proxy2);
}
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java Wed Mar 24 00:01:34 2010
@@ -542,7 +542,7 @@ public class ServerSocketTest extends So
// checks if it is a least a certain number as some platforms make
// it higher than we request. Unfortunately non-server versions of
// windows artificially limit the backlog to 5 and 5 is the
- // historical default so it it not a great test.
+ // historical default so it is not a great test.
theSocket = new ServerSocket();
theAddress = new InetSocketAddress(InetAddress.getLocalHost(), 0);
theSocket.bind(theAddress, 4);
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java Wed Mar 24 00:01:34 2010
@@ -101,7 +101,7 @@ public class PropertyResourceBundleTest
/**
* @add tests {@link java.util.PropertyResourceBundle#Enumeration}
*/
- public void test_access$0_Enumberation() throws IOException {
+ public void test_access$0_Enumeration() throws IOException {
class MockResourceBundle extends PropertyResourceBundle {
MockResourceBundle(java.io.InputStream stream) throws IOException {
super(stream);
Propchange: harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/README.txt?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/README.txt (original)
+++ harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources/README.txt Wed Mar 24 00:01:34 2010
@@ -96,8 +96,7 @@ The key properties required by the java.
* WebName : The unqualified name of the host where the HTTP server is running.
* TestResourcesDir : the name of the folder on the HTTP server beneath the
- document root where the where the web resources have been
- deployed.
+ document root where the web resources have been deployed.
* HomeAddressResponse : the expected response returned from a successful get
from the HTTP server.
Propchange: harmony/enhanced/trunk/classlib/modules/nio_char/src/main/native/niochar/windows/hyniochar.def
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/pack200/depends/manifests/asm-3.1/
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java (original)
+++ harmony/enhanced/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java Wed Mar 24 00:01:34 2010
@@ -1313,7 +1313,7 @@ public class ClassBands extends BandSet
}
/**
- * Answer an ArrayList of ArrayLists which hold the the code attributes
+ * Answer an ArrayList of ArrayLists which hold the code attributes
* corresponding to all classes in order.
*
* If a class doesn't have any attributes, the corresponding element in this
Propchange: harmony/enhanced/trunk/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/suncompat/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoderImpl.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
('svn:mergeinfo' removed)
Propchange: harmony/enhanced/trunk/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
('svn:mergeinfo' removed)
Modified: harmony/enhanced/trunk/classlib/modules/text/src/main/java/java/text/NumberFormat.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/text/src/main/java/java/text/NumberFormat.java?rev=926871&r1=926870&r2=926871&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/text/src/main/java/java/text/NumberFormat.java (original)
+++ harmony/enhanced/trunk/classlib/modules/text/src/main/java/java/text/NumberFormat.java Wed Mar 24 00:01:34 2010
@@ -520,7 +520,7 @@ public abstract class NumberFormat exten
* stops if a decimal separator is encountered.
*
* @return {@code true} if this number format only parses integers,
- * {@code false} if if parsese integers as well as fractions.
+ * {@code false} if it parses integers as well as fractions.
*/
public boolean isParseIntegerOnly() {
return parseIntegerOnly;