SCM
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/State.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/State.java
index fa1537cf..8037c497 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/State.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/State.java
@@ -23,7 +23,6 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
/**
* A representation of the model object '
@@ -57,14 +56,12 @@
* Editor Deployable Unit Name}
* {@link org.enterprisedomain.classmaker.State#getJobFamily Job
* Family}
- * {@link org.enterprisedomain.classmaker.State#getResource
- * Resource}
- * {@link org.enterprisedomain.classmaker.State#getCommitIds Commit
- * Ids}
* {@link org.enterprisedomain.classmaker.State#getCommitId Commit
* Id}
* {@link org.enterprisedomain.classmaker.State#getStateCustomizers
* State Customizers}
+ * {@link org.enterprisedomain.classmaker.State#getNonExclusiveStateCustomizers
+ * Non Exclusive State Customizers}
* {@link org.enterprisedomain.classmaker.State#getProjectName Project
* Name}
* {@link org.enterprisedomain.classmaker.State#isMaking
@@ -74,6 +71,8 @@
* Editor}
* {@link org.enterprisedomain.classmaker.State#getStrategy
* Strategy}
+ * {@link org.enterprisedomain.classmaker.State#getBasePackage Base
+ * Package}
*
*
* @see org.enterprisedomain.classmaker.ClassMakerPackage#getState()
@@ -353,51 +352,6 @@ public interface State extends Item, ISchedulingRule {
*/
void setJobFamily(String value);
- /**
- * Returns the value of the 'Resource' reference.
- *
- * If the meaning of the 'Resource' reference isn't clear, there really
- * should be more of a description here...
- *
- *
- *
- * @return the value of the 'Resource' reference.
- * @see #setResource(Resource)
- * @see org.enterprisedomain.classmaker.ClassMakerPackage#getState_Resource()
- * @model type="org.enterprisedomain.classmaker.Resource" resolveProxies="false"
- * @generated
- */
- Resource getResource();
-
- /**
- * Sets the value of the
- * '{@link org.enterprisedomain.classmaker.State#getResource Resource}'
- * reference.
- *
- * @param value the new value of the 'Resource' reference.
- * @see #getResource()
- * @generated
- */
- void setResource(Resource value);
-
- /**
- * Returns the value of the 'Commit Ids' attribute list. The
- * list contents are of type {@link java.lang.String}.
- *
- * If the meaning of the 'Commit Ids' attribute list isn't clear, there
- * really should be more of a description here...
- *
- * An SCM commit's associated
- * with the state identifiers.
- *
- * @return the value of the 'Commit Ids' attribute list.
- * @see org.enterprisedomain.classmaker.ClassMakerPackage#getState_CommitIds()
- * @model
- * @generated
- */
- EList getCommitIds();
-
/**
* Returns the value of the 'Commit Id' attribute.
@@ -448,6 +402,21 @@ public interface State extends Item, ISchedulingRule {
*/
EMap getStateCustomizers();
+ /**
+ * Returns the value of the 'Non Exclusive State Customizers'
+ * map. The key is of type
+ * {@link org.enterprisedomain.classmaker.StageQualifier}, and the value is of
+ * type {@link org.enterprisedomain.classmaker.Customizer},
+ *
+ * @return the value of the 'Non Exclusive State Customizers' map.
+ * @see org.enterprisedomain.classmaker.ClassMakerPackage#getState_NonExclusiveStateCustomizers()
+ * @model mapType="org.enterprisedomain.classmaker.StageQualifierToCustomizerMapEntry<org.enterprisedomain.classmaker.StageQualifier,
+ * org.enterprisedomain.classmaker.Customizer>"
+ * @generated
+ */
+ EMap getNonExclusiveStateCustomizers();
+
/**
* Returns the value of the 'Project Name' attribute.
@@ -574,6 +543,29 @@ public interface State extends Item, ISchedulingRule {
*/
void setStrategy(Strategy value);
+ /**
+ * Returns the value of the 'Base Package' attribute.
+ *
+ * @return the value of the 'Base Package' attribute.
+ * @see #setBasePackage(String)
+ * @see org.enterprisedomain.classmaker.ClassMakerPackage#getState_BasePackage()
+ * @model
+ * @generated
+ */
+ String getBasePackage();
+
+ /**
+ * Sets the value of the
+ * '{@link org.enterprisedomain.classmaker.State#getBasePackage Base
+ * Package}' attribute.
+ *
+ * @param value the new value of the 'Base Package' attribute.
+ * @see #getBasePackage()
+ * @generated
+ */
+ void setBasePackage(String value);
+
/**
*
*
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Strategy.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Strategy.java
index 6792ed4a..c971cb9f 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Strategy.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Strategy.java
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EObject;
import org.enterprisedomain.classmaker.jobs.Worker;
@@ -28,16 +29,10 @@
* The following features are supported:
*
*
- * - {@link org.enterprisedomain.classmaker.Strategy#getGenerators
- * Generators}
- * - {@link org.enterprisedomain.classmaker.Strategy#getExporters
- * Exporters}
- * - {@link org.enterprisedomain.classmaker.Strategy#getInstallers
- * Installers}
- * - {@link org.enterprisedomain.classmaker.Strategy#getLoaders
- * Loaders}
* - {@link org.enterprisedomain.classmaker.Strategy#getState
* State}
+ * - {@link org.enterprisedomain.classmaker.Strategy#getWorkers
+ * Workers}
*
*
* @see org.enterprisedomain.classmaker.ClassMakerPackage#getStrategy()
@@ -45,56 +40,6 @@
* @generated
*/
public interface Strategy extends EObject {
- /**
- * Returns the value of the 'Generators' reference list. The
- * list contents are of type
- * {@link org.enterprisedomain.classmaker.jobs.Worker}.
- *
- *
- * @return the value of the 'Generators' reference list.
- * @see org.enterprisedomain.classmaker.ClassMakerPackage#getStrategy_Generators()
- * @model type="org.enterprisedomain.classmaker.Worker" resolveProxies="false"
- * @generated
- */
- EList getGenerators();
-
- /**
- * Returns the value of the 'Exporters' reference list. The list
- * contents are of type {@link org.enterprisedomain.classmaker.jobs.Worker}.
- *
- *
- * @return the value of the 'Exporters' reference list.
- * @see org.enterprisedomain.classmaker.ClassMakerPackage#getStrategy_Exporters()
- * @model type="org.enterprisedomain.classmaker.Worker" resolveProxies="false"
- * @generated
- */
- EList getExporters();
-
- /**
- * Returns the value of the 'Installers' reference list. The
- * list contents are of type
- * {@link org.enterprisedomain.classmaker.jobs.Worker}.
- *
- *
- * @return the value of the 'Installers' reference list.
- * @see org.enterprisedomain.classmaker.ClassMakerPackage#getStrategy_Installers()
- * @model type="org.enterprisedomain.classmaker.Worker" resolveProxies="false"
- * @generated
- */
- EList getInstallers();
-
- /**
- * Returns the value of the 'Loaders' reference list. The list
- * contents are of type {@link org.enterprisedomain.classmaker.jobs.Worker}.
- *
- *
- * @return the value of the 'Loaders' reference list.
- * @see org.enterprisedomain.classmaker.ClassMakerPackage#getStrategy_Loaders()
- * @model type="org.enterprisedomain.classmaker.Worker" resolveProxies="false"
- * @generated
- */
- EList getLoaders();
-
/**
* Returns the value of the 'State' reference. It is
* bidirectional and its opposite is
@@ -122,44 +67,34 @@ public interface Strategy extends EObject {
void setState(State value);
/**
- *
- *
- * @model type="org.enterprisedomain.classmaker.Worker"
- * @generated
- */
- Worker createGenerator();
-
- /**
- *
+ * Returns the value of the 'Workers' map. The key is of type
+ * {@link org.enterprisedomain.classmaker.StageQualifier}, and the value is of
+ * type list of {@link org.enterprisedomain.classmaker.jobs.Worker},
*
- * @model type="org.enterprisedomain.classmaker.Worker"
- * @generated
- */
- Worker createExporter();
-
- /**
- *
- *
- * @model type="org.enterprisedomain.classmaker.Worker"
+ * @return the value of the 'Workers' map.
+ * @see org.enterprisedomain.classmaker.ClassMakerPackage#getStrategy_Workers()
+ * @model mapType="org.enterprisedomain.classmaker.StageQualifierToWorkersMapEntry<org.enterprisedomain.classmaker.StageQualifier,
+ * org.enterprisedomain.classmaker.Worker>"
* @generated
*/
- Worker createInstaller();
+ EMap> getWorkers();
/**
*
*
- * @model type="org.enterprisedomain.classmaker.Worker"
+ * @model kind="operation" type="org.enterprisedomain.classmaker.Worker"
* @generated
*/
- Worker createModelLoader();
+ Worker getReturnWorker();
/**
*
*
- * @model kind="operation" type="org.enterprisedomain.classmaker.Worker"
+ * @model monitorDataType="org.enterprisedomain.classmaker.IProgressMonitor"
* @generated
*/
- Worker getReturnWorker();
+ int configureJobs(boolean create, IProgressMonitor monitor);
/**
*
@@ -167,14 +102,14 @@ public interface Strategy extends EObject {
* @model monitorDataType="org.enterprisedomain.classmaker.IProgressMonitor"
* @generated
*/
- int configureJobs(boolean create, IProgressMonitor monitor);
+ void configuteBuildJobs(IProgressMonitor monitor);
/**
*
*
- * @model monitorDataType="org.enterprisedomain.classmaker.IProgressMonitor"
+ * @model type="org.enterprisedomain.classmaker.Worker"
* @generated
*/
- void configuteBuildJobs(IProgressMonitor monitor);
+ EList get(Stage stage, String step);
} // Strategy
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Workspace.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Workspace.java
index 60934511..50974a25 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Workspace.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/Workspace.java
@@ -21,6 +21,7 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -43,10 +44,14 @@
* Resource Set}
* {@link org.enterprisedomain.classmaker.Workspace#getCustomizers
* Customizers}
+ * {@link org.enterprisedomain.classmaker.Workspace#getNonExclusiveCustomizers
+ * Non Exclusive Customizers}
* {@link org.enterprisedomain.classmaker.Workspace#getService
* Service}
* {@link org.enterprisedomain.classmaker.Workspace#getSCMRegistry SCM
* Registry}
+ * {@link org.enterprisedomain.classmaker.Workspace#getExcludedEPackages
+ * Excluded EPackages}
*
*
* @see org.enterprisedomain.classmaker.ClassMakerPackage#getWorkspace()
@@ -107,6 +112,20 @@ public interface Workspace extends EObject, ISchedulingRule {
*/
EMap getCustomizers();
+ /**
+ * Returns the value of the 'Non Exclusive Customizers' map. The
+ * key is of type {@link org.enterprisedomain.classmaker.StageQualifier}, and
+ * the value is of type {@link org.enterprisedomain.classmaker.Customizer},
+ *
+ * @return the value of the 'Non Exclusive Customizers' map.
+ * @see org.enterprisedomain.classmaker.ClassMakerPackage#getWorkspace_NonExclusiveCustomizers()
+ * @model mapType="org.enterprisedomain.classmaker.StageQualifierToCustomizerMapEntry<org.enterprisedomain.classmaker.StageQualifier,
+ * org.enterprisedomain.classmaker.Customizer>"
+ * @generated
+ */
+ EMap getNonExclusiveCustomizers();
+
/**
* Returns the value of the 'Service' container reference. It is
* bidirectional and its opposite is
@@ -151,6 +170,18 @@ public interface Workspace extends EObject, ISchedulingRule {
*/
SCMRegistry getSCMRegistry();
+ /**
+ * Returns the value of the 'Excluded EPackages' reference list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.EPackage}.
+ *
+ * @return the value of the 'Excluded EPackages' reference list.
+ * @see org.enterprisedomain.classmaker.ClassMakerPackage#getWorkspace_ExcludedEPackages()
+ * @model
+ * @generated
+ */
+ EList getExcludedEPackages();
+
/**
*
* Initializes Workspace.
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ClassMakerPlugin.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ClassMakerPlugin.java
index 8ad7ec3b..f9beb2ef 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ClassMakerPlugin.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ClassMakerPlugin.java
@@ -42,6 +42,8 @@
public class ClassMakerPlugin extends Plugin {
+ public static final boolean DEBUG = false;
+
public static final String PLUGIN_ID = "org.enterprisedomain.classmaker"; //$NON-NLS-1$
public static final String CONTRIBUTION_NATURE_ID = PLUGIN_ID + ".contributionProjectNature"; //$NON-NLS-1$
@@ -168,6 +170,11 @@ public static void setDefaultOutputStream(PrintStream defaultOutputStream) {
ClassMakerPlugin.defaultOutputStream = defaultOutputStream;
}
+ public static void print(String string) {
+ if (DEBUG)
+ getDefaultOutputStream().println("*** " + string);
+ }
+
public static void setRunnerWithProgress(IRunnerWithProgress runner) {
ClassMakerPlugin.runner = runner;
}
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ContributionProjectNature.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ContributionProjectNature.java
index 4981ffec..9176f8a4 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ContributionProjectNature.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/core/ContributionProjectNature.java
@@ -27,8 +27,8 @@ public class ContributionProjectNature implements IProjectNature {
@Override
public void configure() throws CoreException {
ResourceUtils.removeProjectNature(project, ClassMakerPlugin.NATURE_ID);
- ResourceUtils.addProjectNature(project, ClassMakerPlugin.JAVA_NATURE);
ResourceUtils.addProjectNature(project, ClassMakerPlugin.PDE_PLUGIN_NATURE);
+ ResourceUtils.addProjectNature(project, ClassMakerPlugin.JAVA_NATURE);
ResourceUtils.addToBuildSpec(project, ClassMakerBuilder.BUILDER_ID);
}
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/BlueprintImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/BlueprintImpl.java
index 5625294d..47606a17 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/BlueprintImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/BlueprintImpl.java
@@ -17,7 +17,8 @@
import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
+import javax.management.Notification;
+
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerFactoryImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerFactoryImpl.java
index 71ed1909..d3acdff7 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerFactoryImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerFactoryImpl.java
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
@@ -27,7 +28,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
@@ -54,7 +55,7 @@
import org.enterprisedomain.classmaker.Strategy;
import org.enterprisedomain.classmaker.Workspace;
import org.enterprisedomain.classmaker.core.ClassMakerPlugin;
-import org.osgi.framework.Version;
+import org.enterprisedomain.classmaker.jobs.Worker;
/**
* An implementation of the model Factory.
+ *
+ * @generated
+ */
+ public Map.Entry> createStageQualifierToWorkersMapEntry() {
+ StageQualifierToWorkersMapEntryImpl stageQualifierToWorkersMapEntry = new StageQualifierToWorkersMapEntryImpl();
+ return stageQualifierToWorkersMapEntry;
+ }
+
/**
*
*
@@ -449,6 +466,24 @@ public String convertStageToString(EDataType eDataType, Object instanceValue) {
return instanceValue == null ? null : instanceValue.toString();
}
+ /**
+ *
+ *
+ * @generated
+ */
+ public ClassLoader createClassLoaderFromString(EDataType eDataType, String initialValue) {
+ return (ClassLoader) super.createFromString(eDataType, initialValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String convertClassLoaderToString(EDataType eDataType, Object instanceValue) {
+ return super.convertToString(eDataType, instanceValue);
+ }
+
/**
*
*
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerPackageImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerPackageImpl.java
index 78e4a2e3..87e73b39 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerPackageImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerPackageImpl.java
@@ -15,9 +15,6 @@
*/
package org.enterprisedomain.classmaker.impl;
-import static org.enterprisedomain.classmaker.ClassMakerPackage.ADAPTER;
-import static org.enterprisedomain.classmaker.ClassMakerPackage.RESOURCE;
-
import java.lang.reflect.InvocationTargetException;
import java.util.Locale;
import java.util.Map;
@@ -26,6 +23,8 @@
import java.util.concurrent.Future;
import java.util.concurrent.Semaphore;
+import javax.management.Notification;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -33,7 +32,6 @@
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -72,7 +70,6 @@
import org.enterprisedomain.classmaker.Workspace;
import org.enterprisedomain.classmaker.jobs.Worker;
import org.enterprisedomain.classmaker.util.ClassMakerValidator;
-import org.osgi.framework.Version;
/**
* An implementation of the model Package.
+ *
+ * @generated
+ */
+ private EClass stageQualifierToWorkersMapEntryEClass = null;
+
/**
*
*
@@ -305,6 +309,13 @@ public class ClassMakerPackageImpl extends EPackageImpl implements ClassMakerPac
*/
private EEnum stageEEnum = null;
+ /**
+ *
+ *
+ * @generated
+ */
+ private EDataType classLoaderEDataType = null;
+
/**
*
*
@@ -673,8 +684,8 @@ public EAttribute getState_JobFamily() {
* @generated
*/
@Override
- public EReference getState_Resource() {
- return (EReference) stateEClass.getEStructuralFeatures().get(10);
+ public EAttribute getState_CommitId() {
+ return (EAttribute) stateEClass.getEStructuralFeatures().get(10);
}
/**
@@ -683,8 +694,8 @@ public EReference getState_Resource() {
* @generated
*/
@Override
- public EAttribute getState_CommitIds() {
- return (EAttribute) stateEClass.getEStructuralFeatures().get(11);
+ public EReference getState_StateCustomizers() {
+ return (EReference) stateEClass.getEStructuralFeatures().get(11);
}
/**
@@ -693,8 +704,8 @@ public EAttribute getState_CommitIds() {
* @generated
*/
@Override
- public EAttribute getState_CommitId() {
- return (EAttribute) stateEClass.getEStructuralFeatures().get(12);
+ public EReference getState_NonExclusiveStateCustomizers() {
+ return (EReference) stateEClass.getEStructuralFeatures().get(12);
}
/**
@@ -703,8 +714,8 @@ public EAttribute getState_CommitId() {
* @generated
*/
@Override
- public EReference getState_StateCustomizers() {
- return (EReference) stateEClass.getEStructuralFeatures().get(13);
+ public EAttribute getState_ProjectName() {
+ return (EAttribute) stateEClass.getEStructuralFeatures().get(13);
}
/**
@@ -713,7 +724,7 @@ public EReference getState_StateCustomizers() {
* @generated
*/
@Override
- public EAttribute getState_ProjectName() {
+ public EAttribute getState_Making() {
return (EAttribute) stateEClass.getEStructuralFeatures().get(14);
}
@@ -723,7 +734,7 @@ public EAttribute getState_ProjectName() {
* @generated
*/
@Override
- public EAttribute getState_Making() {
+ public EAttribute getState_Edit() {
return (EAttribute) stateEClass.getEStructuralFeatures().get(15);
}
@@ -733,7 +744,7 @@ public EAttribute getState_Making() {
* @generated
*/
@Override
- public EAttribute getState_Edit() {
+ public EAttribute getState_Editor() {
return (EAttribute) stateEClass.getEStructuralFeatures().get(16);
}
@@ -743,8 +754,8 @@ public EAttribute getState_Edit() {
* @generated
*/
@Override
- public EAttribute getState_Editor() {
- return (EAttribute) stateEClass.getEStructuralFeatures().get(17);
+ public EReference getState_Strategy() {
+ return (EReference) stateEClass.getEStructuralFeatures().get(17);
}
/**
@@ -753,8 +764,8 @@ public EAttribute getState_Editor() {
* @generated
*/
@Override
- public EReference getState_Strategy() {
- return (EReference) stateEClass.getEStructuralFeatures().get(18);
+ public EAttribute getState_BasePackage() {
+ return (EAttribute) stateEClass.getEStructuralFeatures().get(18);
}
/**
@@ -773,7 +784,7 @@ public EClass getStrategy() {
* @generated
*/
@Override
- public EReference getStrategy_Generators() {
+ public EReference getStrategy_State() {
return (EReference) strategyEClass.getEStructuralFeatures().get(0);
}
@@ -783,40 +794,10 @@ public EReference getStrategy_Generators() {
* @generated
*/
@Override
- public EReference getStrategy_Exporters() {
+ public EReference getStrategy_Workers() {
return (EReference) strategyEClass.getEStructuralFeatures().get(1);
}
- /**
- *
- *
- * @generated
- */
- @Override
- public EReference getStrategy_Installers() {
- return (EReference) strategyEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public EReference getStrategy_Loaders() {
- return (EReference) strategyEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public EReference getStrategy_State() {
- return (EReference) strategyEClass.getEStructuralFeatures().get(4);
- }
-
/**
*
*
@@ -907,6 +888,16 @@ public EReference getItem_Project() {
return (EReference) itemEClass.getEStructuralFeatures().get(7);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EReference getItem_Resource() {
+ return (EReference) itemEClass.getEStructuralFeatures().get(8);
+ }
+
/**
*
*
@@ -963,7 +954,7 @@ public EReference getWorkspace_Customizers() {
* @generated
*/
@Override
- public EReference getWorkspace_Service() {
+ public EReference getWorkspace_NonExclusiveCustomizers() {
return (EReference) workspaceEClass.getEStructuralFeatures().get(3);
}
@@ -973,10 +964,30 @@ public EReference getWorkspace_Service() {
* @generated
*/
@Override
- public EReference getWorkspace_SCMRegistry() {
+ public EReference getWorkspace_Service() {
return (EReference) workspaceEClass.getEStructuralFeatures().get(4);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EReference getWorkspace_SCMRegistry() {
+ return (EReference) workspaceEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EReference getWorkspace_ExcludedEPackages() {
+ return (EReference) workspaceEClass.getEStructuralFeatures().get(6);
+ }
+
/**
*
*
@@ -1097,6 +1108,26 @@ public EAttribute getCustomizer_Rank() {
return (EAttribute) customizerEClass.getEStructuralFeatures().get(0);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getCustomizer_Exclusive() {
+ return (EAttribute) customizerEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EReference getCustomizer_Stage() {
+ return (EReference) customizerEClass.getEStructuralFeatures().get(2);
+ }
+
/**
*
*
@@ -1157,6 +1188,36 @@ public EReference getStageQualifierToCustomizerMapEntry_Value() {
return (EReference) stageQualifierToCustomizerMapEntryEClass.getEStructuralFeatures().get(1);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EClass getStageQualifierToWorkersMapEntry() {
+ return stageQualifierToWorkersMapEntryEClass;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EReference getStageQualifierToWorkersMapEntry_Key() {
+ return (EReference) stageQualifierToWorkersMapEntryEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EReference getStageQualifierToWorkersMapEntry_Value() {
+ return (EReference) stageQualifierToWorkersMapEntryEClass.getEStructuralFeatures().get(1);
+ }
+
/**
*
*
@@ -1173,7 +1234,7 @@ public EClass getModels() {
* @generated
*/
@Override
- public EReference getModels_Dynamic() {
+ public EReference getModels_DynamicEPackage() {
return (EReference) modelsEClass.getEStructuralFeatures().get(0);
}
@@ -1183,7 +1244,7 @@ public EReference getModels_Dynamic() {
* @generated
*/
@Override
- public EReference getModels_Generated() {
+ public EReference getModels_GeneratedEPackage() {
return (EReference) modelsEClass.getEStructuralFeatures().get(1);
}
@@ -1193,7 +1254,7 @@ public EReference getModels_Generated() {
* @generated
*/
@Override
- public EAttribute getModels_GeneratedEdit() {
+ public EAttribute getModels_GeneratedEditPlugin() {
return (EAttribute) modelsEClass.getEStructuralFeatures().get(2);
}
@@ -1203,7 +1264,7 @@ public EAttribute getModels_GeneratedEdit() {
* @generated
*/
@Override
- public EAttribute getModels_GeneratedEditor() {
+ public EAttribute getModels_GeneratedEditorPlugin() {
return (EAttribute) modelsEClass.getEStructuralFeatures().get(3);
}
@@ -1257,16 +1318,6 @@ public EAttribute getProject_ProjectName() {
return (EAttribute) projectEClass.getEStructuralFeatures().get(1);
}
- /**
- *
- *
- * @generated
- */
- @Override
- public EAttribute getProject_Children() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(2);
- }
-
/**
*
*
@@ -1274,7 +1325,7 @@ public EAttribute getProject_Children() {
*/
@Override
public EAttribute getProject_Dirty() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(3);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(2);
}
/**
@@ -1284,7 +1335,7 @@ public EAttribute getProject_Dirty() {
*/
@Override
public EReference getProject_Workspace() {
- return (EReference) projectEClass.getEStructuralFeatures().get(4);
+ return (EReference) projectEClass.getEStructuralFeatures().get(3);
}
/**
@@ -1294,7 +1345,7 @@ public EReference getProject_Workspace() {
*/
@Override
public EAttribute getProject_ResourcePath() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(5);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(4);
}
/**
@@ -1304,7 +1355,7 @@ public EAttribute getProject_ResourcePath() {
*/
@Override
public EAttribute getProject_NeedCompletionNotification() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(6);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(5);
}
/**
@@ -1314,7 +1365,7 @@ public EAttribute getProject_NeedCompletionNotification() {
*/
@Override
public EReference getProject_CompletionNotificationAdapter() {
- return (EReference) projectEClass.getEStructuralFeatures().get(7);
+ return (EReference) projectEClass.getEStructuralFeatures().get(6);
}
/**
@@ -1324,7 +1375,7 @@ public EReference getProject_CompletionNotificationAdapter() {
*/
@Override
public EReference getProject_ResourceReloadListener() {
- return (EReference) projectEClass.getEStructuralFeatures().get(8);
+ return (EReference) projectEClass.getEStructuralFeatures().get(7);
}
/**
@@ -1334,7 +1385,7 @@ public EReference getProject_ResourceReloadListener() {
*/
@Override
public EAttribute getProject_SavingResource() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(9);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(8);
}
/**
@@ -1344,7 +1395,7 @@ public EAttribute getProject_SavingResource() {
*/
@Override
public EReference getProject_Revision() {
- return (EReference) projectEClass.getEStructuralFeatures().get(10);
+ return (EReference) projectEClass.getEStructuralFeatures().get(9);
}
/**
@@ -1354,7 +1405,7 @@ public EReference getProject_Revision() {
*/
@Override
public EReference getProject_Revisions() {
- return (EReference) projectEClass.getEStructuralFeatures().get(11);
+ return (EReference) projectEClass.getEStructuralFeatures().get(10);
}
/**
@@ -1364,7 +1415,7 @@ public EReference getProject_Revisions() {
*/
@Override
public EAttribute getProject_ProjectVersion() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(12);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(11);
}
/**
@@ -1374,7 +1425,7 @@ public EAttribute getProject_ProjectVersion() {
*/
@Override
public EReference getProject_SelectRevealHandler() {
- return (EReference) projectEClass.getEStructuralFeatures().get(13);
+ return (EReference) projectEClass.getEStructuralFeatures().get(12);
}
/**
@@ -1384,7 +1435,7 @@ public EReference getProject_SelectRevealHandler() {
*/
@Override
public EAttribute getProject_Version() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(14);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(13);
}
/**
@@ -1394,7 +1445,7 @@ public EAttribute getProject_Version() {
*/
@Override
public EReference getProject_State() {
- return (EReference) projectEClass.getEStructuralFeatures().get(15);
+ return (EReference) projectEClass.getEStructuralFeatures().get(14);
}
/**
@@ -1404,7 +1455,17 @@ public EReference getProject_State() {
*/
@Override
public EReference getProject_ModelResourceAdapter() {
- return (EReference) projectEClass.getEStructuralFeatures().get(16);
+ return (EReference) projectEClass.getEStructuralFeatures().get(15);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getProject_ClassLoader() {
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(16);
}
/**
@@ -1687,6 +1748,16 @@ public EEnum getStage() {
return stageEEnum;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EDataType getClassLoader() {
+ return classLoaderEDataType;
+ }
+
/**
*
*
@@ -1839,22 +1910,19 @@ public void createPackageContents() {
createEAttribute(stateEClass, STATE__EDIT_DEPLOYABLE_UNIT_NAME);
createEAttribute(stateEClass, STATE__EDITOR_DEPLOYABLE_UNIT_NAME);
createEAttribute(stateEClass, STATE__JOB_FAMILY);
- createEReference(stateEClass, STATE__RESOURCE);
- createEAttribute(stateEClass, STATE__COMMIT_IDS);
createEAttribute(stateEClass, STATE__COMMIT_ID);
createEReference(stateEClass, STATE__STATE_CUSTOMIZERS);
+ createEReference(stateEClass, STATE__NON_EXCLUSIVE_STATE_CUSTOMIZERS);
createEAttribute(stateEClass, STATE__PROJECT_NAME);
createEAttribute(stateEClass, STATE__MAKING);
createEAttribute(stateEClass, STATE__EDIT);
createEAttribute(stateEClass, STATE__EDITOR);
createEReference(stateEClass, STATE__STRATEGY);
+ createEAttribute(stateEClass, STATE__BASE_PACKAGE);
strategyEClass = createEClass(STRATEGY);
- createEReference(strategyEClass, STRATEGY__GENERATORS);
- createEReference(strategyEClass, STRATEGY__EXPORTERS);
- createEReference(strategyEClass, STRATEGY__INSTALLERS);
- createEReference(strategyEClass, STRATEGY__LOADERS);
createEReference(strategyEClass, STRATEGY__STATE);
+ createEReference(strategyEClass, STRATEGY__WORKERS);
itemEClass = createEClass(ITEM);
createEAttribute(itemEClass, ITEM__MODEL_NAME);
@@ -1865,6 +1933,7 @@ public void createPackageContents() {
createEReference(itemEClass, ITEM__PARENT);
createEAttribute(itemEClass, ITEM__LOCALE);
createEReference(itemEClass, ITEM__PROJECT);
+ createEReference(itemEClass, ITEM__RESOURCE);
adapterEClass = createEClass(ADAPTER);
@@ -1872,8 +1941,10 @@ public void createPackageContents() {
createEReference(workspaceEClass, WORKSPACE__PROJECTS);
createEAttribute(workspaceEClass, WORKSPACE__RESOURCE_SET);
createEReference(workspaceEClass, WORKSPACE__CUSTOMIZERS);
+ createEReference(workspaceEClass, WORKSPACE__NON_EXCLUSIVE_CUSTOMIZERS);
createEReference(workspaceEClass, WORKSPACE__SERVICE);
createEReference(workspaceEClass, WORKSPACE__SCM_REGISTRY);
+ createEReference(workspaceEClass, WORKSPACE__EXCLUDED_EPACKAGES);
longToStateMapEntryEClass = createEClass(LONG_TO_STATE_MAP_ENTRY);
createEAttribute(longToStateMapEntryEClass, LONG_TO_STATE_MAP_ENTRY__KEY);
@@ -1893,6 +1964,8 @@ public void createPackageContents() {
customizerEClass = createEClass(CUSTOMIZER);
createEAttribute(customizerEClass, CUSTOMIZER__RANK);
+ createEAttribute(customizerEClass, CUSTOMIZER__EXCLUSIVE);
+ createEReference(customizerEClass, CUSTOMIZER__STAGE);
stageQualifierEClass = createEClass(STAGE_QUALIFIER);
createEAttribute(stageQualifierEClass, STAGE_QUALIFIER__STAGE);
@@ -1902,11 +1975,15 @@ public void createPackageContents() {
createEReference(stageQualifierToCustomizerMapEntryEClass, STAGE_QUALIFIER_TO_CUSTOMIZER_MAP_ENTRY__KEY);
createEReference(stageQualifierToCustomizerMapEntryEClass, STAGE_QUALIFIER_TO_CUSTOMIZER_MAP_ENTRY__VALUE);
+ stageQualifierToWorkersMapEntryEClass = createEClass(STAGE_QUALIFIER_TO_WORKERS_MAP_ENTRY);
+ createEReference(stageQualifierToWorkersMapEntryEClass, STAGE_QUALIFIER_TO_WORKERS_MAP_ENTRY__KEY);
+ createEReference(stageQualifierToWorkersMapEntryEClass, STAGE_QUALIFIER_TO_WORKERS_MAP_ENTRY__VALUE);
+
modelsEClass = createEClass(MODELS);
- createEReference(modelsEClass, MODELS__DYNAMIC);
- createEReference(modelsEClass, MODELS__GENERATED);
- createEAttribute(modelsEClass, MODELS__GENERATED_EDIT);
- createEAttribute(modelsEClass, MODELS__GENERATED_EDITOR);
+ createEReference(modelsEClass, MODELS__DYNAMIC_EPACKAGE);
+ createEReference(modelsEClass, MODELS__GENERATED_EPACKAGE);
+ createEAttribute(modelsEClass, MODELS__GENERATED_EDIT_PLUGIN);
+ createEAttribute(modelsEClass, MODELS__GENERATED_EDITOR_PLUGIN);
createEReference(modelsEClass, MODELS__PARENT);
scmOperatorEClass = createEClass(SCM_OPERATOR);
@@ -1918,7 +1995,6 @@ public void createPackageContents() {
projectEClass = createEClass(PROJECT);
createEAttribute(projectEClass, PROJECT__NAME);
createEAttribute(projectEClass, PROJECT__PROJECT_NAME);
- createEAttribute(projectEClass, PROJECT__CHILDREN);
createEAttribute(projectEClass, PROJECT__DIRTY);
createEReference(projectEClass, PROJECT__WORKSPACE);
createEAttribute(projectEClass, PROJECT__RESOURCE_PATH);
@@ -1933,6 +2009,7 @@ public void createPackageContents() {
createEAttribute(projectEClass, PROJECT__VERSION);
createEReference(projectEClass, PROJECT__STATE);
createEReference(projectEClass, PROJECT__MODEL_RESOURCE_ADAPTER);
+ createEAttribute(projectEClass, PROJECT__CLASS_LOADER);
resourceEClass = createEClass(RESOURCE);
@@ -1971,6 +2048,7 @@ public void createPackageContents() {
stageEEnum = createEEnum(STAGE);
// Create data types
+ classLoaderEDataType = createEDataType(CLASS_LOADER);
propertiesEDataType = createEDataType(PROPERTIES);
iProgressMonitorEDataType = createEDataType(IPROGRESS_MONITOR);
osGiVersionEDataType = createEDataType(OS_GI_VERSION);
@@ -2076,11 +2154,11 @@ public void initializePackageContents() {
op = addEOperation(revisionEClass, null, "checkout", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getELong(), "timestamp", 0, 1, IS_UNIQUE, IS_ORDERED);
- op = addEOperation(revisionEClass, null, "checkout", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEString(), "commitId", 0, 1, IS_UNIQUE, IS_ORDERED);
-
addEOperation(revisionEClass, this.getState(), "newState", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(revisionEClass, this.getState(), "newState", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getELong(), "timestamp", 0, 1, IS_UNIQUE, IS_ORDERED);
+
op = addEOperation(revisionEClass, null, "delete", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getIProgressMonitor(), "monitor", 0, 1, IS_UNIQUE, IS_ORDERED);
addEException(op, this.getCoreException());
@@ -2120,16 +2198,14 @@ public void initializePackageContents() {
IS_DERIVED, IS_ORDERED);
initEAttribute(getState_JobFamily(), ecorePackage.getEString(), "jobFamily", null, 0, 1, State.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getState_Resource(), this.getResource(), null, "resource", null, 0, 1, State.class, IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getState_CommitIds(), ecorePackage.getEString(), "commitIds", null, 0, -1, State.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getState_CommitId(), ecorePackage.getEString(), "commitId", null, 0, 1, State.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getState_StateCustomizers(), this.getStageQualifierToCustomizerMapEntry(), null,
"stateCustomizers", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getState_NonExclusiveStateCustomizers(), this.getStageQualifierToCustomizerMapEntry(), null,
+ "nonExclusiveStateCustomizers", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getState_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, State.class,
IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEAttribute(getState_Making(), ecorePackage.getEBoolean(), "making", "false", 0, 1, State.class,
@@ -2141,6 +2217,8 @@ public void initializePackageContents() {
initEReference(getState_Strategy(), this.getStrategy(), this.getStrategy_State(), "strategy", null, 0, 1,
State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getState_BasePackage(), ecorePackage.getEString(), "basePackage", null, 0, 1, State.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
op = addEOperation(stateEClass, null, "setProjectVersion", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getIProgressMonitor(), "monitor", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2171,29 +2249,12 @@ public void initializePackageContents() {
initEClass(strategyEClass, Strategy.class, "Strategy", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getStrategy_Generators(), this.getWorker(), null, "generators", null, 0, -1, Strategy.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getStrategy_Exporters(), this.getWorker(), null, "exporters", null, 0, -1, Strategy.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getStrategy_Installers(), this.getWorker(), null, "installers", null, 0, -1, Strategy.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getStrategy_Loaders(), this.getWorker(), null, "loaders", null, 0, -1, Strategy.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getStrategy_State(), this.getState(), this.getState_Strategy(), "state", null, 0, 1,
Strategy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(strategyEClass, this.getWorker(), "createGenerator", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- addEOperation(strategyEClass, this.getWorker(), "createExporter", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- addEOperation(strategyEClass, this.getWorker(), "createInstaller", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- addEOperation(strategyEClass, this.getWorker(), "createModelLoader", 0, 1, IS_UNIQUE, IS_ORDERED);
+ initEReference(getStrategy_Workers(), this.getStageQualifierToWorkersMapEntry(), null, "workers", null, 0, -1,
+ Strategy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(strategyEClass, this.getWorker(), "getReturnWorker", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2204,6 +2265,10 @@ public void initializePackageContents() {
op = addEOperation(strategyEClass, null, "configuteBuildJobs", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getIProgressMonitor(), "monitor", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(strategyEClass, this.getWorker(), "get", 0, -1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getStage(), "stage", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "step", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(itemEClass, Item.class, "Item", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getItem_ModelName(), ecorePackage.getEString(), "modelName", null, 0, 1, Item.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2225,6 +2290,9 @@ public void initializePackageContents() {
initEReference(getItem_Project(), this.getProject(), null, "project", null, 0, 1, Item.class, IS_TRANSIENT,
IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
IS_ORDERED);
+ initEReference(getItem_Resource(), this.getResource(), null, "resource", null, 0, 1, Item.class, IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
op = addEOperation(itemEClass, null, "load", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEBoolean(), "create", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2239,12 +2307,15 @@ public void initializePackageContents() {
addEParameter(op, this.getIProgressMonitor(), "monitor", 0, 1, IS_UNIQUE, IS_ORDERED);
addEException(op, this.getCoreException());
- op = addEOperation(itemEClass, ecorePackage.getEString(), "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEBoolean(), "commit", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEOperation(itemEClass, ecorePackage.getEString(), "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
op = addEOperation(itemEClass, null, "copyModel", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getItem(), "from", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(itemEClass, null, "renameProject", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "oldProjectName", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "newProjectName", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(adapterEClass, Adapter.class, "Adapter", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
initEClass(workspaceEClass, Workspace.class, "Workspace", !IS_ABSTRACT, !IS_INTERFACE,
@@ -2258,6 +2329,9 @@ public void initializePackageContents() {
initEReference(getWorkspace_Customizers(), this.getStageQualifierToCustomizerMapEntry(), null, "customizers",
null, 0, -1, Workspace.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWorkspace_NonExclusiveCustomizers(), this.getStageQualifierToCustomizerMapEntry(), null,
+ "nonExclusiveCustomizers", null, 0, -1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getWorkspace_Service(), this.getClassMakerService(), this.getClassMakerService_Workspace(),
"service", null, 0, 1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2267,6 +2341,9 @@ public void initializePackageContents() {
initEReference(getWorkspace_SCMRegistry(), g1, null, "SCMRegistry", null, 0, 1, Workspace.class, !IS_TRANSIENT,
!IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
+ initEReference(getWorkspace_ExcludedEPackages(), ecorePackage.getEPackage(), null, "excludedEPackages", null, 0,
+ -1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(workspaceEClass, null, "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2360,10 +2437,24 @@ public void initializePackageContents() {
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getCustomizer_Rank(), ecorePackage.getEInt(), "rank", null, 0, 1, Customizer.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCustomizer_Exclusive(), ecorePackage.getEBoolean(), "exclusive", "true", 0, 1,
+ Customizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getCustomizer_Stage(), this.getStageQualifier(), null, "stage", null, 0, 1, Customizer.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
op = addEOperation(customizerEClass, ecorePackage.getEJavaObject(), "customize", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEJavaObject(), "args", 0, -1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(customizerEClass, ecorePackage.getEBoolean(), "isNextAfter", 0, 1, IS_UNIQUE, IS_ORDERED);
+ g1 = createEGenericType(ecorePackage.getEJavaClass());
+ g2 = createEGenericType();
+ g1.getETypeArguments().add(g2);
+ EGenericType g3 = createEGenericType(this.getCustomizer());
+ g2.setEUpperBound(g3);
+ addEParameter(op, g1, "customizerClass", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(stageQualifierEClass, StageQualifier.class, "StageQualifier", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getStageQualifier_Stage(), this.getStage(), "stage", null, 0, 1, StageQualifier.class,
@@ -2380,17 +2471,28 @@ public void initializePackageContents() {
Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(stageQualifierToWorkersMapEntryEClass, Map.Entry.class, "StageQualifierToWorkersMapEntry",
+ !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getStageQualifierToWorkersMapEntry_Key(), this.getStageQualifier(), null, "key", null, 0, 1,
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getStageQualifierToWorkersMapEntry_Value(), this.getWorker(), null, "value", null, 0, -1,
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(modelsEClass, Models.class, "Models", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getModels_Dynamic(), ecorePackage.getEObject(), null, "dynamic", null, 0, 1, Models.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getModels_Generated(), ecorePackage.getEObject(), null, "generated", null, 0, 1, Models.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getModels_GeneratedEdit(), this.getEMFPlugin(), "generatedEdit", null, 0, 1, Models.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getModels_GeneratedEditor(), this.getEMFPlugin(), "generatedEditor", null, 0, 1, Models.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getModels_DynamicEPackage(), ecorePackage.getEObject(), null, "dynamicEPackage", null, 0, 1,
+ Models.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getModels_GeneratedEPackage(), ecorePackage.getEObject(), null, "generatedEPackage", null, 0, 1,
+ Models.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getModels_GeneratedEditPlugin(), this.getEMFPlugin(), "generatedEditPlugin", null, 0, 1,
+ Models.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getModels_GeneratedEditorPlugin(), this.getEMFPlugin(), "generatedEditorPlugin", null, 0, 1,
+ Models.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEReference(getModels_Parent(), this.getItem(), this.getItem_DomainModel(), "parent", null, 0, 1,
Models.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2494,8 +2596,6 @@ public void initializePackageContents() {
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getProject_ProjectName(), ecorePackage.getEString(), "projectName", "", 0, 1, Project.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProject_Children(), ecorePackage.getEJavaObject(), "children", null, 0, -1, Project.class,
- IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEAttribute(getProject_Dirty(), ecorePackage.getEBoolean(), "dirty", null, 0, 1, Project.class, IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getProject_Workspace(), this.getWorkspace(), this.getWorkspace_Projects(), "workspace", null, 0,
@@ -2535,6 +2635,8 @@ public void initializePackageContents() {
initEReference(getProject_ModelResourceAdapter(), this.getResourceAdapter(), this.getResourceAdapter_Project(),
"modelResourceAdapter", null, 0, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE,
IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProject_ClassLoader(), this.getClassLoader(), "classLoader", null, 0, 1, Project.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
op = addEOperation(projectEClass, null, "create", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getIProgressMonitor(), "monitor", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2563,8 +2665,7 @@ public void initializePackageContents() {
addEParameter(op, this.getIProgressMonitor(), "monitor", 0, 1, IS_UNIQUE, IS_ORDERED);
addEException(op, this.getCoreException());
- op = addEOperation(projectEClass, ecorePackage.getEString(), "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEBoolean(), "commit", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEOperation(projectEClass, ecorePackage.getEString(), "initialize", 0, 1, IS_UNIQUE, IS_ORDERED);
op = addEOperation(projectEClass, null, "addCompletionListener", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getCompletionListener(), "resultListener", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2622,16 +2723,6 @@ public void initializePackageContents() {
addEParameter(op, ecorePackage.getELong(), "timestamp", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "commitId", 0, 1, IS_UNIQUE, IS_ORDERED);
- op = addEOperation(projectEClass, null, "checkout", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getELong(), "timestamp", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- op = addEOperation(projectEClass, null, "checkout", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getELong(), "timestamp", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEString(), "commitId", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- op = addEOperation(projectEClass, null, "checkout", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEString(), "commitId", 0, 1, IS_UNIQUE, IS_ORDERED);
-
op = addEOperation(projectEClass, null, "initAdapters", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getRevision(), "revision", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2732,7 +2823,7 @@ public void initializePackageContents() {
g1 = createEGenericType(this.getFuture());
g2 = createEGenericType();
g1.getETypeArguments().add(g2);
- EGenericType g3 = createEGenericType(ecorePackage.getEObject());
+ g3 = createEGenericType(ecorePackage.getEObject());
g2.setEUpperBound(g3);
initEOperation(op, g1);
@@ -2925,6 +3016,8 @@ public void initializePackageContents() {
addEEnumLiteral(stageEEnum, Stage.LOADED);
// Initialize data types
+ initEDataType(classLoaderEDataType, ClassLoader.class, "ClassLoader", IS_SERIALIZABLE,
+ !IS_GENERATED_INSTANCE_CLASS);
initEDataType(propertiesEDataType, Properties.class, "Properties", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
initEDataType(iProgressMonitorEDataType, IProgressMonitor.class, "IProgressMonitor", IS_SERIALIZABLE,
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerServiceImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerServiceImpl.java
index ff946b2f..72046720 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerServiceImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ClassMakerServiceImpl.java
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -27,6 +28,9 @@
import java.util.concurrent.FutureTask;
import java.util.concurrent.Semaphore;
+import javax.management.Notification;
+import javax.tools.Diagnostic;
+
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -34,13 +38,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.ECollections;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EOperation;
@@ -56,6 +57,7 @@
import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
import org.eclipse.m2m.qvt.oml.ModelExtent;
import org.eclipse.m2m.qvt.oml.TransformationExecutor;
+import org.eclipse.osgi.util.NLS;
import org.enterprisedomain.classmaker.Blueprint;
import org.enterprisedomain.classmaker.ClassMakerFactory;
import org.enterprisedomain.classmaker.ClassMakerPackage;
@@ -69,7 +71,6 @@
import org.enterprisedomain.classmaker.core.ClassMakerPlugin;
import org.enterprisedomain.classmaker.util.ModelUtil;
import org.enterprisedomain.classmaker.util.ResourceUtils;
-import org.osgi.framework.Version;
/**
* An implementation of the model object
@@ -269,7 +270,7 @@ public void completed(Project result) throws Exception {
wait.acquire();
} catch (InterruptedException e) {
}
- return contrib.getDomainModel().getGenerated();
+ return contrib.getDomainModel().getGeneratedEPackage();
} catch (CoreException e) {
ClassMakerPlugin.getInstance().getLog().log(e.getStatus());
throw e;
@@ -364,7 +365,7 @@ public EObject replace(Blueprint source, Blueprint target, Version version, IPro
if (contribution == null) {
contribution = getWorkspace().getContribution(source.getDynamicModel(), true);
if (contribution != null) {
- EObject existingModel = contribution.getDomainModel().getDynamic();
+ EObject existingModel = contribution.getDomainModel().getDynamicEPackage();
if (ModelUtil.eObjectsAreEqual(existingModel, source.getDynamicModel(), false)) {
Revision revision = null;
if (version.compareTo(contribution.getVersion()) < 0) {
@@ -374,13 +375,13 @@ public EObject replace(Blueprint source, Blueprint target, Version version, IPro
contribution.checkout(revision.getVersion());
} else
revision = contribution.createRevision(monitor);
- revision.getDomainModel().setDynamic(EcoreUtil.copy(target.getDynamicModel()));
+ revision.getDomainModel().setDynamicEPackage(EcoreUtil.copy(target.getDynamicModel()));
}
} else {
return null;
}
} else {
- EObject existingModel = contribution.getDomainModel().getDynamic();
+ EObject existingModel = contribution.getDomainModel().getDynamicEPackage();
if (ModelUtil.eObjectsAreEqual(existingModel, source.getDynamicModel(), true)) {
Revision revision = contribution.getRevision();
if (version.compareTo(contribution.getVersion()) > 0) {
@@ -388,7 +389,7 @@ public EObject replace(Blueprint source, Blueprint target, Version version, IPro
State state = revision.getState();
state.copyModel(contribution.getState());
revision.create(monitor);
- String commitId = state.initialize(true);
+ String commitId = state.initialize();
contribution.checkout(revision.getVersion(), state.getTimestamp(), commitId);
} else if (version.compareTo(contribution.getVersion()) < 0) {
if (!contribution.getRevisions().containsKey(version))
@@ -396,30 +397,19 @@ public EObject replace(Blueprint source, Blueprint target, Version version, IPro
revision = contribution.getRevisions().get(version);
contribution.checkout(revision.getVersion());
}
- revision.getDomainModel().setDynamic(EcoreUtil.copy(target.getDynamicModel()));
+ revision.getDomainModel().setDynamicEPackage(EcoreUtil.copy(target.getDynamicModel()));
} else {
return null;
}
}
contribution.getDependencies().addAll(target.getDependencies());
- final Semaphore wait = new Semaphore(0);
- CompletionListener waitListener = new CompletionListenerImpl() {
-
- @Override
- public void completed(Project result) throws Exception {
- wait.release();
- }
-
- };
- target.getCompletionListeners().add(waitListener);
+ final Object lock = new Object();
for (CompletionListener listener : target.getCompletionListeners())
contribution.addCompletionListener(listener);
- contribution.make(monitor);
- try {
- wait.acquire();
- } catch (InterruptedException e) {
+ synchronized (lock) {
+ contribution.make(monitor);
}
- return contribution.getDomainModel().getGenerated();
+ return contribution.getDomainModel().getGeneratedEPackage();
}
/**
@@ -668,6 +658,14 @@ public Blueprint createBlueprint() {
* @generated NOT
*/
public String computeProjectName(String packageName) {
+ if (packageName.endsWith(".edit"))
+ packageName = packageName.substring(0, packageName.lastIndexOf(".edit"));
+ if (packageName.isEmpty())
+ packageName = ".edit";
+ if (packageName.endsWith(".editor"))
+ packageName = packageName.substring(0, packageName.lastIndexOf(".editor"));
+ if (packageName.isEmpty())
+ packageName = ".editor";
return CodeGenUtil.safeName(packageName.toLowerCase());
}
@@ -686,6 +684,7 @@ public T copy(T original) {
* @generated NOT
*/
public void initialize() {
+ ClassMakerPlugin.print("Initializing service");
initializing = true;
getWorkspace().setService(this);
ClassMakerService.Stages.contributeStages();
@@ -694,12 +693,16 @@ public void initialize() {
try {
Resource workspaceResource = WorkspaceImpl.RESOURCE_SET_EDEFAULT.getResource(uri, true);
try {
+ ClassMakerPlugin.print("Loading workspace resource");
workspaceResource.load(Collections.emptyMap());
if (!workspaceResource.getContents().isEmpty()) {
setWorkspace(EcoreUtil.copy((Workspace) workspaceResource.getContents().get(0)));
for (Project project : getWorkspace().getProjects()) {
- if (project.eIsSet(ClassMakerPackage.Literals.PROJECT__STATE))
+ if (project.eIsSet(ClassMakerPackage.Literals.PROJECT__STATE)) {
+ ClassMakerPlugin.print(NLS.bind("Project {0} state {1} load", project.getName(),
+ project.getState().getTimestamp()));
project.getState().load(false, true);
+ }
}
} else
getWorkspace().initialize();
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionNotificationAdapterImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionNotificationAdapterImpl.java
index f955e101..e3db7164 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionNotificationAdapterImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionNotificationAdapterImpl.java
@@ -15,8 +15,9 @@
*/
package org.enterprisedomain.classmaker.impl;
+import javax.management.Notification;
+
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EClass;
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ContributionImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ContributionImpl.java
index 605786dd..fb7de969 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ContributionImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/ContributionImpl.java
@@ -15,14 +15,15 @@
*/
package org.enterprisedomain.classmaker.impl;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import javax.management.Notification;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -32,8 +33,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.ECollections;
import org.eclipse.emf.common.util.EList;
@@ -41,19 +40,10 @@
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.ListBranchCommand;
-import org.eclipse.jgit.api.ReflogCommand;
import org.eclipse.jgit.api.errors.JGitInternalException;
-import org.eclipse.jgit.errors.LockFailedException;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.ReflogEntry;
import org.enterprisedomain.classmaker.ClassMakerPackage;
import org.enterprisedomain.classmaker.CompletionListener;
import org.enterprisedomain.classmaker.Contribution;
@@ -62,14 +52,12 @@
import org.enterprisedomain.classmaker.Models;
import org.enterprisedomain.classmaker.Project;
import org.enterprisedomain.classmaker.Revision;
-import org.enterprisedomain.classmaker.SCMOperator;
import org.enterprisedomain.classmaker.Stage;
import org.enterprisedomain.classmaker.StageQualifier;
import org.enterprisedomain.classmaker.State;
import org.enterprisedomain.classmaker.core.ClassMakerPlugin;
import org.enterprisedomain.classmaker.util.ListUtil;
import org.enterprisedomain.classmaker.util.ResourceUtils;
-import org.osgi.framework.Version;
/**
* An implementation of the model object '
@@ -102,11 +90,6 @@ public class ContributionImpl extends ProjectImpl implements Contribution {
@Override
public void completed(Project result) throws Exception {
addResourceChangeListener(getResourceReloadListener());
- // if (getState().getPhase().equals(Stage.LOADED)) {
- // EPackage ePackage = (EPackage) getState().getDomainModel().getGenerated();
- // if (ePackage != null)
- // Registry.INSTANCE.put(ePackage.getNsURI(), ePackage);
- // }
}
};
@@ -185,31 +168,18 @@ public State basicGetState() {
public Version getLatestVersion() {
if (!isRevisionSet() || getRevisions().isEmpty())
return Version.emptyVersion;
- List sorted = new ArrayList();
+ List sorted = new LinkedList();
sorted.addAll((Collection) getRevisions().keySet());
Collections.sort(sorted, new Comparator() {
@Override
public int compare(org.osgi.framework.Version o1, org.osgi.framework.Version o2) {
- return o1.getMajor() - o2.getMajor() + o1.getMinor() - o2.getMinor() + o1.getMicro() - o2.getMicro();
+ return o1.compareTo(o2);
}
});
return ListUtil.getLast(sorted);
}
- /**
- *
- *
- * @generated NOT
- */
- public void copyModel(Item from) {
- setModelName(from.getModelName());
- setLanguage(from.getLanguage());
- EObject eObject = from.getDomainModel().getDynamic();
- if (eObject != null)
- getDomainModel().setDynamic(EcoreUtil.copy(eObject));
- }
-
/**
*
*
@@ -286,94 +256,6 @@ public Item basicGetParent() {
public void setParent(Item newParent) {
}
- /**
- *
- *
- * @generated NOT
- */
- public String initialize(boolean commit) {
- @SuppressWarnings("unchecked")
- SCMOperator operator = (SCMOperator) getWorkspace().getSCMRegistry().get(getProjectName());
- setName(getModelName() != null ? getModelName() : CodeGenUtil.capName(getProjectName()));
- try {
- Git git = operator.getRepositorySCM();
- // if (git == null)
- // return "";
- String currentBranch = git.getRepository().getBranch();
-
- ListBranchCommand listBranches = git.branchList();
- List[ branches = listBranches.call();
- Iterator][ it = branches.iterator();
- Ref branch = null;
- long timestamp = -1;
- String commitId = "";
- do {
- Version version = null;
- if (it.hasNext()) {
- branch = it.next();
- String[] name = branch.getName().split("/"); //$NON-NLS-1$
- try {
- version = operator.decodeVersion(name[name.length - 1]);
- ReflogCommand reflog = git.reflog();
- reflog.setRef(branch.getName().toString());
- Collection refs = reflog.call();
- for (ReflogEntry ref : refs)
- if (ref.getNewId().equals(branch.getObjectId())) {
- timestamp = operator.decodeTimestamp(ref.getComment());
- if (timestamp == -1)
- timestamp = operator.decodeTimestamp(version.getQualifier());
- }
- } catch (IllegalArgumentException e) {
- continue;
- }
- }
- if (version != null && !getRevisions().containsKey(version)) {
- Revision newRevision = newBareRevision(version);
- newRevision.setTimestamp(timestamp);
- newRevision.setProject(this);
- doNewRevision(newRevision);
- commitId = newRevision.initialize(commit);
- }
- } while (it.hasNext());
- if (!getRevisions().isEmpty() && getVersion().equals(Version.emptyVersion))
- setVersion(ListUtil.getLast(getRevisions()).getKey());
- else if (!getVersion().equals(Version.emptyVersion)) {
- if (isStateSet()) {
- try {
- getState().add(".");
- getState().commit();
- } catch (JGitInternalException e) {
- }
- }
- checkout(getVersion(), timestamp);
- }
- if (currentBranch.equals(SCMOperator.MASTER_BRANCH))
- checkout(getVersion(), timestamp);
- if (!getWorkspace().getResourceSet().eAdapters().contains(resourceChangeAdapter))
- getWorkspace().getResourceSet().eAdapters().add(resourceChangeAdapter);
- addResourceChangeListener(getResourceReloadListener());
- if (getPhase().equals(Stage.MODELED)) {
- EPackage ePackage = (EPackage) getDomainModel().getDynamic();
- if (ePackage != null)
- Registry.INSTANCE.put(ePackage.getNsURI(), ePackage);
- } else if (getPhase().equals(Stage.LOADED)) {
- EPackage ePackage = (EPackage) getDomainModel().getGenerated();
- if (ePackage != null)
- Registry.INSTANCE.put(ePackage.getNsURI(), ePackage);
- }
- return commitId;
- } catch (Exception e) {
- ClassMakerPlugin.getInstance().getLog().log(ClassMakerPlugin.createErrorStatus(e));
- return null;
- } finally {
- try {
- operator.ungetRepositorySCM();
- } catch (Exception e) {
- ClassMakerPlugin.getInstance().getLog().log(ClassMakerPlugin.createErrorStatus(e));
- }
- }
- }
-
@Override
public void create(IProgressMonitor monitor) throws CoreException {
super.create(monitor);
@@ -403,27 +285,18 @@ public String make(Revision revision, IProgressMonitor monitor) throws CoreExcep
@Override
public String make(IProgressMonitor monitor) throws CoreException {
removeResourceChangeListener(getResourceReloadListener());
- String result = // "";
-// try {
-// result =
- make(getRevision(), monitor);
-// } catch (CoreException e) {
-// if (e.getCause() instanceof InvocationTargetException) {
-// InvocationTargetException ex = (InvocationTargetException) e.getCause();
-// if (ex.getCause() instanceof Error) {
-// ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
-// result = make(getRevision(), monitor);
-// }
-// } else
-// throw e;
-// }
+ String result = make(getRevision(), monitor);
setDirty(false);
return result;
}
@Override
public void doNewRevision(Revision newRevision) {
- State newState = newRevision.newState();
+ State newState = null;
+ if (newRevision.eIsSet(ClassMakerPackage.Literals.REVISION__TIMESTAMP))
+ newState = newRevision.newState(newRevision.getTimestamp());
+ else
+ newState = newRevision.newState();
if (isStateSet())
newState.copyModel(getState());
initAdapters(newRevision);
@@ -558,7 +431,7 @@ public void delete(IProgressMonitor monitor) throws CoreException {
public void delete(EList]