diff options
Diffstat (limited to 'plugins/uml/textedit')
31 files changed, 316 insertions, 326 deletions
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/pom.xml new file mode 100644 index 00000000000..d86d6e0e676 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/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 e2dc881dc22..f844d8033bf 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 @@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml new file mode 100644 index 00000000000..cb4b5e519a4 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/pom.xml new file mode 100644 index 00000000000..1efad3d31e4 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.common.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF index cc48be9ea11..d9eca46cb56 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml new file mode 100644 index 00000000000..3a6549024b3 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.common.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/pom.xml new file mode 100644 index 00000000000..a4847ccc989 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF index c46a4f435fa..884cda0613b 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml new file mode 100644 index 00000000000..f1d6fdb6f9b --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml new file mode 100644 index 00000000000..4812ad9aa50 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/pom.xml new file mode 100644 index 00000000000..c13686326a4 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.javaconstraint</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/pom.xml new file mode 100644 index 00000000000..b9487ea0457 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.message.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/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 64b0eef26a5..9921dd3f6e8 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 @@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml new file mode 100644 index 00000000000..45e597f3c16 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.message.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath index 5353f0e9459..ae46291dfda 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java" kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <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="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src"/> + <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="output" path="bin"/> +</classpath>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/pom.xml new file mode 100644 index 00000000000..4b9c50544eb --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java deleted file mode 100644 index 67760f9a2f4..00000000000 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java +++ /dev/null @@ -1,311 +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.parameter.xtext.ui.contributions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.TypeRule;
-import org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.internal.UmlParameterActivator;
-import org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.ParameterRule;
-import org.eclipse.papyrus.uml.textedit.parameter.xtext.validation.SemanticValidator;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.ParameterDirectionKind;
-import org.eclipse.uml2.uml.ParameterEffectKind;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-
-import com.google.inject.Injector;
-
-
-
-public class ParameterPopupEditor extends PopupEditorConfiguration {
-
- /** the new name for the {@link Parameter} */
- private String newName;
-
- /** the new type for the {@link Parameter} */
- private Type newType;
-
- /** the new visibility for the {@link Parameter} */
- private org.eclipse.uml2.uml.VisibilityKind newVisibility;
-
- /** the managed {@link Parameter} */
- private Parameter parameter;
-
- /** the new value for isException */
- private boolean newIsException = false;
-
- /** the new value for isStream */
- private boolean newIsStream = false;
-
- /** the new value for isOrdered */
- private boolean newIsOrdered = false;
-
- /** the new value for isUnique */
- private boolean newIsUnique = false;
-
- /** the new lowerBound */
- private int newLowerBound = 1;
-
- /** the new upperBound */
- private int newUpperBound = 1;
-
- /** the new effect for the parameter */
- private ParameterEffectKind newEffect;
-
- /** the new direction of the parameter */
- private ParameterDirectionKind newDirection;
-
- //TODO : do an abstract method in the super class to init the validator
- //public abstract initValidator(Element el);
- //with the validator in the super class
-
- /**
- *
- * @see org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration#createPopupEditorHelper(java.lang.Object)
- *
- * @param editPart
- * @return
- */
- @Override
- public IPopupEditorHelper createPopupEditorHelper(Object editPart) {
- // resolves the edit part, and the associated semantic element
- IGraphicalEditPart graphicalEditPart = null;
- if(!(editPart instanceof IGraphicalEditPart)) {
- return null;
- }
- graphicalEditPart = (IGraphicalEditPart)editPart;
-
- if(!(graphicalEditPart.resolveSemanticElement() instanceof Parameter)) {
- return null;
- }
- parameter = (Parameter)graphicalEditPart.resolveSemanticElement();
-
- // retrieves the XText injector
- Injector injector = UmlParameterActivator.getInstance().getInjector("org.eclipse.papyrus.uml.textedit.parameter.xtext.UmlParameter"); //$NON-NLS-1$
-
- // builds the text content and extension for a temporary file, to be edited by the xtext editor
- String textToEdit = "" + this.getTextToEdit(graphicalEditPart.resolveSemanticElement()); //$NON-NLS-1$
- String fileExtension = "" + ".umlparameter"; //$NON-NLS-1$ //$NON-NLS-2$
-
- // builds a new IXtextEMFReconciler.
- // Its purpose is to extract any relevant information from the textual specification,
- // and then merge it in the context UML model if necessary
- IXtextEMFReconciler reconciler = new IXtextEMFReconciler() {
-
- public void reconcile(EObject modelObject, EObject xtextObject) {
- // first: retrieves / determines if the xtextObject is a CollaborationUseRule object
- EObject modifiedObject = xtextObject;
- if(!(modelObject instanceof Parameter)) {
- return;
- }
- while(xtextObject != null && !(xtextObject instanceof ParameterRule)) {
- modifiedObject = modifiedObject.eContainer();
- }
- if(modifiedObject == null) {
- return;
- }
- ParameterRule parameterRuleObject = (ParameterRule)xtextObject;
-
- // Retrieves the information to be populated in modelObject
- if(parameterRuleObject.getModifiers() != null) {
- for(org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.ModifierSpecification modifier : parameterRuleObject.getModifiers().getValues()) {
- switch(modifier.getValue()) {
- case ORDERED:
- newIsOrdered = true;
- break;
- case UNIQUE:
- newIsUnique = true;
- break;
- case EXCEPTION:
- newIsException = true;
- break;
- case STREAM:
- newIsStream = true;
- break;
- default:
- break;
- }
- }
- }
-
- if(parameterRuleObject.getMultiplicity() != null) {
- if(parameterRuleObject.getMultiplicity().getBounds().size() == 1) {
- String tempBound = parameterRuleObject.getMultiplicity().getBounds().get(0).getValue();
- if(tempBound.equals("*")) { //$NON-NLS-1$
- newLowerBound = 0;
- newUpperBound = -1;
- } else {
- newLowerBound = new Integer(tempBound).intValue();
- newUpperBound = new Integer(tempBound).intValue();
- }
- } else { //size == 2
- String tempBound = parameterRuleObject.getMultiplicity().getBounds().get(0).getValue();
- newLowerBound = new Integer(tempBound).intValue();
- tempBound = parameterRuleObject.getMultiplicity().getBounds().get(1).getValue();
- if(tempBound.equals("*")) { //$NON-NLS-1$
- newUpperBound = -1;
- } else {
- newUpperBound = new Integer(tempBound).intValue();
- }
- }
- } else {//reset to the default value :
- newLowerBound = 1;
- newUpperBound = 1;
- }
-
- newName = "" + parameterRuleObject.getName(); //$NON-NLS-1$
-
- TypeRule typeRule = parameterRuleObject.getType();
- if(typeRule == null) {
- newType = null;
- } else {
- newType = typeRule.getType();
- }
-
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PUBLIC_LITERAL;
-
- switch(parameterRuleObject.getVisibility()) {
- case PUBLIC:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PUBLIC_LITERAL;
- break;
- case PACKAGE:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PACKAGE_LITERAL;
- break;
- case PRIVATE:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PRIVATE_LITERAL;
- break;
- case PROTECTED:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PROTECTED_LITERAL;
- break;
- default:
- break;
- }
-
- switch(parameterRuleObject.getDirection()) {
- case IN:
- newDirection = ParameterDirectionKind.IN_LITERAL;
- break;
- case OUT:
- newDirection = ParameterDirectionKind.OUT_LITERAL;
- break;
- case INOUT:
- newDirection = ParameterDirectionKind.INOUT_LITERAL;
- break;
- case RETURN:
- newDirection = ParameterDirectionKind.RETURN_LITERAL;
- break;
-
- }
-
- switch(parameterRuleObject.getEffect().getEffectKind()) {
- case CREATE:
- newEffect = ParameterEffectKind.CREATE_LITERAL;
- break;
- case DELETE:
- newEffect = ParameterEffectKind.DELETE_LITERAL;
- break;
- case READ:
- newEffect = ParameterEffectKind.READ_LITERAL;
- break;
- case UPDATE:
- newEffect = ParameterEffectKind.UPDATE_LITERAL;
- break;
- }
-
- IUndoableOperation updateCommand = getUpdateCommand();
-
- try {
- CheckedOperationHistory.getInstance().execute(updateCommand, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- System.err.println(e);
- }
- }
- };
- return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new SemanticValidator());
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration#getTextToEdit(java.lang.Object)
- *
- * @param editedObject
- * @return
- */
- @Override
- public String getTextToEdit(Object editedObject) {
- if(editedObject instanceof Parameter) {
- return UMLParameterEditorUtil.getLabel((Parameter)editedObject).trim();
- }
- return "not a Parameter"; //$NON-NLS-1$
- }
-
- /**
- * Returns the list of requests to update the {@link #parameter}
- *
- * @return
- * the list of requests to update the {@link #parameter}
- */
- protected List<SetRequest> getRequests() {
- List<SetRequest> requests = new ArrayList<SetRequest>();
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getNamedElement_Name(), newName));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getNamedElement_Visibility(), newVisibility));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getTypedElement_Type(), newType));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_IsException(), newIsException));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_IsStream(), newIsStream));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered(), newIsOrdered));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique(), newIsUnique));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_Direction(), newDirection));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_Lower(), newLowerBound));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_Upper(), newUpperBound));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_Effect(), newEffect));
- return requests;
- }
-
- /**
- * Returns the update command
- *
- * @return
- * the update command
- */
- protected IUndoableOperation getUpdateCommand() {
- CompositeCommand cc = new CompositeCommand("Set values for Parameter"); //$NON-NLS-1$
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(parameter);
- if(provider != null) {
-
- ICommand editCommand = null;
- for(SetRequest current : getRequests()) {
- editCommand = provider.getEditCommand(current);
-
- if(editCommand != null && editCommand.canExecute()) {
- cc.add(editCommand);
- }
- }
- }
- return cc;
- }
-}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF index e5058395f62..1f816be4454 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF @@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
org.eclipse.uml2.uml;bundle-version="3.1.0",
org.eclipse.xtext.util,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml new file mode 100644 index 00000000000..9755ab48457 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.parameter.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/pom.xml new file mode 100644 index 00000000000..6518e45ee22 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.port.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml new file mode 100644 index 00000000000..13e5a17df22 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.port.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml new file mode 100644 index 00000000000..bc4e861d372 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.property.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml new file mode 100644 index 00000000000..a6fd425f54c --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.property.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/pom.xml new file mode 100644 index 00000000000..949bc57a09b --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.state.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF index 58e88bbb052..aff81121bf8 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml new file mode 100644 index 00000000000..9acdfac4380 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.state.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/pom.xml new file mode 100644 index 00000000000..21bff6eea2c --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml new file mode 100644 index 00000000000..9aee2f5b8cb --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/pom.xml new file mode 100644 index 00000000000..4d330bc7e28 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext.ui</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF index 22ada5688bf..9c656265c65 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml new file mode 100644 index 00000000000..ac554c7d017 --- /dev/null +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/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.0.0-SNAPSHOT</version> + <relativePath>../../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file |