Refactored text from IM to Mangrove and added support for the branches.common plugin for menu definition
diff --git a/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/META-INF/MANIFEST.MF b/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/META-INF/MANIFEST.MF
index 7422cf5..d7c4390 100644
--- a/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/META-INF/MANIFEST.MF
+++ b/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.soa.mangrove,
- org.eclipse.soa.sca.sca1_1.model;bundle-version="2.2.0"
+ org.eclipse.soa.sca.sca1_1.model;bundle-version="2.2.0",
+ org.eclipse.soa.mangrove.branches.common;bundle-version="0.5.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: INRIA
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/plugin.xml b/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/plugin.xml
index bfe6382..d450e3d 100644
--- a/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/plugin.xml
+++ b/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/plugin.xml
@@ -22,18 +22,10 @@
id="org.eclipse.soa.mangrove.in.sca.contribution1"
nameFilter="*.composite"
objectClass="org.eclipse.core.resources.IFile">
- <menu
- label="Intermediate Model"
- path="additions"
- id="org.eclipse.soa.mangrove.in.sca.menu1">
- <separator
- name="group1">
- </separator>
- </menu>
<action
- label="Export to the Intermediate Model"
+ label="Export to Mangrove Core"
class="org.eclipse.soa.mangrove.in.sca.popup.actions.ExportToIMAction"
- menubarPath="org.eclipse.soa.mangrove.in.sca.menu1/group1"
+ menubarPath="org.eclipse.soa.mangrove.branches.common.mainMenu/mainGroup"
enablesFor="1"
id="org.eclipse.soa.mangrove.in.sca.exportAction">
</action>
diff --git a/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/src/org/eclipse/soa/mangrove/in/sca/transform/SCA2IMTransformer.java b/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/src/org/eclipse/soa/mangrove/in/sca/transform/SCA2IMTransformer.java
index 3bfb727..38600fc 100644
--- a/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/src/org/eclipse/soa/mangrove/in/sca/transform/SCA2IMTransformer.java
+++ b/org.eclipse.soa.mangrove.branches/trunk/org.eclipse.soa.mangrove.in.sca/src/org/eclipse/soa/mangrove/in/sca/transform/SCA2IMTransformer.java
@@ -91,11 +91,11 @@
//to finish up, the IM must be persisted in the workspace
//(using an identical file name to the SCA one, with a changed extension)
try {
- URI imURI = uri.trimFileExtension().appendFileExtension("im");
+ URI imURI = uri.trimFileExtension().appendFileExtension("mangrove");
imHandler.persistIM(imURI);
container.refreshLocal(2, null); //refreshes the workspace so that the saved file is visible
} catch (IOException e) {
- displayIMError("Could not save the IM file", e);
+ displayIMError("Could not save the Mangrove file", e);
} catch (CoreException e) {
displayIMError("Could not refresh the workspace", e);
}
