createSCMRegistry() {
/**
*
- *
* @generated
*/
@Override
@@ -374,7 +373,6 @@ public ResourceChangeListener createResourceChangeListener() {
/**
*
- *
* @generated
*/
@Override
@@ -385,7 +383,6 @@ public ResourceAdapter createResourceAdapter() {
/**
*
- *
* @generated
*/
@Override
@@ -396,7 +393,6 @@ public ClassMakerService createClassMakerService() {
/**
*
- *
* @generated
*/
@Override
@@ -407,7 +403,6 @@ public Blueprint createBlueprint() {
/**
*
- *
* @generated
*/
@Override
@@ -418,7 +413,6 @@ public CompletionNotificationAdapter createCompletionNotificationAdapter() {
/**
*
- *
* @generated
*/
@Override
@@ -429,7 +423,6 @@ public SelectRevealHandler createSelectRevealHandler() {
/**
*
- *
* @generated
*/
public Stage createStageFromString(EDataType eDataType, String initialValue) {
@@ -442,13 +435,28 @@ public Stage createStageFromString(EDataType eDataType, String initialValue) {
/**
*
- *
* @generated
*/
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);
+ }
+
/**
*
*
@@ -467,7 +475,6 @@ public Properties createPropertiesFromString(EDataType eDataType, String initial
/**
*
- *
* @generated
*/
public String convertPropertiesToString(EDataType eDataType, Object instanceValue) {
@@ -476,7 +483,6 @@ public String convertPropertiesToString(EDataType eDataType, Object instanceValu
/**
*
- *
* @generated
*/
public IProgressMonitor createIProgressMonitorFromString(EDataType eDataType, String initialValue) {
@@ -485,7 +491,6 @@ public IProgressMonitor createIProgressMonitorFromString(EDataType eDataType, St
/**
*
- *
* @generated
*/
public String convertIProgressMonitorToString(EDataType eDataType, Object instanceValue) {
@@ -494,7 +499,6 @@ public String convertIProgressMonitorToString(EDataType eDataType, Object instan
/**
*
- *
* @generated
*/
public Version createOSGiVersionFromString(EDataType eDataType, String initialValue) {
@@ -503,7 +507,6 @@ public Version createOSGiVersionFromString(EDataType eDataType, String initialVa
/**
*
- *
* @generated
*/
public String convertOSGiVersionToString(EDataType eDataType, Object instanceValue) {
@@ -512,7 +515,6 @@ public String convertOSGiVersionToString(EDataType eDataType, Object instanceVal
/**
*
- *
* @generated
*/
public Semaphore createSemaphoreFromString(EDataType eDataType, String initialValue) {
@@ -521,7 +523,6 @@ public Semaphore createSemaphoreFromString(EDataType eDataType, String initialVa
/**
*
- *
* @generated
*/
public String convertSemaphoreToString(EDataType eDataType, Object instanceValue) {
@@ -530,7 +531,6 @@ public String convertSemaphoreToString(EDataType eDataType, Object instanceValue
/**
*
- *
* @generated
*/
public CoreException createCoreExceptionFromString(EDataType eDataType, String initialValue) {
@@ -539,7 +539,6 @@ public CoreException createCoreExceptionFromString(EDataType eDataType, String i
/**
*
- *
* @generated
*/
public String convertCoreExceptionToString(EDataType eDataType, Object instanceValue) {
@@ -548,7 +547,6 @@ public String convertCoreExceptionToString(EDataType eDataType, Object instanceV
/**
*
- *
* @generated
*/
public InvocationTargetException createInvocationTargetExceptionFromString(EDataType eDataType,
@@ -558,7 +556,6 @@ public InvocationTargetException createInvocationTargetExceptionFromString(EData
/**
*
- *
* @generated
*/
public String convertInvocationTargetExceptionToString(EDataType eDataType, Object instanceValue) {
@@ -567,7 +564,6 @@ public String convertInvocationTargetExceptionToString(EDataType eDataType, Obje
/**
*
- *
* @generated
*/
public IStatus createIStatusFromString(EDataType eDataType, String initialValue) {
@@ -576,7 +572,6 @@ public IStatus createIStatusFromString(EDataType eDataType, String initialValue)
/**
*
- *
* @generated
*/
public String convertIStatusToString(EDataType eDataType, Object instanceValue) {
@@ -585,7 +580,6 @@ public String convertIStatusToString(EDataType eDataType, Object instanceValue)
/**
*
- *
* @generated
*/
public URI createURIFromString(EDataType eDataType, String initialValue) {
@@ -594,7 +588,6 @@ public URI createURIFromString(EDataType eDataType, String initialValue) {
/**
*
- *
* @generated
*/
public String convertURIToString(EDataType eDataType, Object instanceValue) {
@@ -603,7 +596,6 @@ public String convertURIToString(EDataType eDataType, Object instanceValue) {
/**
*
- *
* @generated
*/
public EMFPlugin createEMFPluginFromString(EDataType eDataType, String initialValue) {
@@ -612,7 +604,6 @@ public EMFPlugin createEMFPluginFromString(EDataType eDataType, String initialVa
/**
*
- *
* @generated
*/
public String convertEMFPluginToString(EDataType eDataType, Object instanceValue) {
@@ -621,7 +612,6 @@ public String convertEMFPluginToString(EDataType eDataType, Object instanceValue
/**
*
- *
* @generated
*/
public String createNameFromString(EDataType eDataType, String initialValue) {
@@ -630,7 +620,6 @@ public String createNameFromString(EDataType eDataType, String initialValue) {
/**
*
- *
* @generated
*/
public String convertNameToString(EDataType eDataType, Object instanceValue) {
@@ -639,7 +628,6 @@ public String convertNameToString(EDataType eDataType, Object instanceValue) {
/**
*
- *
* @generated
*/
public Exception createExceptionFromString(EDataType eDataType, String initialValue) {
@@ -648,7 +636,6 @@ public Exception createExceptionFromString(EDataType eDataType, String initialVa
/**
*
- *
* @generated
*/
public String convertExceptionToString(EDataType eDataType, Object instanceValue) {
@@ -657,7 +644,6 @@ public String convertExceptionToString(EDataType eDataType, Object instanceValue
/**
*
- *
* @generated
*/
public Locale createLocaleFromString(EDataType eDataType, String initialValue) {
@@ -666,7 +652,6 @@ public Locale createLocaleFromString(EDataType eDataType, String initialValue) {
/**
*
- *
* @generated
*/
public String convertLocaleToString(EDataType eDataType, Object instanceValue) {
@@ -675,7 +660,6 @@ public String convertLocaleToString(EDataType eDataType, Object instanceValue) {
/**
*
- *
* @generated
*/
@Override
@@ -685,7 +669,6 @@ public ClassMakerPackage getClassMakerPackage() {
/**
*
- *
* @deprecated
* @generated
*/
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..ac2b1968 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
@@ -77,328 +77,295 @@
/**
* An implementation of the model Package.
- *
* @generated
*/
public class ClassMakerPackageImpl extends EPackageImpl implements ClassMakerPackage {
/**
*
- *
* @generated
*/
private EClass contributionEClass = null;
/**
*
- *
* @generated
*/
private EClass revisionEClass = null;
/**
*
- *
* @generated
*/
private EClass stateEClass = null;
/**
*
- *
* @generated
*/
private EClass strategyEClass = null;
/**
*
- *
* @generated
*/
private EClass itemEClass = null;
/**
*
- *
* @generated
*/
private EClass adapterEClass = null;
/**
*
- *
* @generated
*/
private EClass workspaceEClass = null;
/**
*
- *
* @generated
*/
private EClass longToStateMapEntryEClass = null;
/**
*
- *
* @generated
*/
private EClass versionToRevisionMapEntryEClass = null;
/**
*
- *
* @generated
*/
private EClass iSchedulingRuleEClass = null;
/**
*
- *
* @generated
*/
private EClass executorEClass = null;
/**
*
- *
* @generated
*/
private EClass futureEClass = null;
/**
*
- *
* @generated
*/
private EClass iAdapterFactoryEClass = null;
/**
*
- *
* @generated
*/
private EClass customizerEClass = null;
/**
*
- *
* @generated
*/
private EClass stageQualifierEClass = null;
/**
*
- *
* @generated
*/
private EClass stageQualifierToCustomizerMapEntryEClass = null;
/**
*
- *
+ * @generated
+ */
+ private EClass stageQualifierToWorkersMapEntryEClass = null;
+
+ /**
+ *
* @generated
*/
private EClass modelsEClass = null;
/**
*
- *
* @generated
*/
private EClass projectEClass = null;
/**
*
- *
* @generated
*/
private EClass scmOperatorEClass = null;
/**
*
- *
* @generated
*/
private EClass scmRegistryEClass = null;
/**
*
- *
* @generated
*/
private EClass resourceEClass = null;
/**
*
- *
* @generated
*/
private EClass resourceChangeListenerEClass = null;
/**
*
- *
* @generated
*/
private EClass notificationEClass = null;
/**
*
- *
* @generated
*/
private EClass notifierEClass = null;
/**
*
- *
* @generated
*/
private EClass completionListenerEClass = null;
/**
*
- *
* @generated
*/
private EClass workerEClass = null;
/**
*
- *
* @generated
*/
private EClass selectRevealHandlerEClass = null;
/**
*
- *
* @generated
*/
private EClass resourceAdapterEClass = null;
/**
*
- *
* @generated
*/
private EClass classMakerServiceEClass = null;
/**
*
- *
* @generated
*/
private EClass blueprintEClass = null;
/**
*
- *
* @generated
*/
private EClass completionNotificationAdapterEClass = null;
/**
*
- *
* @generated
*/
private EEnum stageEEnum = null;
/**
*
- *
+ * @generated
+ */
+ private EDataType classLoaderEDataType = null;
+
+ /**
+ *
* @generated
*/
private EDataType propertiesEDataType = null;
/**
*
- *
* @generated
*/
private EDataType iProgressMonitorEDataType = null;
/**
*
- *
* @generated
*/
private EDataType osGiVersionEDataType = null;
/**
*
- *
* @generated
*/
private EDataType semaphoreEDataType = null;
/**
*
- *
* @generated
*/
private EDataType coreExceptionEDataType = null;
/**
*
- *
* @generated
*/
private EDataType invocationTargetExceptionEDataType = null;
/**
*
- *
* @generated
*/
private EDataType iStatusEDataType = null;
/**
*
- *
* @generated
*/
private EDataType uriEDataType = null;
/**
*
- *
* @generated
*/
private EDataType emfPluginEDataType = null;
/**
*
- *
* @generated
*/
private EDataType nameEDataType = null;
/**
*
- *
* @generated
*/
private EDataType exceptionEDataType = null;
/**
*
- *
* @generated
*/
private EDataType localeEDataType = null;
/**
* Creates an instance of the model Package, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
- * package package URI value.
- *
- * Note: the correct way to create the package is via the static factory method
- * {@link #init init()}, which also performs initialization of the package, or
- * returns the registered package, if one already exists.
- *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.enterprisedomain.classmaker.ClassMakerPackage#eNS_URI
* @see #init()
@@ -410,21 +377,17 @@ private ClassMakerPackageImpl() {
/**
*
- *
* @generated
*/
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the Package for this model, and
- * for any others upon which it depends.
+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
*
- *
- * This method is used to initialize {@link ClassMakerPackage#eINSTANCE} when
- * that field is accessed. Clients should not invoke it directly. Instead, they
- * should simply access that field to obtain the package.
- *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -469,7 +432,6 @@ public EValidator getEValidator() {
/**
*
- *
* @generated
*/
@Override
@@ -479,7 +441,6 @@ public EClass getContribution() {
/**
*
- *
* @generated
*/
@Override
@@ -489,7 +450,6 @@ public EAttribute getContribution_Dependencies() {
/**
*
- *
* @generated
*/
@Override
@@ -499,7 +459,6 @@ public EAttribute getContribution_LatestVersion() {
/**
*
- *
* @generated
*/
@Override
@@ -509,7 +468,6 @@ public EClass getRevision() {
/**
*
- *
* @generated
*/
@Override
@@ -519,7 +477,6 @@ public EReference getRevision_State() {
/**
*
- *
* @generated
*/
@Override
@@ -529,7 +486,6 @@ public EAttribute getRevision_Timestamp() {
/**
*
- *
* @generated
*/
@Override
@@ -539,7 +495,6 @@ public EReference getRevision_StateHistory() {
/**
*
- *
* @generated
*/
@Override
@@ -549,7 +504,6 @@ public EAttribute getRevision_LatestTimestamp() {
/**
*
- *
* @generated
*/
@Override
@@ -559,7 +513,6 @@ public EAttribute getRevision_Version() {
/**
*
- *
* @generated
*/
@Override
@@ -569,7 +522,6 @@ public EClass getState() {
/**
*
- *
* @generated
*/
@Override
@@ -579,7 +531,6 @@ public EAttribute getState_PackageClassName() {
/**
*
- *
* @generated
*/
@Override
@@ -589,7 +540,6 @@ public EAttribute getState_EditPluginClassName() {
/**
*
- *
* @generated
*/
@Override
@@ -599,7 +549,6 @@ public EAttribute getState_EditorPluginClassName() {
/**
*
- *
* @generated
*/
@Override
@@ -609,7 +558,6 @@ public EAttribute getState_RequiredPlugins() {
/**
*
- *
* @generated
*/
@Override
@@ -619,7 +567,6 @@ public EReference getState_Revision() {
/**
*
- *
* @generated
*/
@Override
@@ -629,7 +576,6 @@ public EAttribute getState_Timestamp() {
/**
*
- *
* @generated
*/
@Override
@@ -639,7 +585,6 @@ public EAttribute getState_DeployableUnitName() {
/**
*
- *
* @generated
*/
@Override
@@ -649,7 +594,6 @@ public EAttribute getState_EditDeployableUnitName() {
/**
*
- *
* @generated
*/
@Override
@@ -659,7 +603,6 @@ public EAttribute getState_EditorDeployableUnitName() {
/**
*
- *
* @generated
*/
@Override
@@ -669,97 +612,87 @@ 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);
}
/**
*
- *
* @generated
*/
@Override
- public EAttribute getState_CommitIds() {
- return (EAttribute) stateEClass.getEStructuralFeatures().get(11);
+ public EReference getState_StateCustomizers() {
+ return (EReference) stateEClass.getEStructuralFeatures().get(11);
}
/**
*
- *
* @generated
*/
@Override
- public EAttribute getState_CommitId() {
- return (EAttribute) stateEClass.getEStructuralFeatures().get(12);
+ public EReference getState_NonExclusiveStateCustomizers() {
+ return (EReference) stateEClass.getEStructuralFeatures().get(12);
}
/**
*
- *
* @generated
*/
@Override
- public EReference getState_StateCustomizers() {
- return (EReference) stateEClass.getEStructuralFeatures().get(13);
+ public EAttribute getState_ProjectName() {
+ return (EAttribute) stateEClass.getEStructuralFeatures().get(13);
}
/**
*
- *
* @generated
*/
@Override
- public EAttribute getState_ProjectName() {
+ public EAttribute getState_Making() {
return (EAttribute) stateEClass.getEStructuralFeatures().get(14);
}
/**
*
- *
* @generated
*/
@Override
- public EAttribute getState_Making() {
+ public EAttribute getState_Edit() {
return (EAttribute) stateEClass.getEStructuralFeatures().get(15);
}
/**
*
- *
* @generated
*/
@Override
- public EAttribute getState_Edit() {
+ public EAttribute getState_Editor() {
return (EAttribute) stateEClass.getEStructuralFeatures().get(16);
}
/**
*
- *
* @generated
*/
@Override
- public EAttribute getState_Editor() {
- return (EAttribute) stateEClass.getEStructuralFeatures().get(17);
+ public EReference getState_Strategy() {
+ return (EReference) stateEClass.getEStructuralFeatures().get(17);
}
/**
*
- *
* @generated
*/
@Override
- public EReference getState_Strategy() {
- return (EReference) stateEClass.getEStructuralFeatures().get(18);
+ public EAttribute getState_BasePackage() {
+ return (EAttribute) stateEClass.getEStructuralFeatures().get(18);
}
/**
*
- *
* @generated
*/
@Override
@@ -769,57 +702,24 @@ public EClass getStrategy() {
/**
*
- *
* @generated
*/
@Override
- public EReference getStrategy_Generators() {
+ public EReference getStrategy_State() {
return (EReference) strategyEClass.getEStructuralFeatures().get(0);
}
/**
*
- *
* @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);
- }
-
- /**
- *
- *
* @generated
*/
@Override
@@ -829,7 +729,6 @@ public EClass getItem() {
/**
*
- *
* @generated
*/
@Override
@@ -839,7 +738,6 @@ public EAttribute getItem_ModelName() {
/**
*
- *
* @generated
*/
@Override
@@ -849,7 +747,6 @@ public EAttribute getItem_Phase() {
/**
*
- *
* @generated
*/
@Override
@@ -859,7 +756,6 @@ public EAttribute getItem_Language() {
/**
*
- *
* @generated
*/
@Override
@@ -869,7 +765,6 @@ public EReference getItem_DomainModel() {
/**
*
- *
* @generated
*/
@Override
@@ -879,7 +774,6 @@ public EReference getItem_Customizers() {
/**
*
- *
* @generated
*/
@Override
@@ -889,7 +783,6 @@ public EReference getItem_Parent() {
/**
*
- *
* @generated
*/
@Override
@@ -899,7 +792,6 @@ public EAttribute getItem_Locale() {
/**
*
- *
* @generated
*/
@Override
@@ -909,7 +801,15 @@ public EReference getItem_Project() {
/**
*
- *
+ * @generated
+ */
+ @Override
+ public EReference getItem_Resource() {
+ return (EReference) itemEClass.getEStructuralFeatures().get(8);
+ }
+
+ /**
+ *
* @generated
*/
@Override
@@ -919,7 +819,6 @@ public EClass getAdapter() {
/**
*
- *
* @generated
*/
@Override
@@ -929,7 +828,6 @@ public EClass getWorkspace() {
/**
*
- *
* @generated
*/
@Override
@@ -939,7 +837,6 @@ public EReference getWorkspace_Projects() {
/**
*
- *
* @generated
*/
@Override
@@ -949,7 +846,6 @@ public EAttribute getWorkspace_ResourceSet() {
/**
*
- *
* @generated
*/
@Override
@@ -959,27 +855,42 @@ public EReference getWorkspace_Customizers() {
/**
*
- *
* @generated
*/
@Override
- public EReference getWorkspace_Service() {
+ public EReference getWorkspace_NonExclusiveCustomizers() {
return (EReference) workspaceEClass.getEStructuralFeatures().get(3);
}
/**
*
- *
* @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);
+ }
+
+ /**
+ *
* @generated
*/
@Override
@@ -989,7 +900,6 @@ public EClass getLongToStateMapEntry() {
/**
*
- *
* @generated
*/
@Override
@@ -999,7 +909,6 @@ public EAttribute getLongToStateMapEntry_Key() {
/**
*
- *
* @generated
*/
@Override
@@ -1009,7 +918,6 @@ public EReference getLongToStateMapEntry_Value() {
/**
*
- *
* @generated
*/
@Override
@@ -1019,7 +927,6 @@ public EClass getVersionToRevisionMapEntry() {
/**
*
- *
* @generated
*/
@Override
@@ -1029,7 +936,6 @@ public EAttribute getVersionToRevisionMapEntry_Key() {
/**
*
- *
* @generated
*/
@Override
@@ -1039,7 +945,6 @@ public EReference getVersionToRevisionMapEntry_Value() {
/**
*
- *
* @generated
*/
@Override
@@ -1049,7 +954,6 @@ public EClass getISchedulingRule() {
/**
*
- *
* @generated
*/
@Override
@@ -1059,7 +963,6 @@ public EClass getExecutor() {
/**
*
- *
* @generated
*/
@Override
@@ -1069,7 +972,6 @@ public EClass getFuture() {
/**
*
- *
* @generated
*/
@Override
@@ -1079,7 +981,6 @@ public EClass getIAdapterFactory() {
/**
*
- *
* @generated
*/
@Override
@@ -1089,7 +990,6 @@ public EClass getCustomizer() {
/**
*
- *
* @generated
*/
@Override
@@ -1099,7 +999,24 @@ public EAttribute getCustomizer_Rank() {
/**
*
- *
+ * @generated
+ */
+ @Override
+ public EAttribute getCustomizer_Exclusive() {
+ return (EAttribute) customizerEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ *
+ * @generated
+ */
+ @Override
+ public EReference getCustomizer_Stage() {
+ return (EReference) customizerEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ *
* @generated
*/
@Override
@@ -1109,7 +1026,6 @@ public EClass getStageQualifier() {
/**
*
- *
* @generated
*/
@Override
@@ -1119,7 +1035,6 @@ public EAttribute getStageQualifier_Stage() {
/**
*
- *
* @generated
*/
@Override
@@ -1129,7 +1044,6 @@ public EAttribute getStageQualifier_Step() {
/**
*
- *
* @generated
*/
@Override
@@ -1139,7 +1053,6 @@ public EClass getStageQualifierToCustomizerMapEntry() {
/**
*
- *
* @generated
*/
@Override
@@ -1149,7 +1062,6 @@ public EReference getStageQualifierToCustomizerMapEntry_Key() {
/**
*
- *
* @generated
*/
@Override
@@ -1159,7 +1071,33 @@ public EReference getStageQualifierToCustomizerMapEntry_Value() {
/**
*
- *
+ * @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);
+ }
+
+ /**
+ *
* @generated
*/
@Override
@@ -1169,7 +1107,6 @@ public EClass getModels() {
/**
*
- *
* @generated
*/
@Override
@@ -1179,7 +1116,6 @@ public EReference getModels_Dynamic() {
/**
*
- *
* @generated
*/
@Override
@@ -1189,7 +1125,6 @@ public EReference getModels_Generated() {
/**
*
- *
* @generated
*/
@Override
@@ -1199,7 +1134,6 @@ public EAttribute getModels_GeneratedEdit() {
/**
*
- *
* @generated
*/
@Override
@@ -1209,7 +1143,6 @@ public EAttribute getModels_GeneratedEditor() {
/**
*
- *
* @generated
*/
@Override
@@ -1219,7 +1152,6 @@ public EReference getModels_Parent() {
/**
*
- *
* @generated
*/
@Override
@@ -1229,7 +1161,6 @@ public EDataType getEMFPlugin() {
/**
*
- *
* @generated
*/
@Override
@@ -1239,7 +1170,6 @@ public EClass getProject() {
/**
*
- *
* @generated
*/
@Override
@@ -1249,7 +1179,6 @@ public EAttribute getProject_Name() {
/**
*
- *
* @generated
*/
@Override
@@ -1259,157 +1188,141 @@ public EAttribute getProject_ProjectName() {
/**
*
- *
- * @generated
- */
- @Override
- public EAttribute getProject_Children() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- *
- *
* @generated
*/
@Override
public EAttribute getProject_Dirty() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(3);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(2);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_Workspace() {
- return (EReference) projectEClass.getEStructuralFeatures().get(4);
+ return (EReference) projectEClass.getEStructuralFeatures().get(3);
}
/**
*
- *
* @generated
*/
@Override
public EAttribute getProject_ResourcePath() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(5);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(4);
}
/**
*
- *
* @generated
*/
@Override
public EAttribute getProject_NeedCompletionNotification() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(6);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(5);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_CompletionNotificationAdapter() {
- return (EReference) projectEClass.getEStructuralFeatures().get(7);
+ return (EReference) projectEClass.getEStructuralFeatures().get(6);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_ResourceReloadListener() {
- return (EReference) projectEClass.getEStructuralFeatures().get(8);
+ return (EReference) projectEClass.getEStructuralFeatures().get(7);
}
/**
*
- *
* @generated
*/
@Override
public EAttribute getProject_SavingResource() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(9);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(8);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_Revision() {
- return (EReference) projectEClass.getEStructuralFeatures().get(10);
+ return (EReference) projectEClass.getEStructuralFeatures().get(9);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_Revisions() {
- return (EReference) projectEClass.getEStructuralFeatures().get(11);
+ return (EReference) projectEClass.getEStructuralFeatures().get(10);
}
/**
*
- *
* @generated
*/
@Override
public EAttribute getProject_ProjectVersion() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(12);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(11);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_SelectRevealHandler() {
- return (EReference) projectEClass.getEStructuralFeatures().get(13);
+ return (EReference) projectEClass.getEStructuralFeatures().get(12);
}
/**
*
- *
* @generated
*/
@Override
public EAttribute getProject_Version() {
- return (EAttribute) projectEClass.getEStructuralFeatures().get(14);
+ return (EAttribute) projectEClass.getEStructuralFeatures().get(13);
}
/**
*
- *
* @generated
*/
@Override
public EReference getProject_State() {
- return (EReference) projectEClass.getEStructuralFeatures().get(15);
+ return (EReference) projectEClass.getEStructuralFeatures().get(14);
}
/**
*
- *
* @generated
*/
@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);
}
/**
*
- *
* @generated
*/
@Override
@@ -1419,7 +1332,6 @@ public EClass getSCMOperator() {
/**
*
- *
* @generated
*/
@Override
@@ -1429,7 +1341,6 @@ public EAttribute getSCMOperator_ProjectName() {
/**
*
- *
* @generated
*/
@Override
@@ -1439,7 +1350,6 @@ public EReference getSCMOperator_Registry() {
/**
*
- *
* @generated
*/
@Override
@@ -1449,7 +1359,6 @@ public EClass getSCMRegistry() {
/**
*
- *
* @generated
*/
@Override
@@ -1459,7 +1368,6 @@ public EClass getResource() {
/**
*
- *
* @generated
*/
@Override
@@ -1469,7 +1377,6 @@ public EClass getResourceChangeListener() {
/**
*
- *
* @generated
*/
@Override
@@ -1479,7 +1386,6 @@ public EClass getNotification() {
/**
*
- *
* @generated
*/
@Override
@@ -1489,7 +1395,6 @@ public EClass getNotifier() {
/**
*
- *
* @generated
*/
@Override
@@ -1499,7 +1404,6 @@ public EClass getCompletionListener() {
/**
*
- *
* @generated
*/
@Override
@@ -1509,7 +1413,6 @@ public EClass getWorker() {
/**
*
- *
* @generated
*/
@Override
@@ -1519,7 +1422,6 @@ public EClass getSelectRevealHandler() {
/**
*
- *
* @generated
*/
@Override
@@ -1529,7 +1431,6 @@ public EClass getResourceAdapter() {
/**
*
- *
* @generated
*/
@Override
@@ -1539,7 +1440,6 @@ public EReference getResourceAdapter_Resource() {
/**
*
- *
* @generated
*/
@Override
@@ -1549,7 +1449,6 @@ public EAttribute getResourceAdapter_Filename() {
/**
*
- *
* @generated
*/
@Override
@@ -1559,7 +1458,6 @@ public EReference getResourceAdapter_Project() {
/**
*
- *
* @generated
*/
@Override
@@ -1569,7 +1467,6 @@ public EClass getClassMakerService() {
/**
*
- *
* @generated
*/
@Override
@@ -1579,7 +1476,6 @@ public EReference getClassMakerService_Workspace() {
/**
*
- *
* @generated
*/
@Override
@@ -1589,7 +1485,6 @@ public EClass getBlueprint() {
/**
*
- *
* @generated
*/
@Override
@@ -1599,7 +1494,6 @@ public EReference getBlueprint_DynamicModel() {
/**
*
- *
* @generated
*/
@Override
@@ -1609,7 +1503,6 @@ public EAttribute getBlueprint_Dependencies() {
/**
*
- *
* @generated
*/
@Override
@@ -1619,7 +1512,6 @@ public EReference getBlueprint_CompletionListeners() {
/**
*
- *
* @generated
*/
@Override
@@ -1629,7 +1521,6 @@ public EAttribute getBlueprint_Edit() {
/**
*
- *
* @generated
*/
@Override
@@ -1639,7 +1530,6 @@ public EAttribute getBlueprint_Editor() {
/**
*
- *
* @generated
*/
@Override
@@ -1649,7 +1539,6 @@ public EClass getCompletionNotificationAdapter() {
/**
*
- *
* @generated
*/
@Override
@@ -1659,7 +1548,6 @@ public EAttribute getCompletionNotificationAdapter_Error() {
/**
*
- *
* @generated
*/
@Override
@@ -1669,7 +1557,6 @@ public EReference getCompletionNotificationAdapter_Project() {
/**
*
- *
* @generated
*/
@Override
@@ -1679,7 +1566,6 @@ public EDataType getLocale() {
/**
*
- *
* @generated
*/
@Override
@@ -1689,7 +1575,15 @@ public EEnum getStage() {
/**
*
- *
+ * @generated
+ */
+ @Override
+ public EDataType getClassLoader() {
+ return classLoaderEDataType;
+ }
+
+ /**
+ *
* @generated
*/
@Override
@@ -1699,7 +1593,6 @@ public EDataType getProperties() {
/**
*
- *
* @generated
*/
@Override
@@ -1709,7 +1602,6 @@ public EDataType getIProgressMonitor() {
/**
*
- *
* @generated
*/
@Override
@@ -1719,7 +1611,6 @@ public EDataType getOSGiVersion() {
/**
*
- *
* @generated
*/
@Override
@@ -1729,7 +1620,6 @@ public EDataType getSemaphore() {
/**
*
- *
* @generated
*/
@Override
@@ -1739,7 +1629,6 @@ public EDataType getCoreException() {
/**
*
- *
* @generated
*/
@Override
@@ -1749,7 +1638,6 @@ public EDataType getInvocationTargetException() {
/**
*
- *
* @generated
*/
@Override
@@ -1759,7 +1647,6 @@ public EDataType getIStatus() {
/**
*
- *
* @generated
*/
@Override
@@ -1769,7 +1656,6 @@ public EDataType getURI() {
/**
*
- *
* @generated
*/
@Override
@@ -1779,7 +1665,6 @@ public EDataType getName_() {
/**
*
- *
* @generated
*/
@Override
@@ -1789,7 +1674,6 @@ public EDataType getException() {
/**
*
- *
* @generated
*/
@Override
@@ -1799,16 +1683,15 @@ public ClassMakerFactory getClassMakerFactory() {
/**
*
- *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is guarded to
- * have no affect on any invocation but its first.
- *
* @generated
*/
public void createPackageContents() {
@@ -1839,22 +1722,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 +1745,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 +1753,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 +1776,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,6 +1787,10 @@ 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);
@@ -1918,7 +1807,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 +1821,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 +1860,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);
@@ -1987,7 +1877,6 @@ public void createPackageContents() {
/**
*
- *
* @generated
*/
private boolean isInitialized = false;
@@ -2081,6 +1970,9 @@ public void initializePackageContents() {
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 +2012,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 +2031,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 +2063,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 +2079,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 +2104,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,8 +2121,7 @@ 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);
@@ -2258,6 +2139,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 +2151,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 +2247,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,6 +2281,15 @@ 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,
@@ -2494,8 +2404,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 +2443,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 +2473,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);
@@ -2732,7 +2641,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 +2834,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..9202efd3 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
@@ -56,6 +56,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;
@@ -78,17 +79,15 @@
* The following features are implemented:
*
*
- * - {@link org.enterprisedomain.classmaker.impl.ClassMakerServiceImpl#getWorkspace
- * Workspace}
+ * - {@link org.enterprisedomain.classmaker.impl.ClassMakerServiceImpl#getWorkspace Workspace}
*
*
* @generated
*/
public class ClassMakerServiceImpl extends EObjectImpl implements ClassMakerService {
/**
- * The cached value of the '{@link #getWorkspace() Workspace}'
- * containment reference.
- *
+ * The cached value of the '{@link #getWorkspace() Workspace}' containment reference.
+ *
* @see #getWorkspace()
* @generated
* @ordered
@@ -171,7 +170,6 @@ public ClassMakerServiceImpl() {
/**
*
- *
* @generated
*/
@Override
@@ -181,7 +179,6 @@ protected EClass eStaticClass() {
/**
*
- *
* @generated
*/
@Override
@@ -191,7 +188,6 @@ public Workspace getWorkspace() {
/**
*
- *
* @generated
*/
public NotificationChain basicSetWorkspace(Workspace newWorkspace, NotificationChain msgs) {
@@ -210,7 +206,6 @@ public NotificationChain basicSetWorkspace(Workspace newWorkspace, NotificationC
/**
*
- *
* @generated
*/
@Override
@@ -388,7 +383,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))
@@ -668,6 +663,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 +689,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 +698,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();
@@ -725,7 +733,6 @@ public void dispose() {
/**
*
- *
* @generated
*/
@Override
@@ -742,7 +749,6 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
- *
* @generated
*/
@Override
@@ -756,7 +762,6 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
- *
* @generated
*/
@Override
@@ -770,7 +775,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
- *
* @generated
*/
@Override
@@ -785,7 +789,6 @@ public void eSet(int featureID, Object newValue) {
/**
*
- *
* @generated
*/
@Override
@@ -800,7 +803,6 @@ public void eUnset(int featureID) {
/**
*
- *
* @generated
*/
@Override
diff --git a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionListenerImpl.java b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionListenerImpl.java
index c6699131..b2eb8560 100644
--- a/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionListenerImpl.java
+++ b/bundles/org.enterprisedomain.classmaker/src/org/enterprisedomain/classmaker/impl/CompletionListenerImpl.java
@@ -30,7 +30,6 @@
public abstract class CompletionListenerImpl extends EObjectImpl implements CompletionListener {
/**
*
- *
* @generated
*/
protected CompletionListenerImpl() {
@@ -39,7 +38,6 @@ protected CompletionListenerImpl() {
/**
*
- *
* @generated
*/
@Override
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..614e4790 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
@@ -35,10 +35,8 @@
* The following features are implemented:
*
*
- * - {@link org.enterprisedomain.classmaker.impl.CompletionNotificationAdapterImpl#getError
- * Error}
- * - {@link org.enterprisedomain.classmaker.impl.CompletionNotificationAdapterImpl#getProject
- * Project}
+ * - {@link org.enterprisedomain.classmaker.impl.CompletionNotificationAdapterImpl#getError Error}
+ * - {@link org.enterprisedomain.classmaker.impl.CompletionNotificationAdapterImpl#getProject Project}
*
*
* @generated
@@ -67,7 +65,6 @@ public class CompletionNotificationAdapterImpl extends EObjectImpl implements Co
/**
* The cached value of the '{@link #getProject() Project}' reference.
*
- *
* @see #getProject()
* @generated
* @ordered
@@ -76,7 +73,6 @@ public class CompletionNotificationAdapterImpl extends EObjectImpl implements Co
/**
*
- *
* @generated
*/
protected CompletionNotificationAdapterImpl() {
@@ -85,7 +81,6 @@ protected CompletionNotificationAdapterImpl() {
/**
*
- *
* @generated
*/
@Override
@@ -95,7 +90,6 @@ protected EClass eStaticClass() {
/**
*
- *
* @generated
*/
@Override
@@ -105,7 +99,6 @@ public IStatus getError() {
/**
*
- *
* @generated
*/
@Override
@@ -124,7 +117,6 @@ public Project getProject() {
/**
*
- *
* @generated
*/
public Project basicGetProject() {
@@ -133,7 +125,6 @@ public Project basicGetProject() {
/**
*
- *
* @generated
*/
public NotificationChain basicSetProject(Project newProject, NotificationChain msgs) {
@@ -152,7 +143,6 @@ public NotificationChain basicSetProject(Project newProject, NotificationChain m
/**
*
- *
* @generated
*/
@Override
@@ -175,7 +165,6 @@ public void setProject(Project newProject) {
/**
*
- *
* @generated
*/
@Override
@@ -192,7 +181,6 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
- *
* @generated
*/
@Override
@@ -246,7 +234,6 @@ public void setTarget(Notifier newTarget) {
/**
*
- *
* @generated
*/
@Override
@@ -264,7 +251,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
- *
* @generated
*/
@Override
@@ -279,7 +265,6 @@ public void eSet(int featureID, Object newValue) {
/**
*
- *
* @generated
*/
@Override
@@ -294,7 +279,6 @@ public void eUnset(int featureID) {
/**
*
- *
* @generated
*/
@Override
@@ -310,7 +294,6 @@ public boolean eIsSet(int featureID) {
/**
*
- *
* @generated
*/
@Override
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..8c85aa93 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,11 +15,10 @@
*/
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;
@@ -32,7 +31,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;
@@ -41,19 +39,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,7 +51,6 @@
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;
@@ -78,10 +66,8 @@
* The following features are implemented:
*
*
- * - {@link org.enterprisedomain.classmaker.impl.ContributionImpl#getDependencies
- * Dependencies}
- * - {@link org.enterprisedomain.classmaker.impl.ContributionImpl#getLatestVersion
- * Latest Version}
+ * - {@link org.enterprisedomain.classmaker.impl.ContributionImpl#getDependencies Dependencies}
+ * - {@link org.enterprisedomain.classmaker.impl.ContributionImpl#getLatestVersion Latest Version}
*
*
* @generated
@@ -89,9 +75,8 @@
public class ContributionImpl extends ProjectImpl implements Contribution {
/**
- * The default value of the '{@link #getLatestVersion() Latest
- * Version}' attribute.
- *
+ * The default value of the '{@link #getLatestVersion() Latest Version}' attribute.
+ *
* @see #getLatestVersion()
* @generated
* @ordered
@@ -102,18 +87,12 @@ 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);
- // }
}
};
/**
*
- *
* @generated
*/
protected ContributionImpl() {
@@ -122,7 +101,6 @@ protected ContributionImpl() {
/**
*
- *
* @generated
*/
@Override
@@ -185,31 +163,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 +251,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 +280,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 +426,7 @@ public void delete(IProgressMonitor monitor) throws CoreException {
public void delete(EList]