summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-12-28 08:12:30 (EST)
committerEike Stepper2007-12-28 08:12:30 (EST)
commit7a7df60205060ad8edbde0c547772b70705fae17 (patch)
tree748510ad8943033028f3e92924cf29145209bcdc
parent9ae56773604f9501d291698e76fbb45dec30859d (diff)
downloadcdo-7a7df60205060ad8edbde0c547772b70705fae17.zip
cdo-7a7df60205060ad8edbde0c547772b70705fae17.tar.gz
cdo-7a7df60205060ad8edbde0c547772b70705fae17.tar.bz2
Regenerated resource.genmodel with EMF 2.4.0M4
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java7
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java27
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java13
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java40
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java25
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java25
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java15
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java20
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java10
20 files changed, 180 insertions, 61 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index cc1c41e..62bdee4 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -158,7 +158,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -210,7 +210,10 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
*/
public void dispose()
{
- if (cdoResourceItemProvider != null) cdoResourceItemProvider.dispose();
+ if (cdoResourceItemProvider != null)
+ {
+ cdoResourceItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 008f7bf..7987fa5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -587,7 +587,7 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
@Override
protected boolean isNotificationRequired()
{
- return CDOResourceImpl.this.eNotificationRequired();
+ return eNotificationRequired();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
index 1d2a89a..64625f4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
@@ -104,7 +104,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
*/
public static EresourcePackage init()
{
- if (isInited) return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI);
+ if (isInited)
+ {
+ return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI);
+ }
// Obtain or create and register package
EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE
@@ -293,7 +296,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
*/
public void createPackageContents()
{
- if (isCreated) return;
+ if (isCreated)
+ {
+ return;
+ }
isCreated = true;
// Create classes and their features
@@ -330,7 +336,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
*/
public void initializePackageContents()
{
- if (isInitialized) return;
+ if (isInitialized)
+ {
+ return;
+ }
isInitialized = true;
// Initialize package
@@ -350,10 +359,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
// Initialize classes and features; add operations and parameters
initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCDOResource_ResourceSet(), this.getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
+ initEAttribute(getCDOResource_ResourceSet(), getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_URI(), this.getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCDOResource_URI(), getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE,
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCDOResource_Contents(), theEcorePackage.getEObject(), null, "contents", null, 0, -1,
CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -364,9 +373,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
initEAttribute(getCDOResource_TrackingModification(), ecorePackage.getEBoolean(), "trackingModification", null, 0,
1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_Errors(), this.getDiagnostic(), "errors", null, 0, -1, CDOResource.class,
- IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_Warnings(), this.getDiagnostic(), "warnings", null, 0, -1, CDOResource.class,
+ initEAttribute(getCDOResource_Errors(), getDiagnostic(), "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCDOResource_Warnings(), getDiagnostic(), "warnings", null, 0, -1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResource_TimeStamp(), theEcorePackage.getELong(), "timeStamp", null, 0, 1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
index 3d4bf13..a99ecbd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
@@ -74,9 +74,11 @@ public class EresourceSwitch<T>
{
return doSwitch(theEClass.getClassifierID(), theEObject);
}
-
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ else
+ {
+ List<EClass> eSuperTypes = theEClass.getESuperTypes();
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ }
}
/**
@@ -94,7 +96,10 @@ public class EresourceSwitch<T>
{
CDOResource cdoResource = (CDOResource)theEObject;
T result = caseCDOResource(cdoResource);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
index 8b4250a..ac06dcf 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
@@ -171,7 +171,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl implements Adapter.In
revision.getVersion() - 1, false);
CDOTransactionImpl transaction = cdoView().toTransaction();
- transaction.registerRevisionDelta(this.cdoRevision().createDelta(originRevision));
+ transaction.registerRevisionDelta(cdoRevision().createDelta(originRevision));
}
public void cdoInternalPostLoad()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 3b29dfd..2b86ecb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -141,11 +141,17 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
data.view = view;
// TRANSIENT --> PREPARED_ATTACH
- if (TRACER.isEnabled()) TRACER.format("ATTACH: {0} --> {1}", object, view);
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("ATTACH: {0} --> {1}", object, view);
+ }
process(object, CDOEvent.ATTACH, data);
// PREPARED_ATTACH --> NEW
- if (TRACER.isEnabled()) TRACER.format("FINALIZE_ATTACH: {0} --> {1}", object, view);
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("FINALIZE_ATTACH: {0} --> {1}", object, view);
+ }
process(object, CDOEvent.FINALIZE_ATTACH, data);
}
@@ -157,7 +163,10 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
public void read(InternalCDOObject object)
{
- if (TRACER.isEnabled()) trace(object, CDOEvent.READ);
+ if (TRACER.isEnabled())
+ {
+ trace(object, CDOEvent.READ);
+ }
process(object, CDOEvent.READ, null);
}
@@ -168,7 +177,10 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
public void write(InternalCDOObject object, CDOFeatureDelta featureChange)
{
- if (TRACER.isEnabled()) trace(object, CDOEvent.WRITE);
+ if (TRACER.isEnabled())
+ {
+ trace(object, CDOEvent.WRITE);
+ }
process(object, CDOEvent.WRITE, featureChange);
}
@@ -208,26 +220,38 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
for (CDORevisionImpl revision : revisions)
{
InternalCDOObject object = ids.get(revision.getID());
- if (TRACER.isEnabled()) trace(object, CDOEvent.RELOAD);
+ if (TRACER.isEnabled())
+ {
+ trace(object, CDOEvent.RELOAD);
+ }
process(object, CDOEvent.RELOAD, null);
}
}
public void invalidate(InternalCDOObject object, long timeStamp)
{
- if (TRACER.isEnabled()) trace(object, CDOEvent.INVALIDATE);
+ if (TRACER.isEnabled())
+ {
+ trace(object, CDOEvent.INVALIDATE);
+ }
process(object, CDOEvent.INVALIDATE, timeStamp);
}
public void commit(InternalCDOObject object, CommitTransactionResult result)
{
- if (TRACER.isEnabled()) trace(object, CDOEvent.COMMIT);
+ if (TRACER.isEnabled())
+ {
+ trace(object, CDOEvent.COMMIT);
+ }
process(object, CDOEvent.COMMIT, result);
}
public void rollback(InternalCDOObject object, boolean remote)
{
- if (TRACER.isEnabled()) trace(object, CDOEvent.ROLLBACK);
+ if (TRACER.isEnabled())
+ {
+ trace(object, CDOEvent.ROLLBACK);
+ }
process(object, CDOEvent.ROLLBACK, remote);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 0dc412a..bd237fb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -94,7 +94,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
public CDOViewImpl(int id, CDOSessionImpl session)
{
- this.viewID = id;
+ viewID = id;
this.session = session;
enableInvalidationNotifications = OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue();
loadRevisionCollectionChunkSize = OM.PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE.getValue();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
index 9272724..fd88398 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
@@ -55,7 +55,7 @@ public class CDOFeatureAnalyzerModelBased extends CDOAbstractFeatureRuleAnalyzer
{
fetchData();
List<CDOFetchRule> rules = new ArrayList<CDOFetchRule>();
- rules.addAll(featureInfos.getRules(this.lastTraverseCDOObject.cdoClass(), this.lastTraverseFeature));
+ rules.addAll(featureInfos.getRules(lastTraverseCDOObject.cdoClass(), lastTraverseFeature));
return rules;
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java
index 0291781..4d2d6f7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java
@@ -49,7 +49,7 @@ public class CDOFeatureAnalyzerUI extends CDOAbstractFeatureRuleAnalyzer
public CDOID getContext()
{
- if (this.lastTraverseFeature.isMany())
+ if (lastTraverseFeature.isMany())
{
return CDOID.NULL;
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
index 57454b5..587e754 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
@@ -62,24 +62,24 @@ public abstract class OM
public static final OMPreferences PREFS = BUNDLE.preferences();
- public static final OMPreference<String> PREF_REPOSITORY_NAME = //
+ public static final OMPreference<String> PREF_REPOSITORY_NAME = //
PREFS.initString("PREF_REPOSITORY_NAME"); //$NON-NLS-1$
- public static final OMPreference<String> PREF_USER_NAME = //
+ public static final OMPreference<String> PREF_USER_NAME = //
PREFS.initString("PREF_USER_NAME"); //$NON-NLS-1$
- public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = //
+ public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = //
PREFS.initString("PREF_CONNECTOR_DESCRIPTION"); //$NON-NLS-1$
- public static final OMPreference<Integer> PREF_REFERENCE_CHUNK_SIZE = //
+ public static final OMPreference<Integer> PREF_REFERENCE_CHUNK_SIZE = //
PREFS.init("PREF_REFERENCE_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
- public static final OMPreference<Boolean> PREF_ENABLE_INVALIDATION_NOTIFICATIONS = //
+ public static final OMPreference<Boolean> PREF_ENABLE_INVALIDATION_NOTIFICATIONS = //
PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATIONS", false); //$NON-NLS-1$
- public static final OMPreference<Integer> PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE = //
+ public static final OMPreference<Integer> PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE = //
PREFS.init("PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE", CDOView.NO_PRELOAD); //$NON-NLS-1$
- public static final OMPreference<Long> PREF_DEFAULT_COMMIT_TIMEOUT = //
+ public static final OMPreference<Long> PREF_DEFAULT_COMMIT_TIMEOUT = //
PREFS.init("PREF_DEFAULT_COMMIT_TIMEOUT", CDOTransaction.DEFAULT_COMMIT_TIMEOUT); //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
index aab6ef2..8c497d5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
@@ -65,7 +65,10 @@ public class LoadChunkRequest extends CDOClientRequest<CDOID>
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
CDOID id = revision.getID();
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing revision ID: {0}", id);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing revision ID: {0}", id);
+ }
CDOIDImpl.write(out, id);
int version = revision.getVersion();
@@ -74,18 +77,30 @@ public class LoadChunkRequest extends CDOClientRequest<CDOID>
--version;
}
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing revision version: {0}", version);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing revision version: {0}", version);
+ }
out.writeInt(version);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing feature: {0}", feature);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing feature: {0}", feature);
+ }
CDOClassRefImpl classRef = (CDOClassRefImpl)feature.getContainingClass().createClassRef();
classRef.write(out, null);
out.writeInt(feature.getFeatureID());
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing fromIndex: {0}", fromIndex);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing fromIndex: {0}", fromIndex);
+ }
out.writeInt(fromIndex);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing toIndex: {0}", toIndex);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing toIndex: {0}", toIndex);
+ }
out.writeInt(toIndex);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java
index c4d7285..f826a13 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java
@@ -54,7 +54,10 @@ public class LoadRevisionByTimeRequest extends LoadRevisionRequest
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
super.requesting(out);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing timeStamp: {0}", timeStamp);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing timeStamp: {0}", timeStamp);
+ }
out.writeLong(timeStamp);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java
index 2ae6d6d..994be18 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java
@@ -47,7 +47,10 @@ public class LoadRevisionByVersionRequest extends LoadRevisionRequest
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
super.requesting(out);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing version: {0}", version);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing version: {0}", version);
+ }
out.writeInt(version);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java
index 8655400..78811ea 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java
@@ -67,15 +67,24 @@ public class LoadRevisionRequest extends CDOClientRequest<List<CDORevisionImpl>>
@Override
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing referenceChunk: {0}", referenceChunk);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing referenceChunk: {0}", referenceChunk);
+ }
out.writeInt(referenceChunk);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing {0} IDs", ids.size());
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing {0} IDs", ids.size());
+ }
out.writeInt(ids.size());
for (CDOID id : ids)
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing ID: {0}", id);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing ID: {0}", id);
+ }
CDOIDImpl.write(out, id);
}
@@ -110,7 +119,10 @@ public class LoadRevisionRequest extends CDOClientRequest<List<CDORevisionImpl>>
CDOSessionPackageManager packageManager = session.getPackageManager();
ArrayList<CDORevisionImpl> revisions = new ArrayList<CDORevisionImpl>(ids.size());
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Reading {0} revisions", ids.size());
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Reading {0} revisions", ids.size());
+ }
for (int i = 0; i < ids.size(); i++)
{
CDORevisionImpl revision = new CDORevisionImpl(in, revisionManager, packageManager);
@@ -120,7 +132,10 @@ public class LoadRevisionRequest extends CDOClientRequest<List<CDORevisionImpl>>
int size = in.readInt();
if (size != 0)
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Reading {0} additional revisions", size);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Reading {0} additional revisions", size);
+ }
for (int i = 0; i < size; i++)
{
try
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
index 7b89902..2fb68e0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
@@ -53,10 +53,16 @@ public class OpenSessionRequest extends RequestWithConfirmation<OpenSessionResul
@Override
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing repositoryName: {0}", repositoryName);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing repositoryName: {0}", repositoryName);
+ }
out.writeString(repositoryName);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing disableLegacyObjects: {0}", disableLegacyObjects);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing disableLegacyObjects: {0}", disableLegacyObjects);
+ }
out.writeBoolean(disableLegacyObjects);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java
index fabdb9d..97b5465 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java
@@ -53,12 +53,18 @@ public class QueryObjectTypesRequest extends CDOClientRequest<CDOClassRef[]>
@Override
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing {0} IDs", ids.size());
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing {0} IDs", ids.size());
+ }
out.writeInt(ids.size());
for (CDOID id : ids)
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing ID: {0}", id);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing ID: {0}", id);
+ }
CDOIDImpl.write(out, id);
}
}
@@ -70,7 +76,10 @@ public class QueryObjectTypesRequest extends CDOClientRequest<CDOClassRef[]>
for (int i = 0; i < types.length; i++)
{
types[i] = new CDOClassRefImpl(in, null);
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Read type: {0}", types[i]);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Read type: {0}", types[i]);
+ }
}
return types;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java
index 223f31e..40638a2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java
@@ -58,14 +58,20 @@ public class VerifyRevisionRequest extends CDOClientRequest<List<CDORevisionImpl
@Override
protected void requesting(ExtendedDataOutputStream out) throws IOException
{
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing {0} IDs and versions", revisions.size());
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing {0} IDs and versions", revisions.size());
+ }
out.writeInt(revisions.size());
for (CDORevisionImpl revision : revisions)
{
CDOID id = revision.getID();
int version = revision.getVersion();
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Writing ID and version: {0}v{1}", id, version);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing ID and version: {0}v{1}", id, version);
+ }
CDOIDImpl.write(out, id);
out.writeInt(version);
}
@@ -76,11 +82,17 @@ public class VerifyRevisionRequest extends CDOClientRequest<List<CDORevisionImpl
{
ArrayList<CDORevisionImpl> result = new ArrayList<CDORevisionImpl>();
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Reading {0} timeStamps", revisions.size());
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Reading {0} timeStamps", revisions.size());
+ }
for (CDORevisionImpl revision : revisions)
{
long revised = in.readLong();
- if (PROTOCOL.isEnabled()) PROTOCOL.format("Reading timeStamp: {0}", revised);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Reading timeStamp: {0}", revised);
+ }
if (revised != CDORevision.UNSPECIFIED_DATE)
{
revision.setRevised(revised);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
index 1bd5b66..91de910 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
@@ -56,7 +56,10 @@ public class CompletePackageClosure extends PackageClosure
{
if (visited.add(p))
{
- if (TRACER.isEnabled()) TRACER.trace("Found package " + p.getNsURI());
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Found package " + p.getNsURI());
+ }
}
}
else
@@ -94,7 +97,10 @@ public class CompletePackageClosure extends PackageClosure
{
if (visited.add(eClass))
{
- if (TRACER.isEnabled()) TRACER.trace("Found class " + eClass.getName());
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Found class " + eClass.getName());
+ }
handleEStructuralFeatures(eClass.getEStructuralFeatures(), visited);
handleEOperations(eClass.getEOperations(), visited);
handleEClasses(eClass.getESuperTypes(), visited);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java
index 66ebf67..dcded5d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java
@@ -96,7 +96,10 @@ public final class GenUtil
}
}
- if (name.length() != 0) parsedName.addAll(parseName(name, '_'));
+ if (name.length() != 0)
+ {
+ parsedName.addAll(parseName(name, '_'));
+ }
StringBuilder result = new StringBuilder();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java
index 3f5e467..5b3aa89 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java
@@ -56,7 +56,10 @@ public class InstancePackageClosure extends PackageClosure
{
if (visited.add(p))
{
- if (TRACER.isEnabled()) TRACER.trace("Found package " + p.getNsURI());
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Found package " + p.getNsURI());
+ }
}
}
else
@@ -94,7 +97,10 @@ public class InstancePackageClosure extends PackageClosure
{
if (visited.add(eClass))
{
- if (TRACER.isEnabled()) TRACER.trace("Found class " + eClass.getName());
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Found class " + eClass.getName());
+ }
handleEStructuralFeatures(eClass.getEStructuralFeatures(), visited);
handleEOperations(eClass.getEOperations(), visited);
handleEClasses(eClass.getESuperTypes(), visited);