Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/plugin.xml8
-rw-r--r--plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.qvtd.debug/plugin.xml4
-rw-r--r--plugins/org.eclipse.qvtd.umlx.design/description/umlx.odesign2
-rw-r--r--plugins/org.eclipse.qvtd.umlx.design/icons/umlxx.gifbin364 -> 0 bytes
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/build.properties3
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/icons/UMLXModelFile.gif (renamed from plugins/org.eclipse.qvtd.debug.ui/icons/umlxx.gif)bin364 -> 364 bytes
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/plugin.xml21
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java (renamed from plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/UMLXLaunchConfigurationDelegate.java)4
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationTabGroup.java (renamed from plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/UMLXLaunchConfigurationTabGroup.java)3
-rw-r--r--plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java (renamed from plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/UMLXMainTab.java)12
13 files changed, 42 insertions, 29 deletions
diff --git a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
index 41cfceb81..d848702da 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
@@ -7,21 +7,20 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.codegen.ecore;bundle-version="[2.7.0,3.0.0)",
org.eclipse.emf.common.ui;bundle-version="[2.7.0,3.0.0)",
org.eclipse.ocl.examples.codegen;bundle-version="[2.1.0,3.0.0)",
org.eclipse.ocl.examples.debug.vm.ui;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.qvtd.debug;bundle-version="[0.14.0,1.0.0)",
+ org.eclipse.qvtd.debug;bundle-version="[0.14.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.codegen;bundle-version="[0.14.0,1.0.0)",
org.eclipse.qvtd.compiler;bundle-version="[0.14.0,1.0.0)",
org.eclipse.qvtd.xtext.qvtcore;bundle-version="[0.14.0,1.0.0)",
org.eclipse.qvtd.xtext.qvtimperative;bundle-version="[0.14.0,1.0.0)",
org.eclipse.qvtd.xtext.qvtimperative.ui;bundle-version="[0.14.0,1.0.0)",
- org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.14.0,1.0.0)",
- org.eclipse.qvtd.umlx
+ org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.14.0,1.0.0)"
Bundle-Activator: org.eclipse.qvtd.debug.ui.QVTdDebugUIPlugin
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j,
diff --git a/plugins/org.eclipse.qvtd.debug.ui/plugin.xml b/plugins/org.eclipse.qvtd.debug.ui/plugin.xml
index b2abdc4b4..68a4482b2 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/plugin.xml
+++ b/plugins/org.eclipse.qvtd.debug.ui/plugin.xml
@@ -135,10 +135,6 @@
configTypeID="org.eclipse.qvtd.debug.launching.QVTrLaunchConfigurationDelegate"
icon="icons/QVTrModelFile.gif"
id="QVTr Debug"/>
- <launchConfigurationTypeImage
- configTypeID="org.eclipse.qvtd.debug.launching.UMLXLaunchConfigurationDelegate"
- icon="icons/umlxx.gif"
- id="UMLX Debug"/>
</extension>
<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
@@ -154,10 +150,6 @@
class="org.eclipse.qvtd.debug.ui.launching.QVTrLaunchConfigurationTabGroup"
description="Create a configuration to launch a QVTr (Relations) transformation"
type="org.eclipse.qvtd.debug.launching.QVTrLaunchConfigurationDelegate"/>
- <launchConfigurationTabGroup id="org.eclipse.qvtd.debug.launching.UMLXLaunchConfigurationTabGroup"
- class="org.eclipse.qvtd.debug.ui.launching.UMLXLaunchConfigurationTabGroup"
- description="Create a configuration to launch a UMLX transformation"
- type="org.eclipse.qvtd.debug.launching.UMLXLaunchConfigurationDelegate"/>
</extension>
<extension point="org.eclipse.debug.core.launchDelegates">
diff --git a/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
index e3940bc6a..69b45cada 100644
--- a/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
@@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.qvtd.codegen;bundle-version="[0.14.0,1.0.0)";visibility:=reexport,
org.eclipse.qvtd.xtext.qvtcore;bundle-version="[0.14.0,1.0.0)",
org.eclipse.qvtd.xtext.qvtimperative;bundle-version="[0.14.0,1.0.0)",
- org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.14.0,1.0.0)",
- org.eclipse.qvtd.umlx
+ org.eclipse.qvtd.xtext.qvtrelation;bundle-version="[0.14.0,1.0.0)"
Export-Package: org.eclipse.qvtd.debug,
org.eclipse.qvtd.debug.core,
org.eclipse.qvtd.debug.evaluator,
diff --git a/plugins/org.eclipse.qvtd.debug/plugin.xml b/plugins/org.eclipse.qvtd.debug/plugin.xml
index 54ba05709..96dbbf09a 100644
--- a/plugins/org.eclipse.qvtd.debug/plugin.xml
+++ b/plugins/org.eclipse.qvtd.debug/plugin.xml
@@ -28,10 +28,6 @@
delegate="org.eclipse.qvtd.debug.launching.QVTrLaunchConfigurationDelegate"
modes="run"
name="QVTr (Relations) Transformation"/>
- <launchConfigurationType id="org.eclipse.qvtd.debug.launching.UMLXLaunchConfigurationDelegate"
- delegate="org.eclipse.qvtd.debug.launching.UMLXLaunchConfigurationDelegate"
- modes="run"
- name="UMLX Transformation"/>
</extension>
<extension point="org.eclipse.debug.core.sourceLocators">
diff --git a/plugins/org.eclipse.qvtd.umlx.design/description/umlx.odesign b/plugins/org.eclipse.qvtd.umlx.design/description/umlx.odesign
index c70366d64..32db1fadf 100644
--- a/plugins/org.eclipse.qvtd.umlx.design/description/umlx.odesign
+++ b/plugins/org.eclipse.qvtd.umlx.design/description/umlx.odesign
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="umlx" version="11.1.1.201610211630">
- <ownedViewpoints name="umlx-viewpoint-id" label="UMLX Viewpoint Label" modelFileExtension="umlx" icon="/org.eclipse.qvtd.umlx.design/icons/umlxx.gif">
+ <ownedViewpoints name="umlx-viewpoint-id" label="UMLX Viewpoint Label" modelFileExtension="umlx" icon="/org.eclipse.qvtd.umlx.ui/icons/UMLXModelFile.gif">
<ownedRepresentations xsi:type="description_1:DiagramDescription" name="UMLX Relation Diagram" titleExpression="service: umlxRelDiagramTitleExpression" domainClass="umlx.RelDiagram">
<metamodel href="http://www.eclipse.org/qvt/2016/UMLX#/"/>
<defaultLayer name="Default">
diff --git a/plugins/org.eclipse.qvtd.umlx.design/icons/umlxx.gif b/plugins/org.eclipse.qvtd.umlx.design/icons/umlxx.gif
deleted file mode 100644
index 876d7c1c6..000000000
--- a/plugins/org.eclipse.qvtd.umlx.design/icons/umlxx.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.umlx.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.umlx.ui/META-INF/MANIFEST.MF
index 45af7b9a7..69faa2dce 100644
--- a/plugins/org.eclipse.qvtd.umlx.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.umlx.ui/META-INF/MANIFEST.MF
@@ -11,8 +11,10 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.ocl.xtext.base;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.qvtd.xtext.qvtcore;bundle-version="0.14.0",
org.eclipse.qvtd.compiler;bundle-version="[0.14.0,1.0.0)",
+ org.eclipse.qvtd.debug.ui;bundle-version="0.14.0",
org.eclipse.qvtd.umlx;bundle-version="[0.14.0,1.0.0)"
Export-Package: org.eclipse.qvtd.umlx.ui.commands,
+ org.eclipse.qvtd.umlx.ui.launching,
org.eclipse.qvtd.umlx.ui.messages
diff --git a/plugins/org.eclipse.qvtd.umlx.ui/build.properties b/plugins/org.eclipse.qvtd.umlx.ui/build.properties
index 1dde0d2c6..e02737baa 100644
--- a/plugins/org.eclipse.qvtd.umlx.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.umlx.ui/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
.,\
plugin.properties,\
about.html,\
- plugin.xml
+ plugin.xml,\
+ icons/
src.includes = about.html
diff --git a/plugins/org.eclipse.qvtd.debug.ui/icons/umlxx.gif b/plugins/org.eclipse.qvtd.umlx.ui/icons/UMLXModelFile.gif
index 876d7c1c6..876d7c1c6 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/icons/umlxx.gif
+++ b/plugins/org.eclipse.qvtd.umlx.ui/icons/UMLXModelFile.gif
Binary files differ
diff --git a/plugins/org.eclipse.qvtd.umlx.ui/plugin.xml b/plugins/org.eclipse.qvtd.umlx.ui/plugin.xml
index 3a30f7b74..1534efefa 100644
--- a/plugins/org.eclipse.qvtd.umlx.ui/plugin.xml
+++ b/plugins/org.eclipse.qvtd.umlx.ui/plugin.xml
@@ -23,4 +23,25 @@
</menuContribution>
</extension>
+ <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+ <launchConfigurationTypeImage
+ configTypeID="org.eclipse.qvtd.umlx.launching.UMLXLaunchConfigurationDelegate"
+ icon="icons/UMLXModelFile.gif"
+ id="UMLX Debug"/>
+ </extension>
+
+ <extension point="org.eclipse.debug.core.launchConfigurationTypes">
+ <launchConfigurationType id="org.eclipse.qvtd.umlx.launching.UMLXLaunchConfigurationDelegate"
+ delegate="org.eclipse.qvtd.umlx.ui.launching.UMLXLaunchConfigurationDelegate"
+ modes="run"
+ name="UMLX Transformation"/>
+ </extension>
+
+ <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+ <launchConfigurationTabGroup id="org.eclipse.qvtd.umlx.launching.UMLXLaunchConfigurationTabGroup"
+ class="org.eclipse.qvtd.umlx.ui.launching.UMLXLaunchConfigurationTabGroup"
+ description="Create a configuration to launch a UMLX transformation"
+ type="org.eclipse.qvtd.umlx.launching.UMLXLaunchConfigurationDelegate"/>
+ </extension>
+
</plugin>
diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/UMLXLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java
index 7e16716cd..bbec24168 100644
--- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/UMLXLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java
@@ -9,7 +9,7 @@
* R.Dvorak and others - QVTo debugger framework
* E.D.Willink - revised API for OCL/QVTi debugger framework
*******************************************************************************/
-package org.eclipse.qvtd.debug.launching;
+package org.eclipse.qvtd.umlx.ui.launching;
import java.util.HashMap;
import java.util.Map;
@@ -26,6 +26,8 @@ import org.eclipse.qvtd.compiler.CompilerChain;
import org.eclipse.qvtd.debug.QVTiDebugPlugin;
import org.eclipse.qvtd.debug.core.QVTiDebugCore;
import org.eclipse.qvtd.debug.evaluator.BasicQVTrExecutor;
+import org.eclipse.qvtd.debug.launching.QVTcLaunchConstants;
+import org.eclipse.qvtd.debug.launching.QVTiLaunchConfigurationDelegate;
import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTransformation;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiExecutor;
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/UMLXLaunchConfigurationTabGroup.java b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationTabGroup.java
index 212de1dcc..e045f6c89 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/UMLXLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationTabGroup.java
@@ -9,7 +9,7 @@
* R.Dvorak and others - QVTo debugger framework
* E.D.Willink - revised API for OCL/QVTi debugger framework
*******************************************************************************/
-package org.eclipse.qvtd.debug.ui.launching;
+package org.eclipse.qvtd.umlx.ui.launching;
import java.util.ArrayList;
import java.util.List;
@@ -17,6 +17,7 @@ import java.util.List;
import org.eclipse.debug.ui.CommonTab;
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.qvtd.debug.ui.launching.LaunchConfigurationTabGroup;
public class UMLXLaunchConfigurationTabGroup extends LaunchConfigurationTabGroup
{
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/UMLXMainTab.java b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java
index 23d5da1f0..dd99a08aa 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/UMLXMainTab.java
+++ b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java
@@ -9,7 +9,7 @@
* R.Dvorak and others - QVTo debugger framework
* E.D.Willink - revised API for OCL/QVTi debugger framework
*******************************************************************************/
-package org.eclipse.qvtd.debug.ui.launching;
+package org.eclipse.qvtd.umlx.ui.launching;
import java.io.IOException;
import java.util.ArrayList;
@@ -29,11 +29,11 @@ import org.eclipse.ocl.pivot.utilities.PivotUtil;
import org.eclipse.ocl.pivot.utilities.TreeIterable;
import org.eclipse.qvtd.compiler.AbstractCompilerChain;
import org.eclipse.qvtd.compiler.CompilerChain;
-import org.eclipse.qvtd.compiler.CompilerChainException;
-import org.eclipse.qvtd.compiler.QVTrCompilerChain;
import org.eclipse.qvtd.compiler.CompilerChain.Key;
+import org.eclipse.qvtd.compiler.CompilerChainException;
import org.eclipse.qvtd.debug.launching.QVTiLaunchConstants;
import org.eclipse.qvtd.debug.ui.QVTdDebugUIPlugin;
+import org.eclipse.qvtd.debug.ui.launching.DirectionalMainTab;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
import org.eclipse.qvtd.umlx.TxDiagram;
import org.eclipse.qvtd.umlx.TxTypedModelNode;
@@ -44,7 +44,6 @@ import org.eclipse.swt.graphics.Image;
public class UMLXMainTab extends DirectionalMainTab<TxDiagram>
{
private static final @NonNull String @NonNull [] intermediateKeys = new @NonNull String[] {
- CompilerChain.UMLX_STEP,
CompilerChain.QVTR_STEP,
CompilerChain.QVTC_STEP,
CompilerChain.QVTU_STEP,
@@ -57,7 +56,8 @@ public class UMLXMainTab extends DirectionalMainTab<TxDiagram>
};
@Override
- protected @NonNull QVTrCompilerChain createCompilerChain(@NonNull QVTiEnvironmentFactory environmentFactory, @NonNull URI txURI, @NonNull Map<@NonNull String, @Nullable Map<@NonNull Key<Object>, @Nullable Object>> options) {
+ protected @NonNull CompilerChain createCompilerChain(@NonNull QVTiEnvironmentFactory environmentFactory, @NonNull URI txURI,
+ @NonNull Map<@NonNull String, @Nullable Map<@NonNull Key<Object>, @Nullable Object>> options) {
QVTcoreStandaloneSetup.class.getName(); // QVTrCompilerChain doesn't initialize QVTc
return new UMLXCompilerChain(environmentFactory, txURI, options);
}
@@ -75,7 +75,7 @@ public class UMLXMainTab extends DirectionalMainTab<TxDiagram>
@Override
public Image getImage() {
- return QVTdDebugUIPlugin.getDefault().createImage("icons/umlxx.gif");
+ return QVTdDebugUIPlugin.getDefault().createImage("icons/UMLXModelFile.gif");
}
@Override

Back to the top