From 48791c63b845135e716ef9cbb35285b3874f49eb Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Mon, 7 Jan 2013 10:03:51 +0100
Subject: ant
---
.../.settings/org.eclipse.core.resources.prefs | 2 +-
.../model/interfaces.ecore | 70 ----------------------
.../model/interfaces.genmodel | 56 -----------------
.../model/interfaces.legacy.genmodel | 56 -----------------
.../model/model4interfaces.ecore | 69 +++++++++++++++++++++
.../model/model4interfaces.genmodel | 54 +++++++++++++++++
.../model/model4interfaces.legacy.genmodel | 56 +++++++++++++++++
.../IContainedElementNoParentLink.java | 2 +-
.../IMultiRefContainedElement.java | 2 +-
.../tests/model4interfaces/IMultiRefContainer.java | 2 +-
.../model4interfaces/IMultiRefContainerNPL.java | 4 +-
.../IMultiRefNonContainedElement.java | 2 +-
.../model4interfaces/IMultiRefNonContainer.java | 4 +-
.../model4interfaces/IMultiRefNonContainerNPL.java | 4 +-
.../cdo/tests/model4interfaces/INamedElement.java | 4 +-
.../ISingleRefContainedElement.java | 2 +-
.../model4interfaces/ISingleRefContainer.java | 2 +-
.../model4interfaces/ISingleRefContainerNPL.java | 4 +-
.../ISingleRefNonContainedElement.java | 2 +-
.../model4interfaces/ISingleRefNonContainer.java | 2 +-
.../ISingleRefNonContainerNPL.java | 4 +-
.../util/model4interfacesAdapterFactory.java | 3 +-
.../legacy/util/model4interfacesSwitch.java | 4 +-
.../util/model4interfacesSwitch.java | 28 ---------
24 files changed, 205 insertions(+), 233 deletions(-)
delete mode 100644 plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore
delete mode 100644 plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
delete mode 100644 plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel
create mode 100644 plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore
create mode 100644 plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel
create mode 100644 plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel
(limited to 'plugins/org.eclipse.emf.cdo.tests.model4interfaces')
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs
index 845a3b0679..c00c29ffbe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
-encoding//model/interfaces.legacy.genmodel=UTF-8
+encoding//model/model4interfaces.legacy.genmodel=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore
deleted file mode 100644
index 71b02acaf8..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
deleted file mode 100644
index dd30ee38a4..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- interfaces.ecore
- CDO=org.eclipse.emf.cdo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel
deleted file mode 100644
index c10f40b611..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- interfaces.ecore
- CDO=org.eclipse.emf.cdo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore
new file mode 100644
index 0000000000..65cc861667
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel
new file mode 100644
index 0000000000..415b72a6be
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel
@@ -0,0 +1,54 @@
+
+
+ model4interfaces.ecore
+ CDO=org.eclipse.emf.cdo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel
new file mode 100644
index 0000000000..b4e3f1331b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel
@@ -0,0 +1,56 @@
+
+
+ model4interfaces.ecore
+ CDO=org.eclipse.emf.cdo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
index 20ec12be87..93b14b911d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIContainedElementNoParentLink()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIContainedElementNoParentLink()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
index 9541a1f429..6728ca5d82 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
index 9465af8865..1710ba36a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainer()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
index 0f7cab5dcb..3fb0555e9f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -40,7 +40,7 @@ public interface IMultiRefContainerNPL extends EObject
*
*
* @return the value of the 'Elements' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
index 347f338e55..ac2f3652ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
index 9b2440b63e..dac47cc552 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer()
* @model interface="true" abstract="true"
* @generated
*/
@@ -41,7 +41,7 @@ public interface IMultiRefNonContainer extends EObject
*
*
* @return the value of the 'Elements' reference list.
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainer_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer_Elements()
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent
* @model opposite="parent"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
index a3c87be379..afaa8a4800 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -40,7 +40,7 @@ public interface IMultiRefNonContainerNPL extends EObject
*
*
* @return the value of the 'Elements' reference list.
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
index 8d5869e6ad..912bbc897e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getINamedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement()
* @model interface="true" abstract="true"
* @generated
*/
@@ -37,7 +37,7 @@ public interface INamedElement extends EObject
*
* @return the value of the 'Name' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getINamedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
index 09c3f14826..73c7ff95a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
index b48c1beb63..a7b5caac5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainer()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
index 4f1892c479..71173aacaa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -39,7 +39,7 @@ public interface ISingleRefContainerNPL extends EObject
*
* @return the value of the 'Element' containment reference.
* @see #setElement(IContainedElementNoParentLink)
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainerNPL_Element()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL_Element()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
index 5740280a28..b9a0591363 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
index 108b8d7db1..eb3cb4e51f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainer()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
index 2cea409e79..28a57e4840 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -39,7 +39,7 @@ public interface ISingleRefNonContainerNPL extends EObject
*
* @return the value of the 'Element' reference.
* @see #setElement(IContainedElementNoParentLink)
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java
index 85c8add074..76b4c18a1e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java
@@ -4,12 +4,13 @@
* 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.cdo.tests.model4interfaces.legacy.util;
+//import org.eclipse.emf.cdo.tests.model4interfaces.*;
import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
index 00e95962bc..c1a7d90f6e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.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:
* Eike Stepper - initial API and implementation
*/
@@ -31,6 +31,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.model4interfaces.*;
+
/**
*
* The Switch for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
index a0734f643c..8d0bf4a913 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
@@ -108,9 +108,7 @@ public class model4interfacesSwitch
ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
T result = caseISingleRefContainer(iSingleRefContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
@@ -118,9 +116,7 @@ public class model4interfacesSwitch
ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
T result = caseISingleRefContainedElement(iSingleRefContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
@@ -128,9 +124,7 @@ public class model4interfacesSwitch
ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
T result = caseISingleRefNonContainer(iSingleRefNonContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -138,9 +132,7 @@ public class model4interfacesSwitch
ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_CONTAINER:
@@ -148,9 +140,7 @@ public class model4interfacesSwitch
IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
T result = caseIMultiRefContainer(iMultiRefContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
@@ -158,9 +148,7 @@ public class model4interfacesSwitch
IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
@@ -168,9 +156,7 @@ public class model4interfacesSwitch
IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
@@ -178,9 +164,7 @@ public class model4interfacesSwitch
IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.INAMED_ELEMENT:
@@ -188,9 +172,7 @@ public class model4interfacesSwitch
INamedElement iNamedElement = (INamedElement)theEObject;
T result = caseINamedElement(iNamedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
@@ -198,9 +180,7 @@ public class model4interfacesSwitch
IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
@@ -208,9 +188,7 @@ public class model4interfacesSwitch
ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
@@ -218,9 +196,7 @@ public class model4interfacesSwitch
ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
@@ -228,9 +204,7 @@ public class model4interfacesSwitch
IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
@@ -238,9 +212,7 @@ public class model4interfacesSwitch
IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
--
cgit v1.2.3