You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by no...@apache.org on 2012/11/08 14:05:44 UTC
svn commit: r1407041 [1/2] - in
/directmemory/lightning/trunk/lightning-core/src:
main/java/org/apache/directmemory/lightning/internal/
main/java/org/apache/directmemory/lightning/internal/beans/
main/java/org/apache/directmemory/lightning/internal/ins...
Author: noctarius
Date: Thu Nov 8 13:05:42 2012
New Revision: 1407041
URL: http://svn.apache.org/viewvc?rev=1407041&view=rev
Log:
Used formatter to use braces on if-clauses
Modified:
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/CheatPropertyDescriptor.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinitionContainer.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDescriptor.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalMarshallerContext.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializationContext.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/beans/InternalPropertyDescriptor.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/instantiator/sun/SunUnsafeAllocateInstanceInstantiator.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastIntMap.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastLongMap.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/StringUtil.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/UnicodeUtil.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/AbstractLightningBenchmark.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/ComplexClassHierarchyTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/CustomBenchmark.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/PropertyFinderTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ArrayMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java
directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/CheatPropertyDescriptor.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/CheatPropertyDescriptor.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/CheatPropertyDescriptor.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/CheatPropertyDescriptor.java Thu Nov 8 13:05:42 2012
@@ -161,40 +161,62 @@ public class CheatPropertyDescriptor
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
CheatPropertyDescriptor other = (CheatPropertyDescriptor) obj;
if ( declaringCanonicalClassname == null )
{
if ( other.declaringCanonicalClassname != null )
+ {
return false;
+ }
}
else if ( !declaringCanonicalClassname.equals( other.declaringCanonicalClassname ) )
+ {
return false;
+ }
if ( internalSignature == null )
{
if ( other.internalSignature != null )
+ {
return false;
+ }
}
else if ( !internalSignature.equals( other.internalSignature ) )
+ {
return false;
+ }
if ( name == null )
{
if ( other.name != null )
+ {
return false;
+ }
}
else if ( !name.equals( other.name ) )
+ {
return false;
+ }
if ( propertyName == null )
{
if ( other.propertyName != null )
+ {
return false;
+ }
}
else if ( !propertyName.equals( other.propertyName ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java Thu Nov 8 13:05:42 2012
@@ -115,25 +115,41 @@ class InternalClassDefinition
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
InternalClassDefinition other = (InternalClassDefinition) obj;
if ( canonicalName == null )
{
if ( other.canonicalName != null )
+ {
return false;
+ }
}
else if ( !canonicalName.equals( other.canonicalName ) )
+ {
return false;
+ }
if ( !Arrays.equals( checksum, other.checksum ) )
+ {
return false;
+ }
if ( id != other.id )
+ {
return false;
+ }
if ( serialVersionUID != other.serialVersionUID )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinitionContainer.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinitionContainer.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinitionContainer.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinitionContainer.java Thu Nov 8 13:05:42 2012
@@ -43,7 +43,7 @@ class InternalClassDefinitionContainer
private final ClassDefinition[] classDefinitions;
- //private final LongObjectMap<ClassDefinition> classDefinitionsMappings;
+ // private final LongObjectMap<ClassDefinition> classDefinitionsMappings;
private final FastLongMap<ClassDefinition> classDefinitionsMappings;
// Serialization
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDescriptor.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDescriptor.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDescriptor.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDescriptor.java Thu Nov 8 13:05:42 2012
@@ -111,19 +111,29 @@ public class InternalClassDescriptor
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
InternalClassDescriptor other = (InternalClassDescriptor) obj;
if ( type == null )
{
if ( other.type != null )
+ {
return false;
+ }
}
else if ( !type.equals( other.type ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalMarshallerContext.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalMarshallerContext.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalMarshallerContext.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalMarshallerContext.java Thu Nov 8 13:05:42 2012
@@ -19,13 +19,9 @@
package org.apache.directmemory.lightning.internal;
import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.MarshallerContext;
import org.apache.directmemory.lightning.internal.util.FastIntMap;
-import org.apache.directmemory.lightning.internal.util.FastLongMap;
public class InternalMarshallerContext
implements MarshallerContext
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializationContext.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializationContext.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializationContext.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializationContext.java Thu Nov 8 13:05:42 2012
@@ -21,8 +21,6 @@ package org.apache.directmemory.lightnin
import java.lang.reflect.Type;
import java.util.IdentityHashMap;
import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.MarshallerContext;
import org.apache.directmemory.lightning.MarshallerStrategy;
@@ -31,7 +29,6 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.TypeBindableMarshaller;
import org.apache.directmemory.lightning.instantiator.ObjectInstantiatorFactory;
import org.apache.directmemory.lightning.internal.util.FastIntMap;
-import org.apache.directmemory.lightning.internal.util.FastLongMap;
import org.apache.directmemory.lightning.internal.util.TypeUtil;
import org.apache.directmemory.lightning.metadata.ClassDefinitionContainer;
import org.apache.directmemory.lightning.metadata.ValueNullableEvaluator;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/beans/InternalPropertyDescriptor.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/beans/InternalPropertyDescriptor.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/beans/InternalPropertyDescriptor.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/beans/InternalPropertyDescriptor.java Thu Nov 8 13:05:42 2012
@@ -143,56 +143,88 @@ class InternalPropertyDescriptor
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
InternalPropertyDescriptor other = (InternalPropertyDescriptor) obj;
if ( !Arrays.equals( annotations, other.annotations ) )
+ {
return false;
+ }
if ( declaringCanonicalClassname == null )
{
if ( other.declaringCanonicalClassname != null )
+ {
return false;
+ }
}
else if ( !declaringCanonicalClassname.equals( other.declaringCanonicalClassname ) )
+ {
return false;
+ }
if ( declaringClass == null )
{
if ( other.declaringClass != null )
+ {
return false;
+ }
}
else if ( !declaringClass.equals( other.declaringClass ) )
+ {
return false;
+ }
if ( definedClass == null )
{
if ( other.definedClass != null )
+ {
return false;
+ }
}
else if ( !definedClass.equals( other.definedClass ) )
+ {
return false;
+ }
if ( internalSignature == null )
{
if ( other.internalSignature != null )
+ {
return false;
+ }
}
else if ( !internalSignature.equals( other.internalSignature ) )
+ {
return false;
+ }
if ( name == null )
{
if ( other.name != null )
+ {
return false;
+ }
}
else if ( !name.equals( other.name ) )
+ {
return false;
+ }
if ( propertyName == null )
{
if ( other.propertyName != null )
+ {
return false;
+ }
}
else if ( !propertyName.equals( other.propertyName ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/instantiator/sun/SunUnsafeAllocateInstanceInstantiator.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/instantiator/sun/SunUnsafeAllocateInstanceInstantiator.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/instantiator/sun/SunUnsafeAllocateInstanceInstantiator.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/instantiator/sun/SunUnsafeAllocateInstanceInstantiator.java Thu Nov 8 13:05:42 2012
@@ -41,7 +41,9 @@ public class SunUnsafeAllocateInstanceIn
try
{
if ( UNSAFE != null )
+ {
return UNSAFE.allocateInstance( type );
+ }
}
catch ( Exception e )
{
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java Thu Nov 8 13:05:42 2012
@@ -181,7 +181,9 @@ public class ListMarshaller
private void ensureMarshallerInitialized( SerializationContext serializationContext )
{
if ( listTypeMarshaller != null )
+ {
return;
+ }
listTypeMarshaller = serializationContext.findMarshaller( listType );
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshaller.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshaller.java Thu Nov 8 13:05:42 2012
@@ -238,7 +238,9 @@ public class MapMarshaller
private void ensureMarshallersInitialized( SerializationContext serializationContext )
{
if ( mapKeyTypeMarshaller != null && mapValueTypeMarshaller != null )
+ {
return;
+ }
mapKeyTypeMarshaller = serializationContext.findMarshaller( mapKeyType );
mapValueTypeMarshaller = serializationContext.findMarshaller( mapValueType );
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshaller.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshaller.java Thu Nov 8 13:05:42 2012
@@ -176,7 +176,9 @@ public class SetMarshaller
private void ensureMarshallerInitialized( SerializationContext serializationContext )
{
if ( setTypeMarshaller != null )
+ {
return;
+ }
setTypeMarshaller = serializationContext.findMarshaller( setType );
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java Thu Nov 8 13:05:42 2012
@@ -407,25 +407,41 @@ public final class ClassUtil
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
JavaBuildInTypeClassDefinition other = (JavaBuildInTypeClassDefinition) obj;
if ( canonicalName == null )
{
if ( other.canonicalName != null )
+ {
return false;
+ }
}
else if ( !canonicalName.equals( other.canonicalName ) )
+ {
return false;
+ }
if ( !Arrays.equals( checksum, other.checksum ) )
+ {
return false;
+ }
if ( id != other.id )
+ {
return false;
+ }
if ( serialVersionUID != other.serialVersionUID )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastIntMap.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastIntMap.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastIntMap.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastIntMap.java Thu Nov 8 13:05:42 2012
@@ -45,14 +45,22 @@ public final class FastIntMap<V>
public FastIntMap( int initialCapacity, float loadFactor )
{
if ( initialCapacity > 1 << 30 )
+ {
throw new IllegalArgumentException( "initialCapacity is too large." );
+ }
if ( initialCapacity < 0 )
+ {
throw new IllegalArgumentException( "initialCapacity must be greater than zero." );
+ }
if ( loadFactor <= 0 )
+ {
throw new IllegalArgumentException( "initialCapacity must be greater than zero." );
+ }
capacity = 1;
while ( capacity < initialCapacity )
+ {
capacity <<= 1;
+ }
this.threshold = (int) ( capacity * loadFactor );
this.table = new Entry[capacity];
this.mask = capacity - 1;
@@ -77,7 +85,9 @@ public final class FastIntMap<V>
for ( Entry<V> e = table[index]; e != null; e = e.next )
{
if ( e.key != key )
+ {
continue;
+ }
V oldValue = e.value;
e.value = value;
return oldValue;
@@ -86,7 +96,9 @@ public final class FastIntMap<V>
table[index] = new Entry<V>( key, value, table[index] );
if ( size++ >= threshold )
+ {
rehash( table );
+ }
return null;
}
@@ -102,7 +114,9 @@ public final class FastIntMap<V>
{
Entry<V> e = table[i];
if ( e == null )
+ {
continue;
+ }
do
{
final Entry<V> next = e.next;
@@ -124,8 +138,12 @@ public final class FastIntMap<V>
{
final int index = index( key );
for ( Entry<V> e = table[index]; e != null; e = e.next )
+ {
if ( e.key == key )
+ {
return e.value;
+ }
+ }
return null;
}
@@ -133,9 +151,15 @@ public final class FastIntMap<V>
{
final Entry<V>[] table = this.table;
for ( int i = table.length - 1; i >= 0; i-- )
+ {
for ( Entry<V> e = table[i]; e != null; e = e.next )
+ {
if ( e.value.equals( value ) )
+ {
return true;
+ }
+ }
+ }
return false;
}
@@ -143,8 +167,12 @@ public final class FastIntMap<V>
{
final int index = index( key );
for ( Entry<V> e = table[index]; e != null; e = e.next )
+ {
if ( e.key == key )
+ {
return true;
+ }
+ }
return false;
}
@@ -161,9 +189,13 @@ public final class FastIntMap<V>
{
size--;
if ( prev == e )
+ {
table[index] = next;
+ }
else
+ {
prev.next = next;
+ }
return e.value;
}
prev = e;
@@ -186,10 +218,13 @@ public final class FastIntMap<V>
{
final Entry<V>[] table = this.table;
for ( int index = table.length - 1; index >= 0; index-- )
+ {
table[index] = null;
+ }
size = 0;
}
+ @Override
public EntryIterator iterator()
{
return new EntryIterator();
@@ -215,19 +250,27 @@ public final class FastIntMap<V>
final Entry<V>[] table = FastIntMap.this.table;
int i;
for ( i = table.length - 1; i >= 0; i-- )
+ {
if ( table[i] != null )
+ {
break;
+ }
+ }
nextIndex = i;
}
+ @Override
public boolean hasNext()
{
if ( nextIndex >= 0 )
+ {
return true;
+ }
Entry e = current;
return e != null && e.next != null;
}
+ @Override
public Entry<V> next()
{
// Next entry in current bucket.
@@ -246,12 +289,17 @@ public final class FastIntMap<V>
int i = nextIndex;
e = current = table[i];
while ( --i >= 0 )
+ {
if ( table[i] != null )
+ {
break;
+ }
+ }
nextIndex = i;
return e;
}
+ @Override
public void remove()
{
FastIntMap.this.remove( current.key );
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastLongMap.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastLongMap.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastLongMap.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/FastLongMap.java Thu Nov 8 13:05:42 2012
@@ -49,14 +49,22 @@ public final class FastLongMap<V>
public FastLongMap( int initialCapacity, float loadFactor )
{
if ( initialCapacity > 1 << 30 )
+ {
throw new IllegalArgumentException( "initialCapacity is too large." );
+ }
if ( initialCapacity < 0 )
+ {
throw new IllegalArgumentException( "initialCapacity must be greater than zero." );
+ }
if ( loadFactor <= 0 )
+ {
throw new IllegalArgumentException( "initialCapacity must be greater than zero." );
+ }
capacity = 1;
while ( capacity < initialCapacity )
+ {
capacity <<= 1;
+ }
this.threshold = (int) ( capacity * loadFactor );
this.table = new Entry[capacity];
this.mask = capacity - 1;
@@ -82,7 +90,9 @@ public final class FastLongMap<V>
for ( Entry<V> e = table[index]; e != null; e = e.next )
{
if ( e.key != key )
+ {
continue;
+ }
V oldValue = e.value;
e.value = value;
return oldValue;
@@ -91,7 +101,9 @@ public final class FastLongMap<V>
table[index] = new Entry<V>( key, value, table[index] );
if ( size++ >= threshold )
+ {
rehash( table );
+ }
return null;
}
@@ -107,7 +119,9 @@ public final class FastLongMap<V>
{
Entry<V> e = table[i];
if ( e == null )
+ {
continue;
+ }
do
{
final Entry<V> next = e.next;
@@ -129,8 +143,12 @@ public final class FastLongMap<V>
{
final int index = index( key );
for ( Entry<V> e = table[index]; e != null; e = e.next )
+ {
if ( e.key == key )
+ {
return e.value;
+ }
+ }
return null;
}
@@ -138,9 +156,15 @@ public final class FastLongMap<V>
{
final Entry<V>[] table = this.table;
for ( int i = table.length - 1; i >= 0; i-- )
+ {
for ( Entry<V> e = table[i]; e != null; e = e.next )
+ {
if ( e.value.equals( value ) )
+ {
return true;
+ }
+ }
+ }
return false;
}
@@ -148,8 +172,12 @@ public final class FastLongMap<V>
{
final int index = index( key );
for ( Entry<V> e = table[index]; e != null; e = e.next )
+ {
if ( e.key == key )
+ {
return true;
+ }
+ }
return false;
}
@@ -166,9 +194,13 @@ public final class FastLongMap<V>
{
size--;
if ( prev == e )
+ {
table[index] = next;
+ }
else
+ {
prev.next = next;
+ }
return e.value;
}
prev = e;
@@ -191,10 +223,13 @@ public final class FastLongMap<V>
{
final Entry<V>[] table = this.table;
for ( int index = table.length - 1; index >= 0; index-- )
+ {
table[index] = null;
+ }
size = 0;
}
+ @Override
public EntryIterator iterator()
{
return new EntryIterator();
@@ -220,19 +255,27 @@ public final class FastLongMap<V>
final Entry<V>[] table = FastLongMap.this.table;
int i;
for ( i = table.length - 1; i >= 0; i-- )
+ {
if ( table[i] != null )
+ {
break;
+ }
+ }
nextIndex = i;
}
+ @Override
public boolean hasNext()
{
if ( nextIndex >= 0 )
+ {
return true;
+ }
Entry e = current;
return e != null && e.next != null;
}
+ @Override
public Entry<V> next()
{
// Next entry in current bucket.
@@ -251,12 +294,17 @@ public final class FastLongMap<V>
int i = nextIndex;
e = current = table[i];
while ( --i >= 0 )
+ {
if ( table[i] != null )
+ {
break;
+ }
+ }
nextIndex = i;
return e;
}
+ @Override
public void remove()
{
FastLongMap.this.remove( current.key );
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/StringUtil.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/StringUtil.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/StringUtil.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/StringUtil.java Thu Nov 8 13:05:42 2012
@@ -28,10 +28,14 @@ public final class StringUtil
public static String toLowerCamelCase( String value )
{
if ( value == null )
+ {
return null;
+ }
if ( value.length() == 0 )
+ {
return value;
+ }
return toCamelCase( value );
}
@@ -52,16 +56,24 @@ public final class StringUtil
{
i = ignoreWhitespace( characters, i );
if ( i == -1 )
+ {
break;
+ }
if ( camelCase.length() == 0 )
+ {
camelCase.append( Character.toLowerCase( characters[i] ) );
+ }
else
+ {
camelCase.append( Character.toUpperCase( characters[i] ) );
+ }
int nextWhitespace = nextWhitespace( characters, i );
if ( nextWhitespace == -1 )
+ {
nextWhitespace = characters.length;
+ }
camelCase.append( value.substring( i + 1, nextWhitespace ) );
i = nextWhitespace;
@@ -76,7 +88,9 @@ public final class StringUtil
{
char c = characters[i];
if ( !Character.isWhitespace( c ) && '-' != c && '_' != c )
+ {
return i;
+ }
}
return -1;
}
@@ -87,7 +101,9 @@ public final class StringUtil
{
char c = characters[i];
if ( Character.isWhitespace( c ) || '-' == c || '_' == c )
+ {
return i;
+ }
}
return -1;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/UnicodeUtil.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/UnicodeUtil.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/UnicodeUtil.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/UnicodeUtil.java Thu Nov 8 13:05:42 2012
@@ -235,16 +235,22 @@ public final class UnicodeUtil
// Valid surrogate pair
}
else
+ {
// Unmatched high surrogate
return false;
+ }
}
else
+ {
// Unmatched high surrogate
return false;
+ }
}
else if ( ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END )
+ {
// Unmatched low surrogate
return false;
+ }
}
return true;
@@ -266,14 +272,20 @@ public final class UnicodeUtil
// Valid surrogate pair
}
else
+ {
return false;
+ }
}
else
+ {
return false;
+ }
}
else if ( ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END )
+ {
// Unmatched low surrogate
return false;
+ }
}
return true;
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/AbstractLightningBenchmark.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/AbstractLightningBenchmark.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/AbstractLightningBenchmark.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/AbstractLightningBenchmark.java Thu Nov 8 13:05:42 2012
@@ -244,37 +244,59 @@ public abstract class AbstractLightningB
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Foo other = (Foo) obj;
if ( enumValue != other.enumValue )
+ {
return false;
+ }
if ( first == null )
{
if ( other.first != null )
+ {
return false;
+ }
}
else if ( !first.equals( other.first ) )
+ {
return false;
+ }
if ( second == null )
{
if ( other.second != null )
+ {
return false;
+ }
}
else if ( !second.equals( other.second ) )
+ {
return false;
+ }
if ( someOther != other.someOther )
+ {
return false;
+ }
if ( value == null )
{
if ( other.value != null )
+ {
return false;
+ }
}
else if ( !value.equals( other.value ) )
+ {
return false;
+ }
return true;
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/ComplexClassHierarchyTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/ComplexClassHierarchyTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/ComplexClassHierarchyTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/ComplexClassHierarchyTestCase.java Thu Nov 8 13:05:42 2012
@@ -230,21 +230,33 @@ public class ComplexClassHierarchyTestCa
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Foo other = (Foo) obj;
if ( id != other.id )
+ {
return false;
+ }
if ( name == null )
{
if ( other.name != null )
+ {
return false;
+ }
}
else if ( !name.equals( other.name ) )
+ {
return false;
+ }
return true;
}
@@ -298,21 +310,33 @@ public class ComplexClassHierarchyTestCa
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Complex other = (Complex) obj;
if ( bar != other.bar )
+ {
return false;
+ }
if ( foo == null )
{
if ( other.foo != null )
+ {
return false;
+ }
}
else if ( !foo.equals( other.foo ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/CustomBenchmark.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/CustomBenchmark.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/CustomBenchmark.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/CustomBenchmark.java Thu Nov 8 13:05:42 2012
@@ -434,37 +434,59 @@ public class CustomBenchmark
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Foo other = (Foo) obj;
if ( enumValue != other.enumValue )
+ {
return false;
+ }
if ( first == null )
{
if ( other.first != null )
+ {
return false;
+ }
}
else if ( !first.equals( other.first ) )
+ {
return false;
+ }
if ( second == null )
{
if ( other.second != null )
+ {
return false;
+ }
}
else if ( !second.equals( other.second ) )
+ {
return false;
+ }
if ( someOther != other.someOther )
+ {
return false;
+ }
if ( value == null )
{
if ( other.value != null )
+ {
return false;
+ }
}
else if ( !value.equals( other.value ) )
+ {
return false;
+ }
return true;
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java Thu Nov 8 13:05:42 2012
@@ -233,14 +233,22 @@ public class GenericTypedTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Foo other = (Foo) obj;
if ( id != other.id )
+ {
return false;
+ }
return true;
}
@@ -294,21 +302,33 @@ public class GenericTypedTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Complex other = (Complex) obj;
if ( bar != other.bar )
+ {
return false;
+ }
if ( foo == null )
{
if ( other.foo != null )
+ {
return false;
+ }
}
else if ( !foo.equals( other.foo ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/PropertyFinderTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/PropertyFinderTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/PropertyFinderTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/PropertyFinderTestCase.java Thu Nov 8 13:05:42 2012
@@ -393,21 +393,33 @@ public class PropertyFinderTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Standard other = (Standard) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -462,21 +474,33 @@ public class PropertyFinderTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( !super.equals( obj ) )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Inherted other = (Inherted) obj;
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
if ( value4 != other.value4 )
+ {
return false;
+ }
return true;
}
@@ -518,19 +542,29 @@ public class PropertyFinderTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( !super.equals( obj ) )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ComposedInherted other = (ComposedInherted) obj;
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
@@ -608,28 +642,44 @@ public class PropertyFinderTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
Composed other = (Composed) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ArrayMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ArrayMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ArrayMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ArrayMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -508,14 +508,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
BooleanArray other = (BooleanArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -555,14 +563,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ByteArray other = (ByteArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -602,14 +618,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
CharArray other = (CharArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -649,14 +673,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ShortArray other = (ShortArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -696,14 +728,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
IntArray other = (IntArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -743,14 +783,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
LongArray other = (LongArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -790,14 +838,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
FloatArray other = (FloatArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -837,14 +893,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
DoubleArray other = (DoubleArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -884,14 +948,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ObjectArray other = (ObjectArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
@@ -931,14 +1003,22 @@ public class ArrayMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
DeepObjectArray other = (DeepObjectArray) obj;
if ( !Arrays.equals( array, other.array ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -163,33 +163,51 @@ public class BigDecimalMarshallerTestCas
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
BigDecimalHolder other = (BigDecimalHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -163,33 +163,51 @@ public class BigIntegerMarshallerTestCas
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
BigIntegerHolder other = (BigIntegerHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class BooleanMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( value1 != other.value1 )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class BooleanMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class ByteMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( value1 != other.value1 )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class ByteMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class CharacterMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( value1 != other.value1 )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class CharacterMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -195,16 +195,26 @@ public class DoubleMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( Double.doubleToLongBits( value1 ) != Double.doubleToLongBits( other.value1 ) )
+ {
return false;
+ }
if ( Double.doubleToLongBits( value2 ) != Double.doubleToLongBits( other.value2 ) )
+ {
return false;
+ }
return true;
}
@@ -272,33 +282,51 @@ public class DoubleMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class FloatMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( Float.floatToIntBits( value1 ) != Float.floatToIntBits( other.value1 ) )
+ {
return false;
+ }
if ( Float.floatToIntBits( value2 ) != Float.floatToIntBits( other.value2 ) )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class FloatMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class IntegerMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( value1 != other.value1 )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class IntegerMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -193,19 +193,29 @@ public class ListMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
NoGenericTypeList other = (NoGenericTypeList) obj;
if ( list == null )
{
if ( other.list != null )
+ {
return false;
+ }
}
else if ( !list.equals( other.list ) )
+ {
return false;
+ }
return true;
}
@@ -245,19 +255,29 @@ public class ListMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
SimpleGenericTypeList other = (SimpleGenericTypeList) obj;
if ( list == null )
{
if ( other.list != null )
+ {
return false;
+ }
}
else if ( !list.equals( other.list ) )
+ {
return false;
+ }
return true;
}
@@ -297,19 +317,29 @@ public class ListMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ComplexGenericTypeList other = (ComplexGenericTypeList) obj;
if ( list == null )
{
if ( other.list != null )
+ {
return false;
+ }
}
else if ( !list.equals( other.list ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class LongMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( value1 != other.value1 )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class LongMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}