resources = resourceSet.getResources();
+ // for (Resource resource : resources.toArray(new Resource[resources.size()]))
+ // {
+ // if (resource instanceof CDOResource)
+ // {
+ // CDOResource cdoResource = (CDOResource)resource;
+ // String path = cdoResource.getPath();
+ // // if (ObjectUtil.equals(path, oldPath))
+ // // {
+ // // // Don't handle *this* node
+ // // continue;
+ // // }
+ //
+ // if (path.startsWith(oldPath))
+ // {
+ // }
+ // }
+ // }
+ }
+
+ /**
+ * @ADDED
+ */
+ private void checkDuplicates(String newPath)
+ {
+ try
+ {
+ cdoView().getResourceID(newPath);
+ }
+ catch (Exception ex)
+ {
+ throw new CDOException("Duplicate path: " + newPath);
+ }
+ }
} // CDOResourceNodeImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
index d15d3a6cdb..9ac655f3d0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource.impl;
+import org.eclipse.emf.cdo.eresource.*;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.EresourceFactory;
@@ -25,14 +26,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
* An implementation of the model Factory.
- *
* @generated
*/
public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory
{
/**
- * Creates the default factory implementation.
- *
+ * Creates the default factory implementation.
+ *
* @generated
*/
public static EresourceFactory init()
@@ -54,8 +54,8 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
}
/**
- * Creates an instance of the factory.
- *
+ * Creates an instance of the factory.
+ *
* @generated
*/
public EresourceFactoryImpl()
@@ -65,7 +65,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
*
- *
* @generated
*/
@Override
@@ -74,9 +73,9 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
switch (eClass.getClassifierID())
{
case EresourcePackage.CDO_RESOURCE_FOLDER:
- return createCDOResourceFolder();
+ return (EObject)createCDOResourceFolder();
case EresourcePackage.CDO_RESOURCE:
- return createCDOResource();
+ return (EObject)createCDOResource();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -84,7 +83,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
*
- *
* @generated
*/
@Override
@@ -101,7 +99,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
*
- *
* @generated
*/
@Override
@@ -130,7 +127,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
*
- *
* @generated
*/
public CDOResource createCDOResource()
@@ -161,7 +157,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
*
- *
* @generated
*/
public EresourcePackage getEresourcePackage()
@@ -171,7 +166,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
*
- *
* @deprecated
* @generated
*/
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 0945a393d0..0dfb9ef2e3 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
@@ -28,49 +28,42 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
/**
* An implementation of the model Package.
- *
* @generated
*/
public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage
{
/**
*
- *
* @generated
*/
private EClass cdoResourceNodeEClass = null;
/**
*
- *
* @generated
*/
private EClass cdoResourceFolderEClass = null;
/**
*
- *
* @generated
*/
private EClass cdoResourceEClass = null;
/**
*
- *
* @generated
*/
private EDataType resourceSetEDataType = null;
/**
*
- *
* @generated
*/
private EDataType uriEDataType = null;
/**
*
- *
* @generated
*/
private EDataType diagnosticEDataType = null;
@@ -95,24 +88,27 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
- * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
- * method drives initialization for interdependent packages directly, in parallel with this package, itself.
- *
- * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
- * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
- * packages are created before any are initialized, since one package's meta-model objects may refer to those of
- * another.
- *
- * Invocation of this method will not affect any packages that have already been initialized.
+ * Creates, registers, and initializes the Package for this
+ * model, and for any others upon which it depends. Simple
+ * dependencies are satisfied by calling this method on all
+ * dependent packages before doing anything else. This method drives
+ * initialization for interdependent packages directly, in parallel
+ * with this package, itself.
+ *
Of this package and its interdependencies, all packages which
+ * have not yet been registered by their URI values are first created
+ * and registered. The packages are then initialized in two steps:
+ * meta-model objects for all of the packages are created before any
+ * are initialized, since one package's meta-model objects may refer to
+ * those of another.
+ *
Invocation of this method will not affect any packages that have
+ * already been initialized.
+ *
*
- *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -121,9 +117,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
public static EresourcePackage init()
{
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
@@ -215,7 +209,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EClass getCDOResource()
@@ -225,7 +218,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_ResourceSet()
@@ -235,7 +227,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_URI()
@@ -245,7 +236,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EReference getCDOResource_Contents()
@@ -255,7 +245,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_Modified()
@@ -265,7 +254,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_Loaded()
@@ -275,7 +263,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_TrackingModification()
@@ -285,7 +272,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_Errors()
@@ -295,7 +281,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_Warnings()
@@ -305,7 +290,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EAttribute getCDOResource_TimeStamp()
@@ -315,7 +299,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EDataType getResourceSet()
@@ -325,7 +308,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EDataType getURI()
@@ -335,7 +317,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EDataType getDiagnostic()
@@ -345,7 +326,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
public EresourceFactory getEresourceFactory()
@@ -355,23 +335,20 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
- * first.
- *
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ *
* @generated
*/
public void createPackageContents()
{
if (isCreated)
- {
return;
- }
isCreated = true;
// Create classes and their features
@@ -402,23 +379,20 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
*
- *
* @generated
*/
private boolean isInitialized = false;
/**
- * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
- * invocation but its first.
- *
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ *
* @generated
*/
public void initializePackageContents()
{
if (isInitialized)
- {
return;
- }
isInitialized = true;
// Initialize package
@@ -434,32 +408,32 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
// Set bounds for type parameters
// Add supertypes to classes
- cdoResourceFolderEClass.getESuperTypes().add(getCDOResourceNode());
- cdoResourceEClass.getESuperTypes().add(getCDOResourceNode());
+ cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode());
+ cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode());
// Initialize classes and features; add operations and parameters
initEClass(cdoResourceNodeEClass, CDOResourceNode.class, "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCDOResourceNode_Folder(), getCDOResourceFolder(), getCDOResourceFolder_Nodes(), "folder", null,
- 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCDOResourceNode_Folder(), this.getCDOResourceFolder(), this.getCDOResourceFolder_Nodes(),
+ "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResourceNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, CDOResourceNode.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResourceNode_Path(), ecorePackage.getEString(), "path", null, 0, 1, CDOResourceNode.class,
- IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEClass(cdoResourceFolderEClass, CDOResourceFolder.class, "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCDOResourceFolder_Nodes(), getCDOResourceNode(), getCDOResourceNode_Folder(), "nodes", null, 0,
- -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCDOResourceFolder_Nodes(), this.getCDOResourceNode(), this.getCDOResourceNode_Folder(), "nodes",
+ null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCDOResource_ResourceSet(), getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
+ initEAttribute(getCDOResource_ResourceSet(), this.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(), 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(), this.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);
@@ -470,9 +444,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(), 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,
+ 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,
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/EresourceAdapterFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java
index b682d6a099..6ac82ece25 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource.util;
+import org.eclipse.emf.cdo.eresource.*;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
@@ -23,22 +24,21 @@ import org.eclipse.emf.ecore.EObject;
/**
* The Adapter Factory for the model. It provides an adapter createXXX
* method for each class of the model.
- *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage
* @generated
*/
public class EresourceAdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package.
- *
+ * The cached model package.
+ *
* @generated
*/
protected static EresourcePackage modelPackage;
/**
- * Creates an instance of the adapter factory.
- *
+ * Creates an instance of the adapter factory.
+ *
* @generated
*/
public EresourceAdapterFactory()
@@ -50,10 +50,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Returns whether this factory is applicable for the type of the object. This implementation
+ * Returns whether this factory is applicable for the type of the object.
+ * This implementation
* returns true if the object is either the model's package or is an instance object of the model.
- *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -72,8 +72,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * The switch that delegates to the createXXX methods.
- *
+ * The switch that delegates to the createXXX methods.
+ *
* @generated
*/
protected EresourceSwitch modelSwitch = new EresourceSwitch()
@@ -104,10 +104,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
};
/**
- * Creates an adapter for the target.
- *
- * @param target
- * the object to adapt.
+ * Creates an adapter for the target.
+ *
+ * @param target the object to adapt.
* @return the adapter for the target.
* @generated
*/
@@ -118,8 +117,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode
- * CDO Resource Node}'. This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode CDO Resource Node}'.
+ * 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.
*
* @since 2.0
@@ -133,8 +132,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder
- * CDO Resource Folder}'. This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder CDO Resource Folder}'.
+ * 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.
*
* @since 2.0
@@ -148,10 +147,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource
- * CDO Resource}'. This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource CDO Resource}'.
+ * 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.
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.eresource.CDOResource
* @generated
@@ -162,9 +160,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case. This default implementation returns null. This default implementation returns null.
- *
* @return the new adapter.
* @generated
*/
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 6075a7f16e..76ef67a35c 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
@@ -19,28 +19,28 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import java.util.List;
+import org.eclipse.emf.cdo.eresource.*;
/**
* The Switch for the model's inheritance hierarchy. It supports the call
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the caseXXX 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.
- *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage
* @generated
*/
public class EresourceSwitch
{
/**
- * The cached model package
- *
+ * The cached model package
+ *
* @generated
*/
protected static EresourcePackage modelPackage;
/**
- * Creates an instance of the switch.
- *
+ * Creates an instance of the switch.
+ *
* @generated
*/
public EresourceSwitch()
@@ -54,7 +54,6 @@ public class EresourceSwitch
/**
* Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
*
- *
* @return the first non-null result returned by a caseXXX call.
* @generated
*/
@@ -66,7 +65,6 @@ public class EresourceSwitch
/**
* Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
*
- *
* @return the first non-null result returned by a caseXXX call.
* @generated
*/
@@ -86,7 +84,6 @@ public class EresourceSwitch
/**
* Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
*
- *
* @return the first non-null result returned by a caseXXX call.
* @generated
*/
@@ -99,9 +96,7 @@ public class EresourceSwitch
CDOResourceNode cdoResourceNode = (CDOResourceNode)theEObject;
T result = caseCDOResourceNode(cdoResourceNode);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case EresourcePackage.CDO_RESOURCE_FOLDER:
@@ -109,13 +104,9 @@ public class EresourceSwitch
CDOResourceFolder cdoResourceFolder = (CDOResourceFolder)theEObject;
T result = caseCDOResourceFolder(cdoResourceFolder);
if (result == null)
- {
result = caseCDOResourceNode(cdoResourceFolder);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case EresourcePackage.CDO_RESOURCE:
@@ -123,13 +114,9 @@ public class EresourceSwitch
CDOResource cdoResource = (CDOResource)theEObject;
T result = caseCDOResource(cdoResource);
if (result == null)
- {
result = caseCDOResourceNode(cdoResource);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
@@ -138,12 +125,12 @@ public class EresourceSwitch
}
/**
- * Returns the result of interpreting the object as an instance of 'CDO Resource Node'. This implementation returns null; returning a non-null result will terminate the switch.
*
* @since 2.0
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of 'CDO Resource Node'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -154,12 +141,12 @@ public class EresourceSwitch
}
/**
- * Returns the result of interpreting the object as an instance of 'CDO Resource Folder'. This implementation returns null; returning a non-null result will terminate the switch.
*
* @since 2.0
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of 'CDO Resource Folder'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -170,11 +157,10 @@ public class EresourceSwitch
}
/**
- * Returns the result of interpreting the object as an instance of 'CDO Resource'.
+ * Returns the result of interpreting the object as an instance of 'CDO Resource'.
+ *
* This implementation returns null; returning a non-null result will terminate the switch.
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of 'CDO Resource'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -185,12 +171,11 @@ public class EresourceSwitch
}
/**
- * Returns the result of interpreting the object as an instance of 'EObject'. This
+ * Returns the result of interpreting the object as an instance of 'EObject'.
+ * This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway.
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of 'EObject'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
index cdd1dfb691..5ae27d134c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
import org.eclipse.emf.cdo.eresource.EresourceFactory;
import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
+import org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl;
import org.eclipse.emf.cdo.spi.common.InternalCDOPackage;
import org.eclipse.emf.cdo.spi.common.InternalCDORevision;
import org.eclipse.emf.cdo.spi.common.InternalCDORevisionDelta;
@@ -236,6 +237,16 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
List names = CDOURIUtil.analyzePath(uri);
String resourceName = names.isEmpty() ? null : names.remove(names.size() - 1);
+ CDOResourceFolder folder = getOrCreateResourceFolder(names);
+ attachNewResourceNode(folder, resourceName, resource);
+ }
+
+ /**
+ * @return never null;
+ * @since 2.0
+ */
+ public CDOResourceFolder getOrCreateResourceFolder(List names)
+ {
CDOResourceFolder folder = null;
for (String name : names)
{
@@ -262,26 +273,27 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
}
}
- attachNewResourceNode(folder, resourceName, resource);
+ return folder;
}
private void attachNewResourceNode(CDOResourceFolder folder, String name, CDOResourceNode newNode)
{
- newNode.setName(name);
+ CDOResourceNodeImpl node = (CDOResourceNodeImpl)newNode;
+ node.basicSetName(name, false);
if (folder == null)
{
- if (newNode.isRoot())
+ if (node.isRoot())
{
- CDOStateMachine.INSTANCE.attach((InternalCDOObject)newNode, this);
+ CDOStateMachine.INSTANCE.attach(node, this);
}
else
{
- getRootResource().getContents().add(newNode);
+ getRootResource().getContents().add(node);
}
}
else
{
- newNode.setFolder(folder);
+ node.basicSetFolder(folder, false);
}
}
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 3747c3acd4..6e92d99b73 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
@@ -340,9 +340,10 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
}
/**
+ * @return never null
* @since 2.0
*/
- protected CDOID getResourceID(String path)
+ public CDOID getResourceID(String path)
{
if (StringUtil.isEmpty(path))
{
@@ -366,6 +367,9 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
return folderID;
}
+ /**
+ * @retrn never null
+ */
private CDOID getResourceID(CDOID folderID, String name)
{
folderID = getResourceNodeID(folderID, name);
@@ -373,6 +377,7 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
{
throw new CDOException("Can not find " + name);
}
+
return folderID;
}
@@ -496,8 +501,11 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
}
/**
+ * TODO Remove me
+ *
* @since 2.0
*/
+ @Deprecated
public CDOResourceFolder getResourceFolder(String path)
{
if (path == null)
@@ -805,7 +813,7 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
protected void cleanObject(InternalCDOObject object, InternalCDORevision revision)
{
object.cdoInternalCleanup();
-
+
object.cdoInternalSetView(this);
object.cdoInternalSetRevision(revision);
object.cdoInternalSetID(revision.getID());
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index 254289eee5..2b4d43a2bb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -28,22 +28,17 @@ import org.eclipse.emf.internal.cdo.CDOViewImpl;
import org.eclipse.emf.internal.cdo.CDOViewSetImpl;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
-import org.eclipse.net4j.util.ImplementationError;
-
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EGenericType;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Map;
/**
* @author Eike Stepper
@@ -281,22 +276,8 @@ public final class FSMUtil
synchronized (resourceSet)
{
viewSet = (CDOViewSetImpl)CDOUtil.getViewSet(resourceSet);
-
if (viewSet == null)
{
- if (resourceSet instanceof ResourceSetImpl)
- {
- Map resourceMap = null;
- ResourceSetImpl rs = (ResourceSetImpl)resourceSet;
- resourceMap = rs.getURIResourceMap();
- rs.setURIResourceMap(new ProxyResolverURIResourceMap(null, resourceMap));
- }
- else
- {
- throw new ImplementationError("Not a " + ResourceSetImpl.class.getName() + ": "
- + resourceSet.getClass().getName());
- }
-
viewSet = new CDOViewSetImpl();
resourceSet.eAdapters().add(viewSet);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java
deleted file mode 100644
index 1e4f98d4f1..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.internal.cdo.util;
-
-import org.eclipse.emf.internal.cdo.CDOViewImpl;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-final class ProxyResolverResource implements Resource
-{
- @SuppressWarnings("unused")
- private CDOViewImpl view;
-
- public ProxyResolverResource(CDOViewImpl view)
- {
- this.view = view;
- }
-
- /*
- * @ADDED Called by {@link ResourceSetImpl#getResource(URI, boolean)}
- */
- public boolean isLoaded()
- {
- return true;
- }
-
- /*
- * @ADDED Called by {@link ResourceSetImpl#getEObject(URI, boolean)}
- */
- public EObject getEObject(String uriFragment)
- {
- // TODO Implement me
- throw new UnsupportedOperationException("Not yet implemented");
- // CDOID id = CDOIDUtil.create(Long.parseLong(uriFragment));
- // InternalCDOObject object = view.getObject(id);
- // InternalEObject instance = object.cdoInternalInstance();
- // if (instance instanceof CDOAdapterImpl)
- // {
- // if (object.cdoState() == CDOState.PROXY)
- // {
- // object.cdoInternalPostLoad();
- // }
- // }
- //
- // return instance;
- }
-
- public TreeIterator getAllContents()
- {
- throw new UnsupportedOperationException();
- }
-
- public EList getContents()
- {
- throw new UnsupportedOperationException();
- }
-
- public EList getErrors()
- {
- throw new UnsupportedOperationException();
- }
-
- public ResourceSet getResourceSet()
- {
- throw new UnsupportedOperationException();
- }
-
- public URI getURI()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getURIFragment(EObject object)
- {
- throw new UnsupportedOperationException();
- }
-
- public void delete(Map options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public long getTimeStamp()
- {
- throw new UnsupportedOperationException();
- }
-
- public void setTimeStamp(long timeStamp)
- {
- throw new UnsupportedOperationException();
- }
-
- public EList getWarnings()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean isModified()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean isTrackingModification()
- {
- throw new UnsupportedOperationException();
- }
-
- public void load(Map options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public void load(InputStream inputStream, Map options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public void save(Map options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public void save(OutputStream outputStream, Map options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public void setModified(boolean isModified)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setTrackingModification(boolean isTrackingModification)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setURI(URI uri)
- {
- throw new UnsupportedOperationException();
- }
-
- public void unload()
- {
- throw new UnsupportedOperationException();
- }
-
- public EList eAdapters()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean eDeliver()
- {
- throw new UnsupportedOperationException();
- }
-
- public void eNotify(Notification notification)
- {
- throw new UnsupportedOperationException();
- }
-
- public void eSetDeliver(boolean deliver)
- {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java
deleted file mode 100644
index df14a5ede6..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.internal.cdo.util;
-
-import org.eclipse.emf.internal.cdo.CDOViewImpl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public final class ProxyResolverURIResourceMap implements Map
-{
- private Map delegate;
-
- private Resource proxyResolverResource;
-
- public ProxyResolverURIResourceMap(CDOViewImpl view, Map delegate)
- {
- if (delegate == null)
- {
- delegate = new HashMap(); // TODO Cleanup of this lookup
- // cache?
- }
-
- this.delegate = delegate;
- proxyResolverResource = new ProxyResolverResource(view);
- }
-
- public Resource get(Object key)
- {
- if (key instanceof URI)
- {
- URI uri = (URI)key;
- String scheme = uri.scheme();
- if ("cdo".equals(scheme))
- {
- String opaquePart = uri.opaquePart();
- if ("proxy".equals(opaquePart))
- {
- return proxyResolverResource;
- }
- }
- }
-
- return delegate.get(key);
- }
-
- public void clear()
- {
- delegate.clear();
- }
-
- public boolean containsKey(Object key)
- {
- return delegate.containsKey(key);
- }
-
- public boolean containsValue(Object value)
- {
- return delegate.containsValue(value);
- }
-
- public Set> entrySet()
- {
- return delegate.entrySet();
- }
-
- @Override
- public boolean equals(Object o)
- {
- return delegate.equals(o);
- }
-
- @Override
- public int hashCode()
- {
- return delegate.hashCode();
- }
-
- public boolean isEmpty()
- {
- return delegate.isEmpty();
- }
-
- public Set keySet()
- {
- return delegate.keySet();
- }
-
- public Resource put(URI key, Resource value)
- {
- return delegate.put(key, value);
- }
-
- public void putAll(Map t)
- {
- delegate.putAll(t);
- }
-
- public Resource remove(Object key)
- {
- return delegate.remove(key);
- }
-
- public int size()
- {
- return delegate.size();
- }
-
- public Collection values()
- {
- return delegate.values();
- }
-}
--
cgit v1.2.3