diff options
| author | Ansgar Radermacher | 2013-11-04 13:31:43 +0000 |
|---|---|---|
| committer | Ansgar Radermacher | 2013-11-04 13:31:43 +0000 |
| commit | aaf42a430e6cb29d2935475c45d5fc77ed98501b (patch) | |
| tree | 7d8c50e8b5468d3c77a4ec879f17d0a642dbb98b | |
| parent | c3e33d3babb34f6948200b9a06fa428edf675d15 (diff) | |
| parent | ee77297e3ec2e434a3dc89f1e23221a995398674 (diff) | |
| download | org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.tar.gz org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.tar.xz org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.zip | |
Merge branch 'Qompass'
Conflicts:
extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
24 files changed, 567 insertions, 5 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath new file mode 100644 index 00000000000..64c5e31b7a2 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath @@ -0,0 +1,7 @@ +<?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/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.project b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.project new file mode 100644 index 00000000000..09d5deae110 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.acceleo.debug</name> + <comment></comment> + <projects> + </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> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..7a31411de1e --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.papyrus.acceleo.debug;singleton:=true +Bundle-Version: 0.10.1.qualifier +Bundle-Activator: org.eclipse.papyrus.qompass.designer.debug.Activator +Bundle-Vendor: %providerName +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.uml2.uml;bundle-version="4.0.0", + org.eclipse.acceleo.engine;bundle-version="3.2.2", + org.eclipse.papyrus.fcm.profile;bundle-version="0.10.0", + org.eclipse.papyrus.acceleo;bundle-version="0.10.0", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.10.1", + org.eclipse.papyrus.infra.emf;bundle-version="0.10.1", + org.eclipse.papyrus.acceleo.ui;bundle-version="0.10.1" +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ActivationPolicy: lazy +Bundle-Localization: plugin diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/about.html b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/about.html new file mode 100644 index 00000000000..209103075a7 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/about.html @@ -0,0 +1,28 @@ +<!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 ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/codegen/org.eclipse.papyrus.acceleo.debug/build.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/build.properties new file mode 100644 index 00000000000..34d2e4d2dad --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/allocation.gif b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/allocation.gif Binary files differnew file mode 100644 index 00000000000..ced634f9c9c --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/allocation.gif diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/deploy.gif b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/deploy.gif Binary files differnew file mode 100644 index 00000000000..7a7ced35f3d --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/icons/deploy.gif diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.properties new file mode 100644 index 00000000000..30bf84aaf85 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.properties @@ -0,0 +1,12 @@ +###############################################################################
+# 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 Designer debug support (Incubation)
+providerName=Eclipse Modeling Project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.xml b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.xml new file mode 100644 index 00000000000..2b41ea5541b --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/plugin.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension + point="org.eclipse.ui.commands"> + <command + categoryId="org.eclipse.papyrus.editor.category" + defaultHandler="org.eclipse.papyrus.qompass.designer.debug.handlers.TestAcceleoHandler" + description="Test Acceleo Template" + id="org.eclipse.papyrus.qompass.designer.debug.menuActions.TestAcceleoCmd" + name="dummy"> + </command> + <command + categoryId="org.eclipse.papyrus.editor.category" + defaultHandler="org.eclipse.papyrus.qompass.designer.debug.handlers.ResetAcceleoHandler" + description="Reset Acceleo driver" + id="org.eclipse.papyrus.qompass.designer.debug.menuActions.ResetAcceleoCmd" + name="dummy"> + </command> + </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + allPopups="false" + locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.codegen"> + <command + commandId="org.eclipse.papyrus.qompass.designer.debug.menuActions.TestAcceleoCmd" + icon="icons/allocation.gif" + id="org.eclipse.papyrus.qompass.designer.debug.menuActions.TestAcceleoMenu" + label="Qompass: Test Acceleo template" + mnemonic="T" + mode="FORCE_TEXT" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.qompass.designer.debug.menuActions.ResetAcceleoCmd" + icon="icons/allocation.gif" + id="org.eclipse.papyrus.qompass.designer.debug.menuActions.ResetAcceleoMenu" + label="Qompass: Reset Acceleo driver" + mnemonic="A" + mode="FORCE_TEXT" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + </menuContribution> + <menuContribution + allPopups="false" + locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu.codegen"> + <command + commandId="org.eclipse.papyrus.qompass.designer.debug.menuActions.TestAcceleoCmd" + icon="icons/allocation.gif" + id="org.eclipse.papyrus.qompass.designer.debug.menuActions.TestAcceleoMenu" + label="Qompass: Test Acceleo template" + mnemonic="A" + mode="FORCE_TEXT" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.qompass.designer.debug.menuActions.ResetAcceleoCmd" + icon="icons/allocation.gif" + id="org.eclipse.papyrus.qompass.designer.debug.menuActions.ResetAcceleoMenu" + label="Qompass: Reset Acceleo driver" + mnemonic="A" + mode="FORCE_TEXT" + style="push"> + <visibleWhen + checkEnabled="true"> + </visibleWhen> + </command> + </menuContribution> + </extension> +</plugin> diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/Activator.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/Activator.java new file mode 100644 index 00000000000..0e46005680a --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/Activator.java @@ -0,0 +1,50 @@ +package org.eclipse.papyrus.qompass.designer.debug; + +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.debug"; //$NON-NLS-1$ + + // 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/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/dialogs/TestAcceleoDialog.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/dialogs/TestAcceleoDialog.java new file mode 100644 index 00000000000..aebb2cee499 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/dialogs/TestAcceleoDialog.java @@ -0,0 +1,161 @@ +package org.eclipse.papyrus.qompass.designer.debug.dialogs; + +import org.eclipse.papyrus.acceleo.AcceleoDriver; +import org.eclipse.papyrus.acceleo.AcceleoException; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.dialogs.SelectionStatusDialog; +import org.eclipse.uml2.uml.NamedElement; + +/** + * Select container rules, either from a list of globally defined rules or from + * local rules which may be created "on the fly" by this dialog. + * + * TODO: extend rule application to instances (problematic, since rules + * transformation is done on type level) + * + * @author ansgar + */ +public class TestAcceleoDialog extends SelectionStatusDialog { + + protected NamedElement m_acceleoParam; + + protected Text fTemplate; + + protected Button fApplyAcceleoButton; + + protected Text fOutput; + + protected Text fErr; + + protected static String saveTemplate = ""; + + public TestAcceleoDialog(Shell parent, NamedElement acceleoParam) { + super(parent); + m_acceleoParam = acceleoParam; + } + + /** + * @see SelectionStatusDialog#computeResult() + */ + protected void computeResult() { + // nothing to do + saveTemplate = fTemplate.getText(); + } + + public Control createDialogArea(Composite parent) { + Composite contents = (Composite)super.createDialogArea(parent); + // (parent, "Container rules", "Avail. extensions/interceptors"); + + createTextAcceleoGroup(contents); + return contents; + } + + // create instance configuration group + protected void createTextAcceleoGroup(Composite parent) { + GridData groupGridData = DialogUtils.createFillGridData(); + + Group instanceConfigurationGroup = new Group(parent, SWT.BORDER); + instanceConfigurationGroup.setText(" Test Acceleo Template"); + instanceConfigurationGroup.setLayout(new RowLayout(SWT.VERTICAL)); + instanceConfigurationGroup.setLayout(new GridLayout(1, false)); + instanceConfigurationGroup.setLayoutData(groupGridData); + + GridData span2 = new GridData(); + span2.horizontalAlignment = GridData.FILL; + span2.verticalAlignment = GridData.FILL; + span2.grabExcessHorizontalSpace = true; + span2.grabExcessVerticalSpace = true; + span2.widthHint = 400; + span2.heightHint = 150; + + Label descriptionLabel = new Label(instanceConfigurationGroup, SWT.NONE); + descriptionLabel.setText("Template:"); + + fTemplate = new Text(instanceConfigurationGroup, SWT.WRAP + | SWT.V_SCROLL); + fTemplate.setLayoutData(span2); + fTemplate.setText(saveTemplate); + + fApplyAcceleoButton = new Button(instanceConfigurationGroup, SWT.NONE); + fApplyAcceleoButton.setText("instantiate template"); + fApplyAcceleoButton.addKeyListener(new KeyListener() { + + public void keyReleased(KeyEvent e) { + } + + public void keyPressed(KeyEvent e) { + System.out.println(e); + } + }); + // fApplyAcceleoButton.setLayoutData(span2); + fApplyAcceleoButton.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent e) { + try { + AcceleoDriver.clearErrors(); + String result = AcceleoDriver.bind(fTemplate.getText(), m_acceleoParam); + fOutput.setText(result); + fErr.setText(""); + } + catch (AcceleoException err) { + fOutput.setText(""); + fErr.setText(err.toString()); + } + } + + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + Button fResetButton = new Button(instanceConfigurationGroup, SWT.NONE); + fResetButton.setText("reset acceleo driver (reread initial scripts)"); + fResetButton.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent e) { + fOutput.setText(""); + fErr.setText(""); + AcceleoDriver.init(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + Label resultLabel = new Label(instanceConfigurationGroup, SWT.NONE); + resultLabel.setText("Result:"); + + fOutput = new Text(instanceConfigurationGroup, SWT.WRAP + | SWT.V_SCROLL | SWT.READ_ONLY); + fOutput.setLayoutData(span2); + + Label errLabel = new Label(instanceConfigurationGroup, SWT.NONE); + errLabel.setText("Error:"); + + GridData span3 = new GridData(); + span3.horizontalAlignment = GridData.FILL; + span3.verticalAlignment = GridData.FILL; + span3.grabExcessHorizontalSpace = true; + // span3.grabExcessVerticalSpace = true; + span3.heightHint = 50; + + fErr = new Text(instanceConfigurationGroup, SWT.WRAP + | SWT.V_SCROLL | SWT.READ_ONLY); + fErr.setLayoutData(span3); + } + +} diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/handlers/ResetAcceleoHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/handlers/ResetAcceleoHandler.java new file mode 100644 index 00000000000..f11260ead65 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/handlers/ResetAcceleoHandler.java @@ -0,0 +1,45 @@ +/***************************************************************************** + * Copyright (c) 2010 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: + * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation + *****************************************************************************/ + +package org.eclipse.papyrus.qompass.designer.debug.handlers; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.papyrus.acceleo.AcceleoDriver; +import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.NamedElement; + +public class ResetAcceleoHandler extends CmdHandler { + + /** + * {@inheritDoc} + */ + @Override + public boolean isEnabled() { + updateSelectedEObject(); + if(selectedEObject instanceof Element) { + return true; + } + return false; + } + + /** + * {@inheritDoc} + */ + public Object execute(ExecutionEvent event) throws ExecutionException { + if(selectedEObject instanceof NamedElement) { + AcceleoDriver.init(); + } + return null; + } +} diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/handlers/TestAcceleoHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/handlers/TestAcceleoHandler.java new file mode 100644 index 00000000000..71f287085c2 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/qompass/designer/debug/handlers/TestAcceleoHandler.java @@ -0,0 +1,53 @@ +/***************************************************************************** + * Copyright (c) 2010 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: + * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation + *****************************************************************************/ + +package org.eclipse.papyrus.qompass.designer.debug.handlers; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler; +import org.eclipse.papyrus.qompass.designer.debug.dialogs.TestAcceleoDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.uml2.uml.NamedElement; + +/** + * Test the Acceleo handler: call a dialog that opens the + * @author ansgar + * + */ +public class TestAcceleoHandler extends CmdHandler { + + /** + * {@inheritDoc} + */ + @Override + public boolean isEnabled() { + updateSelectedEObject(); + if(selectedEObject instanceof NamedElement) { + return true; + } + return false; + } + + /** + * {@inheritDoc} + */ + public Object execute(ExecutionEvent event) throws ExecutionException { + if(selectedEObject instanceof NamedElement) { + NamedElement selectedNE = (NamedElement)selectedEObject; + + TestAcceleoDialog tag = new TestAcceleoDialog(new Shell(), selectedNE); + tag.open(); + } + return null; + } +} diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..f42de363afa --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF index 106d45464be..c8facb34362 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.acceleo;bundle-version="0.10.1",
org.eclipse.cdt.core;bundle-version="5.5.0",
org.eclipse.papyrus.acceleo.ui;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1"
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",
+ org.eclipse.papyrus.acceleo.ui;bundle-version="0.10.1"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.1.qualifier
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl index 93f229094ce..0126195414d 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl @@ -28,10 +28,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Union"> @@ -219,10 +223,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> </argument> </body> @@ -231,10 +239,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> </argument> </body> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl index f02c32f643c..c90b1a6efdf 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl @@ -123,10 +123,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/> </argument> </source> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl index 87f12d18900..48d38fca763 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl @@ -9,9 +9,13 @@ </input> <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/> <<<<<<< HEAD +<<<<<<< HEAD ======= <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/> +>>>>>>> refs/heads/Qompass <imports href="../CppPrimitiveTypes.emtl#/0"/> <imports href="../CppEnumerations.emtl#/0"/> <ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public"> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl index 42b8f6bebf5..e3b085443c6 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl @@ -337,10 +337,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Inline"> @@ -429,10 +433,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> </body> @@ -510,10 +518,14 @@ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/ConstInit"> @@ -533,10 +545,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/ConstInit"> @@ -547,10 +563,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Create"> @@ -574,10 +594,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:VariableExp" name="language" referredVariable="/0/getBodyInTemplate/language"> @@ -676,10 +700,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/85"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++"> @@ -782,10 +810,14 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/> <<<<<<< HEAD +<<<<<<< HEAD <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95"> ======= <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/114"> >>>>>>> - [Bug 420376] Generated C++ code is not formatted +======= + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/114"> +>>>>>>> refs/heads/Qompass <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> </argument> </body> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF index 284cf1c8bbd..97a10c9599d 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF @@ -31,7 +31,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.acceleo;bundle-version="0.10.1",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.1"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.1",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.10.1"
Export-Package: org.eclipse.papyrus.qompass.designer.core,
org.eclipse.papyrus.qompass.designer.core.acceleo,
org.eclipse.papyrus.qompass.designer.core.deployment,
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 fee539f50f8..c2307b2a091 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.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.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> 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 832ffe921d7..4fcc936901a 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.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.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;" 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 f06ff9e9859..b785a6d03e0 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.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;" + 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.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml index 808e1ace6d5..efb378923d8 100644 --- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml +++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml @@ -61,6 +61,20 @@ http://www.eclipse.org/legal/epl-v10.html unpack="false"/> <plugin + id="org.eclipse.papyrus.acceleo.debug" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.acceleo.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.eclipse.papyrus.texteditor.cdt" download-size="0" install-size="0" |
