Merge branch 'master' of ssh://ptessier@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git

11 files changed, 8 insertions, 94 deletions

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
index 1bfc5e18dba..6f1da7c0f80 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
@@ -114,13 +114,6 @@ http://www.eclipse.org/legal/epl-v10.html
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.papyrus.infra.gmfdiag.xtext.glue"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter"

          download-size="0"

          install-size="0"

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
index 070a485e47d..e2dc881dc22 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
@@ -27,7 +27,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/validation/SemanticValidator.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/validation/SemanticValidator.java
deleted file mode 100644
index d45b0959271..00000000000
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/validation/SemanticValidator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.validation;

-

-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXTextSemanticValidator;

-

-/**

- * Custom implementation for IXtextSemanticValidator in the context of the textual editor for {@link CollaborationUse}

- * 

- * 

- */

-public class SemanticValidator implements IXTextSemanticValidator {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXTextSemanticValidator#validate()

-	 * 

-	 * @return

-	 */

-	public boolean validate() {

-		UmlCollaborationUseJavaValidator validator = new UmlCollaborationUseJavaValidator();

-		return validator.validate();

-	}

-

-}

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
index 83dd399228b..e14dc10ef8f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.200",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
index 7b9430db05e..64b0eef26a5 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
index 0053dfd434c..3f4e409b269 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.uml2.uml,

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
index 5b0eb58e539..fa20cec2bf5 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
@@ -14,8 +14,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext.ui;
    org.eclipse.papyrus.uml.textedit.property.xtext.services",

  org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr.internal,

  org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions;

-  uses:="org.eclipse.papyrus.infra.gmfdiag.xtext.glue,

-   org.eclipse.papyrus.extensionpoints.editors.ui,

+  uses:="org.eclipse.papyrus.extensionpoints.editors.ui,

    org.eclipse.uml2.uml,

    org.eclipse.papyrus.uml.tools.utils",

  org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal;uses:="org.eclipse.ui.plugin,org.osgi.framework,com.google.inject",

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
index 29ea2e8e5c7..143ae9a9314 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

  org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",

  org.apache.log4j;bundle-version="1.2.15",

  org.eclipse.papyrus.uml.alf.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.0.0",

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
index ef67291d774..407a8cef51f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
@@ -27,7 +27,6 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
  org.eclipse.uml2.uml;bundle-version="3.1.1",

  org.eclipse.jface,

  org.eclipse.ui.ide,

- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.profile;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/scoping/AppliedStereotypePropertyScopeProvider.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/scoping/AppliedStereotypePropertyScopeProvider.java
index a86953484ed..a183ba5326c 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/scoping/AppliedStereotypePropertyScopeProvider.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/scoping/AppliedStereotypePropertyScopeProvider.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2012 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
@@ -15,14 +15,12 @@ package org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.scoping;
 
 import java.util.ArrayList;
 
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gef.EditPart;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.PopupXtextEditorHelper;
 import org.eclipse.papyrus.uml.alf.alf.PrimaryExpression;
 import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;
 import org.eclipse.papyrus.uml.profile.structure.AppliedStereotypeProperty;
 import org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.AppliedStereotypePropertyRule;
+import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementUtil;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
@@ -30,30 +28,28 @@ import org.eclipse.xtext.scoping.impl.SimpleScope;
 
 /**
  * This class contains custom scoping description.
- * 
+ *
  * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping
  * on how and when to use it
- * 
+ *
  */
 public class AppliedStereotypePropertyScopeProvider extends AlfScopeProvider {
 
 	public IScope scope_AppliedStereotypePropertyRule_property(AppliedStereotypePropertyRule ctx, EReference ref) {
-
 		IScope result = null;
-		EditPart contextEObject = ((EditPart)PopupXtextEditorHelper.getHostEditPart());
-		if(contextEObject instanceof IAdaptable) {
-			AppliedStereotypeProperty appliedStereotypeProperty = (AppliedStereotypeProperty)contextEObject.getAdapter(AppliedStereotypeProperty.class);
 
+		AppliedStereotypeProperty appliedStereotypeProperty = (AppliedStereotypeProperty)ContextElementUtil.getContextElement(ctx.eResource());
+		if(appliedStereotypeProperty != null) {
 			ArrayList<org.eclipse.uml2.uml.Property> properties = new ArrayList<org.eclipse.uml2.uml.Property>();
 			properties.add(appliedStereotypeProperty.getStereotypeProperty());
 			Iterable<IEObjectDescription> visiblePropertiesIterable = Scopes.scopedElementsFor(properties);
 			result = new SimpleScope(visiblePropertiesIterable);
 		}
+
 		return result;
 	}
 
 	public IScope scope_PrimaryExpression_prefix(PrimaryExpression ctx, EReference ref) {
-		IScope result = null;
 		return null;
 	}
 }
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/validation/SemanticValidator.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/validation/SemanticValidator.java
deleted file mode 100644
index 5dbb41ef3d7..00000000000
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/validation/SemanticValidator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.validation;

-

-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXTextSemanticValidator;

-

-/**

- * Custom implementation for IXtextSemanticValidator in the context of the textual editor for states

- * 

- * @author CEA LIST

- * 

- */

-public class SemanticValidator implements IXTextSemanticValidator {

-

-	public boolean validate() {

-		return AppliedStereotypePropertyJavaValidator.validate();

-	}

-

-}