Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-10-19 04:16:23 -0400
committerEike Stepper2008-10-19 04:16:23 -0400
commit6c7ab2a44332a6ef1ebc3188bc1c674c2056c83e (patch)
treed162b341f4b9e944d3552ad9e732f22ed269b50e /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util
parent0f58816f3277f791aa8b9e8c9e39fe036c5286bd (diff)
downloadcdo-6c7ab2a44332a6ef1ebc3188bc1c674c2056c83e.tar.gz
cdo-6c7ab2a44332a6ef1ebc3188bc1c674c2056c83e.tar.xz
cdo-6c7ab2a44332a6ef1ebc3188bc1c674c2056c83e.zip
some refactorings
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java20
2 files changed, 12 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
index acb80fc76b..a6e8153c60 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDMetaRange;
import org.eclipse.emf.cdo.common.model.CDOPackage;
import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
import org.eclipse.emf.cdo.spi.common.InternalCDOPackage;
-import org.eclipse.emf.cdo.util.CDOEMFUtil;
+import org.eclipse.emf.cdo.util.EMFUtil;
import org.eclipse.emf.cdo.util.CDOPackageRegistry;
import org.eclipse.emf.cdo.util.CDOPackageType;
import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry;
@@ -127,7 +127,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements CDOP
if (value instanceof EPackageImpl)
{
EPackageImpl ePackage = (EPackageImpl)value;
- if (CDOEMFUtil.isDynamicEPackage(ePackage))
+ if (EMFUtil.isDynamicEPackage(ePackage))
{
ModelUtil.prepareDynamicEPackage(ePackage);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
index 1384bea8a1..44c5b02dd3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.spi.common.InternalCDOClass;
import org.eclipse.emf.cdo.spi.common.InternalCDOFeature;
import org.eclipse.emf.cdo.spi.common.InternalCDOPackage;
-import org.eclipse.emf.cdo.util.CDOEMFUtil;
+import org.eclipse.emf.cdo.util.EMFUtil;
import org.eclipse.emf.cdo.util.CDOPackageRegistry;
import org.eclipse.emf.internal.cdo.CDOFactoryImpl;
@@ -130,7 +130,7 @@ public final class ModelUtil
public static void initializeCDOPackage(EPackage ePackage, CDOPackage cdoPackage)
{
((InternalCDOPackage)cdoPackage).setClientInfo(ePackage);
- for (EClass eClass : CDOEMFUtil.getPersistentClasses(ePackage))
+ for (EClass eClass : EMFUtil.getPersistentClasses(ePackage))
{
CDOClass cdoClass = createCDOClass(eClass, cdoPackage);
((InternalCDOPackage)cdoPackage).addClass(cdoClass);
@@ -184,7 +184,7 @@ public final class ModelUtil
}
/**
- * @see CDOEMFUtil#getPersistentFeatures(org.eclipse.emf.common.util.EList)
+ * @see EMFUtil#getPersistentFeatures(org.eclipse.emf.common.util.EList)
* @see http://www.eclipse.org/newsportal/article.php?id=26780&group=eclipse.tools.emf#26780
*/
private static CDOPackage createCDOPackage(EPackage ePackage, CDOSessionPackageManagerImpl packageManager)
@@ -193,7 +193,7 @@ public final class ModelUtil
String uri = ePackage.getNsURI();
String parentURI = getParentURI(ePackage);
String name = ePackage.getName();
- boolean dynamic = CDOEMFUtil.isDynamicEPackage(ePackage);
+ boolean dynamic = EMFUtil.isDynamicEPackage(ePackage);
String ecore = null;
CDOIDMetaRange idRange = null;
@@ -201,7 +201,7 @@ public final class ModelUtil
{
if (!EcorePackage.eINSTANCE.getNsURI().equals(uri))
{
- ecore = CDOEMFUtil.ePackageToString(ePackage, session.getPackageRegistry());
+ ecore = EMFUtil.ePackageToString(ePackage, session.getPackageRegistry());
}
idRange = session.registerEPackage(ePackage);
@@ -227,7 +227,7 @@ public final class ModelUtil
// Bugs: 247978 Make sure featureIndex are properly set for dynamic classes
eClass.getEAllStructuralFeatures();
- for (EStructuralFeature eFeature : CDOEMFUtil.getPersistentFeatures(eClass.getEStructuralFeatures()))
+ for (EStructuralFeature eFeature : EMFUtil.getPersistentFeatures(eClass.getEStructuralFeatures()))
{
CDOFeature cdoFeature = createCDOFeature(eFeature, cdoClass);
cdoClass.addFeature(cdoFeature);
@@ -238,7 +238,7 @@ public final class ModelUtil
private static CDOFeature createCDOFeature(EStructuralFeature eFeature, CDOClass containingClass)
{
- InternalCDOFeature cdoFeature = (InternalCDOFeature)(CDOEMFUtil.isReference(eFeature) ? createCDOReference(
+ InternalCDOFeature cdoFeature = (InternalCDOFeature)(EMFUtil.isReference(eFeature) ? createCDOReference(
(EReference)eFeature, containingClass) : createCDOAttribute((EAttribute)eFeature, containingClass));
cdoFeature.setClientInfo(eFeature);
return cdoFeature;
@@ -251,7 +251,7 @@ public final class ModelUtil
String name = eFeature.getName();
CDOClassRef classRef = createClassRef(eFeature.getEType());
boolean many = eFeature.isMany();
- boolean containment = CDOEMFUtil.isContainment(eFeature);
+ boolean containment = EMFUtil.isContainment(eFeature);
CDOFeature cdoFeature = CDOModelUtil.createReference(containingClass, featureID, name, new CDOClassProxy(classRef,
packageManager), many, containment);
@@ -270,7 +270,7 @@ public final class ModelUtil
int featureID = eFeature.getFeatureID();
String name = eFeature.getName();
CDOType type = getCDOType(eFeature);
- boolean many = CDOEMFUtil.isMany(eFeature);
+ boolean many = EMFUtil.isMany(eFeature);
return CDOModelUtil.createAttribute(containingClass, featureID, name, type, many);
}
@@ -347,7 +347,7 @@ public final class ModelUtil
{
CDOPackage topLevelPackage = cdoPackage.getTopLevelPackage();
String ecore = topLevelPackage.getEcore();
- EPackageImpl topLevelPackageEPackage = (EPackageImpl)CDOEMFUtil.ePackageFromString(ecore);
+ EPackageImpl topLevelPackageEPackage = (EPackageImpl)EMFUtil.ePackageFromString(ecore);
EPackageImpl ePackage = prepareDynamicEPackage(topLevelPackageEPackage, cdoPackage.getPackageURI());
return ePackage;
}

Back to the top