Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2015-03-26 04:58:32 -0400
committerEd Merks2015-03-28 03:00:59 -0400
commit1437f0b2ce8651a0566aaed6caaa5e1012c7cb51 (patch)
treeef736db03c612f1a0f3a6c07927df39d50882909 /examples/org.eclipse.emf.examples.databinding.project.core.model
parent5ce762d2b21c17b9ff4e9e7f8eae8cf038f3c9f8 (diff)
downloadorg.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.tar.gz
org.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.tar.xz
org.eclipse.emf-1437f0b2ce8651a0566aaed6caaa5e1012c7cb51.zip
[434699] Regenerate models
Diffstat (limited to 'examples/org.eclipse.emf.examples.databinding.project.core.model')
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel11
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java4
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java4
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java42
12 files changed, 30 insertions, 47 deletions
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF
index 77f9d560c..c3480b097 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.examples.databinding.project.core.model;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel b/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel
index e980813cd..3c21b76a1 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/model/Project.genmodel
@@ -1,9 +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"
+<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.examples.databinding.project.core.model/src"
- modelPluginID="org.eclipse.emf.examples.databinding.project.core.model" modelName="Project"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
+ editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.examples.databinding.project.core.model"
+ modelName="Project" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="5.0" copyrightFields="false">
<foreignModel>Project.ecore</foreignModel>
<genPackages prefix="Project" basePackage="org.eclipse.emf.examples.databinding.project.core.model"
disposableProviderFactory="true" ecorePackage="Project.ecore#/">
@@ -20,6 +20,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/start"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/end"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/longname"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/devmail"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Project/homepage"/>
</genClasses>
<genClasses ecoreClass="Project.ecore#//CommitterShip">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//CommitterShip/start"/>
@@ -32,6 +34,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Person/firstname"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Person/email"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Project.ecore#//Person/committerships"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Project.ecore#//Person/image"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java
index f58ea7ec7..43685a68a 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/CommitterShip.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getStart <em>Start</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getEnd <em>End</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getProject <em>Project</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.CommitterShip#getPerson <em>Person</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getCommitterShip()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java
index ef288c456..88c776d17 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Foundation.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Foundation#getProjects <em>Projects</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Foundation#getPersons <em>Persons</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getFoundation()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java
index 12bc1fdd1..ac3015aa8 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Person.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getLastname <em>Lastname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getFirstname <em>Firstname</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getCommitterships <em>Committerships</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Person#getImage <em>Image</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getPerson()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java
index d897f8d68..9c75f6004 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/Project.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getShortname <em>Shortname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getSubprojects <em>Subprojects</em>}</li>
@@ -35,7 +36,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getDevmail <em>Devmail</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.Project#getHomepage <em>Homepage</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage#getProject()
* @model
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java
index d5e656ca1..44a8f6dba 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/CommitterShipImpl.java
@@ -35,13 +35,13 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getStart <em>Start</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getEnd <em>End</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getProject <em>Project</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.CommitterShipImpl#getPerson <em>Person</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -172,7 +172,7 @@ public class CommitterShipImpl extends EObjectImpl implements CommitterShip
public Project getProject()
{
if (eContainerFeatureID() != ProjectPackage.COMMITTER_SHIP__PROJECT) return null;
- return (Project)eContainer();
+ return (Project)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java
index 34b4a143b..5ef8647e8 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/FoundationImpl.java
@@ -35,11 +35,11 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.FoundationImpl#getProjects <em>Projects</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.FoundationImpl#getPersons <em>Persons</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java
index a84abe8b0..34d80167a 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/PersonImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getLastname <em>Lastname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getFirstname <em>Firstname</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getCommitterships <em>Committerships</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.PersonImpl#getImage <em>Image</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java
index 6c2917ffe..bb6c449ca 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectFactoryImpl.java
@@ -39,7 +39,7 @@ public class ProjectFactoryImpl extends EFactoryImpl implements ProjectFactory
{
try
{
- ProjectFactory theProjectFactory = (ProjectFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/project/1.0.0");
+ ProjectFactory theProjectFactory = (ProjectFactory)EPackage.Registry.INSTANCE.getEFactory(ProjectPackage.eNS_URI);
if (theProjectFactory != null)
{
return theProjectFactory;
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java
index 289879566..1c7c907aa 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/impl/ProjectImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getShortname <em>Shortname</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getSubprojects <em>Subprojects</em>}</li>
@@ -53,7 +54,6 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPa
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getDevmail <em>Devmail</em>}</li>
* <li>{@link org.eclipse.emf.examples.databinding.project.core.model.project.impl.ProjectImpl#getHomepage <em>Homepage</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -289,7 +289,7 @@ public class ProjectImpl extends EObjectImpl implements Project
public Project getParent()
{
if (eContainerFeatureID() != ProjectPackage.PROJECT__PARENT) return null;
- return (Project)eContainer();
+ return (Project)eInternalContainer();
}
/**
diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java
index 6466c876c..0b6496a95 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/src/org/eclipse/emf/examples/databinding/project/core/model/project/util/ProjectSwitch.java
@@ -10,11 +10,10 @@
*/
package org.eclipse.emf.examples.databinding.project.core.model.project.util;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
import org.eclipse.emf.examples.databinding.project.core.model.project.*;
@@ -31,7 +30,7 @@ import org.eclipse.emf.examples.databinding.project.core.model.project.*;
* @see org.eclipse.emf.examples.databinding.project.core.model.project.ProjectPackage
* @generated
*/
-public class ProjectSwitch<T>
+public class ProjectSwitch<T> extends Switch<T>
{
/**
* The cached model package
@@ -56,38 +55,17 @@ public class ProjectSwitch<T>
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ * Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @param ePackage the package in question.
+ * @return whether this is a switch for the given package.
* @generated
*/
- public T doSwitch(EObject theEObject)
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage)
{
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else
- {
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
- }
+ return ePackage == modelPackage;
}
/**
@@ -97,6 +75,7 @@ public class ProjectSwitch<T>
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
+ @Override
protected T doSwitch(int classifierID, EObject theEObject)
{
switch (classifierID)
@@ -208,6 +187,7 @@ public class ProjectSwitch<T>
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object)
{
return null;

Back to the top