diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal')
50 files changed, 128 insertions, 122 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java index 958bd619af..f5a29cd6a3 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java @@ -43,7 +43,7 @@ import java.util.Collection; /** * Overrides the {@link AuditHandler} to implement CDO * specific audit handling. - * + * * @author Martin Taal */ public class CDOAuditHandler extends AuditHandler @@ -55,8 +55,8 @@ public class CDOAuditHandler extends AuditHandler final InternalCDORevision cdoRevision = (InternalCDORevision)object; teneoAuditEntry.setTeneo_container_feature_id(cdoRevision.getContainingFeatureID()); - teneoAuditEntry.setTeneo_container_id(HibernateUtil.getInstance().convertCDOIDToString( - (CDOID)cdoRevision.getContainerID())); + teneoAuditEntry + .setTeneo_container_id(HibernateUtil.getInstance().convertCDOIDToString((CDOID)cdoRevision.getContainerID())); } @Override @@ -173,8 +173,8 @@ public class CDOAuditHandler extends AuditHandler { for (Object value : (Collection<?>)source.getList(sourceEFeature)) { - ((Collection<Object>)auditEntry.eGet(targetEFeature)).add(convertValue(sourceEFeature, targetEFeature, - value)); + ((Collection<Object>)auditEntry.eGet(targetEFeature)) + .add(convertValue(sourceEFeature, targetEFeature, value)); } } } @@ -249,8 +249,8 @@ public class CDOAuditHandler extends AuditHandler cnt++; if (cnt > 1000) { - throw new IllegalStateException("Cycle detected in id mappings " + newID + " maps to " - + commitContext.getIDMappings().get(newID)); + throw new IllegalStateException( + "Cycle detected in id mappings " + newID + " maps to " + commitContext.getIDMappings().get(newID)); } } cdoID = newID; diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java index 032ddf21cc..3798dd8f8a 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java @@ -26,7 +26,8 @@ public class CDOHibernateBranchPointImpl extends CDOBranchPointImpl public CDOHibernateBranchPointImpl(long timeStamp) { - super(HibernateThreadContext.getCurrentStoreAccessor().getStore().getRepository().getBranchManager() - .getMainBranch(), timeStamp); + super( + HibernateThreadContext.getCurrentStoreAccessor().getStore().getRepository().getBranchManager().getMainBranch(), + timeStamp); } } diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java index 3b72524970..d39354807b 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.server.internal.hibernate; /** * Maintains constants used in the CDO-Hibernate integration. - * + * * @author Martin Taal */ public class CDOHibernateConstants diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java index 7ee1fbb983..b1569188b3 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.InternalEObject; /** * Is responsible for converting container related information from and to a string representation. - * + * * @see InternalCDORevision#getContainerID() * @see InternalCDORevision#getContainingFeatureID() * @see InternalCDORevision#getContainingFeatureID() @@ -57,7 +57,7 @@ public class ContainerInfoConverter * Converts the container information of a {@link InternalCDORevision} to a String representation. The container * information is the container id ({@link InternalCDORevision#getContainerID()} and the containingFeatureID ( * {@link InternalCDORevision#getContainingFeatureID()}). - * + * * @param cdoRevision * the InternalCDORevision which has the container information * @return a String representation of the container information which can be stored in a single varchar in the @@ -72,7 +72,7 @@ public class ContainerInfoConverter * Converts the container information of a {@link InternalCDORevision} to a String representation. The container * information is the container id ({@link InternalCDORevision#getContainerID()} and the containingFeatureID ( * {@link InternalCDORevision#getContainingFeatureID()}). - * + * * @param cdoRevision * the InternalCDORevision which has the container information * @param containerID @@ -113,7 +113,7 @@ public class ContainerInfoConverter /** * Converts the String generated by the method {@link #convertContainerRelationToString(InternalCDORevision)} back to * container information and sets this in the cdoRevision. - * + * * @param cdoRevision * the InternalCDORevision in which the container info is stored. * @param containerInfo diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java index 2514499268..0e1d27784d 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java @@ -26,7 +26,7 @@ import java.io.InputStreamReader; /** * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration. - * + * * @author Martin Taal */ public class FileHibernateMappingProvider extends HibernateMappingProvider diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java index 705fe19295..cfeed9c798 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java @@ -20,7 +20,7 @@ import org.w3c.dom.NodeList; /** * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration. - * + * * @author Martin Taal */ public class FileHibernateMappingProviderFactory implements IHibernateMappingProvider.Factory diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java index e672cb8eb3..b2542dd07a 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java @@ -115,17 +115,18 @@ public class HibernateAuditHandler final InternalCDORevision revision; if (teneoAuditEntry.getTeneo_audit_kind() == TeneoAuditKind.DELETE) { - revision = new DetachedCDORevision(domainEClass, cdoID, hibernateStore.getRepository().getBranchManager() - .getMainBranch(), new Long(teneoAuditEntry.getTeneo_object_version()).intValue(), - teneoAuditEntry.getTeneo_start(), CDOBranchPoint.UNSPECIFIED_DATE); + revision = new DetachedCDORevision(domainEClass, cdoID, + hibernateStore.getRepository().getBranchManager().getMainBranch(), + new Long(teneoAuditEntry.getTeneo_object_version()).intValue(), teneoAuditEntry.getTeneo_start(), + CDOBranchPoint.UNSPECIFIED_DATE); revision.setRevised(CDOBranchPoint.UNSPECIFIED_DATE); } else { revision = hibernateStore.createRevision(domainEClass, cdoID); revision.setVersion(new Long(teneoAuditEntry.getTeneo_object_version()).intValue()); - revision.setBranchPoint(storeAccessor.getStore().getMainBranchHead().getBranch() - .getPoint(teneoAuditEntry.getTeneo_start())); + revision.setBranchPoint( + storeAccessor.getStore().getMainBranchHead().getBranch().getPoint(teneoAuditEntry.getTeneo_start())); if (teneoAuditEntry.getTeneo_end() > 0) { revision.setRevised(teneoAuditEntry.getTeneo_end()); @@ -200,8 +201,8 @@ public class HibernateAuditHandler } if (targetEFeature instanceof EReference) { - final CDOID cdoID = value instanceof CDOID ? (CDOID)value : HibernateUtil.getInstance().convertStringToCDOID( - (String)value); + final CDOID cdoID = value instanceof CDOID ? (CDOID)value + : HibernateUtil.getInstance().convertStringToCDOID((String)value); return cdoID; } if (value instanceof Enumerator) diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java index 79610b0abb..23d4eee9ac 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java @@ -29,7 +29,7 @@ import java.sql.Blob; /** * A DTO for convenience of storing a CDOPackageUnit in the db. - * + * * @author Martin Taal */ public class HibernateCDOPackageUnitDTO diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java index d436bd1ec0..2cf0516216 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java @@ -233,8 +233,8 @@ public class HibernateQueryHandler implements IQueryHandler final InternalCDORevisionManager cdoRevisionManager = hibernateStoreAccessor.getStore().getRepository() .getRevisionManager(); - final CDOBranchVersion cdoBranchVersion = new CDOBranchVersionImpl(hibernateStoreAccessor.getStore() - .getMainBranchHead().getBranch(), internalCDORevision.getVersion() - 1); + final CDOBranchVersion cdoBranchVersion = new CDOBranchVersionImpl( + hibernateStoreAccessor.getStore().getMainBranchHead().getBranch(), internalCDORevision.getVersion() - 1); if (cdoRevisionManager.containsRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion)) { return cdoRevisionManager.getRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion, -1, true); diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java index 9a15b93aa8..c1b57e36e2 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java @@ -96,8 +96,8 @@ public class HibernateStore extends Store implements IHibernateStore public static final String ID_TYPE_EANNOTATION_KEY = "id_type"; - public static final Set<ObjectType> OBJECT_ID_TYPES = new HashSet<ObjectType>(Arrays.asList( - CDOID.ObjectType.STRING_WITH_CLASSIFIER, CDOID.ObjectType.LONG_WITH_CLASSIFIER)); + public static final Set<ObjectType> OBJECT_ID_TYPES = new HashSet<ObjectType>( + Arrays.asList(CDOID.ObjectType.STRING_WITH_CLASSIFIER, CDOID.ObjectType.LONG_WITH_CLASSIFIER)); private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStore.class); @@ -201,7 +201,7 @@ public class HibernateStore extends Store implements IHibernateStore } /** - * Returns all model epackages, so no audit epackages or system + * Returns all model epackages, so no audit epackages or system * epackages. */ public List<EPackage> getModelEPackages() @@ -240,7 +240,7 @@ public class HibernateStore extends Store implements IHibernateStore if (entityName == null) { throw new IllegalArgumentException("EClass " + eClass.getName() //$NON-NLS-1$ - + " does not have an entity name, has it been mapped to Hibernate?"); //$NON-NLS-1$ + + " does not have an entity name, has it been mapped to Hibernate?"); //$NON-NLS-1$ } return entityName; @@ -848,10 +848,10 @@ public class HibernateStore extends Store implements IHibernateStore if (HibernateThreadContext.isCommitContextSet()) { - AuditProcessHandler.setCurrentUserName(HibernateThreadContext.getCommitContext().getCommitContext() - .getUserID()); - AuditProcessHandler.setCurrentComment(HibernateThreadContext.getCommitContext().getCommitContext() - .getCommitComment()); + AuditProcessHandler + .setCurrentUserName(HibernateThreadContext.getCommitContext().getCommitContext().getUserID()); + AuditProcessHandler + .setCurrentComment(HibernateThreadContext.getCommitContext().getCommitContext().getCommitComment()); } super.doAuditWorkInSession(session, auditWorks); } 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 ba7d44b13d..d2240dcf01 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 @@ -489,9 +489,9 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS for (Object o : qry.list()) { final TeneoAuditCommitInfo teneoCommitInfo = (TeneoAuditCommitInfo)o; - final CDOCommitInfo cdoCommitInfo = commitInfoManager.createCommitInfo(getStore().getRepository() - .getBranchManager().getMainBranch(), teneoCommitInfo.getCommitTime(), teneoCommitInfo.getCommitTime() - 1, - teneoCommitInfo.getUser(), teneoCommitInfo.getComment(), null); + final CDOCommitInfo cdoCommitInfo = commitInfoManager.createCommitInfo( + getStore().getRepository().getBranchManager().getMainBranch(), teneoCommitInfo.getCommitTime(), + teneoCommitInfo.getCommitTime() - 1, teneoCommitInfo.getUser(), teneoCommitInfo.getComment(), null); handler.handleCommitInfo(cdoCommitInfo); } } @@ -677,14 +677,14 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS } final String revisionName = (String)value; - final boolean match = exactMatch || revisionName == null || name == null ? ObjectUtil - .equals(revisionName, name) : revisionName.startsWith(name); + final boolean match = exactMatch || revisionName == null || name == null ? ObjectUtil.equals(revisionName, name) + : revisionName.startsWith(name); - if (match && !context.addResource(HibernateUtil.getInstance().getCDOID(revision))) - { - // No more results allowed - break; - } + if (match && !context.addResource(HibernateUtil.getInstance().getCDOID(revision))) + { + // No more results allowed + break; + } } } } @@ -769,11 +769,11 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS return true; } else - // not mapped - if (null != eref.getEAnnotation(TENEO_UNMAPPED_SOURCE)) - { - return false; - } + // not mapped + if (null != eref.getEAnnotation(TENEO_UNMAPPED_SOURCE)) + { + return false; + } // not computed yet for (String propName : session.getSessionFactory().getClassMetadata(entityName).getPropertyNames()) @@ -937,7 +937,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS { if (cdoRevision.getVersion() != revision.getVersion()) { - throw new IllegalStateException("Revision " + cdoRevision + " was already updated by another transaction"); + throw new IllegalStateException( + "Revision " + cdoRevision + " was already updated by another transaction"); } existingRevisions.put(revision.getID(), cdoRevision); } @@ -1080,7 +1081,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS final CDORevision container = HibernateUtil.getInstance().getCDORevision((CDOID)revision.getContainerID()); final String entityName = getStore().getEntityName(revision.getEClass()); final CDOID id = revision.getID(); - final String hqlUpdate = "update " + entityName + " set " + CDOHibernateConstants.CONTAINER_PROPERTY //$NON-NLS-1$ //$NON-NLS-2$ + final String hqlUpdate = "update " + entityName + " set " + CDOHibernateConstants.CONTAINER_PROPERTY //$NON-NLS-1$ //$NON-NLS-2$ + " = :containerInfo where " + getStore().getIdentifierPropertyName(entityName) + " = :id"; //$NON-NLS-1$ //$NON-NLS-2$ final Query qry = session.createQuery(hqlUpdate); qry.setParameter("containerInfo", ContainerInfoConverter.getInstance().convertContainerRelationToString(revision, //$NON-NLS-1$ @@ -1088,7 +1089,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS qry.setParameter("id", HibernateUtil.getInstance().getIdValue(id)); //$NON-NLS-1$ if (qry.executeUpdate() != 1) { - // OM.LOG.error("Not able to update container columns of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$ + // OM.LOG.error("Not able to update container columns of " + entityName + " with id " + id); //$NON-NLS-1$ + // //$NON-NLS-2$ throw new IllegalStateException("Not able to update container columns of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -1108,7 +1110,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS qry.setParameter("id", HibernateUtil.getInstance().getIdValue(id)); //$NON-NLS-1$ if (qry.executeUpdate() != 1) { - // OM.LOG.error("Not able to update resource ids of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$ + // OM.LOG.error("Not able to update resource ids of " + entityName + " with id " + id); //$NON-NLS-1$ + // //$NON-NLS-2$ throw new IllegalStateException("Not able to update resource ids of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java index 811f4837f0..720f548ef1 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Martin Taal - Implementation diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java index 355f1c4fdc..8563516d67 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -70,8 +70,8 @@ public class HibernateStoreFactory implements IStoreFactory Element mappingProviderConfig = (Element)mappingProviderConfigs.item(0); String mappingProviderType = mappingProviderConfig.getAttribute(TYPE_ATTRIBUTE); - IHibernateMappingProvider.Factory factory = HibernateUtil.getInstance().createMappingProviderFactory( - mappingProviderType); + IHibernateMappingProvider.Factory factory = HibernateUtil.getInstance() + .createMappingProviderFactory(mappingProviderType); if (factory == null) { throw new IllegalArgumentException("Unknown mapping provider type: " + mappingProviderType); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java index 95dc565059..1e64a56f62 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java @@ -16,7 +16,7 @@ import java.sql.Clob; /** * Object used to store clob and lob. - * + * * @author Martin Taal */ public class HibernateStoreLob 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 2c7f0e8f35..661ce8025f 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 @@ -640,7 +640,7 @@ public class HibernateUtil } throw new IllegalArgumentException("The ID value type " + idValue.getClass() //$NON-NLS-1$ - + " is not supported by this store. Method called with " + classifierRef); //$NON-NLS-1$ + + " is not supported by this store. Method called with " + classifierRef); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java index 6ee9eba490..f9e82c9cd8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java @@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.server.internal.hibernate; /** * Stores system related information, is used to keep track that CDO is started for the first time. There should only be * one SystemInformation object in the database. - * + * * @author Martin Taal */ public class SystemInformation diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java index b1520647b4..4aee4e6d1d 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.server.internal.hibernate; /** * Is used to store and retrieve properties in the database. - * + * * @author Martin Taal */ public class SystemProperty diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java index 45ac967c69..bf4d674b78 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer; /** * The <em>Operations & Maintenance</em> class of this bundle. - * + * * @author Eike Stepper */ public abstract class OM diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java index 3c16578dd0..02bda726a3 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java index c0b6c68f57..6c53ce7eb0 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java index c1d60be895..8dabd9d7d1 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java index 1602cd324a..c7fc767bb3 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java index c16de81d06..5f447c7d38 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java @@ -17,7 +17,7 @@ import org.hibernate.HibernateException; /** * Gets the time stamp value to store in the database. - * + * * @see CDOHibernateBranchPointImpl * @author Martin Taal */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java index 2562cf5c50..73ba4053ba 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java @@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; /** * Sets the time stamp information in the revision. - * + * * @see CDOHibernateBranchPointImpl * @author Martin Taal */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java index 2879d49f19..9994a7a246 100755 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java @@ -18,7 +18,7 @@ import org.hibernate.HibernateException; /** * gets the container information as a String (to-be-stored in the db) from the CDORevision. - * + * * @see ContainerInfoConverter * @author Martin Taal */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java index 0f31d5860f..d86c4c66cb 100755 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java @@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; /** * Sets the container information from the String (stored in the db) back into the CDORevision. - * + * * @see ContainerInfoConverter * @author Martin Taal */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java index bf0caa1d7a..3299ad0aa7 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java @@ -24,7 +24,7 @@ import java.util.HashMap; /** * Implements the EMF UserType for an Enum in a dynamic model, for an integer field. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class CDOENumIntegerType extends CDOENumStringType diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java index 36f27579b9..49f3622e83 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java @@ -35,7 +35,7 @@ import java.util.Properties; /** * Implements the EMF UserType for an Enum - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class CDOENumStringType implements UserType, ParameterizedType diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java index 883ea22711..3055e88b18 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java @@ -29,7 +29,7 @@ import java.util.Properties; /** * A user type which can handle {@link CDOIDExternal}. It's stored in a single varchar field. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class CDOIDExternalUserType implements UserType, ParameterizedType diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java index f3a8b71159..4ce40a7805 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java @@ -107,8 +107,8 @@ public class CDOIDUserType implements UserType value = HibernateUtil.getInstance().getCDOIDHibernate((CDORevision)value); } - final String strValue = value instanceof String ? (String)value : HibernateUtil.getInstance().convertCDOIDToString( - (CDOID)value); + final String strValue = value instanceof String ? (String)value + : HibernateUtil.getInstance().convertCDOIDToString((CDOID)value); if (strValue == null) { statement.setNull(index, Types.VARCHAR); diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java index 4f3fa99b27..3c27e94ed8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * Resolves entitynames, todo: use entityname strategy! - * + * * @author Martin Taal */ public class CDOInterceptor extends EMFInterceptor diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java index 9400af0930..1957fc51f8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Martin Taal - copied from CDORevisionPropertyHandler and adapted * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java index b5b57859a9..b3c44f97ef 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Martin Taal - copied from CDORevisionPropertyHandler and adapted * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java index 00b417c754..026e2f6b10 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java @@ -30,7 +30,7 @@ import java.util.Map; /** * TODO How does this differ from {@link CDORevisionSetter}? Both needed? - * + * * @author Martin Taal */ public class CDOPropertyGetter extends CDOPropertyHandler implements Getter diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java index 162030bb0c..e6d8fc8037 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java @@ -39,9 +39,9 @@ public abstract class CDOPropertyHandler feature = tuplizer.getEClass().getEStructuralFeature(propertyName); if (getTracer().isEnabled()) { - getTracer().trace( - "Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + propertyName); + getTracer() + .trace("Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + propertyName); } if (feature == null) diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java index 740b428aef..67d1849538 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java @@ -29,7 +29,7 @@ import java.lang.reflect.Method; /** * TODO How does this differ from {@link CDORevisionSetter}? Both needed? - * + * * @author Martin Taal */ public class CDOPropertySetter extends CDOPropertyHandler implements Setter @@ -141,8 +141,8 @@ public class CDOPropertySetter extends CDOPropertyHandler implements Setter } else { - boolean overwriteNilOrNull = currentValue == CDORevisionData.NIL && newValue == null || currentValue == null - && newValue != null && newValue.equals(defaultValue); + boolean overwriteNilOrNull = currentValue == CDORevisionData.NIL && newValue == null + || currentValue == null && newValue != null && newValue.equals(defaultValue); if (!revision.isFrozen() && !overwriteNilOrNull) { revision.setValue(getEStructuralFeature(), newValue); diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java index 2dc30d0fbd..6f76e187ea 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java @@ -86,8 +86,8 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer if (ePackageURI == null || eClassName == null) { throw new IllegalArgumentException("The mapping for the persistentclass " + mappingInfo.getEntityName() //$NON-NLS-1$ - + " is incorrect, there should be meta data tags for both epackage and " //$NON-NLS-1$ - + "eclassname, one or both are missing."); //$NON-NLS-1$ + + " is incorrect, there should be meta data tags for both epackage and " //$NON-NLS-1$ + + "eclassname, one or both are missing."); //$NON-NLS-1$ } if (TRACER.isEnabled()) @@ -135,7 +135,7 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer if (eClass == null) { throw new IllegalArgumentException("The mapped class " + mappingInfo.getEntityName() //$NON-NLS-1$ - + " does not have a eClass equivalent"); //$NON-NLS-1$ + + " does not have a eClass equivalent"); //$NON-NLS-1$ } } @@ -305,14 +305,14 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer } else - if (feature instanceof EReference) - { - setter = new CDOReferenceSetter(this, mappedProperty.getName()); - } - else - { - setter = new CDOPropertySetter(this, mappedProperty.getName()); - } + if (feature instanceof EReference) + { + setter = new CDOReferenceSetter(this, mappedProperty.getName()); + } + else + { + setter = new CDOPropertySetter(this, mappedProperty.getName()); + } } HibernateStore hbStore = HibernateStore.getCurrentHibernateStore(); 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 8416fa71ef..8e6c259d48 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 @@ -34,7 +34,7 @@ import java.util.Map; /** * Is only used for synthetic id's. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class CDOSyntheticIdPropertyHandler implements Getter, Setter, PropertyAccessor diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java index 1152bafe4d..7413092e68 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java @@ -28,7 +28,7 @@ import java.util.Map; /** * Reads the version from the internal version cache. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class CDOSyntheticVersionPropertyHandler implements Getter, Setter, PropertyAccessor diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java index dce5f966f2..8efcf65bc9 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * An example of overriding the standard UUID generator of Hibernate to prevent it overwriting an already existing id in * an object. - * + * * @author mtaal */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java index edd50aaae0..c729308e96 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Martin Taal - copied from CDORevisionPropertyHandler and adapted * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java index 876f0d83c0..193ceb69d4 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Martin Taal - copied from CDORevisionPropertyHandler and adapted * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java index 09a5696bb8..997506c69e 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Handles the string representation of the feature of the feature map entry in the database. - * + * * @see CDOFeatureMapEntry#setEStructuralFeature(EStructuralFeature) * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ @@ -101,7 +101,7 @@ public class FeatureMapEntryFeatureURIPropertyHandler implements PropertyAccesso /** * Set the EStructuralFeature (see {@link #setEStructuralFeature(EStructuralFeature)}) from its String representation. - * + * * @param eFeatureURI * a String representation, must be created by the {@link #getEStructuralFeatureAsString()} method * @see #getEStructuralFeatureAsString() @@ -131,7 +131,8 @@ public class FeatureMapEntryFeatureURIPropertyHandler implements PropertyAccesso } if (ePackage == null) { - throw new IllegalArgumentException("EPackage not found using " + eFeatureURI + " and EPackageURI: " + ePackageURI); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException( + "EPackage not found using " + eFeatureURI + " and EPackageURI: " + ePackageURI); //$NON-NLS-1$ //$NON-NLS-2$ } final EClass eClass = (EClass)ePackage.getEClassifier(eClassName); diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java index cbc0d0caf2..2880e936a4 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java @@ -21,7 +21,7 @@ import java.io.Serializable; /** * Instantiates {@link CDOFeatureMapEntry}. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java index bd4484a80d..4d7409e5c7 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java @@ -35,7 +35,7 @@ import java.util.Map; * Implements the Hibernate accessor for mapped feature map properties. The owner object is always an instance of the * {@link CDOFeatureMapEntry}. Returns null if the mapped property has a different name then the current feature of the * owner (the CDOFeatureMapEntry), calls {@link CDOFeatureMapEntry#getValue()} in all other cases. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class FeatureMapEntryPropertyHandler implements PropertyAccessor, Getter, Setter diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java index 485f1b8c70..a1f9e4c201 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java @@ -27,7 +27,7 @@ import org.hibernate.tuple.component.AbstractComponentTuplizer; /** * Tuplizer for feature map entries. These types are mapped using the dynamic capabilities of Hibernate. - * + * * @see CDOFeatureMapEntry * @see FeatureMapEntryPropertyHandler * @see FeatureMapEntryFeatureURIPropertyHandler diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java index 4904f9c117..5196f00361 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java @@ -32,7 +32,7 @@ import java.util.ListIterator; * Wraps a moveable list so that hibernate always sees an object view while cdo always sees a cdoid view. The same for * EEnum: cdo wants to see an int (the ordinal), hibernate the real eenum value. This to support querying with EENum * parameters. - * + * * @author Martin Taal */ public class HibernateMoveableListWrapper implements MoveableList<Object> @@ -52,7 +52,7 @@ public class HibernateMoveableListWrapper implements MoveableList<Object> int size = size(); if (sourceIndex >= size) { - throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size); //$NON-NLS-1$ //$NON-NLS-2$ } if (targetIndex >= size) diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java index ea8bc1dbbf..b925227b68 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java @@ -21,7 +21,7 @@ import java.util.Map; /** * Keeps mappings from object/feature combinations to a hibernate persistable list. This works because the write action * is done in one thread. - * + * * @author Martin Taal */ public class PersistableListHolder diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java index d3351d66e5..333e92fc3b 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java @@ -26,7 +26,7 @@ import java.util.Map; * Implements the getter/setter for a wild card EAttribute property. This type of property is used in a feature map * created for wild cards. This class implements both the getter, setter and propertyaccessor interfaces. When the * getGetter and getSetter methods are called it returns itself. - * + * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> */ public class WildCardAttributePropertyHandler extends FeatureMapEntryPropertyHandler diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java index df8e53a72e..91cf0a85b8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java @@ -36,7 +36,7 @@ import java.sql.Types; */ public class XMLUserType implements UserType { - private final static java.lang.String XML_TYPE_PACKAGE_NSURI = "http://www.eclipse.org/emf/2003/XMLType"; //$NON-NLS-1$ + private final static java.lang.String XML_TYPE_PACKAGE_NSURI = "http://www.eclipse.org/emf/2003/XMLType"; //$NON-NLS-1$ private EDataType eDataType = null; @@ -148,7 +148,7 @@ public class XMLUserType implements UserType return this.getClass().getSimpleName(); } - return "String"; //$NON-NLS-1$ + return "String"; //$NON-NLS-1$ } public Object nullSafeGet(ResultSet arg0, java.lang.String[] arg1, SessionImplementor sessionImplementor, Object arg2) @@ -274,15 +274,15 @@ public class XMLUserType implements UserType { return super.convertToString(value); } - return super.convertToString(HibernateUtil.getInstance() - .getXMLGregorianCalendarDate((java.util.Date)value, false)); + return super.convertToString( + HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, false)); } @Override protected Object convertToObject(java.lang.String value) { - return new java.sql.Date(((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime() - .getTime()); + return new java.sql.Date( + ((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime()); } @Override @@ -301,15 +301,15 @@ public class XMLUserType implements UserType { return super.convertToString(value); } - return super - .convertToString(HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, true)); + return super.convertToString( + HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, true)); } @Override protected Object convertToObject(java.lang.String value) { - return new java.sql.Timestamp(((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar() - .getTime().getTime()); + return new java.sql.Timestamp( + ((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime()); } @Override |