Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf')
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java16
13 files changed, 48 insertions, 49 deletions
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 1d56b2e810..cc791d2aa0 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
@@ -54,4 +54,4 @@ public interface EDynamicPackageDef extends EPackageDef
*/
void setResourceURI(String value);
-} // DynamicCDOPackageDef
+} // DynamicEPackageDef
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 58fad1091b..e9fa656f57 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
@@ -21,4 +21,4 @@ package org.eclipse.emf.cdo.defs;
*/
public interface EGlobalPackageDef extends EPackageDef
{
-} // NativeCDOPackageDef
+} // NativeEPackageDef
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 38000f0dce..5b60a91682 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
@@ -54,4 +54,4 @@ public interface EPackageDef extends Def
*/
void setNsURI(String value);
-} // CDOPackageDef
+} // EPackageDef
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 701d71f122..cca78b3fde 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
@@ -209,8 +209,8 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
*/
public CDOPackageRegistryDef createCDOPackageRegistryDef()
{
- CDOPackageRegistryDefImpl cdoPackageRegistryDef = new CDOPackageRegistryDefImpl();
- return cdoPackageRegistryDef;
+ CDOPackageRegistryDefImpl ePackageRegistryDef = new CDOPackageRegistryDefImpl();
+ return ePackageRegistryDef;
}
/**
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 e10a53be43..78a2d34af2 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
@@ -93,7 +93,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
*
* @generated
*/
- private EClass cdoPackageRegistryDefEClass = null;
+ private EClass ePackageRegistryDefEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -378,7 +378,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
*/
public EClass getCDOPackageRegistryDef()
{
- return cdoPackageRegistryDefEClass;
+ return ePackageRegistryDefEClass;
}
/**
@@ -388,7 +388,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
*/
public EReference getCDOPackageRegistryDef_Packages()
{
- return (EReference)cdoPackageRegistryDefEClass.getEStructuralFeatures().get(0);
+ return (EReference)ePackageRegistryDefEClass.getEStructuralFeatures().get(0);
}
/**
@@ -572,8 +572,8 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
retryFailOverStrategyDefEClass = createEClass(RETRY_FAIL_OVER_STRATEGY_DEF);
createEAttribute(retryFailOverStrategyDefEClass, RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES);
- cdoPackageRegistryDefEClass = createEClass(CDO_PACKAGE_REGISTRY_DEF);
- createEReference(cdoPackageRegistryDefEClass, CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
+ ePackageRegistryDefEClass = createEClass(CDO_PACKAGE_REGISTRY_DEF);
+ createEReference(ePackageRegistryDefEClass, CDO_PACKAGE_REGISTRY_DEF__PACKAGES);
cdoEagerPackageRegistryDefEClass = createEClass(CDO_EAGER_PACKAGE_REGISTRY_DEF);
@@ -639,7 +639,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
failOverStrategyDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
retryFailOverStrategyDefEClass.getESuperTypes().add(this.getFailOverStrategyDef());
- cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+ ePackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
@@ -672,7 +672,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
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,
+ "ePackageRegistryDef", 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,
@@ -693,7 +693,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
RetryFailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT,
+ initEClass(ePackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1,
CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
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 6eee5dc0ca..0a2bff1189 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
@@ -13,9 +13,6 @@ package org.eclipse.emf.cdo.defs.impl;
import org.eclipse.emf.cdo.defs.CDODefsPackage;
import org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef;
-import org.eclipse.emf.cdo.util.CDOUtil;
-
-import org.eclipse.emf.internal.cdo.session.CDOPackageRegistryImpl.Eager;
import org.eclipse.emf.ecore.EClass;
@@ -57,7 +54,9 @@ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl im
*/
protected Object createInstance()
{
- return addPackages(CDOUtil.createEagerPackageRegistry());
+ // TODO: implement CDOEagerPackageRegistryDefImpl.createInstance()
+ throw new UnsupportedOperationException();
+ // return addPackages(CDOUtil.createEagerPackageRegistry());
}
} // EagerPackageRegistryDefImpl
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 f78c5f9f19..304ad6d856 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
@@ -13,9 +13,6 @@ package org.eclipse.emf.cdo.defs.impl;
import org.eclipse.emf.cdo.defs.CDODefsPackage;
import org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef;
-import org.eclipse.emf.cdo.util.CDOUtil;
-
-import org.eclipse.emf.internal.cdo.session.CDOPackageRegistryImpl.Lazy;
import org.eclipse.emf.ecore.EClass;
@@ -57,6 +54,8 @@ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl imp
*/
protected Object createInstance()
{
- return addPackages(CDOUtil.createLazyPackageRegistry());
+ // TODO: implement CDOLazyPackageRegistryDefImpl.createInstance()
+ throw new UnsupportedOperationException();
+ // return addPackages(CDOUtil.createLazyPackageRegistry());
}
} // LazyPackageRegistryDefImpl
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 98b6e26aa5..0c2ef6d2e4 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
@@ -22,7 +22,6 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -202,7 +201,9 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
*/
protected Object createInstance()
{
- return addPackages(new EPackageRegistryImpl());
+ // TODO: implement CDOPackageRegistryDefImpl.createInstance()
+ throw new UnsupportedOperationException();
+ // return addPackages(new CDOPackageRegistryImpl());
}
/**
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 614a97da5c..51b5c717cd 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
@@ -11,13 +11,13 @@
*/
package org.eclipse.emf.cdo.defs.impl;
+import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.defs.CDODefsPackage;
import org.eclipse.emf.cdo.defs.CDOPackageRegistryDef;
import org.eclipse.emf.cdo.defs.CDOSessionDef;
import org.eclipse.emf.cdo.defs.FailOverStrategyDef;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
-import org.eclipse.emf.cdo.session.CDOPackageRegistry;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.internal.cdo.session.CDOSessionConfigurationImpl;
@@ -98,7 +98,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
* @generated
* @ordered
*/
- protected CDOPackageRegistryDef cdoPackageRegistryDef;
+ protected CDOPackageRegistryDef ePackageRegistryDef;
/**
* The default value of the '{@link #isLegacySupportEnabled() <em>Legacy Support Enabled</em>}' attribute. <!--
@@ -285,18 +285,18 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
*/
public CDOPackageRegistryDef getCdoPackageRegistryDef()
{
- if (cdoPackageRegistryDef != null && cdoPackageRegistryDef.eIsProxy())
+ if (ePackageRegistryDef != null && ePackageRegistryDef.eIsProxy())
{
- InternalEObject oldCdoPackageRegistryDef = (InternalEObject)cdoPackageRegistryDef;
- cdoPackageRegistryDef = (CDOPackageRegistryDef)eResolveProxy(oldCdoPackageRegistryDef);
- if (cdoPackageRegistryDef != oldCdoPackageRegistryDef)
+ InternalEObject oldCdoPackageRegistryDef = (InternalEObject)ePackageRegistryDef;
+ ePackageRegistryDef = (CDOPackageRegistryDef)eResolveProxy(oldCdoPackageRegistryDef);
+ if (ePackageRegistryDef != 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, ePackageRegistryDef));
}
}
- return cdoPackageRegistryDef;
+ return ePackageRegistryDef;
}
/**
@@ -306,7 +306,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
*/
public CDOPackageRegistryDef basicGetCdoPackageRegistryDef()
{
- return cdoPackageRegistryDef;
+ return ePackageRegistryDef;
}
/**
@@ -316,11 +316,11 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
*/
public void setCdoPackageRegistryDef(CDOPackageRegistryDef newCdoPackageRegistryDef)
{
- CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
- cdoPackageRegistryDef = newCdoPackageRegistryDef;
+ CDOPackageRegistryDef oldCdoPackageRegistryDef = ePackageRegistryDef;
+ ePackageRegistryDef = newCdoPackageRegistryDef;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF,
- oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+ oldCdoPackageRegistryDef, ePackageRegistryDef));
}
/**
@@ -545,7 +545,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null : !REPOSITORY_NAME_EDEFAULT
.equals(repositoryName);
case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
- return cdoPackageRegistryDef != null;
+ return ePackageRegistryDef != null;
case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
return legacySupportEnabled != LEGACY_SUPPORT_ENABLED_EDEFAULT;
case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
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 f01c12f92c..b550865ad6 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
@@ -201,4 +201,4 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
CheckUtil.checkState(eIsSet(CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI), "resource uri not set!");
}
-} // DynamicCDOPackageDefImpl
+} // DynamicEPackageDefImpl
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 15d960cdc9..4e897a8b76 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
@@ -195,4 +195,4 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
&& URI.create(getNsURI()) != null, "nsURI not set or not valid!");
}
-} // CDOPackageDefImpl
+} // EPackageDefImpl
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 7dc1d8f1f2..b3979db997 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
@@ -178,10 +178,10 @@ public class CDODefsSwitch<T>
}
case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF:
{
- CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject;
- T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef);
+ CDOPackageRegistryDef ePackageRegistryDef = (CDOPackageRegistryDef)theEObject;
+ T result = caseCDOPackageRegistryDef(ePackageRegistryDef);
if (result == null)
- result = caseDef(cdoPackageRegistryDef);
+ result = caseDef(ePackageRegistryDef);
if (result == null)
result = defaultCase(theEObject);
return result;
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java
index e118794065..b707837881 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java
@@ -28,36 +28,36 @@ import java.util.Date;
*/
public class CDODefsUtil
{
- public static CDOSessionDef createSessionDef(String repositoryName, CDOPackageRegistryDef cdoPackageRegistryDef,
+ public static CDOSessionDef createSessionDef(String repositoryName, CDOPackageRegistryDef ePackageRegistryDef,
TCPConnectorDef tcpConnectorDef)
{
CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
cdoSessionDef.setConnectorDef(tcpConnectorDef);
cdoSessionDef.setRepositoryName(repositoryName);
- cdoSessionDef.setCdoPackageRegistryDef(cdoPackageRegistryDef);
+ cdoSessionDef.setCdoPackageRegistryDef(ePackageRegistryDef);
return cdoSessionDef;
}
- public static CDOSessionDef createSessionDef(String repositoryName, CDOPackageRegistryDef cdoPackageRegistryDef,
+ public static CDOSessionDef createSessionDef(String repositoryName, CDOPackageRegistryDef ePackageRegistryDef,
FailOverStrategyDef failOverStrategyDef)
{
CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef();
cdoSessionDef.setFailOverStrategyDef(failOverStrategyDef);
cdoSessionDef.setRepositoryName(repositoryName);
- cdoSessionDef.setCdoPackageRegistryDef(cdoPackageRegistryDef);
+ cdoSessionDef.setCdoPackageRegistryDef(ePackageRegistryDef);
return cdoSessionDef;
}
public static CDOPackageRegistryDef createEagerPackageRegistryDef()
{
- CDOPackageRegistryDef cdoPackageRegistryDef = CDODefsFactory.eINSTANCE.createCDOEagerPackageRegistryDef();
- return cdoPackageRegistryDef;
+ CDOPackageRegistryDef ePackageRegistryDef = CDODefsFactory.eINSTANCE.createCDOEagerPackageRegistryDef();
+ return ePackageRegistryDef;
}
public static CDOPackageRegistryDef createLazyPackageRegistryDef()
{
- CDOPackageRegistryDef cdoPackageRegistryDef = CDODefsFactory.eINSTANCE.createCDOLazyPackageRegistryDef();
- return cdoPackageRegistryDef;
+ CDOPackageRegistryDef ePackageRegistryDef = CDODefsFactory.eINSTANCE.createCDOLazyPackageRegistryDef();
+ return ePackageRegistryDef;
}
public static CDOAuditDef createCDOAuditDef(CDOSessionDef cdoSessionDef)

Back to the top