Bug 433984 - [QDesginer] Refactoring - move C++ project generation to "standard" code generation (correct broken build, since intermediate changes had been pushed unintentionnaly)

28 files changed, 10 insertions, 769 deletions

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/extensions/ILangSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java
deleted file mode 100644
index 163216422fa..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     CEA LIST - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core.extensions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-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
- */
-public interface ILangSupport {
-
-	/**
-	 * Create a project for a specific language and configure it (according to gathered configuration
-	 * data before). In case of C/C++ for instance, a CDT project should be created, in case of Java,
-	 * a JDT project.
-	 * And implementation should call setProject and setSettings before returning the project
-	 * 
-	 * @param projectName
-	 *        the named of the project
-	 * @param node
-	 *        the node for which the project should be created
-	 * @return the created project
-	 */
-	public IProject createProject(String projectName, InstanceSpecification node) throws TransformationException;
-
-	/**
-	 * Set project information
-	 * 
-	 * @param project
-	 *        the project (must already been initialized)
-	 */
-	public void setProject(IProject project);
-	
-	public IProject getProject();
-
-	/**
-	 * Re-create the project settings from model information
-	 * 
-	 * @param node
-	 *        node for which settings should be set
-	 * @throws TransformationException
-	 */
-	public void setSettings(InstanceSpecification node) throws TransformationException;
-
-	/**
-	 * Generate code for a specific language
-	 * 
-	 * @param monitor
-	 *        a progress monitor
-	 * @param element
-	 *        a packageable element, typically a classifier or a package
-	 * 
-	 * @throws TransformationException
-	 */
-	public void generateCode(IProgressMonitor monitor, PackageableElement element)
-		throws TransformationException;
-
-
-	/**
-	 * Clean the code for a certain element, i.e. remove code that has previously generated for this element
-	 * This code is required for differential code generation which needs to remove elements for instance
-	 * after they have been renamed.
-	 * 
-	 * @param project
-	 *        project in which code should be generated
-	 * @param element
-	 *        the element for which the generate code should be removed
-	 * @throws TransformationException
-	 */
-	public void cleanCode(IProgressMonitor monitor, PackageableElement element)
-		throws TransformationException;
-
-	/**
-	 * Reset gathered configuration data
-	 * 
-	 * @see gatherConfigData
-	 */
-	public void resetConfigurationData();
-
-
-	/**
-	 * Gather configuration data from implementations, e.g. required include paths or libraries
-	 * 
-	 * @param implementation
-	 *        a class copied to the target
-	 */
-	public void gatherConfigData(Class implementation);
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java
deleted file mode 100644
index 812e516240d..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     CEA LIST - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core.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;
-
-
-/**
- * Support for multiple target languages via the Eclipse extension mechanism
- */
-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
-	{
-		IExtensionRegistry reg = Platform.getExtensionRegistry();
-		IConfigurationElement[] configElements = reg.getConfigurationElementsFor(ILANG_SUPPORT_ID);
-		for(IConfigurationElement configElement : configElements) {
-			try {
-				final String extLanguage = configElement.getAttribute("language"); //$NON-NLS-1$
-				if(extLanguage.equals(language)) {
-					// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
-					final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
-					if(obj instanceof ILangSupport) {
-						return (ILangSupport)obj;
-					}
-				}
-			} catch (CoreException exception) {
-				exception.printStackTrace();
-			}
-		}
-		throw new TransformationException(String.format(Messages.LanguageSupport_LanguageNotSupported, language));
-	}
-}
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/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
deleted file mode 100644
index ad32c83a788..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project
deleted file mode 100644
index 3318ef546c9..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.qompass.designer.cpp</name>
-	<comment></comment>
-	<projects>
-		<project>ec3m.genTools.core</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>fr.obeo.acceleo.gen.ui.acceleoGenBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>fr.obeo.acceleo.gen.ui.acceleoGenNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b63063c..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
deleted file mode 100644
index d468fbc366f..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.qompass.designer.cpp

-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

-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-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.cpp;singleto

- n:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties
deleted file mode 100644
index 7b3c227b84a..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-src.includes = about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties
deleted file mode 100644
index 48c00f652ce..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################

-# Copyright (c) 2013 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-###############################################################################

-pluginName=Papyrus extra: Qompass C++ support (Incubation)

-providerName=Eclipse Modeling Project

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/pom.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml
deleted file mode 100644
index a8dae6216ea..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/top-pom-extras.xml</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.qompass.designer.cpp</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
deleted file mode 100644
index a6d735faa50..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/Activator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.qompass.designer.cpp";
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
deleted file mode 100644
index 7cf7f935914..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CCNamedProjectWizard.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
-
-import org.eclipse.cdt.ui.wizards.CCProjectWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Variant of CCProjectWizard that allows for setting an initial
- * project name. It creates the pages and sets the initial name.
- * It does not use the standard CDTMainWizardPage but a variant
- * called CDTMainWizardPageV that skips the first validation which
- * would other trigger an error.
- * 
- * @see org.eclipse.papyrus.qompass.designer.cpp.CDTMainWizardPageV
- * 
- * @author ansgar
- */
-public class CCNamedProjectWizard extends CCProjectWizard {
-
-	public CCNamedProjectWizard(String projectName) {
-		this.projectName = projectName;
-		dontAdd = false;
-	}
-
-	@Override
-	public void addPages() {
-		dontAdd = true;
-		// avoid that page is actually added, since we want to add our page below
-		super.addPages();
-		dontAdd = false;
-		String title = fMainPage.getTitle();
-		String desc = fMainPage.getDescription();
-		fMainPage = new CDTMainWizardPageV(fMainPage.getName());
-		fMainPage.setTitle(title);
-		fMainPage.setDescription(desc);
-		fMainPage.setInitialProjectName(projectName);
-		addPage(fMainPage);
-	}
-
-	@Override
-	public void addPage(IWizardPage page) {
-		if(!dontAdd) {
-			super.addPage(page);
-		}
-	}
-
-	private String projectName;
-
-	private boolean dontAdd;
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
deleted file mode 100644
index 5af2bbd451a..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CDTMainWizardPageV.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
-
-import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
-
-/**
- * Variant of the CDTMainWizardPage that skips the first validation. This
- * is required in the context of setting an initial project name, since the
- * update of the project name will trigger a validation which stops with an
- * exception, since some elements (notable tree) are not yet initialized.
- * 
- * Verify if future versions of CDT still require this "hack" {@link CDTMainWizardPage}
- * 
- * @author ansgar
- * 
- */
-public class CDTMainWizardPageV extends CDTMainWizardPage {
-
-	public CDTMainWizardPageV(String pageName) {
-		super(pageName);
-		firstValidate = true;
-	}
-
-	@Override
-	protected boolean validatePage() {
-		if(firstValidate) {
-			return true;
-		} else {
-			return super.validatePage();
-		}
-	}
-
-	private boolean firstValidate;
-}
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.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
deleted file mode 100644
index 544cc7819b3..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/C_CppLanguageSupport.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package org.eclipse.papyrus.qompass.designer.cpp;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.settings.model.CIncludePathEntry;
-import org.eclipse.cdt.core.settings.model.CMacroEntry;
-import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
-import org.eclipse.cdt.core.settings.model.ICFolderDescription;
-import org.eclipse.cdt.core.settings.model.ICLanguageSetting;
-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.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.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;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * C++ language support
- * 
- * @author ansgar
- */
-public class C_CppLanguageSupport implements ILangSupport {
-
-	/**
-	 * Caller should test before calling, whether the project exists already
-	 * 
-	 * @param projectName
-	 * @return
-	 */
-	public IProject createProject(String projectName, InstanceSpecification node) throws TransformationException
-	{
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
-		IProject project = root.getProject(projectName);
-		try {
-			IWorkbench wb = PlatformUI.getWorkbench();
-
-			final CCProjectWizard wiz = new CCNamedProjectWizard(projectName);
-			// use general selection dialog instead
-
-			wiz.setWindowTitle("create project " + projectName); //$NON-NLS-1$
-			wiz.init(wb, null);
-
-			Display.getDefault().syncExec(new Runnable() {
-
-				public void run() {
-					Shell shell = new Shell();
-					WizardDialog wizDiag = new WizardDialog(shell, wiz);
-
-					wizDiag.create();
-					wizDiag.open();
-				}
-			});
-		} catch (Exception e) {
-			e.printStackTrace();
-			project = null;
-		}
-		if((project == null) || !project.exists()) {
-			throw new TransformationException("could not create CDT project ..."); //$NON-NLS-1$
-		}
-		setProject(project);
-		setSettings(node);
-		return project;
-	}
-
-	public void setProject(IProject project) {
-		m_project = project;
-	}
-	
-	@Override
-	public IProject getProject() {
-		return m_project;
-	}
-
-	public void setSettings(InstanceSpecification node) throws TransformationException
-	{
-		try {
-			// ((CProject) project).
-			IProjectDescription desc = m_project.getDescription();
-			for(ICommand ic : desc.getBuildSpec()) {
-				Log.log(Status.INFO, Log.CODEGEN, "CppLanguageSupport - read build spec: " + ic);
-			}
-			ICProjectDescriptionManager mngr =
-				CoreModel.getDefault().getProjectDescriptionManager();
-			ICProjectDescription cdesc = mngr.getProjectDescription(m_project, true);
-
-			// loop over all configurations
-			for(ICConfigurationDescription configDescr : cdesc.getConfigurations()) {
-
-				ICFolderDescription folderDescription =
-					configDescr.getRootFolderDescription();
-
-				ICLanguageSetting[] languageSettings = folderDescription.getLanguageSettings();
-
-				// copy string array into ICLanguageSetting array
-				ICLanguageSettingEntry[] icIncludePaths = new ICLanguageSettingEntry[includePaths.size()];
-				for(int i = 0; i < includePaths.size(); i++) {
-					icIncludePaths[i] = new CIncludePathEntry(includePaths.get(i), CIncludePathEntry.VALUE_WORKSPACE_PATH);
-				}
-
-				// 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
-					target = UMLUtil.getStereotypeApplication(DepUtils.getClassifier(node), Target.class);
-				}
-				if(target != null) {
-					OperatingSystem os = target.getUsedOS();
-					if(os != null) {
-						macros.add("OS_" + os.getBase_Class().getName()); //$NON-NLS-1$
-					}
-				}
-
-				// define macros
-				EList<ICLanguageSettingEntry> icMacros =
-					new BasicEList<ICLanguageSettingEntry>();
-				for(int i = 0; i < macros.size(); i++) {
-					// TODO: need to define values for macros as well?
-					icMacros.add(new CMacroEntry(macros.get(i), "", 0)); //$NON-NLS-1$
-				}
-
-				// 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());
-					for(String ext : lang.getSourceExtensions()) {
-						if(ext.equals("cpp") || ext.equals("c")) {
-							lang.setSettingEntries(ICSettingEntry.INCLUDE_PATH, icIncludePaths);
-							ICLanguageSettingEntry icOldMacros[] =
-								lang.getSettingEntries(ICSettingEntry.MACRO);
-							for(ICLanguageSettingEntry entry : icOldMacros) {
-								icMacros.add(entry);
-							}
-							lang.setSettingEntries(ICSettingEntry.MACRO, icMacros);
-							break;
-						}
-					}
-				}
-				IConfiguration main = ManagedBuildManager.getConfigurationForDescription(configDescr);
-				// change artifact name
-				// main.setArtifactName(main.getArtifactName () + ".bin");
-
-				// add to -l (libraries)
-				ITool cfTool = main.calculateTargetTool();
-
-				// IOption libOption = cfTool.getOptionBy(IOption.TYPE_LIB);
-
-				for(IOption opt : cfTool.getOptions()) {
-					if(opt.getValueType() == IOption.LIBRARIES) {
-						main.setOption(cfTool, opt, libs.toArray(new String[0]));
-					} else if(opt.getValueType() == IOption.LIBRARY_PATHS) {
-						main.setOption(cfTool, opt, libPaths.toArray(new String[0]));
-					}
-				}
-				mngr.setProjectDescription(m_project, cdesc, true, null);
-			}
-			ManagedBuildManager.saveBuildInfo(m_project, true);
-		} catch (Exception e) {
-			throw new TransformationException(e.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());
-		}
-	}
-
-	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());
-		}
-	}
-
-	public void resetConfigurationData() {
-		includePaths = new UniqueEList<String>();
-		// include project directory (all paths are relative to it => ".")
-		includePaths.add(".");
-		// include also "root" (relative path) 
-		includePaths.add("root");
-
-		libs = new UniqueEList<String>();
-		libPaths = new UniqueEList<String>();
-		macros = new UniqueEList<String>();
-	}
-
-	public void gatherConfigData(Class implementation) {
-		Element owner = implementation.getOwner();
-		while(owner instanceof Package) {
-			ExternLibrary cppLibrary = UMLUtil.getStereotypeApplication(owner, ExternLibrary.class);
-			if(cppLibrary != null) {
-				includePaths.addAll(cppLibrary.getIncludes());
-				for(String libPath : cppLibrary.getLibPaths()) {
-					if(libPath.startsWith("/")) {
-						// libPaths starting with a slash are relative to workspace location
-						// TODO: need to support absolute paths (host file system?) as well?
-						// (additional prefix. Eclipse standards?) Problem: workspace_loc is added
-						// automatically for absolute includePaths 
-						libPaths.add("${workspace_loc:" + libPath + "}");
-					} else {
-						// relative to project root, otherwise
-						libPaths.add(libPath);
-					}
-				}
-				libs.addAll(cppLibrary.getLibs());
-				macros.addAll(cppLibrary.getMacros());
-			}
-			owner = owner.getOwner();
-		}
-	}
-
-	static EList<String> includePaths;
-
-	static EList<String> libs;
-
-	static EList<String> libPaths;
-
-	static EList<String> macros;
-
-	 CppModelElementsCreator creator;
-
-	static IProject m_project;
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java
deleted file mode 100644
index c2d91b37adb..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/cpp/cdtproject/CppLanguageSupport.java
+++ /dev/null
@@ -1,25 +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.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
- * 
- * @author ansgar
- */
-public class CppLanguageSupport 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 CppModelElementsCreator(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>