diff options
22 files changed, 577 insertions, 208 deletions
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF index 64d3a5a0f93..166fe48fd00 100644 --- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF +++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF @@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.alf;bundle-version="1.1.0", org.eclipse.papyrus.uml.alf.text;bundle-version="0.7.0", org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0", - org.eclipse.compare + org.eclipse.compare, + org.eclipse.papyrus.uml.alf.preferences Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.uml.alf.transaction, diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java index 1c2c9402bde..6476489f4a8 100644 --- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java +++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java @@ -26,6 +26,7 @@ import org.eclipse.emf.transaction.ResourceSetChangeEvent; import org.eclipse.emf.transaction.ResourceSetListenerImpl;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.uml.alf.preferences.AlfIntegrationPreferencesUtil;
import org.eclipse.papyrus.uml.alf.transaction.commit.ISyncScenario;
import org.eclipse.papyrus.uml.alf.transaction.commit.ScenarioFactory;
import org.eclipse.papyrus.uml.alf.transaction.observation.listener.filter.FUMLFilter;
@@ -53,6 +54,10 @@ public class FUMLElementListener extends ResourceSetListenerImpl { * Note this is not always possible (e.g. the user has ongoing changes in the text)
*/
public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+ /* 0. If the user disabled the synchronization then we do not exploit notifications*/
+ if(!AlfIntegrationPreferencesUtil.isAlfAutoSyncEnabled()){
+ return null;
+ }
/* 1. Initialization */
CompoundCommand subCommands = new CompoundCommand("Synchronization");
HashMap<Element, List<Notification>> modifications = new HashMap<Element, List<Notification>>();
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath new file mode 100644 index 00000000000..b1dabee3829 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.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/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.project b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.project new file mode 100644 index 00000000000..80913d0f4e5 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.uml.alf.preferences</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/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..11f6e462df7 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.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/alf/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..b67aa16ce5f --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: ALF Preferences (Incubation) +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.preferences;singleton:=true +Bundle-Version: 0.7.0.qualifier +Bundle-Activator: org.eclipse.papyrus.uml.alf.preferences.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.gmf.runtime.common.ui +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-ActivationPolicy: lazy +Bundle-Vendor: Eclipse Modeling Project +Export-Package: org.eclipse.papyrus.uml.alf.preferences diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/about.html b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/about.html new file mode 100644 index 00000000000..82d49bf5f81 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/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>June 5, 2007</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>
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties new file mode 100644 index 00000000000..0545496cbde --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties @@ -0,0 +1,8 @@ +source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ about.html,\
+ build.properties
+src.includes = about.html
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml new file mode 100644 index 00000000000..325969567a2 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.eclipse.papyrus.embeddededitors"
+ class="org.eclipse.papyrus.uml.alf.preferences.AlfIntegrationPreferences"
+ id="org.eclipse.papyrus.uml.alf.preferences.alf_preferences"
+ name="Alf (Action Language for Foundational UML)">
+ </page>
+ </extension>
+
+</plugin>
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml new file mode 100644 index 00000000000..3afbcfcd668 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml @@ -0,0 +1,14 @@ +<?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.1.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-extras.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.alf.preferences</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>0.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java new file mode 100644 index 00000000000..dd58e2cb882 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java @@ -0,0 +1,50 @@ +package org.eclipse.papyrus.uml.alf.preferences;
+
+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.uml.alf.preferences"; //$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/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java new file mode 100644 index 00000000000..781d9d0862e --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java @@ -0,0 +1,66 @@ +/*****************************************************************************
+ * Copyright (c) 2015 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:
+ * Jeremie Tatibouet (CEA LIST)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.alf.preferences;
+
+import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class AlfIntegrationPreferences extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+ private final static String preferencePageTitle = "Configure Alf support in Papyrus Model";
+
+ public AlfIntegrationPreferences() {
+ super(GRID);
+ }
+
+ @Override
+ protected void createFieldEditors() {
+ final CheckBoxFieldEditor enableAlfSupport = new CheckBoxFieldEditor(
+ AlfIntegrationPreferencesConstants.ALF_SUPPORT,
+ AlfIntegrationPreferencesConstants.ALF_SUPPORT_LABEL,
+ this.getFieldEditorParent());
+
+ final CheckBoxFieldEditor enableSynchronization = new CheckBoxFieldEditor(
+ AlfIntegrationPreferencesConstants.ALF_AUTOMATIC_SYNCHRONIZATION,
+ AlfIntegrationPreferencesConstants.ALF_AUTOMATIC_SYNCHRONIZATION_LABEL,
+ this.getFieldEditorParent());
+ enableSynchronization.setEnabled(
+ AlfIntegrationPreferencesUtil.isAlfSupportEnabled(),
+ this.getFieldEditorParent());
+
+ enableAlfSupport.getCheckbox().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ if (enableAlfSupport.getBooleanValue()) {
+ enableSynchronization.setEnabled(true, AlfIntegrationPreferences.this.getFieldEditorParent());
+ } else {
+ enableSynchronization.setEnabled(false, AlfIntegrationPreferences.this.getFieldEditorParent());
+ }
+ }
+ });
+
+ this.addField(enableAlfSupport);
+ this.addField(enableSynchronization);
+ }
+
+ @Override
+ public void init(IWorkbench workbench) {
+ setPreferenceStore(Activator.getDefault().getPreferenceStore());
+ setDescription(preferencePageTitle);
+ }
+}
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java new file mode 100644 index 00000000000..33a24007b47 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java @@ -0,0 +1,25 @@ +/*****************************************************************************
+ * Copyright (c) 2015 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:
+ * Jeremie Tatibouet (CEA LIST)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.alf.preferences;
+
+public class AlfIntegrationPreferencesConstants {
+
+ public final static String ALF_SUPPORT = "ALF_SUPPORT_ENABLED";
+
+ public final static String ALF_SUPPORT_LABEL = "Enable Alf support (Class, Package, Signal, DataType, Enumeration, Association and Activity can be edited through text)";
+
+ public final static String ALF_AUTOMATIC_SYNCHRONIZATION = "ALF_AUTOMATIC_SYNCHRONIZATION";
+
+ public final static String ALF_AUTOMATIC_SYNCHRONIZATION_LABEL = "Enable synchronization (Model and text are automatically synchronized) - [EXPERIMENTAL]";
+}
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java new file mode 100644 index 00000000000..998c2ff5303 --- /dev/null +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java @@ -0,0 +1,35 @@ +/*****************************************************************************
+ * Copyright (c) 2015 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:
+ * Jeremie Tatibouet (CEA LIST)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.alf.preferences;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.IPreferencesService;
+
+public class AlfIntegrationPreferencesUtil {
+
+ private final static String qualifier = "org.eclipse.papyrus.uml.alf.preferences";
+
+ public static boolean isAlfSupportEnabled() {
+ IPreferencesService preferencesService = Platform.getPreferencesService();
+ return preferencesService.getBoolean(qualifier,
+ AlfIntegrationPreferencesConstants.ALF_SUPPORT, false, null);
+ }
+
+ public static boolean isAlfAutoSyncEnabled() {
+ IPreferencesService preferencesService = Platform.getPreferencesService();
+ boolean syncEnabled = preferencesService.getBoolean(qualifier,
+ AlfIntegrationPreferencesConstants.ALF_AUTOMATIC_SYNCHRONIZATION, false, null);
+ return syncEnabled && isAlfSupportEnabled();
+ }
+}
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF index 357c97ee8a6..3c62be446a9 100644 --- a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF @@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.105.0", org.eclipse.papyrus.uml.alf.libraries;bundle-version="1.1.0",
org.eclipse.papyrus.uml.alf.transaction;bundle-version="0.7.0",
org.eclipse.papyrus.uml.alf.text;bundle-version="0.7.0",
- org.eclipse.compare
+ org.eclipse.compare,
+ org.eclipse.papyrus.uml.alf.preferences;bundle-version="0.7.0"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.7.0.qualifier
diff --git a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java index 4da0952f1a4..2d26942bbfa 100644 --- a/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java +++ b/extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java @@ -14,10 +14,13 @@ package org.eclipse.papyrus.uml.alf.properties.xtext.sheet; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
import org.eclipse.jface.viewers.IFilter;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.uml.alf.transaction.observation.listener.filter.FUMLScopeUtil;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.papyrus.uml.alf.preferences.AlfIntegrationPreferencesUtil;
/**
* This class constrains the availability of the embedded ALF editor.
@@ -43,7 +46,8 @@ public class AlfEditorPropertySectionFilter implements IFilter { public boolean select(Object toTest) {
Element element = this.resolveSemanticElement(toTest);
boolean accepted = false;
- if(element!=null){
+ if(element!=null &&
+ AlfIntegrationPreferencesUtil.isAlfSupportEnabled()){
accepted = this.isValidInput(element);
}
return accepted;
@@ -59,6 +63,11 @@ public class AlfEditorPropertySectionFilter implements IFilter { * @return true if element is accepted as an input false otherwise
*/
private boolean isValidInput(Element element){
+ /*1. First constraint: the element must be modifiable (i.e. not read only)*/
+ if(!this.isModifiable(element)){
+ return false;
+ }
+ /*2. It should be in the scope supported by the ALF editor*/
if(FUMLScopeUtil.isClass(element)){
return true;
}else if(FUMLScopeUtil.isPackage(element)){
@@ -79,6 +88,14 @@ public class AlfEditorPropertySectionFilter implements IFilter { return false;
}
+ private boolean isModifiable(Element element){
+ Resource resource = element.eResource();
+ if(resource != null ){
+ return !EMFHelper.isReadOnly(element);
+ }
+ return false;
+ }
+
/**
* From a selection this methods tries to extract the underlying model element
*
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.uml.alf.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.uml.alf.extra.feature/feature.xml index fb47cf13129..55a41f3d61d 100644 --- a/features/papyrus-extra-features/org.eclipse.papyrus.uml.alf.extra.feature/feature.xml +++ b/features/papyrus-extra-features/org.eclipse.papyrus.uml.alf.extra.feature/feature.xml @@ -1,41 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.papyrus.uml.alf.extra.feature" - label="Papyrus ALF Properties View Integration (Incubation)" - version="0.7.0.qualifier" - provider-name="Eclipse Modeling Project"> - - <copyright url="http://www.example.com/copyright"> +<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.uml.alf.extra.feature"
+ label="Papyrus ALF Properties View Integration (Incubation)"
+ version="0.7.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <copyright url="http://www.example.com/copyright">
Copyright (c) 2015 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 - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <plugin - id="org.eclipse.papyrus.uml.alf.text" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.papyrus.uml.alf.transaction" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.papyrus.uml.alf.properties.xtext" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> + v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.alf.text"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.alf.transaction"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.alf.properties.xtext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.alf.preferences"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/transformation/Alf2UML.qvto b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/transformation/Alf2UML.qvto index 007cb7de705..fe44b8e75e9 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/transformation/Alf2UML.qvto +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/transformation/Alf2UML.qvto @@ -880,11 +880,17 @@ mapping ActiveClassDefinition::toClass() : Class ownedReception := self.ownedMember->map toNamedElement()[Reception]; ownedReception += self.ownedMember[definition.oclIsKindOf(SignalReceptionDefinition)]->map toReception(); if self.classifierBehavior <> null then { - classifierBehavior := self.classifierBehavior.map toActivity(); - classifierBehavior.name := uniqueName(result.name + "$behavior", result); - classifierBehavior.visibility := VisibilityKind::private; - ownedBehavior += classifierBehavior; // Eclipse implementation only - // addDefinition(classifierBehavior.oclAsType(Activity), self.classifierBehavior.body); + // NOTE: The Xtext grammar currently does not set isStub = true for a stub classifierBehavior. + if self.classifierBehavior.isStub or self.classifierBehavior.body = null then { + classifierBehavior := new Activity(Sequence{}); + classifierBehavior.name := self.classifierBehavior.actualName() + "$stub"; + } else { + classifierBehavior := self.classifierBehavior.map toActivity(); + classifierBehavior.name := uniqueName(result.name + "$behavior", result); + classifierBehavior.visibility := VisibilityKind::private; + ownedBehavior += classifierBehavior; // Because classifierBehavior is not a member in the Ecore metamodel. + // addDefinition(classifierBehavior.oclAsType(Activity), self.classifierBehavior.body); + } endif; } endif; } endif; } diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Alf.xtext b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Alf.xtext index 5b9936db02a..729197eefe5 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Alf.xtext +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/Alf.xtext @@ -212,7 +212,7 @@ ActiveClassDefinitionOrStub returns ActiveClassDefinition : ;
BehaviorClause returns ActivityDefinition :
- body = Block | name = Name // TODO: isStub = true
+ body = Block | name = Name // NOTE: Does not set isStub = true.
;
ActiveClassMember returns Member :
diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml index b8feda3d82c..d3061646a73 100644 --- a/releng/top-pom-extras.xml +++ b/releng/top-pom-extras.xml @@ -1,163 +1,164 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <modules>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.alf.extra.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.sysml14.feature</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>
- <module>../plugins/customization/org.eclipse.papyrus.customization</module>
- <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>
- <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module>
- <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module>
- <module>../plugins/infra/org.eclipse.papyrus.eclipse.project.editors</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module>
- <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.profile</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.reverse</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.ui</module>
- <module>../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module>
- <module>../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module>
- <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>
- <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
- <module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.async.fuml</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites.utils</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module>
- <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.doc</module>
- <module>../extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common</module>
- <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module>
- <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>
- <module>../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>
- <module>../extraplugins/uml/org.eclipse.papyrus.uml.export</module>
-
- <!-- ALF -->
- <module>../extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text</module>
- <module>../extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction</module>
- <module>../extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext</module>
-
- <!-- Papyrus Uml Rt -->
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module>
-
- <module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>
- <module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>
- <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>
- <!-- Papyrus Uml Diagram Ecore -->
- <module>../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module>
- <!-- Papyrus 4 Education -->
- <module>../extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.education.feature</module>
- <!-- Module EPF +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.alf.extra.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.sysml14.feature</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module> + <module>../plugins/customization/org.eclipse.papyrus.customization</module> + <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module> + <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module> + <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module> + <module>../plugins/infra/org.eclipse.papyrus.eclipse.project.editors</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module> + <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.profile</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.reverse</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.ui</module> + <module>../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module> + <module>../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module> + <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module> + <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module> + <module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.async.fuml</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites.utils</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module> + <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.doc</module> + <module>../extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common</module> + <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module> + <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module> + <module>../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module> + <module>../extraplugins/uml/org.eclipse.papyrus.uml.export</module> + + <!-- ALF --> + <module>../extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text</module> + <module>../extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction</module> + <module>../extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext</module> + <module>../extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.preferences</module> + + <!-- Papyrus Uml Rt --> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module> + + <module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module> + <module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module> + <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module> + <!-- Papyrus Uml Diagram Ecore --> + <module>../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module> + <!-- Papyrus 4 Education --> + <module>../extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.education.feature</module> + <!-- Module EPF --> <module>../extraplugins/epf-richtext/org.eclipse.papyrus.infra.widgets.epf.richtext.extension</module> <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.epf.richtext.feature</module> - -->
+ <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile</module>
<module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant</module>
<module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table</module>
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/AlfCompiler.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/AlfCompiler.java index 1cea8635fc5..8f3fcd38e89 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/AlfCompiler.java +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/AlfCompiler.java @@ -60,17 +60,22 @@ public class AlfCompiler extends AlfMapper { return result.getRootASTElement(); } } - - public String getTextualRepresentation(Element element) { + + public Comment getTextualRepresentationComment(Element element) { for (Comment comment : element.getOwnedComments()) { if (comment.isStereotypeApplied(this.textualRepresentationStereotype) && "Alf".equals(comment.getValue(this.textualRepresentationStereotype, "language"))) { - return comment.getBody(); + return comment; } } return null; } + public String getTextualRepresentation(Element element) { + Comment comment = this.getTextualRepresentationComment(element); + return comment == null? null: comment.getBody(); + } + public void addTextualRepresentation(Element element, String textualRepresentation) { Comment comment = UMLFactory.eINSTANCE.createComment(); comment.setBody(textualRepresentation); @@ -82,6 +87,15 @@ public class AlfCompiler extends AlfMapper { comment.applyStereotype(this.textualRepresentationStereotype); comment.setValue(this.textualRepresentationStereotype, "language", "Alf"); } + + public void updateTextualRepresentation(Element element, String textualRepresentation) { + Comment comment = this.getTextualRepresentationComment(element); + if (comment == null) { + this.addTextualRepresentation(element, textualRepresentation); + } else { + comment.setBody(textualRepresentation); + } + } public void compile(NamedElement contextElement) throws ParsingError, MappingError { String textualRepresentation = this.getTextualRepresentation(contextElement); @@ -97,7 +111,7 @@ public class AlfCompiler extends AlfMapper { alf.add(this.parse(textualRepresentation)); this.map(contextElement, alf); - this.addTextualRepresentation(contextElement, textualRepresentation); + this.updateTextualRepresentation(contextElement, textualRepresentation); } } diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/CompilerTests.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/CompilerTests.java index 18e2bc45f15..47e6cdd8c61 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/CompilerTests.java +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/mapper/CompilerTests.java @@ -540,6 +540,7 @@ public class CompilerTests { Behavior classifierBehavior = testClass.getClassifierBehavior(); assertNotNull(classifierBehavior); + assertTrue(testClass.getOwnedBehaviors().contains(classifierBehavior)); assertEquals(testClass.getName() + "$behavior$1", classifierBehavior.getName()); assertEquals(VisibilityKind.PRIVATE_LITERAL, classifierBehavior.getVisibility()); assertTrue(classifierBehavior instanceof Activity); @@ -578,4 +579,25 @@ public class CompilerTests { assertNotNull(action); assertEquals(operation, action.getOperation()); } + + public static String TEST_ACTIVE_CLASS_TEXT = "active class Test { public p() { } } do 'Test$behavior$1'"; + + @Test + public void testActiveClassRecompile() throws ParsingError, MappingError { + Class testClass = compileTestClassifierBehavior(); + + Behavior classifierBehavior = testClass.getClassifierBehavior(); + assertTextualRepresentation(classifierBehavior, CLASSIFIER_BEHAVIOR_ACTIVITY_TEXT); + + compiler.compile(testClass, TEST_ACTIVE_CLASS_TEXT); + + assertTextualRepresentation(testClass, TEST_ACTIVE_CLASS_TEXT); + assertEquals(classifierBehavior, testClass.getClassifierBehavior()); + assertTrue(testClass.getOwnedBehaviors().contains(classifierBehavior)); + assertEquals(testClass.getName() + "$behavior$1", classifierBehavior.getName()); + assertEquals(VisibilityKind.PRIVATE_LITERAL, classifierBehavior.getVisibility()); + assertTextualRepresentation(classifierBehavior, CLASSIFIER_BEHAVIOR_ACTIVITY_TEXT); + assertTrue(classifierBehavior instanceof Activity); + assertTrue(((Activity)classifierBehavior).getNodes().size() > 0); + } } |