Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2014-05-02 12:06:50 +0000
committerAnsgar Radermacher2014-05-02 12:06:50 +0000
commitdc7e5341590a0e1e95096b61486338fd579afc9e (patch)
tree2a7525a53f29a03e3a0c4ba086cd23978218d5c5 /extraplugins
parent4e2de394d39a1bc837ec260337382ea2b93c449c (diff)
downloadorg.eclipse.papyrus-dc7e5341590a0e1e95096b61486338fd579afc9e.tar.gz
org.eclipse.papyrus-dc7e5341590a0e1e95096b61486338fd579afc9e.tar.xz
org.eclipse.papyrus-dc7e5341590a0e1e95096b61486338fd579afc9e.zip
Bug 433984 - [QDesginer] Refactoring - move C++ project generation to "standard" code generation (correct broken build, since intermediate changes had been pushed unintentionnaly)
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties3
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/plugin.xml5
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/schema/language.exsd109
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java3
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java1
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/extensions/ILangSupport.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java)15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/extensions/LanguageSupport.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java)11
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties1
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.classpath (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath)0
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.project (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project)2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF)9
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/about.html (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html)0
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/build.properties (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties)0
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.properties (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties)0
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.xml18
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml)2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java)4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java)4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java)2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java24
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java)59
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java)10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml18
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java24
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo2
37 files changed, 231 insertions, 121 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
index bb32cd03955..aa49bdda6e1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.acceleo
+Export-Package: org.eclipse.papyrus.acceleo,
+ org.eclipse.papyrus.acceleo.extensions
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.acceleo.engine;bundle-version="3.2.2",
org.eclipse.acceleo.parser;bundle-version="3.2.2",
@@ -13,6 +14,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.acceleo.Activator
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.acceleo
+Bundle-SymbolicName: org.eclipse.papyrus.acceleo;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties
index 5f3abe40576..f2e8d42a1b3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/build.properties
@@ -4,7 +4,8 @@ bin.includes = META-INF/,\
.,\
about.html,\
plugin.properties,\
- build.acceleo
+ build.acceleo,\
+ schema/
output..=bin/
src.includes=about.html
source..=src/
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/plugin.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo/plugin.xml
new file mode 100644
index 00000000000..70f0b0af878
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/plugin.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="language" name="languageSupport" schema="schema/language.exsd"/>
+ </plugin>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/schema/language.exsd b/extraplugins/codegen/org.eclipse.papyrus.acceleo/schema/language.exsd
new file mode 100644
index 00000000000..9e7e950f59b
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/schema/language.exsd
@@ -0,0 +1,109 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.qompass.designer.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.papyrus.qompass.designer.core" id="language" name="languageSupport"/>
+ </appInfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
+ <complexType>
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="client"/>
+ </choice>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="client">
+ <complexType>
+ <attribute name="language" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.qompass.designer.core.ILangSupport"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiinfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java
index 03f6110d01d..d9210fe339e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Activator.java
@@ -5,6 +5,9 @@ import org.osgi.framework.BundleContext;
public class Activator implements BundleActivator {
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.acceleo"; //$NON-NLS-1$
+
private static BundleContext context;
static BundleContext getContext() {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
index a3867d5466d..b25719f6106 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
@@ -4,6 +4,7 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.papyrus.acceleo.messages"; //$NON-NLS-1$
+ public static String LanguageSupport_LanguageNotSupported;
public static String ModelElementsCreator_UnsupportedModelElement;
static {
// initialize resource bundle
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/extensions/ILangSupport.java
index 163216422fa..ffd1621d277 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/extensions/ILangSupport.java
@@ -9,7 +9,7 @@
* CEA LIST - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.qompass.designer.core.extensions;
+package org.eclipse.papyrus.acceleo.extensions;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -17,8 +17,6 @@ import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
-
/**
* Interface used by Qompass extensions that support a specific programming language
*/
@@ -36,7 +34,7 @@ public interface ILangSupport {
* the node for which the project should be created
* @return the created project
*/
- public IProject createProject(String projectName, InstanceSpecification node) throws TransformationException;
+ public IProject createProject(String projectName, InstanceSpecification node);
/**
* Set project information
@@ -55,7 +53,7 @@ public interface ILangSupport {
* node for which settings should be set
* @throws TransformationException
*/
- public void setSettings(InstanceSpecification node) throws TransformationException;
+ public void setSettings(InstanceSpecification node);
/**
* Generate code for a specific language
@@ -67,9 +65,7 @@ public interface ILangSupport {
*
* @throws TransformationException
*/
- public void generateCode(IProgressMonitor monitor, PackageableElement element)
- throws TransformationException;
-
+ public void generateCode(IProgressMonitor monitor, PackageableElement element);
/**
* Clean the code for a certain element, i.e. remove code that has previously generated for this element
@@ -82,8 +78,7 @@ public interface ILangSupport {
* the element for which the generate code should be removed
* @throws TransformationException
*/
- public void cleanCode(IProgressMonitor monitor, PackageableElement element)
- throws TransformationException;
+ public void cleanCode(IProgressMonitor monitor, PackageableElement element);
/**
* Reset gathered configuration data
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/extensions/LanguageSupport.java
index 812e516240d..6cdcf04775b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/extensions/LanguageSupport.java
@@ -9,15 +9,14 @@
* CEA LIST - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.qompass.designer.core.extensions;
+package org.eclipse.papyrus.acceleo.extensions;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.qompass.designer.core.Activator;
-import org.eclipse.papyrus.qompass.designer.core.Messages;
-import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.acceleo.Activator;
+import org.eclipse.papyrus.acceleo.Messages;
/**
@@ -27,7 +26,7 @@ public class LanguageSupport {
public static final String ILANG_SUPPORT_ID = Activator.PLUGIN_ID + ".language"; //$NON-NLS-1$
- public static ILangSupport getLangSupport(String language) throws TransformationException
+ public static ILangSupport getLangSupport(String language)
{
IExtensionRegistry reg = Platform.getExtensionRegistry();
IConfigurationElement[] configElements = reg.getConfigurationElementsFor(ILANG_SUPPORT_ID);
@@ -45,6 +44,6 @@ public class LanguageSupport {
exception.printStackTrace();
}
}
- throw new TransformationException(String.format(Messages.LanguageSupport_LanguageNotSupported, language));
+ throw new RuntimeException(String.format(Messages.LanguageSupport_LanguageNotSupported, language));
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
index ad6e5a9fa79..a1fd22aef6b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
@@ -1 +1,2 @@
+LanguageSupport_LanguageNotSupported=Support for language %s not configured
ModelElementsCreator_UnsupportedModelElement=code generator: unsupported model element %s
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.classpath
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.project
index 3318ef546c9..29f34de0ecf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.qompass.designer.cpp</name>
+ <name>org.eclipse.papyrus.cpp.cdtproject</name>
<comment></comment>
<projects>
<project>ec3m.genTools.core</project>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..c537b63063c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
index d468fbc366f..f0422fe489e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/META-INF/MANIFEST.MF
@@ -1,17 +1,15 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.qompass.designer.cpp
+Export-Package: org.eclipse.papyrus.cpp.cdtproject
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.emf.ecore,
org.eclipse.uml2.uml,
- org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.0",
org.eclipse.cdt.ui,
org.eclipse.papyrus.cpp.codegen;bundle-version="1.0.0",
org.eclipse.ui.ide,
org.eclipse.core.resources,
org.eclipse.cdt.managedbuilder.core;bundle-version="8.0.0",
org.eclipse.cdt.core;bundle-version="5.4.0",
- org.eclipse.papyrus.fcm.profile;bundle-version="1.0.0",
org.eclipse.papyrus.acceleo;bundle-version="1.0.0",
org.eclipse.papyrus.cpp.profile;bundle-version="1.0.0"
Bundle-Vendor: %providerName
@@ -19,9 +17,8 @@ Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.qompass.designer.cpp.Activator
+Bundle-Activator: org.eclipse.papyrus.cpp.cdtproject.Activator
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.cpp;singleto
- n:=true
+Bundle-SymbolicName: org.eclipse.papyrus.cpp.cdtproject;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/about.html
index 209103075a7..209103075a7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/build.properties
index 7b3c227b84a..7b3c227b84a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/build.properties
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.properties
index 48c00f652ce..48c00f652ce 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.properties
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.xml
new file mode 100644
index 00000000000..f2f58f3324b
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/plugin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.acceleo.language">
+ <client
+ class="org.eclipse.papyrus.cpp.cdtproject.CppLanguageSupport"
+ language="C++">
+ </client>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.acceleo.language">
+ <client
+ class="org.eclipse.papyrus.cpp.cdtproject.CLanguageSupport"
+ language="C">
+ </client>
+ </extension>
+</plugin>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml
index a8dae6216ea..815d988adc2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/pom.xml
@@ -7,7 +7,7 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../../releng/top-pom-extras.xml</relativePath>
</parent>
- <artifactId>org.eclipse.papyrus.qompass.designer.cpp</artifactId>
+ <artifactId>org.eclipse.papyrus.cpp.cdtproject</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
index a6d735faa50..e7af4de4e9c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
+package org.eclipse.papyrus.cpp.cdtproject;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.qompass.designer.cpp";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.cpp.cdtproject"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
index 7cf7f935914..6ce8fed7209 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
+package org.eclipse.papyrus.cpp.cdtproject;
import org.eclipse.cdt.ui.wizards.CCProjectWizard;
import org.eclipse.jface.wizard.IWizardPage;
@@ -10,7 +10,7 @@ import org.eclipse.jface.wizard.IWizardPage;
* called CDTMainWizardPageV that skips the first validation which
* would other trigger an error.
*
- * @see org.eclipse.papyrus.qompass.designer.cpp.CDTMainWizardPageV
+ * @see org.eclipse.papyrus.cpp.cdtproject.CDTMainWizardPageV
*
* @author ansgar
*/
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
index 5af2bbd451a..aa64b5c80ac 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
+package org.eclipse.papyrus.cpp.cdtproject;
import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java
new file mode 100644
index 00000000000..cc4ff155a89
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java
@@ -0,0 +1,24 @@
+package org.eclipse.papyrus.cpp.cdtproject;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenConstants;
+
+/**
+ * C language support (largely untested)
+ *
+ * @author ansgar
+ */
+public class CLanguageSupport extends C_CppLanguageSupport implements ILangSupport {
+
+ @Override
+ public void setProject(IProject project) {
+ super.setProject(project);
+
+ IPreferenceStore store = org.eclipse.papyrus.cpp.codegen.Activator.getDefault().getPreferenceStore();
+ String prefix = store.getString(CppCodeGenConstants.P_COMMENT_HEADER) + "\n\n"; //$NON-NLS-1$
+ // creator = new CModelElementsCreator(project, prefix);
+ }
+
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
index 544cc7819b3..060cf8bcfa4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
+package org.eclipse.papyrus.cpp.cdtproject;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.CIncludePathEntry;
@@ -10,31 +10,24 @@ import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.ui.wizards.CCProjectWizard;
-import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.UniqueEList;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.papyrus.C_Cpp.ExternLibrary;
-import org.eclipse.papyrus.FCM.OperatingSystem;
-import org.eclipse.papyrus.FCM.Target;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator;
-import org.eclipse.papyrus.qompass.designer.core.Log;
-import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
-import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
@@ -53,13 +46,20 @@ import org.eclipse.uml2.uml.util.UMLUtil;
*/
public class C_CppLanguageSupport implements ILangSupport {
+ // TODO specific "root" is only required for component based code generation
+ private static final String ROOT = "root"; //$NON-NLS-1$
+
+ private static final String C = "c"; //$NON-NLS-1$
+
+ private static final String CPP = "cpp"; //$NON-NLS-1$
+
/**
* Caller should test before calling, whether the project exists already
*
* @param projectName
* @return
*/
- public IProject createProject(String projectName, InstanceSpecification node) throws TransformationException
+ public IProject createProject(String projectName, InstanceSpecification node)
{
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
@@ -88,7 +88,7 @@ public class C_CppLanguageSupport implements ILangSupport {
project = null;
}
if((project == null) || !project.exists()) {
- throw new TransformationException("could not create CDT project ..."); //$NON-NLS-1$
+ throw new RuntimeException("could not create CDT project ..."); //$NON-NLS-1$
}
setProject(project);
setSettings(node);
@@ -99,19 +99,16 @@ public class C_CppLanguageSupport implements ILangSupport {
m_project = project;
}
- @Override
public IProject getProject() {
return m_project;
}
- public void setSettings(InstanceSpecification node) throws TransformationException
+ public void setSettings(InstanceSpecification node)
{
try {
// ((CProject) project).
- IProjectDescription desc = m_project.getDescription();
- for(ICommand ic : desc.getBuildSpec()) {
- Log.log(Status.INFO, Log.CODEGEN, "CppLanguageSupport - read build spec: " + ic);
- }
+ // IProjectDescription desc = m_project.getDescription();
+
ICProjectDescriptionManager mngr =
CoreModel.getDefault().getProjectDescriptionManager();
ICProjectDescription cdesc = mngr.getProjectDescription(m_project, true);
@@ -132,6 +129,7 @@ public class C_CppLanguageSupport implements ILangSupport {
// define name of used operating system from model (attribute of "Target" stereotype)
// and add it to list of macros
+ /*
Target target = UMLUtil.getStereotypeApplication(node, Target.class);
if(target == null) {
// get information from node referenced by the instance
@@ -143,7 +141,8 @@ public class C_CppLanguageSupport implements ILangSupport {
macros.add("OS_" + os.getBase_Class().getName()); //$NON-NLS-1$
}
}
-
+ */
+
// define macros
EList<ICLanguageSettingEntry> icMacros =
new BasicEList<ICLanguageSettingEntry>();
@@ -155,9 +154,9 @@ public class C_CppLanguageSupport implements ILangSupport {
// now set include path and preprocessor code
for(ICLanguageSetting lang : languageSettings) {
// selection better via ID? (instead of extension)
- Log.log(Status.INFO, Log.CODEGEN, "CppLanguageSupport: lang.getID: " + lang.getId() + " lang.getLanguageID: " + lang.getLanguageId());
+ // Log.log(Status.INFO, Log.CODEGEN, "CppLanguageSupport: lang.getID: " + lang.getId() + " lang.getLanguageID: " + lang.getLanguageId());
for(String ext : lang.getSourceExtensions()) {
- if(ext.equals("cpp") || ext.equals("c")) {
+ if(ext.equals(CPP) || ext.equals(C)) {
lang.setSettingEntries(ICSettingEntry.INCLUDE_PATH, icIncludePaths);
ICLanguageSettingEntry icOldMacros[] =
lang.getSettingEntries(ICSettingEntry.MACRO);
@@ -188,37 +187,39 @@ public class C_CppLanguageSupport implements ILangSupport {
mngr.setProjectDescription(m_project, cdesc, true, null);
}
ManagedBuildManager.saveBuildInfo(m_project, true);
- } catch (Exception e) {
- throw new TransformationException(e.getMessage());
+ }
+ catch (BuildException be) {
+ throw new RuntimeException(be.getMessage());
+ }
+ catch (CoreException ce) {
+ throw new RuntimeException(ce.getMessage());
}
}
public void generateCode(IProgressMonitor monitor, PackageableElement element)
- throws TransformationException
{
try {
creator.createPackageableElement(monitor, element);
} catch (CoreException exception) {
- throw new TransformationException("Exception during C/C++ code generation: " + exception.toString());
+ throw new RuntimeException("Exception during C/C++ code generation: " + exception.getMessage());
}
}
public void cleanCode(IProgressMonitor monitor, PackageableElement element)
- throws TransformationException
{
try {
creator.removePackageableElement(monitor, element);
} catch (CoreException exception) {
- throw new TransformationException("Exception during C/C++ code generation: " + exception.toString());
+ throw new RuntimeException("Exception during C/C++ code generation: " + exception.getMessage());
}
}
public void resetConfigurationData() {
includePaths = new UniqueEList<String>();
// include project directory (all paths are relative to it => ".")
- includePaths.add(".");
+ includePaths.add("."); //$NON-NLS-1$
// include also "root" (relative path)
- includePaths.add("root");
+ includePaths.add(ROOT);
libs = new UniqueEList<String>();
libPaths = new UniqueEList<String>();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java
index c2d91b37adb..bedad0060cf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
+package org.eclipse.papyrus.cpp.cdtproject;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
+import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenConstants;
import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
-import org.eclipse.papyrus.qompass.designer.core.preferences.QompassPreferenceConstants;
/**
* C++ language support
@@ -17,8 +17,8 @@ public class CppLanguageSupport extends C_CppLanguageSupport implements ILangSup
public void setProject(IProject project) {
super.setProject(project);
- IPreferenceStore store = org.eclipse.papyrus.qompass.designer.core.Activator.getDefault().getPreferenceStore();
- String prefix = store.getString(QompassPreferenceConstants.P_CODE_GEN_PREFIX) + "\n\n";
+ IPreferenceStore store = org.eclipse.papyrus.cpp.codegen.Activator.getDefault().getPreferenceStore();
+ String prefix = store.getString(CppCodeGenConstants.P_COMMENT_HEADER) + "\n\n"; //$NON-NLS-1$
creator = new CppModelElementsCreator(project, prefix);
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
index 47e207d7f7a..2308e9d2c6e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
@@ -18,7 +18,7 @@
<acceleoCompiler
sourceFolder="${target.folder}"
outputFolder="${target.folder}"
- dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;"
+ dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.infra.widgets;${target.folder}/../../org.eclipse.papyrus.acceleo;"
binaryResource="false"
packagesToRegister="">
</acceleoCompiler>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
index ad54fffc889..064ad77eb48 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- build.properties,\
about.properties,\
build.acceleo,\
about.html,\
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml
index 3639bad5ebd..1e67fdce17b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/plugin.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="language" name="languageSupport" schema="schema/language.exsd"/>
<extension-point id="instanceConfig" name="instanceConfigName" schema="schema/instanceConfig.exsd"/>
<extension-point id="externalGenerator" name="externalGenerator" schema="schema/externalGenerator.exsd"/>
<extension
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
index 10b3c5bde4e..b639ecf61e4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.qompass.designer.core.deployment;
import java.util.Stack;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.Messages;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
index 22739bcaeb6..d4ae03eca5c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
@@ -15,7 +15,7 @@
package org.eclipse.papyrus.qompass.designer.core.deployment;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.Class;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
index eacb35cd9c7..80d17abc9d7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
@@ -19,9 +19,9 @@ import org.eclipse.emf.compare.match.service.MatchService;
import org.eclipse.emf.compare.util.ModelUtils;
*/
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.ModelManagement;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Element;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
index a45464184ef..aaa63986a94 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
@@ -44,7 +44,6 @@ GenerateCode_CouldNotDeleteOldCode=Could not delete old code: %s
GenerateCode_GeneratingCode=generating %s code
GenerateCode_GeneratingCodeForNode=generating %s code for node %s
-LanguageSupport_LanguageNotSupported=Support for language %s not configured for Qompass
TemplateInstantiation_TemplateIsNull=Passed template element is null
TemplateInstantiationListener_TrafoException=TransformationException: %s
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
index 117c7e86d26..2974b580659 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
@@ -29,6 +29,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.papyrus.FCM.Configuration;
import org.eclipse.papyrus.FCM.util.MapUtil;
import org.eclipse.papyrus.acceleo.AcceleoDriver;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
+import org.eclipse.papyrus.acceleo.extensions.LanguageSupport;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.ModelManagement;
@@ -41,9 +43,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
import org.eclipse.papyrus.qompass.designer.core.deployment.Deploy;
import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
-import org.eclipse.papyrus.qompass.designer.core.extensions.LanguageSupport;
import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
import org.eclipse.papyrus.qompass.designer.core.generate.GenerationOptions;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterRuleApplication;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
index 5d418127c0c..b9abb9f1ae5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
@@ -31,6 +31,8 @@ import org.eclipse.papyrus.FCM.ContainerRule;
import org.eclipse.papyrus.FCM.ContainerRuleKind;
import org.eclipse.papyrus.FCM.util.FCMUtil;
import org.eclipse.papyrus.acceleo.AcceleoDriver;
+import org.eclipse.papyrus.acceleo.extensions.ILangSupport;
+import org.eclipse.papyrus.acceleo.extensions.LanguageSupport;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.ModelManagement;
@@ -38,8 +40,6 @@ import org.eclipse.papyrus.qompass.designer.core.StUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
import org.eclipse.papyrus.qompass.designer.core.acceleo.EnumService;
import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
-import org.eclipse.papyrus.qompass.designer.core.extensions.LanguageSupport;
import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterTemplate;
import org.eclipse.swt.widgets.Display;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml
deleted file mode 100644
index 32dc02dc754..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.qompass.designer.core.language">
- <client
- class="org.eclipse.papyrus.qompass.designer.cpp.CppLanguageSupport"
- language="C++">
- </client>
- </extension>
- <extension
- point="org.eclipse.papyrus.qompass.designer.core.language">
- <client
- class="org.eclipse.papyrus.qompass.designer.cpp.CLanguageSupport"
- language="C">
- </client>
- </extension>
-</plugin>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java
deleted file mode 100644
index 4e5e9ff30ef..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CLanguageSupport.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
-import org.eclipse.papyrus.qompass.designer.core.preferences.QompassPreferenceConstants;
-
-/**
- * C language support (largely untested)
- *
- * @author ansgar
- */
-public class CLanguageSupport extends C_CppLanguageSupport implements ILangSupport {
-
- @Override
- public void setProject(IProject project) {
- super.setProject(project);
-
- IPreferenceStore store = org.eclipse.papyrus.qompass.designer.core.Activator.getDefault().getPreferenceStore();
- String prefix = store.getString(QompassPreferenceConstants.P_CODE_GEN_PREFIX) + "\n\n";
- // creator = new CModelElementsCreator(project, prefix);
- }
-
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
index 33b00e54fd1..d700f3d8e97 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
@@ -18,7 +18,7 @@
<acceleoCompiler
sourceFolder="${target.folder}"
outputFolder="${target.folder}"
- dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;"
+ dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.infra.widgets;${target.folder}/../../org.eclipse.papyrus.acceleo;"
binaryResource="false"
packagesToRegister="">
</acceleoCompiler>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
index 29a2c80ecb9..ef3bae852b7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
@@ -18,7 +18,7 @@
<acceleoCompiler
sourceFolder="${target.folder}"
outputFolder="${target.folder}"
- dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;${target.folder}/../../org.eclipse.papyrus.uml.profile;${target.folder}/../../org.eclipse.papyrus.infra.services.validation;"
+ dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.infra.widgets;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;${target.folder}/../../org.eclipse.papyrus.uml.properties;${target.folder}/../../org.eclipse.papyrus.views.properties;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.common;${target.folder}/../../org.eclipse.gmf.tooling.runtime;"
binaryResource="false"
packagesToRegister="">
</acceleoCompiler>

Back to the top