From 530297b69527a3cbfa87d04a2e071de16db5e0b6 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Fri, 16 Nov 2012 12:58:54 +0000
Subject: [PATCH] extracted resource landscape model to a separate plugin
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9186 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../META-INF/MANIFEST.MF | 88 ++-----------------
.../plugin.xml | 26 ++++++
.../ContainerrepositoryEditor.java | 2 +
.../ResourceconfigurationEditor.java | 2 +
.../presentation/ResourcelandscapeEditor.java | 2 +
.../ResourcelandscapeEditorPlugin.java | 2 +
.../presentation/ResourcetypeEditor.java | 3 +
7 files changed, 44 insertions(+), 81 deletions(-)
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF
index 1d7843db..844b4155 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF
@@ -8,91 +8,17 @@ Bundle-Activator: edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resour
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: edu.kit.ipd.descartes.mm.containerrepository.presentation;
- uses:="org.eclipse.jface.wizard,
- org.eclipse.core.runtime,
- org.eclipse.emf.edit.ui.provider,
- org.eclipse.emf.common.notify,
- org.eclipse.ui.ide,
- org.eclipse.jface.action,
- org.eclipse.emf.ecore.util,
- org.eclipse.emf.ecore,
- org.eclipse.ui.views.contentoutline,
- org.eclipse.core.resources,
- org.eclipse.jface.viewers,
- org.eclipse.ui.dialogs,
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.common.ui.viewer,
- org.eclipse.emf.edit.ui.action,
- org.eclipse.emf.common.util,
- edu.kit.ipd.descartes.mm.containerrepository,
- org.eclipse.ui,
- org.eclipse.swt.events,
- org.eclipse.ui.views.properties,
- org.eclipse.ui.part,
- org.eclipse.emf.edit.provider,
- org.eclipse.swt.widgets,
- org.eclipse.emf.edit.domain,
- org.eclipse.emf.common.ui",
- edu.kit.ipd.descartes.mm.resourceconfiguration.presentation;
- uses:="org.eclipse.jface.wizard,
- edu.kit.ipd.descartes.mm.resourceconfiguration,
- org.eclipse.core.runtime,
- org.eclipse.emf.edit.ui.provider,
- org.eclipse.emf.common.notify,
- org.eclipse.jface.action,
- org.eclipse.ui.ide,
- org.eclipse.emf.ecore.util,
- org.eclipse.emf.ecore,
- org.eclipse.ui.views.contentoutline,
- org.eclipse.core.resources,
- org.eclipse.jface.viewers,
- org.eclipse.ui.dialogs,
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.common.ui.viewer,
- org.eclipse.emf.edit.ui.action,
- org.eclipse.emf.common.util,
- org.eclipse.swt.events,
- org.eclipse.ui,
- org.eclipse.ui.views.properties,
- org.eclipse.ui.part,
- org.eclipse.emf.edit.provider,
- org.eclipse.swt.widgets,
- org.eclipse.emf.common.ui,
- org.eclipse.emf.edit.domain",
- edu.kit.ipd.descartes.mm.resourcelandscape.presentation;
- uses:="org.eclipse.jface.wizard,
- org.eclipse.core.runtime,
- org.eclipse.emf.edit.ui.provider,
- org.eclipse.emf.common.notify,
- org.eclipse.ui.ide,
- org.eclipse.jface.action,
- org.eclipse.emf.ecore.util,
- org.eclipse.emf.ecore,
- org.eclipse.ui.views.contentoutline,
- org.eclipse.core.resources,
- org.eclipse.jface.viewers,
- org.eclipse.ui.dialogs,
- edu.kit.ipd.descartes.mm.resourcelandscape,
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.common.ui.viewer,
- org.eclipse.emf.edit.ui.action,
- org.eclipse.emf.common.util,
- org.eclipse.ui,
- org.eclipse.swt.events,
- org.eclipse.ui.views.properties,
- org.eclipse.ui.part,
- org.eclipse.emf.common,
- org.eclipse.emf.edit.provider,
- org.eclipse.swt.widgets,
- org.eclipse.emf.edit.domain,
- org.eclipse.emf.common.ui"
+Export-Package: edu.kit.ipd.descartes.mm.containerrepository.presentation,
+ edu.kit.ipd.descartes.mm.resourceconfiguration.presentation,
+ edu.kit.ipd.descartes.mm.resourcelandscape.presentation,
+ edu.kit.ipd.descartes.mm.resourcetype.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
+ edu.kit.ipd.descartes.mm.resourcelandscape.edit;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;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;bundle-version="1.0.0",
- edu.kit.ipd.descartes.core.edit;bundle-version="1.0.0"
+ edu.kit.ipd.descartes.mm.resourcepoolconfig.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml
index 7c95b38e..aba9c2d6 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml
@@ -85,4 +85,30 @@
</editor>
</extension>
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ id="org.eclipse.emf.ecore.Wizard.category.ID"
+ name="%_UI_Wizard_category"/>
+ <wizard
+ id="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeModelWizardID"
+ name="%_UI_ResourcetypeModelWizard_label"
+ class="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeModelWizard"
+ category="org.eclipse.emf.ecore.Wizard.category.ID"
+ icon="icons/full/obj16/ResourcetypeModelFile.gif">
+ <description>%_UI_ResourcetypeModelWizard_description</description>
+ <selection class="org.eclipse.core.resources.IResource"/>
+ </wizard>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors">
+ <editor
+ id="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeEditorID"
+ name="%_UI_ResourcetypeEditor_label"
+ icon="icons/full/obj16/ResourcetypeModelFile.gif"
+ extensions="resourcetype"
+ class="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeEditor"
+ contributorClass="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeActionBarContributor">
+ </editor>
+ </extension>
+
</plugin>
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java
index 96ef3590..9439e906 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java
@@ -166,6 +166,7 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resourcelandscape
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;
@@ -709,6 +710,7 @@ public class ContainerrepositoryEditor
adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory());
+ 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.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java
index b7180df5..0a6d4eb7 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java
@@ -166,6 +166,7 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resourcelandscape
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;
@@ -709,6 +710,7 @@ public class ResourceconfigurationEditor
adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory());
+ 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.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java
index 6d21340f..9c380da2 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java
@@ -164,6 +164,7 @@ import edu.kit.ipd.descartes.mm.containerrepository.provider.Containerrepository
import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.ResourceconfigurationItemProviderAdapterFactory;
+import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory;
import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -707,6 +708,7 @@ public class ResourcelandscapeEditor
adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory());
+ 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.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java
index 687687d5..641f27eb 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java
@@ -7,6 +7,7 @@ import edu.kit.ipd.descartes.core.provider.CoreEditPlugin;
import edu.kit.ipd.descartes.identifier.provider.IdentifierEditPlugin;
+import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigEditPlugin;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.ui.EclipseUIPlugin;
@@ -47,6 +48,7 @@ public final class ResourcelandscapeEditorPlugin extends EMFPlugin {
(new ResourceLocator [] {
CoreEditPlugin.INSTANCE,
IdentifierEditPlugin.INSTANCE,
+ ResourcepoolconfigEditPlugin.INSTANCE,
});
}
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java
index 79b59259..e5e3080b 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java
@@ -168,6 +168,8 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resourcelandscape
import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory;
+import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory;
+
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -709,6 +711,7 @@ public class ResourcetypeEditor
adapterFactory.addAdapterFactory(new ResourcetypeItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new CoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new IdentifierItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ResourcepoolconfigItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
// Create the command stack that will notify this editor as commands are executed.
--
GitLab