Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremie.tatibouet2015-05-26 13:24:29 +0000
committerArnaud Cuccuru2015-05-26 15:02:27 +0000
commit455f4aad0b34872dca6ba98c6e46f94558c917c3 (patch)
tree66be0bfbe14974c828e7c65666c6c60cd622af2b /extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext
parent08f1067b5d8478a799c683ed4b65fe21b61c46d8 (diff)
downloadorg.eclipse.papyrus-455f4aad0b34872dca6ba98c6e46f94558c917c3.tar.gz
org.eclipse.papyrus-455f4aad0b34872dca6ba98c6e46f94558c917c3.tar.xz
org.eclipse.papyrus-455f4aad0b34872dca6ba98c6e46f94558c917c3.zip
Provide a preference page for the Papyrus Alf integration.
The nominal behavior is that Alf tooling is disabled. The user can next enabled it through the preference page and additionnaly activate the automated synchronization. Answers to bug 468312. Change-Id: I8c3102b0bb450818e42b921007a2ad49bba89803 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/48638 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Diffstat (limited to 'extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext')
-rw-r--r--extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java4
2 files changed, 5 insertions, 2 deletions
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 6a0432bc2c1..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
@@ -20,6 +20,7 @@ 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.
@@ -45,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;

Back to the top