commit 700c3f88c4cc432b4892db8552651c62b2ca0c9f
author Christoph Engelbert <noctarius@apache.org> Thu Nov 08 13:08:45 2012 +0000
committer Christoph Engelbert <noctarius@apache.org> Thu Nov 08 13:08:45 2012 +0000
tree a4dd6a0651125e529cc5b5d71a83bca25bb6f443
parent 7213f6602526af8f43636b044efb8cdafa4d643c

Renamed serialVersionUID field to serialVersion

git-svn-id: https://svn.apache.org/repos/asf/directmemory/lightning/trunk@1407046 13f79535-47bb-0310-9956-ffa450edef68

lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java

diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
index ec322fe..9050659 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
@@ -39,7 +39,7 @@
 
     private final byte[] checksum;
 
-    private final long serialVersionUID;
+    private final long serialVersion;
 
     private long id;
 
@@ -51,7 +51,7 @@
         byte[] classData = ClassUtil.getClassBytes( !type.isArray() ? type : type.getComponentType() );
         this.checksum = InternalUtil.getChecksum( propertyDescriptors, logger );
         this.id = Crc64Util.checksum( classData );
-        this.serialVersionUID = ClassUtil.calculateSerialVersionUID( type );
+        this.serialVersion = ClassUtil.calculateSerialVersionUID( type );
     }
 
     InternalClassDefinition( long id, Class<?> type, byte[] checksum, long serialVersionUID )
@@ -60,7 +60,7 @@
         this.type = type;
         this.id = id;
         this.checksum = checksum;
-        this.serialVersionUID = serialVersionUID;
+        this.serialVersion = serialVersionUID;
     }
 
     @Override
@@ -90,7 +90,7 @@
     @Override
     public long getSerialVersionUID()
     {
-        return serialVersionUID;
+        return serialVersion;
     }
 
     @Override
@@ -107,7 +107,7 @@
         result = prime * result + ( ( canonicalName == null ) ? 0 : canonicalName.hashCode() );
         result = prime * result + Arrays.hashCode( checksum );
         result = prime * result + (int) ( id ^ ( id >>> 32 ) );
-        result = prime * result + (int) ( serialVersionUID ^ ( serialVersionUID >>> 32 ) );
+        result = prime * result + (int) ( serialVersion ^ ( serialVersion >>> 32 ) );
         return result;
     }
 
@@ -146,7 +146,7 @@
         {
             return false;
         }
-        if ( serialVersionUID != other.serialVersionUID )
+        if ( serialVersion != other.serialVersion )
         {
             return false;
         }
@@ -157,6 +157,6 @@
     public String toString()
     {
         return "InternalClassDefinition [canonicalName=" + canonicalName + ", type=" + type + ", checksum="
-            + Arrays.toString( checksum ) + ", serialVersionUID=" + serialVersionUID + ", id=" + id + "]";
+            + Arrays.toString( checksum ) + ", serialVersionUID=" + serialVersion + ", id=" + id + "]";
     }
 }

lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java

diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
index 2a956c9..e28e299 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
@@ -147,24 +147,24 @@
 
     public static long calculateSerialVersionUID( Class<?> clazz )
     {
-        Long serialVersionUID = SERIAL_VERSION_UID_CACHE.get( clazz );
-        if ( serialVersionUID != null )
+        Long serialVersion = SERIAL_VERSION_UID_CACHE.get( clazz );
+        if ( serialVersion != null )
         {
-            return serialVersionUID;
+            return serialVersion;
         }
 
         if ( Serializable.class.isAssignableFrom( clazz ) )
         {
-            serialVersionUID = ObjectStreamClass.lookup( clazz ).getSerialVersionUID();
-            SERIAL_VERSION_UID_CACHE.put( clazz, serialVersionUID );
-            return serialVersionUID;
+            serialVersion = ObjectStreamClass.lookup( clazz ).getSerialVersionUID();
+            SERIAL_VERSION_UID_CACHE.put( clazz, serialVersion );
+            return serialVersion;
         }
 
-        serialVersionUID = getSerialVersionUIDFromField( clazz );
-        if ( serialVersionUID != null )
+        serialVersion = getSerialVersionUIDFromField( clazz );
+        if ( serialVersion != null )
         {
-            SERIAL_VERSION_UID_CACHE.put( clazz, serialVersionUID );
-            return serialVersionUID;
+            SERIAL_VERSION_UID_CACHE.put( clazz, serialVersion );
+            return serialVersion;
         }
 
         try