diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.objectivity/src/org')
51 files changed, 171 insertions, 178 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java index 6afbee72eb..734deb9599 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java index 069b03f268..70c0abdbd1 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java @@ -90,9 +90,9 @@ public class ObjectivityStore extends Store implements IObjectivityStore // RevisionTemporality.NONE, RevisionTemporality.AUDITING), // set(RevisionParallelism.NONE)); // setRevisionTemporality(RevisionTemporality.AUDITING); - super(TYPE, LongIDStore.OBJECT_ID_TYPES, set(ChangeFormat.REVISION, ChangeFormat.DELTA), set( - RevisionTemporality.NONE, RevisionTemporality.AUDITING), set(RevisionParallelism.NONE, - RevisionParallelism.BRANCHING)); + super(TYPE, LongIDStore.OBJECT_ID_TYPES, set(ChangeFormat.REVISION, ChangeFormat.DELTA), + set(RevisionTemporality.NONE, RevisionTemporality.AUDITING), + set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING)); storeConfig = config; } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java index 9a146f7c6e..e8ede59f72 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java @@ -234,8 +234,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG.trace("Detaching id " + id + " - OID: " + objyObject.ooId().getStoreString() + " verions: " - + version + " in Branch: " + branch.getID() + " and timeStamp: " + timeStamp); + TRACER_DEBUG.trace("Detaching id " + id + " - OID: " + objyObject.ooId().getStoreString() + " verions: " + version + + " in Branch: " + branch.getID() + " and timeStamp: " + timeStamp); } if (getStore().isRequiredToSupportAudits()) @@ -291,7 +291,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { TRACER_DEBUG - .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString())); + .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString())); } if (cdoTrx != null) { @@ -469,8 +469,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG.trace(" writeRevisionDeltas: " + revisionDeltas.length + " - time: " + (System.nanoTime() - start) - / 1000000.0); + TRACER_DEBUG.trace( + " writeRevisionDeltas: " + revisionDeltas.length + " - time: " + (System.nanoTime() - start) / 1000000.0); } } @@ -512,11 +512,11 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv // } // // System.out.println(">>>IS: Delta Writing: " + delta.getID() + " - oid: " + objyObject.ooId().getStoreString()); // // System.out.println("\t - old version : " + delta.getVersion()); - // // System.out.println("\t - created : " + created); + // // System.out.println("\t - created : " + created); // // System.out.println("\t - delta.branch: " + delta.getBranch().toString()); - // // System.out.println("\t - branch : " + branch.toString()); - // // System.out.println("\t - branch TS : " + branch.getPoint(created).getTimeStamp()); - // // System.out.println("\t - delta : " + delta.toString()); + // // System.out.println("\t - branch : " + branch.toString()); + // // System.out.println("\t - branch TS : " + branch.getPoint(created).getTimeStamp()); + // // System.out.println("\t - delta : " + delta.toString()); // // for debugging... // // if (objyOriginalRevision.getVersion() != deltaVersion) @@ -596,8 +596,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv int newVersion = CDOBranchVersion.FIRST_VERSION; ObjyObject objyObject = getObject(delta.getID()); - TRACER_DEBUG.format("writingRevisionDelta getting Object: {0}, v:{1} - BranchId:{2}", objyObject.ooId() - .getStoreString(), deltaVersion, delta.getBranch().getID()); + TRACER_DEBUG.format("writingRevisionDelta getting Object: {0}, v:{1} - BranchId:{2}", + objyObject.ooId().getStoreString(), deltaVersion, delta.getBranch().getID()); ObjyObject objyOriginalRevision = objyObject.getRevisionByVersion(deltaVersion, delta.getBranch().getID(), objySession.getObjectManager()); @@ -616,11 +616,11 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } // System.out.println(">>>IS: Delta Writing: " + delta.getID() + " - oid: " + objyObject.ooId().getStoreString()); // System.out.println("\t - old version : " + delta.getVersion()); - // System.out.println("\t - created : " + created); + // System.out.println("\t - created : " + created); // System.out.println("\t - delta.branch: " + delta.getBranch().toString()); - // System.out.println("\t - branch : " + branch.toString()); - // System.out.println("\t - branch TS : " + branch.getPoint(created).getTimeStamp()); - // System.out.println("\t - delta : " + delta.toString()); + // System.out.println("\t - branch : " + branch.toString()); + // System.out.println("\t - branch TS : " + branch.getPoint(created).getTimeStamp()); + // System.out.println("\t - delta : " + delta.toString()); // for debugging... if (objyOriginalRevision.getVersion() != deltaVersion) @@ -634,9 +634,9 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv { ObjyObject objyObjectCopy = objySession.getObjectManager().copyRevision(this, objyOriginalRevision); - TRACER_DEBUG.format(" created new object:{0} by copying object:{1} - v:{2} - newBranch:{3}", objyObjectCopy - .ooId().getStoreString(), objyOriginalRevision.ooId().getStoreString(), objyOriginalRevision.getVersion(), - branch.getID()); + TRACER_DEBUG.format(" created new object:{0} by copying object:{1} - v:{2} - newBranch:{3}", + objyObjectCopy.ooId().getStoreString(), objyOriginalRevision.ooId().getStoreString(), + objyOriginalRevision.getVersion(), branch.getID()); // // newObjyRevision = objySession.getObjectManager().copyRevision(this, objyRevision); // // objyRevision.setRevisedBranchId(branch.getID(); @@ -741,10 +741,10 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { TRACER_DEBUG - .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0); - // TRACER_DEBUG.trace(" getObjectTime: " + ObjyObjectManager.getObjectTime / 1000000.0); - // TRACER_DEBUG.trace(" updateObjectTime: " + ObjyObjectManager.updateObjectTime / 1000000.0); - // TRACER_DEBUG.trace(" resourceCheckAndUpdateTime: " + ObjyObjectManager.resourceCheckAndUpdateTime / + .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0); + // TRACER_DEBUG.trace(" getObjectTime: " + ObjyObjectManager.getObjectTime / 1000000.0); + // TRACER_DEBUG.trace(" updateObjectTime: " + ObjyObjectManager.updateObjectTime / 1000000.0); + // TRACER_DEBUG.trace(" resourceCheckAndUpdateTime: " + ObjyObjectManager.resourceCheckAndUpdateTime / // 1000000.0); // ObjyObjectManager.getObjectTime = 0; // ObjyObjectManager.updateObjectTime = 0; @@ -794,21 +794,21 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } // System.out.println(">>>IS: Writing: " + revision.getID() + " - oid: " + objyObject.ooId().getStoreString()); - // System.out.println("\t - version : " + revision.getVersion()); - // System.out.println("\t - timestamp : " + revision.getTimeStamp()); - // System.out.println("\t - revised : " + revision.getRevised()); + // System.out.println("\t - version : " + revision.getVersion()); + // System.out.println("\t - timestamp : " + revision.getTimeStamp()); + // System.out.println("\t - revised : " + revision.getRevised()); // System.out.println("\t - resourceId : " + revision.getResourceID()); // System.out.println("\t - containerId: " + revision.getContainerID()); - // System.out.println("\t - branch : " + revision.getBranch().toString()); - // System.out.println("\t - revision : " + revision.toString()); + // System.out.println("\t - branch : " + revision.getBranch().toString()); + // System.out.println("\t - revision : " + revision.toString()); ObjyObject newObjyRevision = objyObject; if (revision.getVersion() > CDOBranchVersion.FIRST_VERSION) // we're updating other versions... { // TRACER_DEBUG.format("...Updating other revisions using writeRevision()..."); - ObjyObject oldObjyRevision = objyObject.getRevisionByVersion(revision.getVersion() - 1, revision.getBranch() - .getID(), objySession.getObjectManager()); + ObjyObject oldObjyRevision = objyObject.getRevisionByVersion(revision.getVersion() - 1, + revision.getBranch().getID(), objySession.getObjectManager()); if (oldObjyRevision == null) { @@ -831,8 +831,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (getStore().isRequiredToSupportBranches()) { // add the newObjyRevision to the proper branch. - ObjyBranch objyBranch = objySession.getBranchManager(getRepositoryName()).getBranch( - revision.getBranch().getID()); + ObjyBranch objyBranch = objySession.getBranchManager(getRepositoryName()) + .getBranch(revision.getBranch().getID()); ooObj anObj = ooObj.create_ooObj(newObjyRevision.ooId()); try { @@ -1016,8 +1016,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG.format("queryResources() for : " + (pathPrefix == null ? "NULL" : pathPrefix) + " - exactMatch: " - + exactMatch); + TRACER_DEBUG.format( + "queryResources() for : " + (pathPrefix == null ? "NULL" : pathPrefix) + " - exactMatch: " + exactMatch); } ObjyResourceList resourceList = objySession.getResourceList(getRepositoryName()); int size = resourceList.size(); @@ -1070,8 +1070,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv String resourceName = ObjyResourceList.getResourceName(resourceRevision); CDOID resourceID = OBJYCDOIDUtil.getCDOID(resource.ooId()); - if (exactMatch && pathPrefix != null && pathPrefix.equals(resourceName) || pathPrefix == null - && resourceName == null) + if (exactMatch && pathPrefix != null && pathPrefix.equals(resourceName) + || pathPrefix == null && resourceName == null) { if (!context.addResource(resourceID)) { @@ -1253,7 +1253,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } // else // { - // TRACER_DEBUG.format("RR - objyObject is ID:" + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$ + // TRACER_DEBUG.format("RR - objyObject is ID:" + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$ // } InternalCDORevision revision = createRevision(objyObject, id); @@ -1269,9 +1269,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv objySession.getObjectManager()); if (objyRevision == null) { - TRACER_DEBUG - .format( - "RR - branches ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), branchPoint.getBranch().getID(), branchPoint.getTimeStamp()); //$NON-NLS-1$ + TRACER_DEBUG.format("RR - branches ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), //$NON-NLS-1$ + branchPoint.getBranch().getID(), branchPoint.getTimeStamp()); } } catch (RuntimeException ex) @@ -1287,9 +1286,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv objySession.getObjectManager()); if (objyRevision == null) { - TRACER_DEBUG - .format( - "RR - audit ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), branchPoint.getBranch().getID(), branchPoint.getTimeStamp()); //$NON-NLS-1$ + TRACER_DEBUG.format("RR - audit ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), //$NON-NLS-1$ + branchPoint.getBranch().getID(), branchPoint.getTimeStamp()); } } catch (RuntimeException ex) @@ -1313,8 +1311,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv { if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG - .format("RR - ...revision for: {0} - OID: {1} is detached.", id, objyObject.ooId().getStoreString()); //$NON-NLS-1$ + TRACER_DEBUG.format("RR - ...revision for: {0} - OID: {1} is detached.", id, //$NON-NLS-1$ + objyObject.ooId().getStoreString()); } EClass eClass = ObjySchema.getEClass(getStore(), objyObject.objyClass()); return new DetachedCDORevision(eClass, id, branchPoint.getBranch(), -objyRevision.getVersion(), @@ -1326,8 +1324,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG - .format("RR - Fetching revision details for: {0} - OID:{1}", id, objyRevision.ooId().getStoreString()); //$NON-NLS-1$ + TRACER_DEBUG.format("RR - Fetching revision details for: {0} - OID:{1}", id, //$NON-NLS-1$ + objyRevision.ooId().getStoreString()); } boolean ok = objyRevision.fetch(this, revision, listChunk); @@ -1370,7 +1368,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } // { - // TRACER_DEBUG.format("RRBV - objyObject 4 ID: " + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$ + // TRACER_DEBUG.format("RRBV - objyObject 4 ID: " + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$ // } ObjyObject objyRevision = null; @@ -1381,9 +1379,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv // objyRevision = objyObject.getRevisionByVersion(branchVersion.getVersion()); if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG - .format( - "Reading revision by version {0} for: {1} - OID: {2}", branchVersion.getVersion(), id, objyObject.ooId().getStoreString()); //$NON-NLS-1$ + TRACER_DEBUG.format("Reading revision by version {0} for: {1} - OID: {2}", branchVersion.getVersion(), id, //$NON-NLS-1$ + objyObject.ooId().getStoreString()); } // } @@ -1394,7 +1391,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv // if (TRACER_DEBUG.isEnabled()) // { // TRACER_DEBUG.format( - // "(None-Audit) Reading revision by version for: {0} - OID: {1}", id, objyObject.ooId().getStoreString()); //$NON-NLS-1$ + // "(None-Audit) Reading revision by version for: {0} - OID: {1}", id, objyObject.ooId().getStoreString()); + // //$NON-NLS-1$ // } // } @@ -1428,7 +1426,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv // if (!ok) // { - // TRACER_DEBUG.format("RRBV - Fetch rev failed 4: {0}, :", id, objyRevision.ooId().getStoreString()); //$NON-NLS-1$ + // TRACER_DEBUG.format("RRBV - Fetch rev failed 4: {0}, :", id, objyRevision.ooId().getStoreString()); //$NON-NLS-1$ // } readRevisionTime += System.nanoTime() - __start; @@ -1508,8 +1506,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } catch (com.objy.db.ObjyRuntimeException ex) { - System.out.println(">>>>IS: Exception<<<< Session: " + objySession + " open status: " - + objySession.isOpen()); + System.out + .println(">>>>IS: Exception<<<< Session: " + objySession + " open status: " + objySession.isOpen()); ex.printStackTrace(); } monitor.worked(); @@ -1524,8 +1522,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv { TRACER_DEBUG.trace(" addIDMappings for " + commitContext.getNewObjects().length + " - time: " + (System.nanoTime() - __start) / 1000000.0); - TRACER_DEBUG.trace(" createObjects : " + ObjyObject.createObjectCount + " - time: " - + ObjyObject.createObjectTime / 1000000.0); + TRACER_DEBUG.trace( + " createObjects : " + ObjyObject.createObjectCount + " - time: " + ObjyObject.createObjectTime / 1000000.0); ObjyObject.createObjectTime = 0; ObjyObject.createObjectCount = 0; } @@ -1689,9 +1687,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv for (ObjyBranch objyBranch : branches) { - InternalCDOBranch branch = branchManager - .getBranch(objyBranch.getBranchId(), new BranchInfo(objyBranch.getBranchName(), objyBranch.getBaseBranchId(), - objyBranch.getBaseBranchTimeStamp())); + InternalCDOBranch branch = branchManager.getBranch(objyBranch.getBranchId(), new BranchInfo( + objyBranch.getBranchName(), objyBranch.getBaseBranchId(), objyBranch.getBaseBranchTimeStamp())); branchHandler.handleBranch(branch); count++; } @@ -1775,10 +1772,10 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv } } - CDOBranchVersion branchVersion = branchManager.getBranch((int)objyObject.getBranchId()).getVersion( - Math.abs(objyObject.getVersion())); - InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion( - OBJYCDOIDUtil.getCDOID(objyObject.ooId()), branchVersion, CDORevision.UNCHUNKED, true); + CDOBranchVersion branchVersion = branchManager.getBranch((int)objyObject.getBranchId()) + .getVersion(Math.abs(objyObject.getVersion())); + InternalCDORevision revision = (InternalCDORevision)revisionManager + .getRevisionByVersion(OBJYCDOIDUtil.getCDOID(objyObject.ooId()), branchVersion, CDORevision.UNCHUNKED, true); return handler.handleRevision(revision); } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java index aaf254ea94..07d196555d 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java @@ -41,8 +41,8 @@ public class ObjectivityStoreChunkReader extends StoreChunkReader implements IOb CDOID id = getRevision().getID(); getAccessor().ensureActiveSession(); ObjyObject objyObject = getAccessor().getObject(id); - ObjyObject objyRevision = objyObject.getRevisionByVersion(getRevision().getVersion(), getRevision().getBranch() - .getID(), getAccessor().getObjySession().getObjectManager()); + ObjyObject objyRevision = objyObject.getRevisionByVersion(getRevision().getVersion(), + getRevision().getBranch().getID(), getAccessor().getObjySession().getObjectManager()); List<Chunk> chunks = getChunks(); diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java index 86d6afb38f..2c1e679ab3 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java index 5bd7bf4019..c617b0028f 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java @@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer; /** * The <em>Operations & Maintenance</em> class of this bundle. - * + * * @author Ibrahim Sallam */ public abstract class OM diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java index 808a808e27..1b7f9283fa 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java index 04be133f2c..9d5a093ab2 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java index 89d85c923f..3b42d55a78 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java @@ -156,8 +156,8 @@ public class ObjyPlacementManagerLocal { // we have to put it somewhere. // call the global placement manager. - nearObject = objySession.getObjectManager().getGlobalPlacementManager() - .getNearObject(null, null, revision.getEClass()); + nearObject = objySession.getObjectManager().getGlobalPlacementManager().getNearObject(null, null, + revision.getEClass()); } ObjyObject objyObject = objySession.getObjectManager().newObject(eClass, nearObject); diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java index 71c8ed638b..cc817a131c 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java @@ -485,7 +485,7 @@ public class FdManager /** * TODO - * + * * @param storeConfig */ public void configure(Element storeConfig) diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java index a3aedc6fd5..aab1a9608e 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.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: * Ibrahim Sallam - initial API and implementation */ @@ -18,7 +18,7 @@ import java.util.HashMap; /** * Wrapper around the AS class to be able to cache attributes. - * + * * @author ibrahim */ public class ObjyClass diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java index ca108351bf..9ac72d9ab2 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java @@ -208,7 +208,7 @@ public class ObjyClassProposed { TRACER_DEBUG.trace("Attribut Changed for " + eClass.getName() + " name : " + feature.getName()); TRACER_DEBUG.trace("... attribute change is not supported in this release... for " + eClass.getName() - + " name : " + feature.getName()); + + " name : " + feature.getName()); } // TODO - enable the rest of attribute type evolution... diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java index af9ab94675..4497731fd7 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java @@ -127,7 +127,7 @@ public class ObjyConnection true, // boolean appendLogFiles, logDirPath, // String logDirPath, "MainLog.txt"// String mainLogFileName - ); + ); } if (TRACER_DEBUG.isEnabled()) { @@ -399,7 +399,7 @@ public class ObjyConnection try { objySession.terminate(); - // TRACER_DEBUG.trace("ObjyConnection.cleanupSessionPool() -- end terminating session. " + + // TRACER_DEBUG.trace("ObjyConnection.cleanupSessionPool() -- end terminating session. " + // objySession.toString()); } catch (ObjyRuntimeException ex) diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java index 1cdb68a987..2916bf6c10 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java @@ -211,8 +211,8 @@ public class ObjyObject } /** - * - */ + * + */ public ooId ooId() { return objectId; @@ -541,8 +541,8 @@ public class ObjyObject if (TRACER_DEBUG.isEnabled()) { checkSession(); - TRACER_DEBUG.trace("ObjyObject.update() - oid:" + ooId().getStoreString() + " - version:" - + revision.getVersion()); + TRACER_DEBUG + .trace("ObjyObject.update() - oid:" + ooId().getStoreString() + " - version:" + revision.getVersion()); } // this is done in the updateDate() @@ -597,8 +597,8 @@ public class ObjyObject { if (TRACER_DEBUG.isEnabled()) { - TRACER_DEBUG.trace("In " + ooId().getStoreString() + " - Can't find mapper for feature " - + feature.getName()); + TRACER_DEBUG + .trace("In " + ooId().getStoreString() + " - Can't find mapper for feature " + feature.getName()); } continue; } @@ -627,7 +627,7 @@ public class ObjyObject else if (value instanceof CDOIDExternal) { TRACER_DEBUG - .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI()); + .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI()); // System.out.println("value is a proxy object - it should be handled by the mapper."); // create an ObjyProxy object to hold the the value. ObjyProxy proxyObject = ObjyProxy.createObject(ooId()); @@ -648,8 +648,8 @@ public class ObjyObject ooId oid = null; if (entryValue instanceof CDOIDExternal) { - TRACER_DEBUG.trace("... CDOIDExternal inserted, at:" + i + ", content:" - + ((CDOIDExternal)entryValue).getURI()); + TRACER_DEBUG + .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)entryValue).getURI()); // System.out.println("value is a proxy object - it should be handled by the mapper."); // create an ObjyProxy object to hold the the value. ObjyProxy proxyObject = ObjyProxy.createObject(ooId()); @@ -1065,8 +1065,8 @@ public class ObjyObject if (TRACER_DEBUG.isEnabled()) { // TODO - verify the message. - TRACER_DEBUG.trace("Size of object " + ooId().getStoreString() + " - is: " + size + " - feature: " - + feature.getName()); + TRACER_DEBUG + .trace("Size of object " + ooId().getStoreString() + " - is: " + size + " - feature: " + feature.getName()); } } catch (RuntimeException ex) @@ -1147,8 +1147,8 @@ public class ObjyObject checkSession(); // TODO - verify the message. TRACER_DEBUG.trace("Get All objects for ID: " + ooId().getStoreString() + " <feature ' " + feature/* - * .getName( ) - */ + * .getName( ) + */ + "':" + feature.getEType() + "> from " + this); } @@ -1441,7 +1441,7 @@ public class ObjyObject if (TRACER_DEBUG.isEnabled()) { TRACER_DEBUG.trace("-->> No process to delete() feature (" + i + ") -> feature:" + feature.getName() - + " - value:" + objects[i] + " ... nothing to do here."); + + " - value:" + objects[i] + " ... nothing to do here."); } } } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java index 4e2c6927da..8c59781ddc 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java index a04043c96e..d462be94ba 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java @@ -43,7 +43,7 @@ import java.util.Map; /** * Wrapper for the AS schema code with caching of the wrapped classes. This class need to be reseted by the * ObjectivityStore doDeactivate(). - * + * * @author ibrahim */ public class ObjySchema @@ -152,7 +152,7 @@ public class ObjySchema /** * Originally in EProposedManager - * + * * @param ePackage */ static public void registerEPackage(EPackage ePackage) diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java index 9549ec5c4b..8d03075a4f 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java @@ -177,7 +177,7 @@ public class ObjyScope /** * TODO - verify need. - * + * * @return */ private ooContObj createNewContainer(String name) diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java index 28575adcea..fcd9391b9d 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java @@ -27,7 +27,7 @@ import com.objy.db.app.ooId; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -/* +/* * @author ibrahim */ public class ObjySession extends Session diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java index 786e7e7c0c..a4cc1eb4ca 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; /** * mapping between Objy AS class/type and EMF types. - * + * * @author ibrahim */ public abstract class BasicTypeMapper diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java index b4332d42c1..e262ab6286 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java index ade387c4fa..341564aebb 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java index 071d7904b4..fe8a0e9744 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -106,7 +106,7 @@ public class ByteArrayTypeMapper extends BasicTypeMapper implements ISingleTypeM } /** - * + * */ public boolean createSchema(Proposed_Class proposedClass, EStructuralFeature feature) { @@ -124,7 +124,7 @@ public class ByteArrayTypeMapper extends BasicTypeMapper implements ISingleTypeM getNullAttributeName(feature), // Attribute name 1, // # elements in fixed-size array ooBaseType.ooBOOLEAN // Default value - ); + ); return false; } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java index 2496a5ecb0..b4aac12fc9 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.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: * Ibrahim Sallam - initial API and implementation */ @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; /*** * Overrides StringManyTypeMapper, and implement the two functions to convert a string to an object and vice versa. - * + * * @author Ibrahim Sallam */ public class CustomDataManyTypeMapper extends StringManyTypeMapper diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java index c8cdd45add..80e675e3cf 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java index 8ea85adbae..ebfb6f45b5 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -103,8 +103,8 @@ public class FeatureMapTypeMapper extends BasicTypeMapper implements IManyTypeMa public void initialize(Class_Object classObject, EStructuralFeature feature) { // create the reference. - Class_Object newClassObject = Class_Object - .new_persistent_object(getArrayListClass(), classObject.objectID(), false); + Class_Object newClassObject = Class_Object.new_persistent_object(getArrayListClass(), classObject.objectID(), + false); // { // ObjyObjectManager.newInternalObjCount++; // } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java index ab57f69a33..d226f2abd5 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; /** * Mapper for composite types (featureMap, manyReference, Multiple...) - * + * * @author ibrahim */ public interface IManyTypeMapper extends ITypeMapper diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java index 7ac1cd2d1a..aae65b4e88 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java index 7d5d3dd000..23d02b5a44 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -22,7 +22,7 @@ import com.objy.as.app.d_Attribute; /** * Maps between Objy types (classes and objects), and EMF types. - * + * * @author ibrahim */ public interface ITypeMapper diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java index c3ccf0e061..880f457995 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -21,7 +21,7 @@ import com.objy.as.app.d_Attribute; import java.util.ArrayList; -// TODO - verify the need for this, and perhaps extend the implementation to the +// TODO - verify the need for this, and perhaps extend the implementation to the // colletion of mappers. public class MultipleTypeMapper extends BasicTypeMapper implements IManyTypeMapper { diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java index fd9da9740a..4cb9d4072f 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java @@ -94,13 +94,13 @@ public abstract class NumericManyTypeMapper extends BasicTypeMapper implements I embeddedAttributeName, // Attribute name 1, // # elements in fixed-size array getObjyBaseType() // Type of numeric data - ); // Default value + ); // Default value propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind embeddedAttributeNull, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooBOOLEAN// Type of numeric data - ); // Default value + ); // Default value // System.out.println("OBJY: Propose Creating new class: " + embeddedClassName()); @@ -143,7 +143,7 @@ public abstract class NumericManyTypeMapper extends BasicTypeMapper implements I /** * TODO - this is a simple change to the attribute, make it handle more complex cases. I also don't think it does * handle the arrays. - * + * * @param proposedooClass * @param feature */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java index 8d9ff6c468..4f8317ce42 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java @@ -80,19 +80,19 @@ public abstract class NumericTypeMapper extends BasicTypeMapper implements ISing getAttributeName(feature), // Attribute name 1, // # elements in fixed-size array getObjyBaseType() // Default value - ); + ); proposedClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind getNullAttributeName(feature), // Attribute name 1, // # elements in fixed-size array ooBaseType.ooBOOLEAN // Default value - ); + ); return false; } /** * TODO - this is a simple change to the attribute, make it handle more complex cases. - * + * * @param proposedooClass * @param feature */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java index 9ff65da23e..5c73f11015 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring comments for CDO 3.0 diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java index b24823010a..7e13d0fa7c 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java index fb6239758d..441f9b767b 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -53,7 +53,7 @@ public class StringTypeMapper extends BasicTypeMapper implements ISingleTypeMapp getNullAttributeName(feature), // Attribute name 1, // # elements in fixed-size array ooBaseType.ooBOOLEAN // Default value - ); + ); } catch (ObjyRuntimeException ex) { diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java index 68a1e501ba..aef0b06eea 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -115,7 +115,7 @@ public class ObjyArrayListId protected ooId getOidValue(long index) { // System.out.println(" - ooArrayListId.getValue() at index: " + index + - // " for classObject: " + classObject.objectID().getStoreString() ); + // " for classObject: " + classObject.objectID().getStoreString() ); return getValue(index).getOid(); } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java index 97b903a965..3a63098a0f 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -54,7 +54,7 @@ public class ObjyArrayListLong extends ObjyArrayList<Long> ObjyArrayList.sizeName, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT32 // Type of numeric data - ); // Default value + ); // Default value A.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind ObjyArrayList.arrayName, // Attribute name diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java index 7f1b22adfd..9f309f306e 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java @@ -87,13 +87,13 @@ public class ObjyArrayListString embeddedAttributeName, // Attribute name 1, // # elements in fixed-size array "ooUtf8String" // Type of numeric data - ); // Default value + ); // Default value embeddedClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind embeddedAttributeNull, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooBOOLEAN // Type of numeric data - ); // Default value + ); // Default value // top_mod.propose_new_class(embeddedClass); @@ -107,7 +107,7 @@ public class ObjyArrayListString ObjyArrayListString.FixedElementsName, // Attribute name ObjyArrayListString.FixedElementsSize, // # elements in fixed-size array embeddedClassName // Type of numeric data - ); // Default value + ); // Default value // top_mod.propose_new_class(fixedArrayClass); @@ -120,7 +120,7 @@ public class ObjyArrayListString ObjyArrayList.sizeName, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT32 // Type of numeric data - ); // Default value + ); // Default value StringArrayClass.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind ObjyArrayList.arrayName, // Attribute name @@ -179,7 +179,7 @@ public class ObjyArrayListString Class_Object chunkObject = getVArray().get_class_obj(chunkItem); // String_Value value = chunkObject.nget_string(FixedElementsName, chunkIndex); Class_Object embeddedElement = chunkObject.nget_class_obj(FixedElementsName, chunkIndex); // TODO - I don't like - // using magic numbers!!! + // using magic numbers!!! String_Value value = embeddedElement.nget_string(embeddedAttributeName); Numeric_Value isNull = embeddedElement.get_numeric(1); return isNull == ITypeMapper.numericTrue ? null : value.toString(); diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java index 433c52a7df..144f5036c8 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -27,7 +27,7 @@ import com.objy.as.app.ooBaseType; /** * EMF Classes in Objectivity are enhanced with this base class. This class is use for the revision data as a base for * other classes created. - * + * * @author ibrahim */ public class ObjyBase @@ -93,7 +93,7 @@ public class ObjyBase ObjyBase.ATT_CONTAINER_FEATUERID, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT32 // Type of numeric data - ); // Default value + ); // Default value propClass.add_ref_attribute(com.objy.as.app.d_Module.LAST, // Access kind d_Access_Kind.d_PUBLIC, // Access kind @@ -111,25 +111,25 @@ public class ObjyBase ObjyBase.ATT_VERSION, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT32 // Type of numeric data - ); // Default value + ); // Default value propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind ObjyBase.ATT_BRANCHID, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT32 // Type of numeric data - ); // Default value + ); // Default value propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind ObjyBase.ATT_CREATION_TIME, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT64 // Type of numeric data - ); // Default value + ); // Default value propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind ObjyBase.ATT_REVISED_TIME, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT64 // Type of numeric data - ); // Default value + ); // Default value if (!inProcess) { diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java index b62e06890e..ec468deb65 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java @@ -20,6 +20,7 @@ import java.util.SortedSet; /** * @author Ibrahim Sallam */ + /** * @author Ibrahim Sallam */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java index 610afb6df6..fc6c5d34b4 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.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: * Simon McDuff - initial API and implementation * Ibrahim Sallam - code refactoring for CDO 3.0 @@ -80,7 +80,7 @@ public class ObjyFeatureMapArrayList extends ObjyArrayList<ObjyFeatureMapEntry> ObjyArrayList.sizeName, // Attribute name 1, // # elements in fixed-size array ooBaseType.ooINT32 // Type of numeric data - ); // Default value + ); // Default value A.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind ObjyArrayList.arrayName, // Attribute name 1, false, ObjyFeatureMapEntry.MapEntryClassName); diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java index 940b24f576..75891c05dd 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java @@ -61,7 +61,7 @@ public class ObjyFeatureMapEntry /**** * Factory. - * + * * @param tagId * @param oid */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java index f19d10d233..c3999afef8 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java @@ -158,10 +158,9 @@ public class ObjyLockArea extends ooObj public String toString() { fetch(); - return MessageFormat - .format( - "ObjyLockArea[id={0}, user={1}, branchPoint={2}, readOnly={3}, readlocks={4}, writeLocks{5}, readWriteLocks{6}", - durableLockingID, userID, branchPoint, readOnly, readLockSet.size(), writeLockSet.size(), - readWriteLockSet.size()); + return MessageFormat.format( + "ObjyLockArea[id={0}, user={1}, branchPoint={2}, readOnly={3}, readlocks={4}, writeLocks{5}, readWriteLocks{6}", + durableLockingID, userID, branchPoint, readOnly, readLockSet.size(), writeLockSet.size(), + readWriteLockSet.size()); } } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java index bf30b2061d..b4842aa4fa 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java @@ -35,7 +35,7 @@ public class ObjyPackageInfo extends ooObj "org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyPackageUnit", // name of related class "packageInfos", // inverse relationship field name Relationship.COPY_DELETE, Relationship.VERSION_DELETE, false, false, Relationship.INLINE_NONE); // none-inline - // association + // association } /** diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java index d0205b50a5..3a4f737ce4 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java @@ -43,12 +43,12 @@ public class ObjyPackageUnit extends ooObj "org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyPackageInfo", // name of related class "packageUnit", // inverse relationship field name Relationship.COPY_DELETE, Relationship.VERSION_DELETE, false, false, Relationship.INLINE_NONE); // none-inline - // association + // association } /** * get all related children - * + * * @return list of ObjyPackageInfo objects. */ public List<ObjyPackageInfo> getPackageInfos() diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java index 9b6f146761..c7fa1f3a96 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java index 3b57f09c0d..7b25ee9fd8 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.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: * Ibrahim Sallam - initial API and implementation */ @@ -61,7 +61,7 @@ public class ObjyProxy ObjyProxy.uriAttributeName, // Attribute name 1, // # elements in fixed-size array "ooUtf8String" // name of embedded class - ); + ); // top_mod.propose_new_class(propClass); if (!inProcess) @@ -80,8 +80,8 @@ public class ObjyProxy // factory. public static ObjyProxy createObject(ooId nearObject) { - Class_Object newClassObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyProxy.className) - .getASClass(), nearObject, false); + Class_Object newClassObject = Class_Object + .new_persistent_object(ObjySchema.getObjyClass(ObjyProxy.className).getASClass(), nearObject, false); ObjyProxy proxyObject = new ObjyProxy(newClassObject); return proxyObject; } diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java index c58d4bc8b1..2ab57249c7 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java @@ -37,7 +37,7 @@ import com.objy.db.util.ooTreeListX; /*** * OoResouceList is a specialized ooArrayListId, where all elements are of type Resourc(Node|Folder). The class will * allow adding, validating and removing resources From the list. - * + * * @author ibrahim */ public class ObjyResourceList @@ -165,7 +165,8 @@ public class ObjyResourceList // CDOID existingID = storeAccessor.readResourceID(folderID, name, revision.getBranch().getHead()); // if (existingID != CDOID.NULL && !existingID.equals(revision.getID())) // { - // throw new IllegalStateException("Duplicate resource or folder: " + name + " in folder " + folderID); //$NON-NLS-1$ //$NON-NLS-2$ + // throw new IllegalStateException("Duplicate resource or folder: " + name + " in folder " + folderID); //$NON-NLS-1$ + // //$NON-NLS-2$ // } // } @@ -240,8 +241,8 @@ public class ObjyResourceList public static ObjyObject create(ooId nearOid) { - Class_Object classObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyResourceList.className) - .getASClass(), nearOid, false); + Class_Object classObject = Class_Object + .new_persistent_object(ObjySchema.getObjyClass(ObjyResourceList.className).getASClass(), nearOid, false); // ObjyObjectManager.newInternalObjCount++; // Class_Position position = classObject.position_in_class(ObjyResourceList.Attribute_arrayName); // Class_Object arrayClassObject = Class_Object.new_persistent_object( diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java index 7c820eba38..8ec3e4f62a 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.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: * Ibrahim Sallam - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java index de7e4213c4..4c8e87b416 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java @@ -118,7 +118,7 @@ public class SmartLock * This should replace ooObj.activate. We do not need to call super.activate because we implemented the code in * ooObj.activate in here. This safeActivate will refresh container in case of errors. >> ... Msg: objref member: test * with oid: #26-387-1-2 not found or accessible - * + * * @param object * @param fcweEx */ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java index ac33b43655..498201c795 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java @@ -20,7 +20,7 @@ import com.objy.db.app.ooObj; /** * Originally EOOUtil TBD: verify if we really need this class... - * + * * @author ibrahim */ public class TypeConvert diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java index 74dbfcf185..4d1508ddd2 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java @@ -1,16 +1,11 @@ /* - * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * 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 + * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the + * accompanying materials 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 */ /** * Server concepts for dealing with Objectivity/DB stores and accessors. */ package org.eclipse.emf.cdo.server.objectivity; - |