diff --git a/edu.kit.ipd.descartes.mm.deployment.edit/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.deployment.edit/META-INF/MANIFEST.MF index 84960ff8bbc8e017ccbefb00e1d25ffd37665259..70a92c0dd731216e0e07bca7e534e42014980418 100644 --- a/edu.kit.ipd.descartes.mm.deployment.edit/META-INF/MANIFEST.MF +++ b/edu.kit.ipd.descartes.mm.deployment.edit/META-INF/MANIFEST.MF @@ -19,7 +19,5 @@ Require-Bundle: org.eclipse.core.runtime, edu.kit.ipd.descartes.identifier;visibility:=reexport, edu.kit.ipd.descartes.identifier.edit;visibility:=reexport, edu.kit.ipd.descartes.mm.resourcelandscape;visibility:=reexport, - edu.kit.ipd.descartes.mm.resourcelandscape.edit;visibility:=reexport, - edu.kit.ipd.descartes.mm.resourcepoolconfig;visibility:=reexport, - edu.kit.ipd.descartes.mm.resourcepoolconfig.edit;visibility:=reexport + edu.kit.ipd.descartes.mm.resourcelandscape.edit;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/edu.kit.ipd.descartes.mm.deployment.edit/src/edu/kit/ipd/descartes/mm/deployment/provider/DeploymentEditPlugin.java b/edu.kit.ipd.descartes.mm.deployment.edit/src/edu/kit/ipd/descartes/mm/deployment/provider/DeploymentEditPlugin.java index f8e68aa1043fd3064031803d2c6221df6a171d30..9a3e30adea9c0089cb19fe1c723450ea187edfc8 100644 --- a/edu.kit.ipd.descartes.mm.deployment.edit/src/edu/kit/ipd/descartes/mm/deployment/provider/DeploymentEditPlugin.java +++ b/edu.kit.ipd.descartes.mm.deployment.edit/src/edu/kit/ipd/descartes/mm/deployment/provider/DeploymentEditPlugin.java @@ -11,8 +11,6 @@ import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPl import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeEditPlugin; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigEditPlugin; - import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; @@ -53,7 +51,6 @@ public final class DeploymentEditPlugin extends EMFPlugin { CoreEditPlugin.INSTANCE, IdentifierEditPlugin.INSTANCE, ResourcelandscapeEditPlugin.INSTANCE, - ResourcepoolconfigEditPlugin.INSTANCE, }); } diff --git a/edu.kit.ipd.descartes.mm.deployment.editor/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.deployment.editor/META-INF/MANIFEST.MF index 3ef2fb8a474bc2dbc109717d946060dd676436d5..e3cc5228df6dabbb6eedf4f4fe00fc04a7bf44c6 100644 --- a/edu.kit.ipd.descartes.mm.deployment.editor/META-INF/MANIFEST.MF +++ b/edu.kit.ipd.descartes.mm.deployment.editor/META-INF/MANIFEST.MF @@ -18,6 +18,5 @@ Require-Bundle: org.eclipse.core.runtime, edu.kit.ipd.descartes.mm.applicationlevel.edit;visibility:=reexport, edu.kit.ipd.descartes.core.edit;visibility:=reexport, edu.kit.ipd.descartes.identifier.edit;visibility:=reexport, - edu.kit.ipd.descartes.mm.resourcelandscape.edit;visibility:=reexport, - edu.kit.ipd.descartes.mm.resourcepoolconfig.edit;visibility:=reexport + edu.kit.ipd.descartes.mm.resourcelandscape.edit;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditor.java b/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditor.java index abe49107f4a2c0498b042df2078f1b0ddadd7f74..505d301ef9798687af57928291d01fed5a006891 100644 --- a/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditor.java +++ b/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditor.java @@ -176,8 +176,6 @@ import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.Resourceconfigura import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory; - import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory; import org.eclipse.ui.actions.WorkspaceModifyOperation; @@ -727,7 +725,6 @@ public class DeploymentEditor adapterFactory.addAdapterFactory(new ResourceconfigurationItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new ContainerrepositoryItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory(new ResourcepoolconfigItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); // Create the command stack that will notify this editor as commands are executed. diff --git a/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditorPlugin.java b/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditorPlugin.java index 9a99aec1b251467e1265d1332b06953906566ceb..f58e16787a26175127f8c45cd1605d4689567c3c 100644 --- a/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditorPlugin.java +++ b/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentEditorPlugin.java @@ -11,8 +11,6 @@ import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPl import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeEditPlugin; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigEditPlugin; - import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.ui.EclipseUIPlugin; @@ -55,7 +53,6 @@ public final class DeploymentEditorPlugin extends EMFPlugin { CoreEditPlugin.INSTANCE, IdentifierEditPlugin.INSTANCE, ResourcelandscapeEditPlugin.INSTANCE, - ResourcepoolconfigEditPlugin.INSTANCE, }); } diff --git a/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentModelWizard.java b/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentModelWizard.java index 49c9da6116278c200963841e9561a5072b40e88f..fa4b8f289d1b409ce4d146e1d3542837a643c186 100644 --- a/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentModelWizard.java +++ b/edu.kit.ipd.descartes.mm.deployment.editor/src/edu/kit/ipd/descartes/mm/deployment/presentation/DeploymentModelWizard.java @@ -396,8 +396,7 @@ public class DeploymentModelWizard extends Wizard implements INewWizard { * @generated */ public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - { + Composite composite = new Composite(parent, SWT.NONE); { GridLayout layout = new GridLayout(); layout.numColumns = 1; layout.verticalSpacing = 12;