Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.mango')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java6
12 files changed, 22 insertions, 33 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
index aa4ca9f3db..bfb8a0c26c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mango"
- nsURI="http://www.eclipse.org/emf/CDO/tests/mango" nsPrefix="mango">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mango" nsURI="http://www.eclipse.org/emf/CDO/tests/mango" nsPrefix="mango">
<eClassifiers xsi:type="ecore:EClass" name="MangoValueList">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
index b0c971b1b5..ddba803b07 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory="" editorDirectory=""
- modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass=""
- updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
- reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory=""
+ editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango"
+ modelPluginClass="" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+ reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
runtimeVersion="2.6">
<foreignModel>mango.ecore</foreignModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel
index 985705eb1d..8e629cbc00 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation"
modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory="" editorDirectory=""
modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass=""
- updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+ updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="" runtimeVersion="2.6">
<foreignModel>mango.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
index a50d1c1896..06d3a661ed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface MangoParameter extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter_Name()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter_Name()
* @model
* @generated
*/
@@ -65,7 +65,7 @@ public interface MangoParameter extends EObject
* @return the value of the '<em>Passing</em>' attribute.
* @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
* @see #setPassing(ParameterPassing)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter_Passing()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter_Passing()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
index 9fe321a610..c72ebb9925 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValue()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue()
* @model
* @generated
*/
@@ -37,7 +37,7 @@ public interface MangoValue extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValue_Name()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
index d50cdfd669..af9213c687 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface MangoValueList extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList_Name()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Name()
* @model
* @generated
*/
@@ -64,7 +64,7 @@ public interface MangoValueList extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Values</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList_Values()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Values()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
index a7ef203bc7..ee9b4b2421 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Parameter Passing</b></em>', and
* utility methods for working with them. <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getParameterPassing()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameterPassing()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
index 2d8de16a9a..cca8ca233e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
@@ -154,10 +154,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
{
ParameterPassing result = ParameterPassing.get(initialValue);
if (result == null)
- {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ eDataType.getName() + "'");
- }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
index b7b3340c1b..fe44f8007f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
@@ -163,10 +163,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
{
ParameterPassing result = ParameterPassing.get(initialValue);
if (result == null)
- {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ eDataType.getName() + "'");
- }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
index ff86abc72b..7008a78859 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.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.mango.legacy.util;
+//import org.eclipse.emf.cdo.tests.mango.*;
import org.eclipse.emf.cdo.tests.mango.MangoParameter;
import org.eclipse.emf.cdo.tests.mango.MangoValue;
import org.eclipse.emf.cdo.tests.mango.MangoValueList;
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
index ed52477721..c442cfba03 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.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
*/
@@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.mango.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
index 003b46aafe..95ec0067e9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
@@ -97,9 +97,7 @@ public class MangoSwitch<T>
MangoValueList mangoValueList = (MangoValueList)theEObject;
T result = caseMangoValueList(mangoValueList);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case MangoPackage.MANGO_VALUE:
@@ -107,9 +105,7 @@ public class MangoSwitch<T>
MangoValue mangoValue = (MangoValue)theEObject;
T result = caseMangoValue(mangoValue);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case MangoPackage.MANGO_PARAMETER:
@@ -117,9 +113,7 @@ public class MangoSwitch<T>
MangoParameter mangoParameter = (MangoParameter)theEObject;
T result = caseMangoParameter(mangoParameter);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:

Back to the top