diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.defs/src/org')
32 files changed, 186 insertions, 127 deletions
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java index 61d153301f..9f7eb313d5 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java index c2f7b3779a..48fd41fe40 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java index e56476255e..fd4a7a5df4 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -16,7 +16,7 @@ import org.eclipse.net4j.defs.ProtocolProviderDef; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Client Protocol Provider Def</b></em>'. <!-- * end-user-doc --> - * + * * @see org.eclipse.emf.cdo.cdodefs.CdodefsPackage#getCDOClientProtocolProviderDef() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java index 92f23e2d27..7196571e7e 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -71,7 +71,7 @@ public interface CDODefsFactory extends EFactory /** * Returns a new object of class '<em>CDO Eager Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>CDO Eager Package Registry Def</em>'. * @generated */ @@ -80,7 +80,7 @@ public interface CDODefsFactory extends EFactory /** * Returns a new object of class '<em>CDO Lazy Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>CDO Lazy Package Registry Def</em>'. * @generated */ @@ -105,7 +105,7 @@ public interface CDODefsFactory extends EFactory /** * Returns a new object of class '<em>CDO Client Protocol Factory Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>CDO Client Protocol Factory Def</em>'. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java index c8b964337d..95c6960d29 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -66,7 +66,7 @@ public interface CDODefsPackage extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOViewDef() * @generated @@ -84,7 +84,7 @@ public interface CDODefsPackage extends EPackage /** * The number of structural features of the '<em>CDO View Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -144,7 +144,7 @@ public interface CDODefsPackage extends EPackage /** * The number of structural features of the '<em>CDO Audit Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -303,7 +303,7 @@ public interface CDODefsPackage extends EPackage /** * The number of structural features of the '<em>EPackage Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -432,7 +432,7 @@ public interface CDODefsPackage extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.defs.ResourceMode <em>Resource Mode</em>}' enum. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.cdo.defs.ResourceMode * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getResourceMode() * @generated @@ -442,7 +442,7 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOViewDef <em>CDO View Def</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>CDO View Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOViewDef * @generated @@ -471,7 +471,7 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOAuditDef <em>CDO Audit Def</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>CDO Audit Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOAuditDef * @generated @@ -491,7 +491,7 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef <em>CDO Session Def</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>CDO Session Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOSessionDef * @generated @@ -579,7 +579,7 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EPackageDef <em>EPackage Def</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>EPackage Def</em>'. * @see org.eclipse.emf.cdo.defs.EPackageDef * @generated @@ -636,7 +636,7 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef <em>CDO Resource Def</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>CDO Resource Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOResourceDef * @generated @@ -676,7 +676,7 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for enum '{@link org.eclipse.emf.cdo.defs.ResourceMode <em>Resource Mode</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for enum '<em>Resource Mode</em>'. * @see org.eclipse.emf.cdo.defs.ResourceMode * @generated @@ -800,7 +800,7 @@ public interface CDODefsPackage extends EPackage /** * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ EReference CDO_PACKAGE_REGISTRY_DEF__PACKAGES = eINSTANCE.getCDOPackageRegistryDef_Packages(); @@ -911,7 +911,7 @@ public interface CDODefsPackage extends EPackage /** * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.ResourceMode <em>Resource Mode</em>}' enum. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.cdo.defs.ResourceMode * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getResourceMode() * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java index f54b71b1c3..f1df491091 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java index cadf7d5143..bc482d5bfd 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java index 2c41b0bfb9..8f4715d43e 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java index a789391354..792b37da8d 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -24,7 +24,7 @@ import org.eclipse.net4j.util.defs.Def; * <li>{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef() * @model * @generated @@ -103,7 +103,7 @@ public interface CDOResourceDef extends Def /** * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Path</em>' attribute. * @see #getPath() diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java index 140bce016b..0da413c259 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java index 553d064d0c..555dee2d59 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.defs; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Transaction Def</b></em>'. <!-- end-user-doc * --> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOTransactionDef() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java index 9d9dbab6c5..7c4f4c35b0 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java index 30ac3ece7d..481dcb7af8 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java index eb1a22c892..14bf8ace47 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java index 202993e0c5..cd36c7dd51 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -47,7 +47,7 @@ public interface EPackageDef extends Def /** * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Ns URI</em>' attribute. * @see #getNsURI() diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java index 70ab663653..3352e38f41 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -31,7 +31,7 @@ public enum ResourceMode implements Enumerator { /** * The '<em><b>GET</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see #GET_VALUE * @generated NOT * @ordered @@ -48,7 +48,7 @@ public enum ResourceMode implements Enumerator /** * The '<em><b>CREATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see #CREATE_VALUE * @generated NOT * @ordered @@ -64,7 +64,7 @@ public enum ResourceMode implements Enumerator /** * The '<em><b>GET OR CREATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @see #GET_OR_CREATE_VALUE * @generated NOT * @ordered diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java index f44101714a..185846677b 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java @@ -93,8 +93,10 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef Date oldTimeStamp = timeStamp; timeStamp = newTimeStamp; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp, timeStamp)); + } } /** @@ -167,7 +169,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (timeStamp: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java index 6818472d90..a88fbf375d 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java @@ -27,8 +27,7 @@ import org.eclipse.emf.ecore.EClass; * * @generated */ -public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements - CDOClientProtocolFactoryDef +public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements CDOClientProtocolFactoryDef { /** * <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java index 1ee96860d3..64904dc5a2 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java @@ -259,8 +259,10 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory { ResourceMode result = ResourceMode.get(initialValue); if (result == null) - throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" - + eDataType.getName() + "'"); + { + throw new IllegalArgumentException( + "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java index 268455f794..f243635791 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -128,7 +128,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also * performs initialization of the package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.emf.cdo.defs.CDODefsPackage#eNS_URI * @see #init() @@ -147,7 +147,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link CDODefsPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -160,11 +160,14 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public static CDODefsPackage init() { if (isInited) + { return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI); + } // Obtain or create and register package - CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE - .get(eNS_URI) : new CDODefsPackageImpl()); + CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE + .get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) + : new CDODefsPackageImpl()); isInited = true; @@ -434,7 +437,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -493,7 +498,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -513,24 +520,24 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage // Add supertypes to classes cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef()); - cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef()); + cdoTransactionDefEClass.getESuperTypes().add(getCDOViewDef()); + cdoAuditDefEClass.getESuperTypes().add(getCDOViewDef()); cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef()); - cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef()); + cdoEagerPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef()); + cdoLazyPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef()); ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef()); - eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef()); + eDynamicPackageDefEClass.getESuperTypes().add(getEPackageDef()); + eGlobalPackageDefEClass.getESuperTypes().add(getEPackageDef()); cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef()); cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, - CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCDOViewDef_CdoSessionDef(), getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, + CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(cdoTransactionDefEClass, CDOTransactionDef.class, "CDOTransactionDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -548,16 +555,16 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null, - "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled", - "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCDOSessionDef_CdoPackageRegistryDef(), getCDOPackageRegistryDef(), null, "cdoPackageRegistryDef", + null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled", "false", + 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1, + initEReference(getCDOPackageRegistryDef_Packages(), getEPackageDef(), null, "packages", null, 0, -1, CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -586,10 +593,10 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, + initEReference(getCDOResourceDef_CdoTransaction(), getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1, + initEAttribute(getCDOResourceDef_ResourceMode(), getResourceMode(), "resourceMode", "null", 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class, diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java index c82fa930b0..fe9e4237d1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -47,7 +47,7 @@ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl im /** * Creates a {@link Eager}. - * + * * @return the CDO package registry */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java index 85d9c8b8c4..d7bc9359f2 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -47,7 +47,7 @@ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl imp /** * Creates a {@link Lazy}. - * + * * @return the CDO package registry */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java index 0dc1f8295f..e358262eb5 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -51,7 +51,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @generated */ protected CDOPackageRegistryDefImpl() @@ -61,7 +61,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @return the e class * @generated */ @@ -73,7 +73,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @return the packages * @generated */ @@ -89,7 +89,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @param otherEnd * the other end * @param featureID @@ -112,7 +112,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @param featureID * the feature id * @param resolve @@ -135,7 +135,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @param featureID * the feature id * @param newValue @@ -158,7 +158,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @param featureID * the feature id * @generated @@ -177,7 +177,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * <!-- begin-user-doc --> <!-- end-user-doc -->. - * + * * @param featureID * the feature id * @return true, if e is set @@ -196,7 +196,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * Creates the instance. - * + * * @return the CDO package registry */ @Override @@ -209,7 +209,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * Adds the packages. - * + * * @param packageRegistry * the package registry * @return the e package. registry @@ -225,7 +225,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * Adds the given {@link EPackage} within the supplied <tt>definition<tt> to the given <tt>CDOPackageRegistry<tt> . - * + * * @param ePackageDef * the ePackage definition * @param packageRegistry @@ -239,7 +239,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi /** * Adds the given {@link EPackage} within the supplied <tt>definition<tt> to the given <tt>CDOPackageRegistry<tt> . - * + * * @param ePackageDef * the ePackage definition * @param packageRegistry diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java index f55a4708e9..36cfbb4a95 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java @@ -37,7 +37,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl#getCdoTransaction <em>Cdo Transaction</em>}</li> * </ul> * </p> - * + * * @generated */ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef @@ -56,7 +56,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * The default value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute. <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getResourceMode() * @generated NOT * @ordered @@ -76,7 +76,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * The default value of the '{@link #getPath() <em>Path</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getPath() * @generated * @ordered @@ -124,8 +124,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef if (cdoTransaction != oldCdoTransaction) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction)); + } } } return cdoTransaction; @@ -149,8 +151,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef CDOTransactionDef oldCdoTransaction = cdoTransaction; cdoTransaction = newCdoTransaction; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction)); + } } /** @@ -171,8 +175,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef ResourceMode oldResourceMode = resourceMode; resourceMode = newResourceMode == null ? RESOURCE_MODE_EDEFAULT : newResourceMode; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE, oldResourceMode, resourceMode)); + } } /** @@ -193,7 +199,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef String oldPath = path; path = newPath; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path)); + } } /** @@ -207,7 +215,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef { case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION: if (resolve) + { return getCdoTransaction(); + } return basicGetCdoTransaction(); case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE: return getResourceMode(); @@ -288,7 +298,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourceMode: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java index c12bc4e83d..d807b4bab1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java @@ -43,7 +43,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}</li> * </ul> * </p> - * + * * @generated */ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef @@ -89,7 +89,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef /** * The cached value of the '{@link #getCdoPackageRegistryDef() <em>Cdo Package Registry Def</em>}' reference. <!-- * begin-user-doc --> - * + * * @since 3.0 <!-- end-user-doc --> * @see #getCdoPackageRegistryDef() * @generated @@ -100,7 +100,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef /** * The default value of the '{@link #isLegacySupportEnabled() <em>Legacy Support Enabled</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isLegacySupportEnabled() * @generated * @ordered @@ -110,7 +110,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef /** * The cached value of the '{@link #isLegacySupportEnabled() <em>Legacy Support Enabled</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isLegacySupportEnabled() * @generated * @ordered @@ -149,8 +149,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef if (connectorDef != oldConnectorDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef)); + } } } return connectorDef; @@ -169,7 +171,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef * <!-- begin-user-doc --> Sets the {@link ConnectorDef} for this {@link CDOSessionDef}. If a * {@link FailOverStrategyDef} was already set, an IllegalStateException is thrown. ConnectorDef and * FailOverStrategyDef are mutually exclusive. - * + * * @throws IllegalStateException * if a {@link FailOverStrategyDef} was set before * @see CDOSessionConfigurationImpl#openSession() <!-- end-user-doc --> @@ -191,8 +193,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef boolean oldConnectorDefESet = connectorDefESet; connectorDefESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef, !oldConnectorDefESet)); + } } /** @@ -206,8 +210,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef connectorDef = null; connectorDefESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, null, oldConnectorDefESet)); + } } /** @@ -237,8 +243,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef String oldRepositoryName = repositoryName; repositoryName = newRepositoryName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME, oldRepositoryName, repositoryName)); + } } /** @@ -254,8 +262,11 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef if (cdoPackageRegistryDef != oldCdoPackageRegistryDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, - CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef)); + CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, + cdoPackageRegistryDef)); + } } } return cdoPackageRegistryDef; @@ -279,8 +290,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef; cdoPackageRegistryDef = newCdoPackageRegistryDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef)); + } } /** @@ -301,8 +314,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef boolean oldLegacySupportEnabled = legacySupportEnabled; legacySupportEnabled = newLegacySupportEnabled; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED, oldLegacySupportEnabled, legacySupportEnabled)); + } } /** @@ -316,13 +331,17 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef { case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF: if (resolve) + { return getConnectorDef(); + } return basicGetConnectorDef(); case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME: return getRepositoryName(); case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF: if (resolve) + { return getCdoPackageRegistryDef(); + } return basicGetCdoPackageRegistryDef(); case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: return isLegacySupportEnabled(); @@ -392,8 +411,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF: return isSetConnectorDef(); case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME: - return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null : !REPOSITORY_NAME_EDEFAULT - .equals(repositoryName); + return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null + : !REPOSITORY_NAME_EDEFAULT.equals(repositoryName); case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF: return cdoPackageRegistryDef != null; case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: @@ -410,7 +429,9 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (repositoryName: "); @@ -440,7 +461,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef protected void validateDefinition() { CheckUtil.checkState // - (eIsSet(CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME), "repository name not set yet!"); + (eIsSet(CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME), "repository name not set yet!"); /* * failoverStrategy and connector are mutually exclusive * @see CDOSessionConfiguration#openSession diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java index 49cba2bf21..c20e90e7f1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java index 89a167c9a9..0da3ebc919 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -81,8 +81,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef if (cdoSessionDef != oldCdoSessionDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef)); + } } } return cdoSessionDef; @@ -106,8 +108,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef CDOSessionDef oldCdoSessionDef = cdoSessionDef; cdoSessionDef = newCdoSessionDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef)); + } } /** @@ -121,7 +125,9 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef { case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF: if (resolve) + { return getCdoSessionDef(); + } return basicGetCdoSessionDef(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java index 4103c64f40..139a625d64 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -91,8 +91,10 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP String oldResourceURI = resourceURI; resourceURI = newResourceURI; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI, oldResourceURI, resourceURI)); + } } /** @@ -165,7 +167,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourceURI: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java index b31f0f5628..e3a0bec081 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java index 45c9fe55b3..05205a66e2 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -32,7 +32,7 @@ import java.net.URI; * <li>{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl#getNsURI <em>Ns URI</em>}</li> * </ul> * </p> - * + * * @generated */ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef @@ -40,7 +40,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * The default value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getNsURI() * @generated * @ordered @@ -50,7 +50,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * The cached value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getNsURI() * @generated * @ordered @@ -94,7 +94,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef String oldNsURI = nsURI; nsURI = newNsURI; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI)); + } } /** @@ -167,7 +169,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (nsURI: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java index f7ca1e2278..503742c4cf 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java @@ -369,7 +369,7 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.net4j.util.defs.Def * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java index bba5f02285..8453006fa1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java @@ -39,7 +39,7 @@ import java.util.List; * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage * @generated */ @@ -47,14 +47,14 @@ public class CDODefsSwitch<T> { /** * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected static CDODefsPackage modelPackage; /** * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ public CDODefsSwitch() @@ -68,7 +68,7 @@ public class CDODefsSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -80,7 +80,7 @@ public class CDODefsSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -100,7 +100,7 @@ public class CDODefsSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -316,7 +316,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>CDO View Def</em>'. <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO View Def</em>'. @@ -331,7 +331,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. @@ -346,7 +346,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. @@ -361,7 +361,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. @@ -377,7 +377,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'. @@ -393,7 +393,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'. @@ -409,7 +409,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'. @@ -424,7 +424,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>EPackage Def</em>'. <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>EPackage Def</em>'. @@ -440,7 +440,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'. @@ -455,7 +455,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. @@ -471,7 +471,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'. @@ -486,7 +486,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. @@ -501,7 +501,7 @@ public class CDODefsSwitch<T> /** * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>Def</em>'. @@ -517,7 +517,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'. @@ -533,7 +533,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'. @@ -549,7 +549,7 @@ public class CDODefsSwitch<T> * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. |