format

6 files changed, 75 insertions, 75 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
index a867454696..34462aedf1 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
@@ -66,7 +66,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
   public HibernateStoreAccessor(HibernateStore store, ISession session)
   {
     super(store, session);
-    HibernateThreadContext.setCurrentHibernateStoreAccessor(this);
+    HibernateThreadContext.setCurrentStoreAccessor(this);
     if (TRACER.isEnabled())
     {
       TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
@@ -76,7 +76,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
   public HibernateStoreAccessor(HibernateStore store, ITransaction transaction)
   {
     super(store, transaction);
-    HibernateThreadContext.setCurrentHibernateStoreAccessor(this);
+    HibernateThreadContext.setCurrentStoreAccessor(this);
     if (TRACER.isEnabled())
     {
       TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
@@ -339,65 +339,65 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       session.setFlushMode(FlushMode.MANUAL);
 
       // first repair the version for all dirty objects
-      for (CDORevision cdoRevision : context.getDirtyObjects())
+      for (CDORevision revision : context.getDirtyObjects())
       {
-        if (cdoRevision instanceof InternalCDORevision)
+        if (revision instanceof InternalCDORevision)
         {
-          InternalCDORevision internalCDORevision = (InternalCDORevision)cdoRevision;
-          internalCDORevision.setVersion(cdoRevision.getVersion() - 1);
-          adjustRevisions.add(internalCDORevision);
+          InternalCDORevision internalRevision = (InternalCDORevision)revision;
+          internalRevision.setVersion(internalRevision.getVersion() - 1);
+          adjustRevisions.add(internalRevision);
         }
       }
 
       // delete all objects
-      for (CDOID cdoID : context.getDetachedObjects())
+      for (CDOID id : context.getDetachedObjects())
       {
-        final CDORevision revision = HibernateUtil.getInstance().getCDORevision(cdoID);
+        final CDORevision revision = HibernateUtil.getInstance().getCDORevision(id);
         session.delete(revision);
       }
 
-      // TODO Martin: Why create an additional list?
-      final List<InternalCDORevision> cdoRevisions = Arrays.asList(context.getNewObjects());
-
       // keep track for which cdoRevisions the container id needs to be repaired afterwards
       final List<InternalCDORevision> repairContainerIDs = new ArrayList<InternalCDORevision>();
 
+      // TODO Martin: Why create an additional list?
+      final List<InternalCDORevision> revisions = Arrays.asList(context.getNewObjects());
+
       // first save the non-cdoresources
-      for (CDORevision cdoRevision : cdoRevisions)
+      for (CDORevision revision : revisions)
       {
-        if (cdoRevision instanceof InternalCDORevision)
+        if (revision instanceof InternalCDORevision)
         {
-          final CDOID containerID = (CDOID)((InternalCDORevision)cdoRevision).getContainerID();
+          final CDOID containerID = (CDOID)((InternalCDORevision)revision).getContainerID();
           if (containerID instanceof CDOIDTemp && !containerID.isNull())
           {
-            repairContainerIDs.add((InternalCDORevision)cdoRevision);
+            repairContainerIDs.add((InternalCDORevision)revision);
           }
         }
 
-        session.merge(HibernateUtil.getInstance().getEntityName(cdoRevision), cdoRevision);
+        session.merge(HibernateUtil.getInstance().getEntityName(revision), revision);
         if (TRACER.isEnabled())
         {
-          TRACER.trace("Persisted new Object " + cdoRevision.getEClass().getName() + " id: " + cdoRevision.getID());
+          TRACER.trace("Persisted new Object " + revision.getEClass().getName() + " id: " + revision.getID());
         }
       }
 
-      for (CDORevision cdoRevision : context.getDirtyObjects())
+      for (CDORevision revision : context.getDirtyObjects())
       {
-        session.merge(HibernateUtil.getInstance().getEntityName(cdoRevision), cdoRevision);
+        session.merge(HibernateUtil.getInstance().getEntityName(revision), revision);
         if (TRACER.isEnabled())
         {
-          TRACER.trace("Updated Object " + cdoRevision.getEClass().getName() + " id: " + cdoRevision.getID());
+          TRACER.trace("Updated Object " + revision.getEClass().getName() + " id: " + revision.getID());
         }
       }
 
       session.flush();
 
       // now do an update of the container without incrementing the version
-      for (InternalCDORevision cdoRevision : repairContainerIDs)
+      for (InternalCDORevision revision : repairContainerIDs)
       {
-        final CDORevision container = HibernateUtil.getInstance().getCDORevision((CDOID)cdoRevision.getContainerID());
-        final String entityName = HibernateUtil.getInstance().getEntityName(cdoRevision);
-        final CDOIDHibernate id = (CDOIDHibernate)cdoRevision.getID();
+        final CDORevision container = HibernateUtil.getInstance().getCDORevision((CDOID)revision.getContainerID());
+        final String entityName = HibernateUtil.getInstance().getEntityName(revision);
+        final CDOIDHibernate id = (CDOIDHibernate)revision.getID();
         final CDOIDHibernate containerID = (CDOIDHibernate)container.getID();
         final String hqlUpdate = "update " + entityName
             + " set contID_Entity = :contEntity, contID_ID=:contID, contID_class=:contClass where e_id = :id";
@@ -421,9 +421,9 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     }
     finally
     {
-      for (InternalCDORevision cdoRevision : adjustRevisions)
+      for (InternalCDORevision revision : adjustRevisions)
       {
-        cdoRevision.setVersion(cdoRevision.getVersion() + 1);
+        revision.setVersion(revision.getVersion() + 1);
       }
     }
 
@@ -494,7 +494,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     }
     finally
     {
-      HibernateThreadContext.setCurrentHibernateStoreAccessor(this);
+      HibernateThreadContext.setCurrentStoreAccessor(this);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java
index 81c9214785..a7401985e1 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java
@@ -27,17 +27,17 @@ public class HibernateThreadContext
 
   private static ThreadLocal<HibernateStoreAccessor> accessor = new ThreadLocal<HibernateStoreAccessor>();
 
-  public static HibernateStoreAccessor getCurrentHibernateStoreAccessor()
+  public static HibernateStoreAccessor getCurrentStoreAccessor()
   {
     return accessor.get();
   }
 
-  public static void setCurrentHibernateStoreAccessor(HibernateStoreAccessor hbStoreAccessor)
+  public static void setCurrentStoreAccessor(HibernateStoreAccessor storeAccessor)
   {
-    accessor.set(hbStoreAccessor);
+    accessor.set(storeAccessor);
   }
 
-  public static HibernateCommitContext getHibernateCommitContext()
+  public static HibernateCommitContext getCommitContext()
   {
     HibernateCommitContext result = commitContext.get();
     if (result == null)
@@ -48,7 +48,7 @@ public class HibernateThreadContext
     return result;
   }
 
-  public static boolean isHibernateCommitContextSet()
+  public static boolean isCommitContextSet()
   {
     return commitContext.get() != null;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
index 46261193a6..1b14933d49 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
@@ -128,7 +128,7 @@ public class HibernateUtil
    */
   public Session getHibernateSession()
   {
-    final HibernateStoreAccessor accessor = HibernateThreadContext.getCurrentHibernateStoreAccessor();
+    final HibernateStoreAccessor accessor = HibernateThreadContext.getCurrentStoreAccessor();
     return accessor.getHibernateSession();
   }
 
@@ -145,9 +145,9 @@ public class HibernateUtil
     return props;
   }
 
-  public String getEntityName(CDORevision cdoRevision)
+  public String getEntityName(CDORevision revision)
   {
-    return cdoRevision.getEClass().getName();
+    return revision.getEClass().getName();
   }
 
   /**
@@ -155,27 +155,27 @@ public class HibernateUtil
    * returning or by persisting the object. Note assumes that the hibernate session and CommitContext are set in
    * HibernateThreadContext.
    */
-  public CDOIDHibernate getCDOIDHibernate(CDOID cdoID)
+  public CDOIDHibernate getCDOIDHibernate(CDOID id)
   {
-    final CDORevision cdoRevision = getCDORevision(cdoID);
-    if (cdoRevision.getID() instanceof CDOIDHibernate)
+    final CDORevision revision = getCDORevision(id);
+    if (revision.getID() instanceof CDOIDHibernate)
     {
-      return (CDOIDHibernate)cdoRevision.getID();
+      return (CDOIDHibernate)revision.getID();
     }
 
     final Session session = getHibernateSession();
-    if (!(cdoRevision.getID() instanceof CDOIDHibernate))
+    if (!(revision.getID() instanceof CDOIDHibernate))
     {
-      session.saveOrUpdate(cdoRevision);
+      session.saveOrUpdate(revision);
     }
 
-    if (!(cdoRevision.getID() instanceof CDOIDHibernate))
+    if (!(revision.getID() instanceof CDOIDHibernate))
     {
-      throw new IllegalStateException("CDORevision " + cdoRevision.getEClass().getName() + " " + cdoRevision.getID()
+      throw new IllegalStateException("CDORevision " + revision.getEClass().getName() + " " + revision.getID()
           + " does not have a hibernate cdoid after saving/updating it");
     }
 
-    return (CDOIDHibernate)cdoRevision.getID();
+    return (CDOIDHibernate)revision.getID();
   }
 
   public InternalCDORevision getCDORevision(Object target)
@@ -201,16 +201,16 @@ public class HibernateUtil
       return null;
     }
 
-    if (HibernateThreadContext.isHibernateCommitContextSet())
+    if (HibernateThreadContext.isCommitContextSet())
     {
-      final HibernateCommitContext hcc = HibernateThreadContext.getHibernateCommitContext();
+      final HibernateCommitContext commitContext = HibernateThreadContext.getCommitContext();
       InternalCDORevision revision;
-      if ((revision = hcc.getDirtyObject(id)) != null)
+      if ((revision = commitContext.getDirtyObject(id)) != null)
       {
         return revision;
       }
 
-      if ((revision = hcc.getNewObject(id)) != null)
+      if ((revision = commitContext.getNewObject(id)) != null)
       {
         return revision;
       }
@@ -218,7 +218,7 @@ public class HibernateUtil
       // maybe the temp was already translated
       if (id instanceof CDOIDTemp)
       {
-        final CDOID newID = hcc.getCommitContext().getIDMappings().get(id);
+        final CDOID newID = commitContext.getCommitContext().getIDMappings().get(id);
         if (newID != null)
         {
           return getCDORevision(newID);
@@ -232,9 +232,9 @@ public class HibernateUtil
           + id.getClass().getName() + ": " + id);
     }
 
-    final CDOIDHibernate cdoIDHibernate = (CDOIDHibernate)id;
+    final CDOIDHibernate hibernateID = (CDOIDHibernate)id;
     final Session session = getHibernateSession();
-    return (InternalCDORevision)session.get(cdoIDHibernate.getEntityName(), cdoIDHibernate.getId());
+    return (InternalCDORevision)session.get(hibernateID.getEntityName(), hibernateID.getId());
   }
 
   public InternalCDORevision getCDORevisionNullable(CDOID id)
@@ -244,16 +244,16 @@ public class HibernateUtil
       return null;
     }
 
-    if (HibernateThreadContext.isHibernateCommitContextSet())
+    if (HibernateThreadContext.isCommitContextSet())
     {
-      final HibernateCommitContext hcc = HibernateThreadContext.getHibernateCommitContext();
+      final HibernateCommitContext commitContext = HibernateThreadContext.getCommitContext();
       InternalCDORevision revision;
-      if ((revision = hcc.getDirtyObject(id)) != null)
+      if ((revision = commitContext.getDirtyObject(id)) != null)
       {
         return revision;
       }
 
-      if ((revision = hcc.getNewObject(id)) != null)
+      if ((revision = commitContext.getNewObject(id)) != null)
       {
         return revision;
       }
@@ -261,7 +261,7 @@ public class HibernateUtil
       // maybe the temp was already translated
       if (id instanceof CDOIDTemp)
       {
-        final CDOID newID = hcc.getCommitContext().getIDMappings().get(id);
+        final CDOID newID = commitContext.getCommitContext().getIDMappings().get(id);
         if (newID != null)
         {
           return getCDORevision(newID);
@@ -274,9 +274,9 @@ public class HibernateUtil
       return null;
     }
 
-    final CDOIDHibernate cdoIDHibernate = (CDOIDHibernate)id;
+    final CDOIDHibernate hibernateID = (CDOIDHibernate)id;
     final Session session = getHibernateSession();
-    return (InternalCDORevision)session.get(cdoIDHibernate.getEntityName(), cdoIDHibernate.getId());
+    return (InternalCDORevision)session.get(hibernateID.getEntityName(), hibernateID.getId());
   }
 
   public int convertStringToFeatureID(EObject contained, String value)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
index ceb2fa730a..cff0328aaf 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
@@ -75,9 +75,9 @@ public class CDOIDPropertyGetter extends CDOPropertyGetter
   {
     InternalCDORevision revision = (InternalCDORevision)target;
     HibernateCommitContext hcc = null;
-    if (HibernateThreadContext.isHibernateCommitContextSet())
+    if (HibernateThreadContext.isCommitContextSet())
     {
-      hcc = HibernateThreadContext.getHibernateCommitContext();
+      hcc = HibernateThreadContext.getCommitContext();
     }
 
     CDOID cdoID = revision.getID();
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
index b20bf0979f..f51ac05776 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
@@ -44,33 +44,33 @@ public class CDOIDPropertySetter extends CDOPropertySetter
       return;
     }
 
-    HibernateCommitContext hcc = null;
-    if (HibernateThreadContext.isHibernateCommitContextSet())
+    HibernateCommitContext commitContext = null;
+    if (HibernateThreadContext.isCommitContextSet())
     {
-      hcc = HibernateThreadContext.getHibernateCommitContext();
+      commitContext = HibernateThreadContext.getCommitContext();
     }
 
     InternalCDORevision revision = (InternalCDORevision)target;
-    CDOID cdoID = revision.getID();
-    if (cdoID == null)
+    CDOID revisionID = revision.getID();
+    if (revisionID == null)
     {
       CDOIDHibernate newCDOID = CDOIDHibernateFactoryImpl.getInstance().createCDOID((Serializable)value,
           revision.getEClass().getName());
       revision.setID(newCDOID);
-      if (hcc != null)
+      if (commitContext != null)
       {
-        hcc.setNewID(cdoID, newCDOID);
+        commitContext.setNewID(revisionID, newCDOID);
       }
     }
-    else if (cdoID instanceof CDOIDTemp)
+    else if (revisionID instanceof CDOIDTemp)
     {
       CDOIDHibernate newCDOID = CDOIDHibernateFactoryImpl.getInstance().createCDOID((Serializable)value,
           revision.getEClass().getName());
       revision.setID(newCDOID);
-      if (hcc != null)
+      if (commitContext != null)
       {
-        hcc.getCommitContext().addIDMapping((CDOIDTemp)cdoID, newCDOID);
-        hcc.setNewID(cdoID, newCDOID);
+        commitContext.getCommitContext().addIDMapping((CDOIDTemp)revisionID, newCDOID);
+        commitContext.setNewID(revisionID, newCDOID);
       }
     }
     else
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
index fd6ea21d00..0f7105189d 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * Is only used for synthetic id's.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 @SuppressWarnings("unchecked")
 public class CDOSyntheticIdPropertyHandler implements Getter, Setter, PropertyAccessor
@@ -98,9 +98,9 @@ public class CDOSyntheticIdPropertyHandler implements Getter, Setter, PropertyAc
     }
 
     HibernateCommitContext hcc = null;
-    if (HibernateThreadContext.isHibernateCommitContextSet())
+    if (HibernateThreadContext.isCommitContextSet())
     {
-      hcc = HibernateThreadContext.getHibernateCommitContext();
+      hcc = HibernateThreadContext.getCommitContext();
     }
 
     InternalCDORevision revision = HibernateUtil.getInstance().getCDORevision(target);