diff options
| author | Vincent Lorenzo | 2015-04-16 14:33:58 +0000 |
|---|---|---|
| committer | Vincent Lorenzo | 2015-04-16 14:33:58 +0000 |
| commit | e492ddc90ea33db7371e0eb35a9a3a022ad08ed8 (patch) | |
| tree | 4286afd8a56d2666963e3f35c373d797e11b9f55 /plugins | |
| parent | f70ea78ef6c1a325a5825f1b7141c7da19295ae4 (diff) | |
| parent | 0002fb0cda50b0245f9d2e26d030a8a1e955e58b (diff) | |
| download | org.eclipse.papyrus-e492ddc90ea33db7371e0eb35a9a3a022ad08ed8.tar.gz org.eclipse.papyrus-e492ddc90ea33db7371e0eb35a9a3a022ad08ed8.tar.xz org.eclipse.papyrus-e492ddc90ea33db7371e0eb35a9a3a022ad08ed8.zip | |
Merge branch 'master' of ssh://git.eclipse.org:29418/papyrus/org.eclipse.papyrus
Diffstat (limited to 'plugins')
56 files changed, 3655 insertions, 3471 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequencePaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequencePaletteFactory.java index 369b125a719..68619b7feba 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequencePaletteFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequencePaletteFactory.java @@ -20,6 +20,7 @@ import java.util.List; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.Cursors;
+import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.EditPolicy;
@@ -480,7 +481,25 @@ public class SequencePaletteFactory extends PaletteFactory.Adapter { public MessageConnectionTool(List<IElementType> elementTypes) {
super(elementTypes);
}
-
+
+ /**
+ * Returns the current x, y position of the mouse cursor.
+ * Sets the Y coordinate to the one of the start location
+ * for messages created with SHIFT being pressed.
+ *
+ * @return the mouse location
+ */
+ @Override
+ protected Point getLocation() {
+ Point mouseLocation = getCurrentInput().getMouseLocation();
+ // Horizontal connection if Shift is pressed
+ if (getCurrentInput().isShiftKeyDown()) {
+ return new Point(mouseLocation.x, getStartLocation().y);
+ } else {
+ return mouseLocation;
+ }
+ }
+
@Override
protected void selectAddedObject(EditPartViewer viewer, Collection objects) {
final List editparts = new ArrayList();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ChangeEdgeTargetCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ChangeEdgeTargetCommand.java index a36783b3d5a..c419f439c80 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ChangeEdgeTargetCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ChangeEdgeTargetCommand.java @@ -35,7 +35,9 @@ import org.eclipse.gmf.runtime.notation.RelativeBendpoints; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageDeleteHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.OccurrenceSpecificationHelper;
+import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
import org.eclipse.uml2.uml.ExecutionSpecification;
import org.eclipse.uml2.uml.Message;
import org.eclipse.uml2.uml.MessageEnd;
@@ -55,6 +57,8 @@ public class ChangeEdgeTargetCommand extends AbstractTransactionalCommand { protected ConnectionViewDescriptor descriptor;
+ protected Edge edge;
+
protected String anchorId;
/**
@@ -75,53 +79,77 @@ public class ChangeEdgeTargetCommand extends AbstractTransactionalCommand { this.anchorId = anchorId;
}
+ /**
+ *
+ * @param editingDomain
+ * the editing domain.
+ * @param createElementAndNodeCommand
+ * used to retrieve the target new node of the edge.
+ * @param edge
+ * the edge.
+ * @param anchorId
+ * the identity of the anchor which will be created to attach the edge.
+ */
+ public ChangeEdgeTargetCommand(TransactionalEditingDomain editingDomain, CreateElementAndNodeCommand createElementAndNodeCommand, Edge edge, String anchorId) {
+ super(editingDomain, "Change message graphical target", null);
+ this.createElementAndNodeCommand = createElementAndNodeCommand;
+ this.edge = edge;
+ this.anchorId = anchorId;
+ }
+
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
// retrieve the edge from the descriptor
- Object obj = descriptor.getAdapter(Edge.class);
- if (obj instanceof Edge) {
- Edge edge = (Edge) obj;
- View newTarget = createElementAndNodeCommand.getCreatedView();
- edge.setTarget(newTarget);
- IdentityAnchor anchor = NotationFactory.eINSTANCE.createIdentityAnchor();
- anchor.setId(anchorId);
- edge.setTargetAnchor(anchor);
- // reset bendpoints to target
- Bendpoints bendpoints = edge.getBendpoints();
- if (bendpoints instanceof RelativeBendpoints) {
- List points = ((RelativeBendpoints) bendpoints).getPoints();
- if (!points.isEmpty()) {
- List<RelativeBendpoint> newPoints = new ArrayList<RelativeBendpoint>();
- RelativeBendpoint first = (RelativeBendpoint) points.get(0);
- RelativeBendpoint last = (RelativeBendpoint) points.get(1);
- RelativeBendpoint rb1 = new RelativeBendpoint(first.getSourceX(), first.getSourceY(), first.getTargetX() - 8, first.getTargetY());
- RelativeBendpoint rb2 = new RelativeBendpoint(last.getSourceX() + 8, last.getSourceY(), last.getTargetX(), 0);
- newPoints.add(rb1);
- for (int i = 1; i < points.size() - 1; i++) {
- newPoints.add((RelativeBendpoint) points.get(i));
- }
- newPoints.add(rb2);
- ((RelativeBendpoints) bendpoints).setPoints(newPoints);
+ if (descriptor != null) {
+ Object obj = descriptor.getAdapter(Edge.class);
+ if (false == obj instanceof Edge) {
+ return null;
+ }
+ edge = (Edge) obj;
+ }
+ View newTarget = createElementAndNodeCommand.getCreatedView();
+ IdentityAnchor anchor = NotationFactory.eINSTANCE.createIdentityAnchor();
+ anchor.setId(anchorId);
+ edge.setTargetAnchor(anchor);
+ // reset bendpoints to target
+ Bendpoints bendpoints = edge.getBendpoints();
+ if (bendpoints instanceof RelativeBendpoints) {
+ List points = ((RelativeBendpoints) bendpoints).getPoints();
+ if (!points.isEmpty()) {
+ List<RelativeBendpoint> newPoints = new ArrayList<RelativeBendpoint>();
+ RelativeBendpoint first = (RelativeBendpoint) points.get(0);
+ RelativeBendpoint last = (RelativeBendpoint) points.get(1);
+ RelativeBendpoint rb1 = new RelativeBendpoint(first.getSourceX(), first.getSourceY(), first.getTargetX() - 8, first.getTargetY());
+ RelativeBendpoint rb2 = new RelativeBendpoint(last.getSourceX() + 8, last.getSourceY(), last.getTargetX(), 0);
+ newPoints.add(rb1);
+ for (int i = 1; i < points.size() - 1; i++) {
+ newPoints.add((RelativeBendpoint) points.get(i));
}
+ newPoints.add(rb2);
+ ((RelativeBendpoints) bendpoints).setPoints(newPoints);
}
- // Reset message end to target ExecutionSpecification, See https://bugs.eclipse.org/bugs/show_bug.cgi?id=402975
- EObject edgeElement = ViewUtil.resolveSemanticElement(edge);
- EObject targetElement = ViewUtil.resolveSemanticElement(newTarget);
- if (edgeElement instanceof Message && MessageSort.SYNCH_CALL_LITERAL == ((Message) edgeElement).getMessageSort() && targetElement instanceof ExecutionSpecification) {
- MessageEnd receiveEvent = ((Message) edgeElement).getReceiveEvent();
+ }
+ // Reset message end to target ExecutionSpecification, See https://bugs.eclipse.org/bugs/show_bug.cgi?id=402975
+ EObject edgeElement = ViewUtil.resolveSemanticElement(edge);
+ EObject targetElement = ViewUtil.resolveSemanticElement(newTarget);
+ if (edgeElement instanceof Message && MessageSort.SYNCH_CALL_LITERAL == ((Message) edgeElement).getMessageSort() && targetElement instanceof ExecutionSpecification) {
+ MessageEnd receiveEvent = ((Message) edgeElement).getReceiveEvent();
- Collection<EStructuralFeature.Setting> collection = EMFHelper.getUsages(receiveEvent);
- for (EStructuralFeature.Setting nonNavigableInverseReference : collection) {
- EObject eObject = nonNavigableInverseReference.getEObject();
- if (eObject instanceof ExecutionSpecification && eObject != targetElement) {
- if (((ExecutionSpecification) eObject).getStart() == receiveEvent) {
- OccurrenceSpecificationHelper.resetExecutionStart((ExecutionSpecification) eObject, UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification());
- }
+ Collection<EStructuralFeature.Setting> collection = EMFHelper.getUsages(receiveEvent);
+ for (EStructuralFeature.Setting nonNavigableInverseReference : collection) {
+ EObject eObject = nonNavigableInverseReference.getEObject();
+ if (eObject instanceof ExecutionSpecification && eObject != targetElement) {
+ if (((ExecutionSpecification) eObject).getStart() == receiveEvent) {
+ OccurrenceSpecificationHelper.resetExecutionStart((ExecutionSpecification) eObject, UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification());
}
}
-
- OccurrenceSpecificationHelper.resetExecutionStart((ExecutionSpecification) targetElement, receiveEvent);
}
+
+ OccurrenceSpecificationHelper.resetExecutionStart((ExecutionSpecification) targetElement, receiveEvent);
+ }
+ if (edgeElement instanceof Message && MessageSort.DELETE_MESSAGE_LITERAL == ((Message) edgeElement).getMessageSort() && targetElement instanceof DestructionOccurrenceSpecification) {
+ // Set Message target to newly created DOS, destroy old MessageOccurrenceSpecification
+ LifelineMessageDeleteHelper.setMessageEndDos((Message)edgeElement, (DestructionOccurrenceSpecification)targetElement);
}
return null;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateElementAndNodeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateElementAndNodeCommand.java index 5100f3c3642..afaec4fd584 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateElementAndNodeCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateElementAndNodeCommand.java @@ -157,7 +157,7 @@ public class CreateElementAndNodeCommand extends AbstractTransactionalCommand { */
protected void createElementView() {
if (nodeEditPart != null) {
- // check if execution specification is already drawn
+ // check if node is already drawn
if (getCreatedView() == null) {
ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(new EObjectAdapter(element), Node.class, elementType.getSemanticHint(), nodeEditPart.getDiagramPreferencesHint());
createViewRequest = new CreateViewRequest(descriptor);
@@ -173,7 +173,7 @@ public class CreateElementAndNodeCommand extends AbstractTransactionalCommand { @Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
element = createModelElement();
- // create the view for the execution specification
+ // create the view for the node
if (element != null) {
createElementView();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4ReorientCommand.java index 6a14e17f3fc..3382439c51a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4ReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage4ReorientCommand.java @@ -48,8 +48,9 @@ public class CustomMessage4ReorientCommand extends Message4ReorientCommand { if (!(getLink().eContainer() instanceof Interaction)) {
return false;
}
+ Element target = MessageConnectionHelper.getMessageTarget(getLink());
Interaction container = (Interaction) getLink().eContainer();
- if (!UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistMessage_4006(container, getLink(), getNewSource(), getOldTarget())) {
+ if (!UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistMessage_4006(container, getLink(), getNewSource(), target)) {
return false;
}
return MessageConnectionHelper.canReorientSource(getLink(), getNewSource());
@@ -63,7 +64,7 @@ public class CustomMessage4ReorientCommand extends Message4ReorientCommand { if (!(getOldTarget() instanceof Element && getNewTarget() instanceof Element)) {
return false;
}
- Element source = getLink().getOwner();
+ Element source = MessageConnectionHelper.getMessageSource(getLink());
if (!(getLink().eContainer() instanceof Interaction)) {
return false;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5CreateCommand.java index b7fe141721f..ffa214d3a06 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5CreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5CreateCommand.java @@ -28,6 +28,7 @@ import org.eclipse.papyrus.uml.diagram.common.commands.EObjectInheritanceCopyCom import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;
+import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageDeleteHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.MessageConnectionHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;
import org.eclipse.uml2.common.util.UML2Util;
@@ -121,8 +122,11 @@ public class CustomMessage5CreateCommand extends Message5CreateCommand { if (message != null) {
doConfigure(message, monitor, info);
((CreateElementRequest) getRequest()).setNewElement(message);
+ if (getTarget() instanceof DestructionOccurrenceSpecification) {
+ LifelineMessageDeleteHelper.setMessageEndDos(message, (DestructionOccurrenceSpecification)getTarget());
+ }
return CommandResult.newOKCommandResult(message);
- }
+ }
return CommandResult.newErrorCommandResult("There is now valid container for events"); //$NON-NLS-1$
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5ReorientCommand.java index 4e7d36125b9..e15fe3d5927 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5ReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomMessage5ReorientCommand.java @@ -48,8 +48,9 @@ public class CustomMessage5ReorientCommand extends Message5ReorientCommand { if (!(getLink().eContainer() instanceof Interaction)) {
return false;
}
+ Element target = MessageConnectionHelper.getMessageTarget(getLink());
Interaction container = (Interaction) getLink().eContainer();
- if (!UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistMessage_4007(container, getLink(), getNewSource(), getOldTarget())) {
+ if (!UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistMessage_4007(container, getLink(), getNewSource(), target)) {
return false;
}
return MessageConnectionHelper.canReorientSource(getLink(), getNewSource());
@@ -63,7 +64,7 @@ public class CustomMessage5ReorientCommand extends Message5ReorientCommand { if (!(getOldTarget() instanceof Element && getNewTarget() instanceof Element)) {
return false;
}
- Element source = getLink().getOwner();
+ Element source = MessageConnectionHelper.getMessageSource(getLink());
if (!(getLink().eContainer() instanceof Interaction)) {
return false;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/AnchorHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/AnchorHelper.java index fa1de4c84a4..c7f01153297 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/AnchorHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/AnchorHelper.java @@ -188,6 +188,8 @@ public class AnchorHelper { } else {
return getBox().getBottomRight();
}
+ } else if (position == PositionConstants.CENTER) {
+ return getBox().getCenter();
}
return super.getLocation(reference);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragment2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragment2EditPart.java index 1e1a9dca710..bb20785af93 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragment2EditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragment2EditPart.java @@ -15,10 +15,12 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomCombinedFragment2ResizeEditPolicy;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.semantic.CustomCombinedFragment2ItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.sequence.figures.CoRegionCombinedFragmentFigure;
import org.eclipse.uml2.uml.Lifeline;
@@ -44,6 +46,7 @@ public class CustomCombinedFragment2EditPart extends CombinedFragment2EditPart { protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCombinedFragment2ItemSemanticEditPolicy());
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new CustomCombinedFragment2ResizeEditPolicy());
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java index f870b0d0d3f..c72ceccd213 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java @@ -55,7 +55,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus; import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions; import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; -import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; @@ -408,16 +407,14 @@ public class CustomCombinedFragmentEditPart extends CombinedFragmentEditPart imp super.handleNotificationEvent(notification); // fixed bug (id=364711) when bounds changed update coveredBys with the figure's bounds. if (notification.getNotifier() instanceof Bounds) { - if (notification.getNotifier() instanceof Bounds) { - Display.getDefault().asyncExec(new Runnable() { + Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - LifelineCoveredByUpdater updater = new LifelineCoveredByUpdater(); - updater.update(CustomCombinedFragmentEditPart.this); - } - }); - } + @Override + public void run() { + LifelineCoveredByUpdater updater = new LifelineCoveredByUpdater(); + updater.update(CustomCombinedFragmentEditPart.this); + } + }); } if ((getModel() != null) && (getModel() == notification.getNotifier())) { if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDestructionOccurrenceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDestructionOccurrenceSpecificationEditPart.java index dc6f7ad9422..ccbfe4d0743 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDestructionOccurrenceSpecificationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDestructionOccurrenceSpecificationEditPart.java @@ -13,16 +13,35 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
+import org.eclipse.draw2d.ConnectionAnchor;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.CreateConnectionRequest;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.AnchorHelper;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.AppliedStereotypeCommentCreationEditPolicyEx;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.semantic.CustomDestructionOccurrenceSpecificationItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.sequence.util.HighlightUtil;
+import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageDeleteHelper;
import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies.AppliedStereotypeCommentCreationEditPolicy;
/**
@@ -48,6 +67,58 @@ public class CustomDestructionOccurrenceSpecificationEditPart extends Destructio protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDestructionOccurrenceSpecificationItemSemanticEditPolicy());
+ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new GraphicalNodeEditPolicy() {
+
+ @Override
+ protected Command getReconnectTargetCommand(ReconnectRequest request) {
+ INodeEditPart node = getConnectableEditPart();
+ if (node == null) {
+ return null;
+ }
+ // Set Edge.Target to the target lifeline
+ Command cmd = super.getReconnectTargetCommand(request);
+ cmd = cmd.chain(LifelineMessageDeleteHelper.getSetEdgeTargetCommand(request, getEditingDomain()));
+ return cmd;
+ }
+
+ @Override
+ protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
+ Command cmd = super.getConnectionCompleteCommand(request);
+ if (false == request instanceof CreateConnectionViewAndElementRequest) {
+ return cmd;
+ }
+ // Set Edge.Target to the target lifeline
+ cmd = cmd.chain(LifelineMessageDeleteHelper.getSetEdgeTargetCommand(request, getEditingDomain()));
+ return cmd;
+ }
+ });
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicyEx() {
+
+ @Override
+ protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
+ request.getMoveDelta().x = 0; // reset offset
+ IFigure feedback = getDragSourceFeedbackFigure();
+ PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
+ getHostFigure().translateToAbsolute(rect);
+ rect.translate(request.getMoveDelta());
+ CustomLifelineEditPart parentEP = (CustomLifelineEditPart)getParent();
+ Rectangle rectParent = parentEP.getFigure().getBounds().getCopy();
+ parentEP.getFigure().translateToAbsolute(rectParent);
+ int minY = parentEP.getMinimumHeight(-1, true) + rectParent.y;
+ if (rect.y < minY) {
+ request.getMoveDelta().y += minY - rect.y;
+ rect.y = minY;
+ }
+ feedback.translateToRelative(rect);
+ feedback.setBounds(rect);
+ }
+
+ @Override
+ protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) {
+ super.eraseChangeBoundsFeedback(request);
+ HighlightUtil.unhighlight();
+ }
+ });
// install a editpolicy to display stereotypes
installEditPolicy(AppliedStereotypeCommentCreationEditPolicy.APPLIED_STEREOTYPE_COMMENT, new AppliedStereotypeCommentCreationEditPolicyEx());
}
@@ -86,4 +157,64 @@ public class CustomDestructionOccurrenceSpecificationEditPart extends Destructio super.refreshVisuals();
refreshLineWidth();
}
+
+ /**
+ * Add connection on the center of the figure during the feedback.
+ */
+ @Override
+ public ConnectionAnchor getTargetConnectionAnchor(Request request) {
+ return new AnchorHelper.FixedAnchorEx(getFigure(), PositionConstants.CENTER);
+ }
+
+ /**
+ * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
+ *
+ * @param connEditPart
+ * The connection edit part.
+ * @return The anchor.
+ */
+ @Override
+ public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connEditPart) {
+ return new AnchorHelper.FixedAnchorEx(getFigure(), PositionConstants.CENTER);
+ }
+
+ /**
+ * Override for redirecting creation request to the lifeline
+ */
+ @Override
+ public void showSourceFeedback(Request request) {
+ if (request instanceof CreateUnspecifiedTypeRequest) {
+ getParent().showSourceFeedback(request);
+ }
+ super.showSourceFeedback(request);
+ }
+
+ /**
+ * Override for redirecting creation request to the lifeline
+ */
+ @Override
+ public void eraseSourceFeedback(Request request) {
+ if (request instanceof CreateUnspecifiedTypeRequest) {
+ getParent().eraseSourceFeedback(request);
+ }
+ super.eraseSourceFeedback(request);
+ }
+
+ @Override
+ public void showTargetFeedback(Request request) {
+ if (request instanceof CreateUnspecifiedTypeRequest) {
+ getParent().showTargetFeedback(request);
+ }
+ super.showTargetFeedback(request);
+ }
+
+ @Override
+ public void eraseTargetFeedback(Request request) {
+ if (request instanceof CreateUnspecifiedTypeRequest) {
+ getParent().eraseTargetFeedback(request);
+ }
+ super.eraseTargetFeedback(request);
+ }
+
+
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java index 8d4cd26d21d..9c6f53365ea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java @@ -53,6 +53,7 @@ import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.gmf.runtime.notation.Size;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
@@ -150,6 +151,20 @@ public class CustomInteractionEditPart extends InteractionEditPart implements IP return notifier;
}
+ public Command getUpdateLifelinesHeightsCommand(Command command) {
+ for (Object child : CustomInteractionEditPart.this.getChildren()) {
+ if (child instanceof InteractionInteractionCompartmentEditPart) {
+ InteractionInteractionCompartmentEditPart childEditPart = (InteractionInteractionCompartmentEditPart) child;
+ for (Object grandChild : childEditPart.getChildren()) {
+ if (grandChild instanceof CustomLifelineEditPart) {
+ command = ((CustomLifelineEditPart)grandChild).getAlignLifelineBottomToParentCommand(command, false);
+ }
+ }
+ }
+ }
+ return command;
+ }
+
/**
* @Override
*/
@@ -177,7 +192,7 @@ public class CustomInteractionEditPart extends InteractionEditPart implements IP if (newBounds.width < minimumSize.width || newBounds.height < minimumSize.height) {
return UnexecutableCommand.INSTANCE;
}
- Command command = super.getResizeCommand(request);
+ Command command = getUpdateLifelinesHeightsCommand(super.getResizeCommand(request));
/** Anchors for Lost/Found message were updated, there's no need to preserve positions after resize. */
// if(command != null && command.canExecute()) {
// if(newBounds.width >= minimumSize.width && newBounds.height >= minimumSize.height) {
@@ -208,14 +223,22 @@ public class CustomInteractionEditPart extends InteractionEditPart implements IP for (Object grandChild : childEditPart.getChildren()) {
GraphicalEditPart editPart = (GraphicalEditPart) grandChild;
IFigure figure = editPart.getFigure();
- bounds.union(figure.getBounds());
+ if (grandChild instanceof CustomLifelineEditPart) {
+ Rectangle childBounds = figure.getBounds().getCopy();
+ childBounds.height = ((CustomLifelineEditPart)grandChild).getMinimumHeight(-1);
+ bounds.union(childBounds);
+ } else {
+ bounds.union(figure.getBounds());
+ }
}
IFigure figure = childEditPart.getFigure();
Rectangle rectangle = figure.getBounds();
IFigure parentfigure = CustomInteractionEditPart.this.getFigure();
Rectangle parentRectangle = parentfigure.getBounds();
- bounds.width += parentRectangle.width - rectangle.width + 10; // border 2x5
- bounds.height += parentRectangle.height - rectangle.height + 16; // border 2x5 + 2x3
+ Dimension zoomedAddon = new Dimension(10, 16);
+ figure.translateToRelative(zoomedAddon);
+ bounds.width += parentRectangle.width - rectangle.width + zoomedAddon.width; // border 2x5
+ bounds.height += parentRectangle.height - rectangle.height + zoomedAddon.height; // border 2x5 + 2x3
break;
}
}
@@ -402,6 +425,12 @@ public class CustomInteractionEditPart extends InteractionEditPart implements IP };
CommandHelper.executeCommandWithoutHistory(getEditingDomain(), cmd, true);
}
+ // Handle Start-up and Undo of creating a MessageCreate
+ // Other cases of keeping lifelines' heights up to date are handled elsewhere in order to prevent blinking
+ Command commandUpdateLifelines = getUpdateLifelinesHeightsCommand(null);
+ if (commandUpdateLifelines != null) {
+ CommandHelper.executeCommandWithoutHistory(getEditingDomain(), new GEFtoEMFCommandWrapper(commandUpdateLifelines), true);
+ }
}
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionInteractionCompartmentEditPart.java index eaec5055deb..bb98c4a06a6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionInteractionCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionInteractionCompartmentEditPart.java @@ -13,14 +13,28 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.TransactionalCommandStack;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.Shape;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.sequence.command.CustomZOrderCommand;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.semantic.CustomInteractionInteractionCompartmentItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.sequence.util.HighlightUtil;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.uml2.uml.Lifeline;
/**
* @author Jin Liu (jin.liu@soyatec.com)
@@ -59,7 +73,42 @@ public class CustomInteractionInteractionCompartmentEditPart extends Interaction super.addChildVisual(childEditPart, index);
}
- /*
+ @Override
+ protected void handleNotificationEvent(Notification notification) {
+ super.handleNotificationEvent(notification);
+ // Bring lifelines forward after delete+undo (https://bugs.eclipse.org/bugs/show_bug.cgi?id=455071)
+ if (notification.getEventType() == Notification.ADD &&
+ notification.getNewValue() instanceof Shape) {
+ final Shape shape = (Shape) notification.getNewValue();
+ if (shape.getElement() instanceof Lifeline) {
+ final TransactionalEditingDomain domain = getEditingDomain();
+
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ View containerView = ViewUtil.getContainerView(shape);
+ CustomZOrderCommand cmd = new CustomZOrderCommand(domain, shape, containerView.getChildren().size() - 1);
+
+ CommandStack commandStack = domain.getCommandStack();
+ if (commandStack instanceof TransactionalCommandStack) {
+ TransactionalCommandStack stack = (TransactionalCommandStack) commandStack;
+ Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
+ options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
+ try {
+ stack.execute(new GMFtoEMFCommandWrapper(cmd), options);
+ }
+ catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ });
+ }
+ }
+ }
+
+ /*
* (non-Javadoc)
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionUseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionUseEditPart.java index b7ec48b73ea..e2986ceff33 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionUseEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionUseEditPart.java @@ -30,6 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.Bounds;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.FillStyle;
import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -49,6 +50,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionUseRectangleF import org.eclipse.papyrus.uml.diagram.sequence.locator.GateLocator;
import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.InteractionUseUtil;
+import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineCoveredByUpdater;
import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
@@ -341,6 +343,16 @@ public class CustomInteractionUseEditPart extends InteractionUseEditPart impleme refreshLineWidth();
}
}
+ if (notification.getNotifier() instanceof Bounds) {
+ Display.getDefault().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ LifelineCoveredByUpdater updater = new LifelineCoveredByUpdater();
+ updater.update(CustomInteractionUseEditPart.this);
+ }
+ });
+ }
refreshShadow();
super.handleNotificationEvent(notification);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java index 03bee4104e4..2a15ab91230 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomLifelineEditPart.java @@ -20,6 +20,9 @@ import java.util.Iterator; import java.util.List;
import java.util.Map;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.IFigure;
@@ -37,6 +40,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.EditPart;
@@ -52,7 +56,9 @@ import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
@@ -69,20 +75,24 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor;
import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.IdentityAnchor;
import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Shape;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.gmf.runtime.notation.datatype.GradientData;
import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand;
+import org.eclipse.papyrus.uml.diagram.common.draw2d.LifelineDotLineFigure;
import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.LifelineAnchor;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;
@@ -109,15 +119,18 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageCreateHelper import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineModelChildrenHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineResizeHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;
+import org.eclipse.papyrus.uml.diagram.sequence.util.OperandBoundsComputeHelper;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
import org.eclipse.uml2.common.util.CacheAdapter;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
import org.eclipse.uml2.uml.ExecutionSpecification;
import org.eclipse.uml2.uml.InteractionFragment;
import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.Message;
import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.StructuredClassifier;
@@ -222,7 +235,8 @@ public class CustomLifelineEditPart extends LifelineEditPart { width = Math.max(width, d.height);
}
}
- return new Dimension(isInlineMode() ? width : minSize.width, getMinimumHeight(height));
+ int minHeight = getMinimumHeight(height, true);
+ return new Dimension(isInlineMode() ? width : minSize.width, minHeight);
}
return super.getMinimumSize(wHint, hHint);
}
@@ -240,6 +254,15 @@ public class CustomLifelineEditPart extends LifelineEditPart { @Override
protected String getNewIdStr(IdentityAnchor anchor) {
+ // DestructionOccurrenceSpecification is always on the bottom
+ if (anchor.eContainer() instanceof Edge) {
+ Edge edge = (Edge) anchor.eContainer();
+ if (edge.getElement() instanceof Message && ((Message)edge.getElement()).getReceiveEvent() instanceof DestructionOccurrenceSpecification) {
+ if (anchor.equals(edge.getTargetAnchor())) {
+ return "(0.5, 1.0)";
+ }
+ }
+ }
String res = super.getNewIdStr(anchor);
String id = anchor.getId();
int start = id.indexOf('{');
@@ -445,7 +468,7 @@ public class CustomLifelineEditPart extends LifelineEditPart { case TimeConstraintEditPart.VISUAL_ID:
case TimeObservationEditPart.VISUAL_ID:
case DurationConstraintEditPart.VISUAL_ID:
- case DestructionOccurrenceSpecificationEditPart.VISUAL_ID:
+ //case DestructionOccurrenceSpecificationEditPart.VISUAL_ID:
return new BorderItemResizableEditPolicy();
}
EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
@@ -810,12 +833,22 @@ public class CustomLifelineEditPart extends LifelineEditPart { return centerFigure;
}
- private int getMinimumHeight(int heightHint) {
+ public int getMinimumHeight(int heightHint) {
+ return getMinimumHeight(heightHint, false);
+ }
+
+ public int getMinimumHeight(int heightHint, boolean ignoreDestructionOccurence) {
Rectangle rect = getFigure().getBounds().getCopy();
getFigure().translateToAbsolute(rect);
+ if (false == resolveSemanticElement() instanceof Lifeline) {
+ return heightHint;
+ }
Lifeline lifeline = (Lifeline) resolveSemanticElement();
EList<InteractionFragment> coveredBys = lifeline.getCoveredBys();
- int bottom = 0;
+ LifelineDotLineFigure figureLifelineDotLineFigure = getPrimaryShape().getFigureLifelineDotLineFigure();
+ Rectangle rectDotLine = figureLifelineDotLineFigure.getBounds().getCopy();
+ figureLifelineDotLineFigure.translateToAbsolute(rectDotLine);
+ int bottom = rectDotLine.y + LifelineXYLayoutEditPolicy.SPACING_HEIGHT; // at least header height + spacing
for (InteractionFragment interactionFragment : coveredBys) {
Collection<Setting> settings = CacheAdapter.getInstance().getNonNavigableInverseReferences(interactionFragment);
for (Setting ref : settings) {
@@ -827,9 +860,17 @@ public class CustomLifelineEditPart extends LifelineEditPart { if (!(part instanceof GraphicalEditPart)) {
continue;
}
+ if (ignoreDestructionOccurence) {
+ if (part instanceof DestructionOccurrenceSpecificationEditPart) {
+ continue;
+ }
+ if (part.getParent() instanceof CustomMessage5EditPart && ((CustomMessage5EditPart)part.getParent()).getSource() != this) {
+ continue;
+ }
+ }
GraphicalEditPart ep = (GraphicalEditPart) part;
Rectangle r = ep.getFigure().getBounds().getCopy();
- getFigure().translateToAbsolute(r);
+ ep.getFigure().translateToAbsolute(r);
bottom = Math.max(bottom, r.bottom());
}
}
@@ -1244,6 +1285,77 @@ public class CustomLifelineEditPart extends LifelineEditPart { super.showTargetFeedback(request);
}
+ public int getAdjustedHeight() {
+ if (false == getParent() instanceof CustomInteractionInteractionCompartmentEditPart) {
+ return -1;
+ }
+ CustomInteractionInteractionCompartmentEditPart parentEP = (CustomInteractionInteractionCompartmentEditPart)getParent();
+ CustomInteractionEditPart grandParent = (CustomInteractionEditPart)parentEP.getParent();
+ final Bounds bounds = (Bounds) ((Shape) getModel()).getLayoutConstraint();
+ final Bounds boundsGrandParent = (Bounds) ((Shape)grandParent.getModel()).getLayoutConstraint();
+ if (bounds != null && boundsGrandParent != null) {
+ Rectangle grandParentRect = OperandBoundsComputeHelper.fillRectangle(boundsGrandParent);
+ if (grandParentRect.height == -1) {
+ grandParentRect = grandParent.getFigure().getBounds().getCopy();
+ }
+ Rectangle boundsRect = OperandBoundsComputeHelper.fillRectangle(bounds);
+ if (boundsRect.height == -1) {
+ boundsRect.height = this.getFigure().getBounds().height;
+ }
+ grandParent.getFigure().translateToRelative(boundsRect);
+ //return boundsGrandParent.getHeight() - boundsRect.y - LifelineXYLayoutEditPolicy.LIFELINE_SOUTH_SPACING;
+ int heightDiff = grandParent.getFigure().getBounds().height - parentEP.getFigure().getBounds().height;
+ Dimension zoomedAddon = new Dimension(0, LifelineXYLayoutEditPolicy.LIFELINE_SOUTH_SPACING);
+ grandParent.getFigure().translateToRelative(zoomedAddon);
+ return grandParentRect.height() - bounds.getY() - heightDiff - zoomedAddon.height;
+ }
+ return -1;
+ }
+
+ /**
+ * Allign bottom of the lifeline to the parent's one.
+ *
+ */
+ public Command getAlignLifelineBottomToParentCommand(Command command, boolean ignoreDOS) {
+ EObject element = ViewUtil.resolveSemanticElement((View)getModel());
+ if (false == element instanceof Lifeline) {
+ return command;
+ }
+ // do nothing if the lifeline has a DOS
+ Lifeline lifeline = (Lifeline) element;
+ if (!ignoreDOS) {
+ for (InteractionFragment coveredBy : lifeline.getCoveredBys()) {
+ if (coveredBy instanceof DestructionOccurrenceSpecification) {
+ return command;
+ }
+ }
+ }
+ ICommand cmd = new AbstractTransactionalCommand(getEditingDomain(), "Allign Lifeline bottom", null) {
+ protected int heightDelta = 0;
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ final int adjustedHeight = getAdjustedHeight();
+ final Bounds bounds = (Bounds) ((Shape) getModel()).getLayoutConstraint();
+ if (adjustedHeight > 0) {
+ int oldHeight = bounds.getHeight();
+ bounds.setHeight(adjustedHeight);
+ heightDelta = bounds.getHeight() - oldHeight;
+ if (heightDelta == 0) {
+ return CommandResult.newOKCommandResult();
+ }
+ org.eclipse.emf.common.command.Command changeHeightCommand = SetCommand.create(getEditingDomain(), bounds, NotationPackage.Literals.SIZE__HEIGHT, bounds.getHeight());
+ changeHeightCommand.execute();
+ PreserveAnchorsPositionCommandEx preserveAnchorsCommand = new PreserveAnchorsPositionCommandEx(CustomLifelineEditPart.this, new Dimension(0, heightDelta), PreserveAnchorsPositionCommand.PRESERVE_Y, getPrimaryShape()
+ .getFigureLifelineDotLineFigure(), PositionConstants.SOUTH);
+ if (preserveAnchorsCommand.canExecute()) {
+ preserveAnchorsCommand.execute(monitor, info);
+ }
+ }
+ return CommandResult.newOKCommandResult();
+ }
+ };
+ return (command == null) ? new ICommandProxy(cmd) : command.chain(new ICommandProxy(cmd));
+ }
+
/**
* set the bounds of the lifeline.
*
@@ -1297,6 +1409,7 @@ public class CustomLifelineEditPart extends LifelineEditPart { /**
* This method automatically moves a lifeline according to the change of the size of the name and stereotypes container.
* This avoids the move of the dash line and its ES.
+ * Also the dash line's height is adjusted (upon lifeline's creation)
*/
public void updateLifelinePosition() {
Bounds bounds = getBounds();
@@ -1332,6 +1445,7 @@ public class CustomLifelineEditPart extends LifelineEditPart { if (size.width != rect.width) {
moveExecutionParts(new Dimension(size.width - rect.width, 0));
rect.width = size.width;
+ rect.height = getAdjustedHeight();
updateLifelineBounds(rect);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomCombinedFragment2ResizeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomCombinedFragment2ResizeEditPolicy.java new file mode 100644 index 00000000000..96c28311655 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomCombinedFragment2ResizeEditPolicy.java @@ -0,0 +1,87 @@ +/***************************************************************************** ++ * Copyright (c) 2009 CEA ++ * ++ * ++ * 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 ++ * Alex Paperno - bug 455080 ++ * ++ *****************************************************************************/ + +package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; + +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.PositionConstants; +import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.draw2d.geometry.PrecisionRectangle; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy; +import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode; +import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure; +import org.eclipse.papyrus.uml.diagram.sequence.util.HighlightUtil; + +public class CustomCombinedFragment2ResizeEditPolicy extends ResizableShapeEditPolicy { + + public CustomCombinedFragment2ResizeEditPolicy() { + setResizeDirections(PositionConstants.SOUTH | PositionConstants.NORTH); + } + + @Override + protected void showChangeBoundsFeedback(ChangeBoundsRequest request) { + CustomLifelineEditPart lifelineEP = (CustomLifelineEditPart) getHost().getParent(); + request.getMoveDelta().x = 0; // reset offset + request.getSizeDelta().width = 0; // reset offset + IFigure feedback = getDragSourceFeedbackFigure(); + PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy()); + getHostFigure().translateToAbsolute(rect); + IFigure f = getHostFigure(); + Dimension min = f.getMinimumSize().getCopy(); + Dimension max = f.getMaximumSize().getCopy(); + IMapMode mmode = MapModeUtil.getMapMode(f); + min.height = mmode.LPtoDP(min.height); + min.width = mmode.LPtoDP(min.width); + max.height = mmode.LPtoDP(max.height); + max.width = mmode.LPtoDP(max.width); + Rectangle originalBounds = rect.getCopy(); + rect.translate(request.getMoveDelta()); + rect.resize(request.getSizeDelta()); + rect.width = Math.min(Math.max(rect.width, min.width), max.width); + rect.height = Math.min(Math.max(rect.height, min.height), max.height); + if (rect.height == min.height && request.getSizeDelta().height < 0 && request.getMoveDelta().y > 0) { // can't shrink at north + Point loc = rect.getLocation(); + loc.y = originalBounds.getBottom().y - min.height; + rect.setLocation(loc); + request.getSizeDelta().height = min.height - originalBounds.height; + request.getMoveDelta().y = loc.y - originalBounds.y; + } + if (rect.height == min.height && request.getSizeDelta().height < 0 && request.getMoveDelta().y == 0) { // can't shrink at south + request.getSizeDelta().height = min.height - originalBounds.height; + } + // Bound to dotline top + IFigure dotlineFigure = ((LifelineFigure)lifelineEP.getPrimaryShape()).getFigureLifelineDotLineFigure(); + Rectangle rectParent = dotlineFigure.getBounds().getCopy(); + lifelineEP.getPrimaryShape().translateToAbsolute(rectParent); + int minLifelineY = rectParent.y + LifelineXYLayoutEditPolicy.SPACING_HEIGHT; + if (rect.y < minLifelineY) { + request.getMoveDelta().y += minLifelineY - rect.y; + rect.y = minLifelineY; + } + feedback.translateToRelative(rect); + feedback.setBounds(rect); + } + + @Override + protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) { + super.eraseChangeBoundsFeedback(request); + HighlightUtil.unhighlight(); + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java index e9458099d70..80405ab0f55 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java @@ -45,6 +45,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPar import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageDeleteHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
import org.eclipse.uml2.uml.ExecutionSpecification;
import org.eclipse.uml2.uml.InteractionFragment;
@@ -106,6 +107,9 @@ public class ElementCreationWithMessageEditPolicy extends LifelineChildGraphical // }
}
}
+ if (getDeleteMessageHint().equals(viewRequest.getConnectionViewDescriptor().getSemanticHint())) {
+ command = LifelineMessageDeleteHelper.getAttachToNewDosCommand(command, viewRequest, getEditingDomain(), targetEP, getHost());
+ }
}
}
return command;
@@ -121,6 +125,11 @@ public class ElementCreationWithMessageEditPolicy extends LifelineChildGraphical return message.getSemanticHint();
}
+ private static String getDeleteMessageHint() {
+ IHintedType message = (IHintedType) UMLElementTypes.Message_4007;
+ return message.getSemanticHint();
+ }
+
private TransactionalEditingDomain getEditingDomain() {
return ((IGraphicalEditPart) getHost()).getEditingDomain();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java index 9fe7ee77e4c..6e4c96cf40e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java @@ -70,6 +70,7 @@ import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCo import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool.CreateAspectUnspecifiedTypeRequest; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomInteractionEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart; @@ -127,6 +128,17 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy Rectangle hostBounds = figure.getBounds(); for (Object o : request.getEditParts()) { GraphicalEditPart child = (GraphicalEditPart) o; + boolean hasCreateLink = LifelineMessageCreateHelper.hasIncomingMessageCreate(child); + // Adjust excessive vertical resizing + if (child instanceof LifelineEditPart && hasCreateLink && request.getMoveDelta().y > 0) { + int oldHeight = child.getFigure().getBounds().height; + int oldMinimumHeight = ((CustomLifelineEditPart)child).getMinimumHeight(-1); + int requestHeight = oldHeight + request.getMoveDelta().y; + int newMinimumHeight = oldMinimumHeight + request.getMoveDelta().y; + int newHeight = Math.max(oldHeight, newMinimumHeight); + request.setSizeDelta(new Dimension(request.getSizeDelta().width, newHeight - requestHeight)); + request.setResizeDirection(PositionConstants.SOUTH); + } Object constraintFor = getConstraintFor(request, child); if (constraintFor instanceof Rectangle) { Rectangle childBounds = (Rectangle) constraintFor; @@ -150,7 +162,6 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy // return UnexecutableCommand.INSTANCE; // } } - boolean hasCreateLink = LifelineMessageCreateHelper.hasIncomingMessageCreate(child); if (hasCreateLink && !LifelineMessageCreateHelper.canMoveLifelineVertical((LifelineEditPart) child, (Rectangle) translateToModelConstraint(constraintFor))) { return UnexecutableCommand.INSTANCE; } @@ -161,6 +172,12 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy compoundCmd.add(new ICommandProxy(LifelineResizeHelper.createManualLabelSizeCommand((LifelineEditPart) child))); } compoundCmd.add(changeConstraintCommand); + // Update heights of all the lifelines + if (child instanceof LifelineEditPart && changeConstraintCommand != null && request.getMoveDelta().y != 0) { + CustomInteractionEditPart hostParent = (CustomInteractionEditPart)getHost().getParent(); + Command commandUpdateLifelines = hostParent.getUpdateLifelinesHeightsCommand(null); + compoundCmd.add(commandUpdateLifelines); + } } if (child instanceof CombinedFragmentEditPart) { OperandBoundsComputeHelper.createUpdateIOBoundsForCFResizeCommand(compoundCmd, request, (CombinedFragmentEditPart) child); @@ -645,7 +662,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy minimunSize.union(getMinimumSizeFor(lifelineEP)); } for (ShapeNodeEditPart executionSpecificationEP : LifelineEditPartUtil.getChildShapeNodeEditPart(lifelineEditPart)) { - int minimunHeight = executionSpecificationEP.getFigure().getBounds().bottom(); + int minimunHeight = executionSpecificationEP.getFigure().getBounds().height; minimunSize.setSize(new Dimension(minimunSize.width, Math.max(minimunSize.height, minimunHeight))); } return minimunSize; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java index 39faf0cc490..1bbb721f9d6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java @@ -45,11 +45,14 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.sequence.command.CreateGateViewCommand;
import org.eclipse.papyrus.uml.diagram.sequence.draw2d.routers.MessageRouter;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.util.GateHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageCreateHelper;
+import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineMessageDeleteHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.OccurrenceSpecificationMoveHelper;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;
import org.eclipse.uml2.uml.CombinedFragment;
@@ -159,7 +162,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends SequenceGraphicalNodeE command = OccurrenceSpecificationMoveHelper.completeReconnectConnectionCommand(command, request, getConnectableEditPart());
if (request.getConnectionEditPart() instanceof Message4EditPart && request.getTarget() instanceof LifelineEditPart) {
LifelineEditPart newSource = (LifelineEditPart) request.getTarget();
- LifelineEditPart target = (LifelineEditPart) request.getConnectionEditPart().getTarget();
+ CustomLifelineEditPart target = (CustomLifelineEditPart) request.getConnectionEditPart().getTarget();
command = LifelineMessageCreateHelper.moveLifelineDown(command, target, newSource.getFigure().getBounds().getLocation().getCopy());
}
}
@@ -183,6 +186,9 @@ public class LifelineChildGraphicalNodeEditPolicy extends SequenceGraphicalNodeE if (request.getConnectionEditPart() instanceof Message4EditPart && request.getTarget() instanceof LifelineEditPart) {
command = LifelineMessageCreateHelper.reconnectMessageCreateTarget(request, command);
}
+ if (request.getConnectionEditPart() instanceof Message5EditPart && request.getTarget() instanceof LifelineEditPart) {
+ command = LifelineMessageDeleteHelper.getReconnectMessageDeleteTargetCommand(request, command);
+ }
}
return command;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java index 5d60441f222..7779b87b4d5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineLabelEditPolicy.java @@ -72,9 +72,9 @@ public class LifelineLabelEditPolicy extends AbstractMaskManagedEditPolicy { if (object == null || getUMLElement() == null) {
return;
}
- if (notification.getFeature().equals(UMLPackage.eINSTANCE.getNamedElement_Name())) {
+ if (UMLPackage.eINSTANCE.getNamedElement_Name().equals(notification.getFeature())) {
refreshDisplay();
- } else if (notification.getFeature().equals(UMLPackage.Literals.LIFELINE__REPRESENTS)) {
+ } else if (UMLPackage.Literals.LIFELINE__REPRESENTS.equals(notification.getFeature())) {
// change represent element
if (notification.getNewValue() instanceof ConnectableElement) {
ConnectableElement ce = (ConnectableElement) notification.getNewValue();
@@ -103,7 +103,7 @@ public class LifelineLabelEditPolicy extends AbstractMaskManagedEditPolicy { }
refreshDisplay();
} else if(object.equals(getUMLElement().getSelector())
- || notification.getFeature().equals(UMLPackage.Literals.LIFELINE__SELECTOR)) {
+ || UMLPackage.Literals.LIFELINE__SELECTOR.equals(notification.getFeature())) {
// change selector
if(notification.getNewValue() instanceof ValueSpecification) {
getDiagramEventBroker().addNotificationListener((ValueSpecification)notification.getNewValue(), this);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineSelectionEditPolicy.java index c8f1b0a7572..9c69de10cf4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineSelectionEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineSelectionEditPolicy.java @@ -27,6 +27,8 @@ import org.eclipse.gef.tools.ResizeTracker; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableEditPolicyEx;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
@@ -37,7 +39,7 @@ import org.eclipse.uml2.uml.Lifeline; public class LifelineSelectionEditPolicy extends ResizableEditPolicyEx {
public LifelineSelectionEditPolicy() {
- setResizeDirections(PositionConstants.NORTH | PositionConstants.SOUTH | PositionConstants.WEST | PositionConstants.EAST);
+ setResizeDirections(PositionConstants.WEST | PositionConstants.EAST);
}
@Override
@@ -63,7 +65,6 @@ public class LifelineSelectionEditPolicy extends ResizableEditPolicyEx { final IFigure fig = primaryShape.getFigureLifelineNameContainerFigure();
createResizeHandle(host, list, fig, PositionConstants.WEST);
createResizeHandle(host, list, fig, PositionConstants.EAST);
- createResizeHandle(list, PositionConstants.SOUTH);
return list;
}
@@ -93,9 +94,9 @@ public class LifelineSelectionEditPolicy extends ResizableEditPolicyEx { boolean skipMinSize = false;
// Only enable horizontal dragging on lifelines(except lifelines that are result of a create message).
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=364688
- if (this.getHost() instanceof LifelineEditPart) {
+ if (this.getHost() instanceof CustomLifelineEditPart) {
skipMinSize = true;
- LifelineEditPart lifelineEP = (LifelineEditPart) this.getHost();
+ CustomLifelineEditPart lifelineEP = (CustomLifelineEditPart) this.getHost();
if (!SequenceUtil.isCreateMessageEndLifeline(lifelineEP)) {
request.getMoveDelta().y = 0;
}
@@ -103,6 +104,17 @@ public class LifelineSelectionEditPolicy extends ResizableEditPolicyEx { // restrict child size within parent bounds
keepInParentBounds(lifelineEP, request, rect);
changeCombinedFragmentBounds(request, lifelineEP);
+ // Adjust lifeline's height if no DestructionOccurrenceSpecification
+ List<?> children = lifelineEP.getChildren();
+ boolean hasDOS = false;
+ for (Object child : children) {
+ if (child instanceof DestructionOccurrenceSpecificationEditPart) {
+ hasDOS = true;
+ }
+ }
+ if (!hasDOS) {
+ rect.height -= request.getMoveDelta().y;
+ }
}
Point left = rect.getLeft();
Point right = rect.getRight();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java index 7d9152d786a..36c6351b29b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java @@ -50,13 +50,13 @@ import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand; import org.eclipse.papyrus.uml.diagram.common.draw2d.LifelineDotLineFigure; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.command.CustomZOrderCommand; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomDurationConstraintEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart.PreserveAnchorsPositionCommandEx; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomStateInvariantEditPart.StateInvariantResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; @@ -79,6 +79,12 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { /** Initialization width of CoRegion. */ public final static int COREGION_INIT_WIDTH = 30; + /** Width of Destruction Occurrence Specification. */ + public final static int DESTRUCTION_INIT_SIZE = 20; + + /** Spacing below Lifeline. */ + public final static int LIFELINE_SOUTH_SPACING = 14; + /** Initialization height of Execution Specification. */ public final static int EXECUTION_INIT_HEIGHT = 50; @@ -102,6 +108,8 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { private static final String CO_REGION_HINT = ((IHintedType) UMLElementTypes.CombinedFragment_3018).getSemanticHint(); + private static final String DESTRUCTION_OCCURANCE_SPECIFICATION_HINT = ((IHintedType) UMLElementTypes.DestructionOccurrenceSpecification_3022).getSemanticHint(); + @Override public EditPart getTargetEditPart(Request request) { EditPart targetEditPart = super.getTargetEditPart(request); @@ -189,6 +197,12 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { return cmd; } } + if (DESTRUCTION_OCCURANCE_SPECIFICATION_HINT.equals(semanticHint)) { + Command cmd = getCommandForDestructionOccuranceCreation(cvr, viewDescriptor); + if (cmd != null) { + return cmd; + } + } if (UMLVisualIDRegistry.getType(StateInvariantEditPart.VISUAL_ID).equals(semanticHint)) { Command cmd = getCommandForStateInvariant(cvr, viewDescriptor); if (cmd != null) { @@ -235,10 +249,14 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { switch (UMLVisualIDRegistry.getVisualID(childView)) { case StateInvariantEditPart.VISUAL_ID: return new StateInvariantResizableEditPolicy(); - case DestructionOccurrenceSpecificationEditPart.VISUAL_ID: - return new BorderItemResizableEditPolicy(); + //case DestructionOccurrenceSpecificationEditPart.VISUAL_ID: + // return new BorderItemResizableEditPolicy(); } - return super.createChildEditPolicy(child); + EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (result == null) { + return super.createChildEditPolicy(child); + } + return result; } @Override @@ -262,13 +280,13 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { } String destructionHint = ((IHintedType) UMLElementTypes.DestructionOccurrenceSpecification_3022).getSemanticHint(); if (destructionHint.equals(req.getViewAndElementDescriptor().getSemanticHint()) && constraint.width < 0 && constraint.height < 0) { - constraint.width = constraint.height = 20;// set initial size, same as DestructionOccurrenceSpecificationPreferencePage + constraint.width = constraint.height = DESTRUCTION_INIT_SIZE;// set initial size, same as DestructionOccurrenceSpecificationPreferencePage } } return constraint; } - private static Rectangle getNewBoundsForCoRegion(LifelineEditPart lifelineEP, Rectangle bounds) { + private static Rectangle getNewBoundsForChild(LifelineEditPart lifelineEP, Rectangle bounds, int figureWidth) { Rectangle newBounds = bounds.getCopy(); // Get the dotline figure LifelineDotLineFigure figureLifelineDotLineFigure = lifelineEP.getPrimaryShape().getFigureLifelineDotLineFigure(); @@ -276,8 +294,8 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { figureLifelineDotLineFigure.translateToRelative(newBounds); newBounds.translate(figureLifelineDotLineFigure.getBounds().getLocation().getCopy().negate()); Rectangle dotLineFigureBounds = figureLifelineDotLineFigure.getBounds(); - newBounds.x = dotLineFigureBounds.width / 2 - COREGION_INIT_WIDTH / 2; - newBounds.width = COREGION_INIT_WIDTH; + newBounds.x = dotLineFigureBounds.width / 2 - figureWidth / 2; + newBounds.width = figureWidth; return newBounds; } @@ -295,11 +313,25 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { if (newBounds.x < 0 || newBounds.y < 0) { newBounds.x = newBounds.y = 0; } - newBounds = getNewBoundsForCoRegion((LifelineEditPart) getHost(), newBounds); + newBounds = getNewBoundsForChild((LifelineEditPart) getHost(), newBounds, COREGION_INIT_WIDTH); TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain(); return new ICommandProxy(new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, viewDescriptor, newBounds)); } + private Command getCommandForDestructionOccuranceCreation(CreateViewRequest cvr, ViewDescriptor viewDescriptor) { + if (cvr.getLocation() == null) { + return UnexecutableCommand.INSTANCE; + } + LifelineEditPart lifelineEP = (LifelineEditPart) getHost(); + // Translate the absolute location to relative + Point location = cvr.getLocation().getCopy(); + lifelineEP.getFigure().translateToRelative(location); + location.translate(lifelineEP.getLocation().getCopy().negate()); + CompoundCommand command = new CompoundCommand(); + command = getSetLifelineHeightCommand(command, lifelineEP, location.y); + return command; + } + private Rectangle getCreateExecuteSpecificationBounds(Point location, Dimension size, String semanticHint) { Point newLocation = location == null ? new Point() : location.getCopy(); if (newLocation.x < 0 || newLocation.y < 0) { @@ -610,7 +642,7 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { if (editParts != null) { CompoundCommand compoundCmd = new CompoundCommand(); compoundCmd.setLabel("Move or resize"); - compoundCmd.setDebugLabel("Debug: Move or resize of an ExecutionSpecification"); + compoundCmd.setDebugLabel("Debug: Move or resize of a Lifeline's children"); for (EditPart ep : editParts) { if (ep instanceof ActionExecutionSpecificationEditPart || ep instanceof BehaviorExecutionSpecificationEditPart) { // an execution specification have been moved or resized @@ -699,7 +731,7 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { bounds.translate(moveDelta); } // Create and add the set bounds command to the compound command - SetBoundsCommand setBoundsCmd = new SetBoundsCommand(cf2EP.getEditingDomain(), "Resize of a CoRegion", cf2EP, getNewBoundsForCoRegion(lifelineEP, bounds)); + SetBoundsCommand setBoundsCmd = new SetBoundsCommand(cf2EP.getEditingDomain(), "Resize of a CoRegion", cf2EP, getNewBoundsForChild(lifelineEP, bounds, COREGION_INIT_WIDTH)); compoundCmd.add(new ICommandProxy(setBoundsCmd)); // keep absolute position of anchors if (sizeDelta != null && sizeDelta.height != 0) { @@ -707,6 +739,10 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { request.getResizeDirection()))); } } + if (ep instanceof DestructionOccurrenceSpecificationEditPart) { + Rectangle rectLifeline = lifelineEP.getFigure().getBounds(); + compoundCmd = getSetLifelineHeightCommand(compoundCmd,lifelineEP, rectLifeline.height + request.getMoveDelta().y); + } } if (!compoundCmd.isEmpty()) { return compoundCmd; @@ -714,6 +750,40 @@ public class LifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { } return null; } + + /** + * Modifies Lifeline's height and keeps anchors' positions intact. + * + * @param compoundCmd + * command to add to + * @param lifelineEP + * Lifeline's edit part + * @param newHeight + * new height of the Lifeline + * + * @return the compound command + */ + public static CompoundCommand getSetLifelineHeightCommand(CompoundCommand compoundCmd, LifelineEditPart lifelineEP, int newHeight) { + Rectangle rectLifeline = lifelineEP.getFigure().getBounds() .getCopy(); + Dimension zoomedAddon = new Dimension(0, DESTRUCTION_INIT_SIZE/2); + lifelineEP.getFigure().translateToRelative(zoomedAddon); + int minimumHeight = ((CustomLifelineEditPart)lifelineEP).getMinimumHeight(-1, true) + zoomedAddon.height; + newHeight = Math.max(newHeight, minimumHeight); + int heightDelta = newHeight - rectLifeline.height; + if (heightDelta == 0) { + return compoundCmd; + } + rectLifeline.height += heightDelta; + ChangeBoundsRequest lifelineResizeRequest = new ChangeBoundsRequest(); + lifelineResizeRequest.setSizeDelta(new Dimension(0, heightDelta)); + lifelineResizeRequest.setResizeDirection(PositionConstants.NORTH); + lifelineResizeRequest.setEditParts(lifelineEP); + compoundCmd.add(new ICommandProxy(new SetBoundsCommand(lifelineEP.getEditingDomain(), "Move of Lifeline/DOS", lifelineEP, rectLifeline))); + PreserveAnchorsPositionCommandEx preserveAnchorsCommand = new PreserveAnchorsPositionCommandEx(lifelineEP, new Dimension(0, heightDelta), PreserveAnchorsPositionCommand.PRESERVE_Y, lifelineEP.getPrimaryShape() + .getFigureLifelineDotLineFigure(), PositionConstants.SOUTH); + compoundCmd.add(new ICommandProxy(preserveAnchorsCommand)); + return compoundCmd; + } /** * Command for change ZOrder of ExecutionSpecification ordered from parent to children. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java index c15c03e2a1c..821b0347483 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageLabelEditPolicy.java @@ -194,11 +194,11 @@ public class MessageLabelEditPolicy extends AbstractMaskManagedEditPolicy { refreshDisplay();
} else if (isRemovedMaskManagedLabelAnnotation(object, notification)) {
refreshDisplay();
- } else if (sig == null && object instanceof Message && notification.getFeature().equals(UMLPackage.eINSTANCE.getNamedElement_Name())) {
+ } else if (sig == null && object instanceof Message && UMLPackage.eINSTANCE.getNamedElement_Name().equals(notification.getFeature())) {
refreshDisplay();
}
// Try to update label when signature of message changed.
- else if (UMLPackage.eINSTANCE.getMessage_Signature() == notification.getFeature()) {
+ else if (UMLPackage.eINSTANCE.getMessage_Signature().equals(notification.getFeature())) {
Object oldValue = notification.getOldValue();
if (oldValue instanceof NamedElement) {
unhookMessageSignature((NamedElement) oldValue);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java index d23a68a664a..392b5462c02 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java @@ -58,6 +58,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool.CreateAspectUnspecifiedTypeConnectionRequest;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomCombinedFragment2EditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionFragmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
@@ -345,7 +346,7 @@ public class SequenceGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { // change constraint of the target lifeline after added a Create Message
if (request.getTargetEditPart() instanceof LifelineEditPart && !(request.getSourceEditPart().equals(request.getTargetEditPart()))) {
if (requestHint.equals((((IHintedType) UMLElementTypes.Message_4006).getSemanticHint()))) {
- LifelineEditPart target = (LifelineEditPart) request.getTargetEditPart();
+ CustomLifelineEditPart target = (CustomLifelineEditPart) request.getTargetEditPart();
command = LifelineMessageCreateHelper.moveLifelineDown(command, target, sourcePoint.getCopy());
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java index 637108a7a89..e43a91149c5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java @@ -64,6 +64,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpec import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;
@@ -161,6 +162,9 @@ public class CustomLifelineItemSemanticEditPolicy extends LifelineItemSemanticEd if (obj instanceof AbstractExecutionSpecificationEditPart) {
SequenceDeleteHelper.destroyMessageEvents(deleteElementsCommand, (AbstractExecutionSpecificationEditPart) obj, req.getEditingDomain());
}
+ if (obj instanceof DestructionOccurrenceSpecificationEditPart) {
+ SequenceDeleteHelper.destroyMessageEvents(deleteElementsCommand, (DestructionOccurrenceSpecificationEditPart) obj, req.getEditingDomain());
+ }
}
}
return deleteElementsCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java index d0630a8e5cf..21e155a9348 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java @@ -18,9 +18,11 @@ import java.util.List; import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineXYLayoutEditPolicy;
public class CoRegionCombinedFragmentFigure extends RectangleFigure {
@@ -111,6 +113,14 @@ public class CoRegionCombinedFragmentFigure extends RectangleFigure { return false;
}
+ @Override
+ public Dimension getMinimumSize(int wHint, int hHint) {
+ Rectangle bounds = new Rectangle();
+ bounds.height = BRACKET_HEIGHT * 2 + LifelineXYLayoutEditPolicy.SPACING_HEIGHT;
+ bounds.width = -1;
+ return bounds.getSize();
+ }
+
/**
* Get a rectangleFigure representing a central vertical line
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java index 4dde6ea782e..52f62fd1a0e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java @@ -13,10 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.util;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
+import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Set;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
@@ -59,14 +59,8 @@ public class LifelineCoveredByUpdater { protected HashMap<GraphicalEditPart, Rectangle> interactionFragments = new HashMap<GraphicalEditPart, Rectangle>();
- protected List<InteractionFragment> coveredByLifelinesToAdd = new ArrayList<InteractionFragment>();
-
- protected List<InteractionFragment> coveredByLifelinesToRemove = new ArrayList<InteractionFragment>();
-
protected TransactionalEditingDomain editingDomain;
- public LifelineCoveredByUpdater() {
- }
protected void init() {
editingDomain = this.context.getEditingDomain();
@@ -123,8 +117,8 @@ public class LifelineCoveredByUpdater { return;
}
EList<InteractionFragment> coveredByLifelines = lifeline.getCoveredBys();
- coveredByLifelinesToAdd.clear();
- coveredByLifelinesToRemove.clear();
+ Set<InteractionFragment> coveredByLifelinesToAdd = new LinkedHashSet<InteractionFragment>();
+ Set<InteractionFragment> coveredByLifelinesToRemove = new LinkedHashSet<InteractionFragment>();
// Update height of Lifeline when coveredBy some InteractionFragments.
int bottom = 0;
for (Map.Entry<GraphicalEditPart, Rectangle> entry : interactionFragments.entrySet()) {
@@ -132,14 +126,16 @@ public class LifelineCoveredByUpdater { Rectangle childBounds = entry.getValue();
InteractionFragment interactionFragment = (InteractionFragment) editPart.resolveSemanticElement();
if (rect.intersects(childBounds)) {
- if (!coveredByLifelines.contains(interactionFragment)) {
- coveredByLifelinesToAdd.add(interactionFragment);
- bottom = Math.max(childBounds.bottom(), bottom);
- }
+ coveredByLifelinesToAdd.add(interactionFragment);
+ bottom = Math.max(childBounds.bottom(), bottom);
} else if (coveredByLifelines.contains(interactionFragment)) {
coveredByLifelinesToRemove.add(interactionFragment);
}
}
+
+ coveredByLifelinesToRemove.removeAll(coveredByLifelinesToAdd);
+ coveredByLifelinesToAdd.removeAll(coveredByLifelines);
+
if (!coveredByLifelinesToAdd.isEmpty()) {
CommandHelper.executeCommandWithoutHistory(editingDomain, AddCommand.create(editingDomain, lifeline, UMLPackage.eINSTANCE.getLifeline_CoveredBy(), coveredByLifelinesToAdd), true);
// Update Lifeline height.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java index 9202d2d4140..110ee2bc145 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageCreateHelper.java @@ -39,6 +39,7 @@ import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.LifelineAnchor;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomInteractionEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;
@@ -181,7 +182,7 @@ public class LifelineMessageCreateHelper { public static Command reconnectMessageCreateTarget(ReconnectRequest request, Command command) {
LifelineEditPart oldTarget = (LifelineEditPart) request.getConnectionEditPart().getTarget();
// LifelineEditPart source = (LifelineEditPart)request.getConnectionEditPart().getSource();
- LifelineEditPart newTarget = (LifelineEditPart) request.getTarget();
+ CustomLifelineEditPart newTarget = (CustomLifelineEditPart) request.getTarget();
// move up the original connection target lifeline, it has only one create message, which will be removed
if (getIncomingMessageCreate(oldTarget).size() == 1) {
Rectangle bounds = oldTarget.getPrimaryShape().getBounds();
@@ -196,7 +197,7 @@ public class LifelineMessageCreateHelper { return command;
}
- public static Command moveLifelineDown(Command command, LifelineEditPart part, Point sourcePointCopy) {
+ public static Command moveLifelineDown(Command command, CustomLifelineEditPart part, Point sourcePointCopy) {
IFigure fig = part.getFigure();
Rectangle bounds = fig.getBounds().getCopy();
int height = part.getPrimaryShape().getFigureLifelineNameContainerFigure().getBounds().height;
@@ -220,15 +221,22 @@ public class LifelineMessageCreateHelper { return command;
}
- // move all lifelines which has incoming create link from part
public static Command moveCascadeLifeline(LifelineEditPart part, Command command, int dy) {
+ command = moveCascadeLifelineRecursive(part, command, dy);
+ CustomInteractionEditPart interactionEP = (CustomInteractionEditPart) part.getParent().getParent();
+ command = interactionEP.getUpdateLifelinesHeightsCommand(command);
+ return command;
+ }
+
+ // move all lifelines which has incoming create link from part
+ public static Command moveCascadeLifelineRecursive(LifelineEditPart part, Command command, int dy) {
List<?> list = part.getSourceConnections();
if (list != null && list.size() > 0) {
for (Object l : list) {
if (l instanceof Message4EditPart) {
EditPart target = ((Message4EditPart) l).getTarget();
- if (target instanceof LifelineEditPart) {
- LifelineEditPart lp = (LifelineEditPart) target;
+ if (target instanceof CustomLifelineEditPart) {
+ CustomLifelineEditPart lp = (CustomLifelineEditPart) target;
Rectangle bounds = lp.getFigure().getBounds().getCopy();
View targetView = lp.getNotationView();
Point location = bounds.getLocation().getCopy().translate(0, dy);
@@ -236,9 +244,9 @@ public class LifelineMessageCreateHelper { // Take care of the order of commands, to make sure target is always bellow the source.
if (dy < 0) { // move up
command = command == null ? boundsCommand : command.chain(boundsCommand);
- command = moveCascadeLifeline(lp, command, dy);
+ command = moveCascadeLifelineRecursive(lp, command, dy);
} else { // move down
- command = moveCascadeLifeline(lp, command, dy);
+ command = moveCascadeLifelineRecursive(lp, command, dy);
command = command == null ? boundsCommand : command.chain(boundsCommand);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageDeleteHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageDeleteHelper.java new file mode 100644 index 00000000000..2371c93324a --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineMessageDeleteHelper.java @@ -0,0 +1,139 @@ +/***************************************************************************** + * Copyright (c) 2014 CEA LIST and others. + * + * 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 + * Alex Paperno - bug 444956 + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.diagram.sequence.util; + +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.commands.UnexecutableCommand; +import org.eclipse.gef.requests.ReconnectRequest; +import org.eclipse.gef.requests.TargetRequest; +import org.eclipse.gmf.runtime.common.core.util.StringStatics; +import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionEndsCommand; +import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; +import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest; +import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; +import org.eclipse.gmf.runtime.emf.type.core.IHintedType; +import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand; +import org.eclipse.gmf.runtime.notation.Edge; +import org.eclipse.papyrus.uml.diagram.sequence.command.ChangeEdgeTargetCommand; +import org.eclipse.papyrus.uml.diagram.sequence.command.CreateElementAndNodeCommand; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes; +import org.eclipse.uml2.uml.DestructionOccurrenceSpecification; +import org.eclipse.uml2.uml.InteractionFragment; +import org.eclipse.uml2.uml.Lifeline; +import org.eclipse.uml2.uml.Message; +import org.eclipse.uml2.uml.MessageEnd; +import org.eclipse.uml2.uml.MessageOccurrenceSpecification; + +public class LifelineMessageDeleteHelper { + + public static Command getReconnectMessageDeleteTargetCommand(ReconnectRequest request, Command command) { + GraphicalEditPart oldTarget = (GraphicalEditPart) request.getConnectionEditPart().getTarget(); + TransactionalEditingDomain editingDomain = oldTarget.getEditingDomain(); + EditPart targetEP = request.getTarget(); + CreateElementAndNodeCommand createDosCommand = getCreateNewDosCommand(request.getLocation(), editingDomain, targetEP, oldTarget); + if (createDosCommand == null) { + return UnexecutableCommand.INSTANCE; + } + command = command.chain(new ICommandProxy(createDosCommand)); + ChangeEdgeTargetCommand changeTargetCommand = new ChangeEdgeTargetCommand(editingDomain, createDosCommand, (Edge)request.getConnectionEditPart().getModel(), "(0.5, 1.0)"); + command = command.chain(new ICommandProxy(changeTargetCommand)); + return command; + } + + public static Command getAttachToNewDosCommand(Command command, CreateConnectionViewAndElementRequest viewRequest, TransactionalEditingDomain editingDomain, EditPart targetEP, EditPart hostEP) { + CreateElementAndNodeCommand createDosCommand = getCreateNewDosCommand(viewRequest.getLocation(), editingDomain, targetEP, hostEP); + if (createDosCommand == null) { + return UnexecutableCommand.INSTANCE; + } + command = command.chain(new ICommandProxy(createDosCommand)); + ChangeEdgeTargetCommand changeTargetCommand = new ChangeEdgeTargetCommand(editingDomain, createDosCommand, viewRequest.getConnectionViewDescriptor(), "(0.5, 1.0)"); + command = command.chain(new ICommandProxy(changeTargetCommand)); + // Set Edge.Target to the target lifeline + command = command.chain(LifelineMessageDeleteHelper.getSetEdgeTargetCommand(viewRequest, editingDomain)); + return command; + } + + private static CreateElementAndNodeCommand getCreateNewDosCommand(Point location, TransactionalEditingDomain editingDomain, EditPart targetEP, EditPart hostEP) { + // target is either Lifeline or CustomBehaviorExecutionSpecificationEditPart, get Lifeline in the later case + if (targetEP instanceof AbstractExecutionSpecificationEditPart) { + targetEP = ((AbstractExecutionSpecificationEditPart)targetEP).getParent(); + } + if (false == targetEP instanceof LifelineEditPart) { + return null; + } + LifelineEditPart lifelineEP = (LifelineEditPart) targetEP; + // Check if a DOS exists already + Lifeline lifeline = (Lifeline) lifelineEP.resolveSemanticElement(); + EList<InteractionFragment> coveredBys = lifeline.getCoveredBys(); + for (InteractionFragment interactionFragment : coveredBys) { + if (interactionFragment instanceof DestructionOccurrenceSpecification) { + return null; + } + } + // Create new DOS at coords from request + IHintedType hintType = (IHintedType) UMLElementTypes.DestructionOccurrenceSpecification_3022; + InteractionFragment ift = SequenceUtil.findInteractionFragmentContainerAt(location, hostEP); + CreateElementAndNodeCommand createDosCommand = new CreateElementAndNodeCommand(editingDomain, lifelineEP, lifeline, hintType, location); + createDosCommand.putCreateElementRequestParameter(SequenceRequestConstant.INTERACTIONFRAGMENT_CONTAINER, ift); + return createDosCommand; + } + + public static void setMessageEndDos(Message message, DestructionOccurrenceSpecification dos) { + MessageEnd oldMessageEnd = message.getReceiveEvent(); + dos.setMessage(message); + message.setReceiveEvent(dos); + if (oldMessageEnd != null) { + oldMessageEnd.setMessage(null); + // Destroy orphan MessageOccurrenceSpecification + if (oldMessageEnd instanceof MessageOccurrenceSpecification) { + DestroyElementCommand.destroy(oldMessageEnd); + } + } + } + + /* + * Set edge.target to the target lifeline + */ + public static Command getSetEdgeTargetCommand(TargetRequest request, TransactionalEditingDomain editingDomain) { + if (request instanceof ReconnectRequest) { + ReconnectRequest reconnectRequest = (ReconnectRequest) request; + EditPart targetEP = reconnectRequest.getTarget().getParent(); + SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK); + sceCommand.setEdgeAdaptor(new EObjectAdapter((EObject) reconnectRequest.getConnectionEditPart().getModel())); + sceCommand.setNewTargetAdaptor(targetEP); + return new ICommandProxy(sceCommand); + } else if (request instanceof CreateConnectionViewAndElementRequest) { + CreateConnectionViewAndElementRequest createRequest = (CreateConnectionViewAndElementRequest) request; + EditPart targetEP = createRequest.getTargetEditPart(); + if (targetEP instanceof DestructionOccurrenceSpecificationEditPart) { + targetEP = targetEP.getParent(); + } + SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK); + sceCommand.setEdgeAdaptor(createRequest.getConnectionViewDescriptor()); + sceCommand.setNewTargetAdaptor(targetEP); + return new ICommandProxy(sceCommand); + } + return null; + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageConnectionHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageConnectionHelper.java index bd59603f4c0..f77bb72df9c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageConnectionHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageConnectionHelper.java @@ -38,10 +38,7 @@ public class MessageConnectionHelper { private MessageConnectionHelper() {
}
- public static boolean canReorientSource(Message message, Element newSource) {
- if (message == null || newSource == null) {
- return false;
- }
+ public static Element getMessageTarget(Message message) {
Element target = null;
MessageEnd receiveEvent = message.getReceiveEvent();
if (receiveEvent instanceof OccurrenceSpecification) {
@@ -54,13 +51,10 @@ public class MessageConnectionHelper { && MessageSort.SYNCH_CALL_LITERAL != message.getMessageSort()) {
target = ((Gate) receiveEvent).getOwner();
}
- return canExist(message, newSource, target);
+ return target;
}
- public static boolean canReorientTarget(Message message, Element newTarget) {
- if (message == null || newTarget == null) {
- return false;
- }
+ public static Element getMessageSource(Message message) {
Element source = null;
MessageEnd sendEvent = message.getSendEvent();
if (sendEvent instanceof OccurrenceSpecification) {
@@ -73,9 +67,23 @@ public class MessageConnectionHelper { && MessageSort.SYNCH_CALL_LITERAL != message.getMessageSort()) {
source = ((Gate) sendEvent).getOwner();
}
- return canExist(message, source, newTarget);
+ return source;
}
+ public static boolean canReorientSource(Message message, Element newSource) {
+ if (message == null || newSource == null) {
+ return false;
+ }
+ return canExist(message, newSource, getMessageTarget(message));
+ }
+
+ public static boolean canReorientTarget(Message message, Element newTarget) {
+ if (message == null || newTarget == null) {
+ return false;
+ }
+ return canExist(message, getMessageSource(message), newTarget);
+ }
+
public static boolean canExist(Message message, Element source, Element target) {
MessageSort messageSort = null;
if (message != null) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java index 407962ce6b0..9db27b428ad 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java @@ -168,6 +168,9 @@ public class OccurrenceSpecificationMoveHelper { // if referencePoint is on a moved part, it must be translated with the location delta of this part
if (!notToMoveEditParts.isEmpty() && childToReconnectTo != lifelinePart) {
Point oldLoc = SequenceUtil.findLocationOfEvent(lifelinePart, movedOccurrenceSpecification);
+ if (oldLoc == null) {
+ return null;
+ }
referencePoint.y = oldLoc.y;
}
// reconnect general ordering from the event
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ReconnectMessageHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ReconnectMessageHelper.java index c9d9537185f..f407b235f45 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ReconnectMessageHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ReconnectMessageHelper.java @@ -17,6 +17,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.util; import org.eclipse.emf.common.util.EList;
import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
import org.eclipse.uml2.uml.CombinedFragment;
+import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.ExecutionSpecification;
import org.eclipse.uml2.uml.Gate;
@@ -56,7 +57,10 @@ public class ReconnectMessageHelper { * @param newElement
*/
public static void updateMessageEnd(MessageEnd messageEnd, Element oldElement, Element newElement) {
- if (messageEnd instanceof MessageOccurrenceSpecification) {
+ if (messageEnd instanceof DestructionOccurrenceSpecification) {
+ updateDos((DestructionOccurrenceSpecification) messageEnd, oldElement, newElement);
+ }
+ else if (messageEnd instanceof MessageOccurrenceSpecification) {
updateMos((MessageOccurrenceSpecification) messageEnd, oldElement, newElement);
} else if (messageEnd instanceof Gate) {
updateGate((Gate) messageEnd, oldElement, newElement);
@@ -72,6 +76,24 @@ public class ReconnectMessageHelper { }
}
+ public static void updateDos(DestructionOccurrenceSpecification messageEnd, Element oldElement, Element newElement) {
+ Message message = messageEnd.getMessage();
+ if (newElement instanceof DestructionOccurrenceSpecification && messageEnd != newElement) {
+ DestructionOccurrenceSpecification newEnd = (DestructionOccurrenceSpecification) newElement;
+ if (message != null) {
+ message.setReceiveEvent(newEnd);
+ newEnd.setMessage(message);
+ messageEnd.setMessage(null);
+ }
+ } else {
+ if (newElement instanceof Lifeline) {
+ // will be set in ChangeEdgeTargetCommand
+ message.setReceiveEvent(null);
+ messageEnd.setMessage(null);
+ }
+ }
+ }
+
public static void updateGate(Gate messageEnd, Element oldElement, Element newElement) {
if (newElement instanceof Gate && messageEnd != newElement) {
Gate newEnd = (Gate) newElement;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java index 14993637e92..a4e84b60eab 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java @@ -14,6 +14,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.util;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
@@ -29,7 +30,6 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.CompoundCommand;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
@@ -48,6 +48,7 @@ import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
import org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ObservationLinkEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;
@@ -96,6 +97,13 @@ public class SequenceDeleteHelper { }
}
}
+ DestructionOccurrenceSpecification dos = (DestructionOccurrenceSpecification) obj;
+ if (dos.getMessage() != null) {
+ destroyMessageEvent(deleteViewsCmd, dos.getMessage().getSendEvent(), editingDomain);
+ DestroyElementRequest myReq = new DestroyElementRequest(editingDomain, dos.getMessage(), false);
+ deleteViewsCmd.add(new ICommandProxy(new DestroyElementCommand(myReq)));
+ }
+ deleteViewsCmd.add(((CustomLifelineEditPart)lifelinePart).getAlignLifelineBottomToParentCommand(null, true));
}
}
}
@@ -263,24 +271,11 @@ public class SequenceDeleteHelper { // Retrieve delete command from the Element Edit service
ICommand deleteCommand = provider.getEditCommand(req);
if (deleteCommand != null) {
- CompositeCommand command = new CompositeCommand(deleteCommand.getLabel());
- command.add(deleteCommand);
- Message message = (Message) selectedEObject;
- MessageEnd receiveEvent = message.getReceiveEvent();
- if (receiveEvent != null) {
- DestroyElementRequest myReq = new DestroyElementRequest(req.getEditingDomain(), receiveEvent, false);
- command.add(new DestroyElementCommand(myReq));
- }
- MessageEnd sendEvent = message.getSendEvent();
- if (sendEvent != null) {
- DestroyElementRequest myReq = new DestroyElementRequest(req.getEditingDomain(), sendEvent, false);
- command.add(new DestroyElementCommand(myReq));
- }
- CompoundCommand compoundCommand = new CompoundCommand();
- compoundCommand.add(new ICommandProxy(command));
- addDeleteMessageRelatedTimeObservationLinkCommand(req.getEditingDomain(), editPart, compoundCommand, receiveEvent, true);
- addDeleteMessageRelatedTimeObservationLinkCommand(req.getEditingDomain(), editPart, compoundCommand, sendEvent, true);
- return compoundCommand;
+ CompoundCommand command = new CompoundCommand(deleteCommand.getLabel());
+ command.add(new ICommandProxy(deleteCommand));
+ //return completeDeleteMessageCommand(command, (ConnectionEditPart)editPart, req.getEditingDomain());
+ destroyMessageEvents(command, Arrays.asList(editPart), req.getEditingDomain());
+ return command;
}
}
return UnexecutableCommand.INSTANCE;
@@ -309,40 +304,38 @@ public class SequenceDeleteHelper { static void destroyMessageEvents(CompoundCommand deleteElementsCommand, List<?> list, TransactionalEditingDomain transactionalEditingDomain) {
for (Object o : list) {
if (o instanceof ConnectionEditPart) {
+ ConnectionEditPart connectionEP = (ConnectionEditPart) o;
EObject model = ((ConnectionEditPart) o).resolveSemanticElement();
if (model instanceof Message) {
Message message = (Message) model;
MessageEnd receiveEvent = message.getReceiveEvent();
- if (receiveEvent != null) {
- DestroyElementRequest myReq = new DestroyElementRequest(transactionalEditingDomain, receiveEvent, false);
- // Sometimes, the message end is also the end of a execution.
- RestoreExecutionEndAdvice provider = new RestoreExecutionEndAdvice();
- if (provider != null) {
- ICommand editCommand = provider.getAfterEditCommand(myReq);
- if (editCommand != null && editCommand.canExecute()) {
- deleteElementsCommand.add(new ICommandProxy(editCommand));
- }
- }
- deleteElementsCommand.add(new ICommandProxy(new DestroyElementCommand(myReq)));
- }
MessageEnd sendEvent = message.getSendEvent();
- if (sendEvent != null) {
- DestroyElementRequest myReq = new DestroyElementRequest(transactionalEditingDomain, sendEvent, false);
- // Sometimes, the message end is also the end of a execution.
- RestoreExecutionEndAdvice provider = new RestoreExecutionEndAdvice();
- if (provider != null) {
- ICommand editCommand = provider.getAfterEditCommand(myReq);
- if (editCommand != null && editCommand.canExecute()) {
- deleteElementsCommand.add(new ICommandProxy(editCommand));
- }
- }
- deleteElementsCommand.add(new ICommandProxy(new DestroyElementCommand(myReq)));
+ destroyMessageEvent(deleteElementsCommand, sendEvent, transactionalEditingDomain);
+ addDeleteMessageRelatedTimeObservationLinkCommand(transactionalEditingDomain, connectionEP, deleteElementsCommand, sendEvent, true);
+ if (false == receiveEvent instanceof DestructionOccurrenceSpecification) {
+ destroyMessageEvent(deleteElementsCommand, receiveEvent, transactionalEditingDomain);
+ addDeleteMessageRelatedTimeObservationLinkCommand(transactionalEditingDomain, connectionEP, deleteElementsCommand, receiveEvent, true);
}
}
}
}
}
+ static void destroyMessageEvent(CompoundCommand deleteElementsCommand, MessageEnd event, TransactionalEditingDomain transactionalEditingDomain) {
+ if (event != null) {
+ DestroyElementRequest myReq = new DestroyElementRequest(transactionalEditingDomain, event, false);
+ // Sometimes, the message end is also the end of a execution.
+ RestoreExecutionEndAdvice provider = new RestoreExecutionEndAdvice();
+ if (provider != null) {
+ ICommand editCommand = provider.getAfterEditCommand(myReq);
+ if (editCommand != null && editCommand.canExecute()) {
+ deleteElementsCommand.add(new ICommandProxy(editCommand));
+ }
+ }
+ deleteElementsCommand.add(new ICommandProxy(new DestroyElementCommand(myReq)));
+ }
+ }
+
static void addDestroyExecutionSpecificationChildrenCommand(CompoundCommand deleteElementsCommand, TransactionalEditingDomain editingDomain, ShapeNodeEditPart part) {
List<ShapeNodeEditPart> list = LifelineXYLayoutEditPolicy.getAffixedExecutionSpecificationEditParts(part);
for (ShapeNodeEditPart p : list) {
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF index d50a6adbd0a..52fcd299b1f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF @@ -25,7 +25,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0", org.eclipse.uml2.uml, org.apache.log4j, - org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.1.0", org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0", org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="1.1.0", org.eclipse.papyrus.uml.tools;bundle-version="1.1.0", @@ -35,5 +34,4 @@ Bundle-Version: 1.1.0.qualifier Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal.UmlValueSpecificationActivator Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;singleton:=true -Import-Package: org.apache.log4j Bundle-Description: %pluginDescription diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/AbstractUmlValueSpecificationProposalProvider.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/AbstractUmlValueSpecificationProposalProvider.java index 949fa148168..be32a0e774b 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/AbstractUmlValueSpecificationProposalProvider.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/AbstractUmlValueSpecificationProposalProvider.java @@ -22,6 +22,9 @@ public class AbstractUmlValueSpecificationProposalProvider extends org.eclipse.x public void completeAbstractRule_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } + public void completeAbstractRule_InstanceSpecification(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); + } public void completeAbstractRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); @@ -29,9 +32,6 @@ public class AbstractUmlValueSpecificationProposalProvider extends org.eclipse.x completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor); completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(4)), context, acceptor); } - public void completeAbstractRule_InstanceSpecification(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); - } public void completeAbstractRule_Undefined(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } @@ -40,7 +40,11 @@ public class AbstractUmlValueSpecificationProposalProvider extends org.eclipse.x // subclasses may override } public void completeLiteralIntegerOrUnlimitedNaturalRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); + completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); + completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); + } + public void completeLiteralIntegerOrUnlimitedNaturalRule_Unlimited(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + // subclasses may override } public void completeLiteralRealRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); @@ -94,13 +98,10 @@ public class AbstractUmlValueSpecificationProposalProvider extends org.eclipse.x public void complete_VALUE_SPECIFICATION_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } - public void complete_VALUE_SPECIFICATION_INT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_VALUE_SPECIFICATION_NEGATIVE_INT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } public void complete_VALUE_SPECIFICATION_DOUBLE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } - public void complete_VALUE_SPECIFICATION_STRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - // subclasses may override - } } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/UmlValueSpecificationParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/UmlValueSpecificationParser.java index 85164fad7bd..415e267b58c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/UmlValueSpecificationParser.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/UmlValueSpecificationParser.java @@ -37,20 +37,21 @@ public class UmlValueSpecificationParser extends AbstractContentAssistParser { nameMappings = new HashMap<AbstractElement, String>() { private static final long serialVersionUID = 1L; { - put(grammarAccess.getAbstractRuleAccess().getAlternatives(), "rule__AbstractRule__Alternatives"); - put(grammarAccess.getAbstractRuleAccess().getAlternatives_0_2(), "rule__AbstractRule__Alternatives_0_2"); - put(grammarAccess.getAbstractRuleAccess().getValueAlternatives_0_2_0_0(), "rule__AbstractRule__ValueAlternatives_0_2_0_0"); + put(grammarAccess.getAbstractRuleAccess().getAlternatives_2(), "rule__AbstractRule__Alternatives_2"); + put(grammarAccess.getAbstractRuleAccess().getValueAlternatives_2_1_0(), "rule__AbstractRule__ValueAlternatives_2_1_0"); put(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0(), "rule__LiteralBooleanRule__ValueAlternatives_0"); + put(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getAlternatives(), "rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives"); + put(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAlternatives_0_0(), "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0"); put(grammarAccess.getVisibilityKindAccess().getAlternatives(), "rule__VisibilityKind__Alternatives"); - put(grammarAccess.getAbstractRuleAccess().getGroup_0(), "rule__AbstractRule__Group_0__0"); - put(grammarAccess.getAbstractRuleAccess().getGroup_0_1(), "rule__AbstractRule__Group_0_1__0"); - put(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0_0(), "rule__AbstractRule__VisibilityAssignment_0_0"); - put(grammarAccess.getAbstractRuleAccess().getNameAssignment_0_1_0(), "rule__AbstractRule__NameAssignment_0_1_0"); - put(grammarAccess.getAbstractRuleAccess().getValueAssignment_0_2_0(), "rule__AbstractRule__ValueAssignment_0_2_0"); - put(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_0_2_1(), "rule__AbstractRule__InstanceSpecificationAssignment_0_2_1"); - put(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_1(), "rule__AbstractRule__UndefinedAssignment_1"); + put(grammarAccess.getAbstractRuleAccess().getGroup(), "rule__AbstractRule__Group__0"); + put(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0(), "rule__AbstractRule__VisibilityAssignment_0"); + put(grammarAccess.getAbstractRuleAccess().getNameAssignment_1(), "rule__AbstractRule__NameAssignment_1"); + put(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_2_0(), "rule__AbstractRule__InstanceSpecificationAssignment_2_0"); + put(grammarAccess.getAbstractRuleAccess().getValueAssignment_2_1(), "rule__AbstractRule__ValueAssignment_2_1"); + put(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_2_2(), "rule__AbstractRule__UndefinedAssignment_2_2"); put(grammarAccess.getLiteralBooleanRuleAccess().getValueAssignment(), "rule__LiteralBooleanRule__ValueAssignment"); - put(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment(), "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment"); + put(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment_0(), "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0"); + put(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAssignment_1(), "rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1"); put(grammarAccess.getLiteralRealRuleAccess().getValueAssignment(), "rule__LiteralRealRule__ValueAssignment"); put(grammarAccess.getLiteralNullRuleAccess().getValueAssignment(), "rule__LiteralNullRule__ValueAssignment"); put(grammarAccess.getLiteralStringRuleAccess().getValueAssignment(), "rule__LiteralStringRule__ValueAssignment"); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g index 7147350eeb1..df4f6a1368e 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g @@ -72,9 +72,9 @@ ruleAbstractRule } : ( -{ before(grammarAccess.getAbstractRuleAccess().getAlternatives()); } -(rule__AbstractRule__Alternatives) -{ after(grammarAccess.getAbstractRuleAccess().getAlternatives()); } +{ before(grammarAccess.getAbstractRuleAccess().getGroup()); } +(rule__AbstractRule__Group__0) +{ after(grammarAccess.getAbstractRuleAccess().getGroup()); } ) ; @@ -128,9 +128,9 @@ ruleLiteralIntegerOrUnlimitedNaturalRule } : ( -{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment()); } -(rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment) -{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment()); } +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getAlternatives()); } +(rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives) +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getAlternatives()); } ) ; @@ -281,43 +281,27 @@ finally { -rule__AbstractRule__Alternatives +rule__AbstractRule__Alternatives_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getGroup_0()); } -(rule__AbstractRule__Group_0__0) -{ after(grammarAccess.getAbstractRuleAccess().getGroup_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_2_0()); } +(rule__AbstractRule__InstanceSpecificationAssignment_2_0) +{ after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_2_0()); } ) |( -{ before(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_1()); } -(rule__AbstractRule__UndefinedAssignment_1) -{ after(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_1()); } -) - -; -finally { - restoreStackSize(stackSize); -} - -rule__AbstractRule__Alternatives_0_2 - @init { - int stackSize = keepStackSize(); - } -: -( -{ before(grammarAccess.getAbstractRuleAccess().getValueAssignment_0_2_0()); } -(rule__AbstractRule__ValueAssignment_0_2_0) -{ after(grammarAccess.getAbstractRuleAccess().getValueAssignment_0_2_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueAssignment_2_1()); } +(rule__AbstractRule__ValueAssignment_2_1) +{ after(grammarAccess.getAbstractRuleAccess().getValueAssignment_2_1()); } ) |( -{ before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_0_2_1()); } -(rule__AbstractRule__InstanceSpecificationAssignment_0_2_1) -{ after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_0_2_1()); } +{ before(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_2_2()); } +(rule__AbstractRule__UndefinedAssignment_2_2) +{ after(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_2_2()); } ) ; @@ -325,39 +309,39 @@ finally { restoreStackSize(stackSize); } -rule__AbstractRule__ValueAlternatives_0_2_0_0 +rule__AbstractRule__ValueAlternatives_2_1_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_2_1_0_0()); } ruleLiteralBooleanRule -{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0()); } +{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_2_1_0_0()); } ) |( -{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1()); } ruleLiteralIntegerOrUnlimitedNaturalRule -{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1()); } +{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1()); } ) |( -{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_0_2_0_0_2()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_2_1_0_2()); } ruleLiteralRealRule -{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_0_2_0_0_2()); } +{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_2_1_0_2()); } ) |( -{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_0_2_0_0_3()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_2_1_0_3()); } ruleLiteralNullRule -{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_0_2_0_0_3()); } +{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_2_1_0_3()); } ) |( -{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_0_2_0_0_4()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_2_1_0_4()); } ruleLiteralStringRule -{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_0_2_0_0_4()); } +{ after(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_2_1_0_4()); } ) ; @@ -391,6 +375,50 @@ finally { restoreStackSize(stackSize); } +rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives + @init { + int stackSize = keepStackSize(); + } +: +( +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment_0()); } +(rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0) +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment_0()); } +) + + |( +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAssignment_1()); } +(rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1) +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAssignment_1()); } +) + +; +finally { + restoreStackSize(stackSize); +} + +rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 + @init { + int stackSize = keepStackSize(); + } +: +( +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueINTTerminalRuleCall_0_0_0()); } + RULE_INT +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueINTTerminalRuleCall_0_0_0()); } +) + + |( +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1()); } + RULE_VALUE_SPECIFICATION_NEGATIVE_INT +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1()); } +) + +; +finally { + restoreStackSize(stackSize); +} + rule__VisibilityKind__Alternatives @init { int stackSize = keepStackSize(); @@ -427,27 +455,27 @@ finally { -rule__AbstractRule__Group_0__0 +rule__AbstractRule__Group__0 @init { int stackSize = keepStackSize(); } : - rule__AbstractRule__Group_0__0__Impl - rule__AbstractRule__Group_0__1 + rule__AbstractRule__Group__0__Impl + rule__AbstractRule__Group__1 ; finally { restoreStackSize(stackSize); } -rule__AbstractRule__Group_0__0__Impl +rule__AbstractRule__Group__0__Impl @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0_0()); } -(rule__AbstractRule__VisibilityAssignment_0_0)? -{ after(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0()); } +(rule__AbstractRule__VisibilityAssignment_0)? +{ after(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0()); } ) ; @@ -456,27 +484,27 @@ finally { } -rule__AbstractRule__Group_0__1 +rule__AbstractRule__Group__1 @init { int stackSize = keepStackSize(); } : - rule__AbstractRule__Group_0__1__Impl - rule__AbstractRule__Group_0__2 + rule__AbstractRule__Group__1__Impl + rule__AbstractRule__Group__2 ; finally { restoreStackSize(stackSize); } -rule__AbstractRule__Group_0__1__Impl +rule__AbstractRule__Group__1__Impl @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getGroup_0_1()); } -(rule__AbstractRule__Group_0_1__0)? -{ after(grammarAccess.getAbstractRuleAccess().getGroup_0_1()); } +{ before(grammarAccess.getAbstractRuleAccess().getNameAssignment_1()); } +(rule__AbstractRule__NameAssignment_1)? +{ after(grammarAccess.getAbstractRuleAccess().getNameAssignment_1()); } ) ; @@ -485,26 +513,26 @@ finally { } -rule__AbstractRule__Group_0__2 +rule__AbstractRule__Group__2 @init { int stackSize = keepStackSize(); } : - rule__AbstractRule__Group_0__2__Impl + rule__AbstractRule__Group__2__Impl ; finally { restoreStackSize(stackSize); } -rule__AbstractRule__Group_0__2__Impl +rule__AbstractRule__Group__2__Impl @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getAlternatives_0_2()); } -(rule__AbstractRule__Alternatives_0_2) -{ after(grammarAccess.getAbstractRuleAccess().getAlternatives_0_2()); } +{ before(grammarAccess.getAbstractRuleAccess().getAlternatives_2()); } +(rule__AbstractRule__Alternatives_2) +{ after(grammarAccess.getAbstractRuleAccess().getAlternatives_2()); } ) ; @@ -519,27 +547,15 @@ finally { -rule__AbstractRule__Group_0_1__0 - @init { - int stackSize = keepStackSize(); - } -: - rule__AbstractRule__Group_0_1__0__Impl - rule__AbstractRule__Group_0_1__1 -; -finally { - restoreStackSize(stackSize); -} -rule__AbstractRule__Group_0_1__0__Impl +rule__AbstractRule__VisibilityAssignment_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getNameAssignment_0_1_0()); } -(rule__AbstractRule__NameAssignment_0_1_0) -{ after(grammarAccess.getAbstractRuleAccess().getNameAssignment_0_1_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0()); } + ruleVisibilityKind{ after(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0()); } ) ; @@ -547,29 +563,14 @@ finally { restoreStackSize(stackSize); } - -rule__AbstractRule__Group_0_1__1 - @init { - int stackSize = keepStackSize(); - } -: - rule__AbstractRule__Group_0_1__1__Impl -; -finally { - restoreStackSize(stackSize); -} - -rule__AbstractRule__Group_0_1__1__Impl +rule__AbstractRule__NameAssignment_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getEqualsSignKeyword_0_1_1()); } - - '=' - -{ after(grammarAccess.getAbstractRuleAccess().getEqualsSignKeyword_0_1_1()); } +{ before(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0()); } + RULE_VALUE_SPECIFICATION_ID{ after(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0()); } ) ; @@ -577,20 +578,18 @@ finally { restoreStackSize(stackSize); } - - - - - - -rule__AbstractRule__VisibilityAssignment_0_0 +rule__AbstractRule__InstanceSpecificationAssignment_2_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0_0()); } - ruleVisibilityKind{ after(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0()); } +( +{ before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1()); } + RULE_ID{ after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1()); } +) +{ after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0()); } ) ; @@ -598,14 +597,15 @@ finally { restoreStackSize(stackSize); } -rule__AbstractRule__NameAssignment_0_1_0 +rule__AbstractRule__ValueAssignment_2_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0()); } - RULE_VALUE_SPECIFICATION_ID{ after(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getValueAlternatives_2_1_0()); } +(rule__AbstractRule__ValueAlternatives_2_1_0) +{ after(grammarAccess.getAbstractRuleAccess().getValueAlternatives_2_1_0()); } ) ; @@ -613,15 +613,14 @@ finally { restoreStackSize(stackSize); } -rule__AbstractRule__ValueAssignment_0_2_0 +rule__AbstractRule__UndefinedAssignment_2_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getValueAlternatives_0_2_0_0()); } -(rule__AbstractRule__ValueAlternatives_0_2_0_0) -{ after(grammarAccess.getAbstractRuleAccess().getValueAlternatives_0_2_0_0()); } +{ before(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_2_2_0()); } + ruleUndefinedRule{ after(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_2_2_0()); } ) ; @@ -629,18 +628,15 @@ finally { restoreStackSize(stackSize); } -rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 +rule__LiteralBooleanRule__ValueAssignment @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0()); } -( -{ before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1()); } - RULE_ID{ after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1()); } -) -{ after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0()); } +{ before(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); } +(rule__LiteralBooleanRule__ValueAlternatives_0) +{ after(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); } ) ; @@ -648,14 +644,15 @@ finally { restoreStackSize(stackSize); } -rule__AbstractRule__UndefinedAssignment_1 +rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_1_0()); } - ruleUndefinedRule{ after(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_1_0()); } +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAlternatives_0_0()); } +(rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0) +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAlternatives_0_0()); } ) ; @@ -663,30 +660,22 @@ finally { restoreStackSize(stackSize); } -rule__LiteralBooleanRule__ValueAssignment +rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); } -(rule__LiteralBooleanRule__ValueAlternatives_0) -{ after(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); } -) +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); } +( +{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); } -; -finally { - restoreStackSize(stackSize); -} + '*' -rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment - @init { - int stackSize = keepStackSize(); - } -: -( -{ before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0()); } - RULE_VALUE_SPECIFICATION_INT{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0()); } +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); } +) + +{ after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); } ) ; @@ -738,8 +727,8 @@ rule__LiteralStringRule__ValueAssignment } : ( -{ before(grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0()); } - RULE_VALUE_SPECIFICATION_STRING{ after(grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0()); } +{ before(grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0()); } + RULE_STRING{ after(grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0()); } ) ; @@ -863,13 +852,11 @@ finally { } -RULE_VALUE_SPECIFICATION_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; - -RULE_VALUE_SPECIFICATION_INT : ('-'? ('0'..'9')+|'*'); +RULE_VALUE_SPECIFICATION_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9')* '='; -RULE_VALUE_SPECIFICATION_DOUBLE : '-'? (('0'..'9')+ ('.'|',') ('0'..'9')*|('0'..'9')* ('.'|',') ('0'..'9')+); +RULE_VALUE_SPECIFICATION_NEGATIVE_INT : '-' RULE_INT; -RULE_VALUE_SPECIFICATION_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\''); +RULE_VALUE_SPECIFICATION_DOUBLE : '-'? (RULE_INT ('.'|',') RULE_INT|RULE_INT ('.'|',')|('.'|',') RULE_INT); RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.tokens b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.tokens index 96c38e7a518..6c7a5d25466 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.tokens +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.tokens @@ -1,23 +1,23 @@ -'#'=22 -'+'=20 -'-'=21 -'<Undefined>'=19 -'='=17 -'false'=16 -'null'=18 -'true'=15 -'~'=23 -RULE_ANY_OTHER=14 -RULE_ID=5 -RULE_INT=9 -RULE_ML_COMMENT=11 -RULE_SL_COMMENT=12 -RULE_STRING=10 -RULE_VALUE_SPECIFICATION_DOUBLE=7 -RULE_VALUE_SPECIFICATION_ID=4 -RULE_VALUE_SPECIFICATION_INT=6 -RULE_VALUE_SPECIFICATION_STRING=8 -RULE_WS=13 +'#'=21 +'*'=16 +'+'=19 +'-'=20 +'<Undefined>'=18 +'false'=15 +'null'=17 +'true'=14 +'~'=22 +RULE_ANY_OTHER=13 +RULE_ID=7 +RULE_INT=4 +RULE_ML_COMMENT=10 +RULE_SL_COMMENT=11 +RULE_STRING=9 +RULE_VALUE_SPECIFICATION_DOUBLE=8 +RULE_VALUE_SPECIFICATION_ID=6 +RULE_VALUE_SPECIFICATION_NEGATIVE_INT=5 +RULE_WS=12 +T__14=14 T__15=15 T__16=16 T__17=17 @@ -26,4 +26,3 @@ T__19=19 T__20=20 T__21=21 T__22=22 -T__23=23 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationLexer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationLexer.java index 3bf012a03f9..3f9935ced8c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationLexer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationLexer.java @@ -12,27 +12,26 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalUmlValueSpecificationLexer extends Lexer { - public static final int RULE_ID=5; - public static final int RULE_VALUE_SPECIFICATION_DOUBLE=7; - public static final int T__23=23; + public static final int RULE_ID=7; + public static final int RULE_VALUE_SPECIFICATION_DOUBLE=8; public static final int T__22=22; - public static final int RULE_ANY_OTHER=14; + public static final int RULE_ANY_OTHER=13; public static final int T__21=21; public static final int T__20=20; - public static final int RULE_VALUE_SPECIFICATION_INT=6; public static final int EOF=-1; - public static final int RULE_SL_COMMENT=12; - public static final int RULE_ML_COMMENT=11; + public static final int RULE_SL_COMMENT=11; + public static final int RULE_ML_COMMENT=10; public static final int T__19=19; - public static final int RULE_STRING=10; + public static final int RULE_STRING=9; public static final int T__16=16; public static final int T__15=15; public static final int T__18=18; public static final int T__17=17; - public static final int RULE_VALUE_SPECIFICATION_STRING=8; - public static final int RULE_INT=9; - public static final int RULE_VALUE_SPECIFICATION_ID=4; - public static final int RULE_WS=13; + public static final int T__14=14; + public static final int RULE_INT=4; + public static final int RULE_VALUE_SPECIFICATION_ID=6; + public static final int RULE_WS=12; + public static final int RULE_VALUE_SPECIFICATION_NEGATIVE_INT=5; // delegates // delegators @@ -47,10 +46,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } public String getGrammarFileName() { return "../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g"; } - // $ANTLR start "T__15" - public final void mT__15() throws RecognitionException { + // $ANTLR start "T__14" + public final void mT__14() throws RecognitionException { try { - int _type = T__15; + int _type = T__14; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:11:7: ( 'true' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:11:9: 'true' @@ -66,12 +65,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__15" + // $ANTLR end "T__14" - // $ANTLR start "T__16" - public final void mT__16() throws RecognitionException { + // $ANTLR start "T__15" + public final void mT__15() throws RecognitionException { try { - int _type = T__16; + int _type = T__15; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:12:7: ( 'false' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:12:9: 'false' @@ -87,17 +86,17 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__16" + // $ANTLR end "T__15" - // $ANTLR start "T__17" - public final void mT__17() throws RecognitionException { + // $ANTLR start "T__16" + public final void mT__16() throws RecognitionException { try { - int _type = T__17; + int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:13:7: ( '=' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:13:9: '=' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:13:7: ( '*' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:13:9: '*' { - match('='); + match('*'); } @@ -107,12 +106,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__17" + // $ANTLR end "T__16" - // $ANTLR start "T__18" - public final void mT__18() throws RecognitionException { + // $ANTLR start "T__17" + public final void mT__17() throws RecognitionException { try { - int _type = T__18; + int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:14:7: ( 'null' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:14:9: 'null' @@ -128,12 +127,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__18" + // $ANTLR end "T__17" - // $ANTLR start "T__19" - public final void mT__19() throws RecognitionException { + // $ANTLR start "T__18" + public final void mT__18() throws RecognitionException { try { - int _type = T__19; + int _type = T__18; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:15:7: ( '<Undefined>' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:15:9: '<Undefined>' @@ -149,12 +148,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__19" + // $ANTLR end "T__18" - // $ANTLR start "T__20" - public final void mT__20() throws RecognitionException { + // $ANTLR start "T__19" + public final void mT__19() throws RecognitionException { try { - int _type = T__20; + int _type = T__19; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:16:7: ( '+' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:16:9: '+' @@ -169,12 +168,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__20" + // $ANTLR end "T__19" - // $ANTLR start "T__21" - public final void mT__21() throws RecognitionException { + // $ANTLR start "T__20" + public final void mT__20() throws RecognitionException { try { - int _type = T__21; + int _type = T__20; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:17:7: ( '-' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:17:9: '-' @@ -189,12 +188,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__21" + // $ANTLR end "T__20" - // $ANTLR start "T__22" - public final void mT__22() throws RecognitionException { + // $ANTLR start "T__21" + public final void mT__21() throws RecognitionException { try { - int _type = T__22; + int _type = T__21; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:18:7: ( '#' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:18:9: '#' @@ -209,12 +208,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__22" + // $ANTLR end "T__21" - // $ANTLR start "T__23" - public final void mT__23() throws RecognitionException { + // $ANTLR start "T__22" + public final void mT__22() throws RecognitionException { try { - int _type = T__23; + int _type = T__22; int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:19:7: ( '~' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:19:9: '~' @@ -229,34 +228,16 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__23" + // $ANTLR end "T__22" // $ANTLR start "RULE_VALUE_SPECIFICATION_ID" public final void mRULE_VALUE_SPECIFICATION_ID() throws RecognitionException { try { int _type = RULE_VALUE_SPECIFICATION_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:866:29: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:866:31: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:855:29: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* '=' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:855:31: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* '=' { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:866:31: ( '^' )? - int alt1=2; - int LA1_0 = input.LA(1); - - if ( (LA1_0=='^') ) { - alt1=1; - } - switch (alt1) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:866:31: '^' - { - match('^'); - - } - break; - - } - if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -266,22 +247,22 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:866:60: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* - loop2: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:855:55: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* + loop1: do { - int alt2=2; - int LA2_0 = input.LA(1); + int alt1=2; + int LA1_0 = input.LA(1); - if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) { - alt2=1; + if ( (LA1_0=='-'||(LA1_0>='0' && LA1_0<='9')||(LA1_0>='A' && LA1_0<='Z')||LA1_0=='_'||(LA1_0>='a' && LA1_0<='z')) ) { + alt1=1; } - switch (alt2) { + switch (alt1) { case 1 : // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g: { - if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { + if ( input.LA(1)=='-'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); } @@ -295,10 +276,11 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop2; + break loop1; } } while (true); + match('='); } @@ -310,95 +292,16 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } // $ANTLR end "RULE_VALUE_SPECIFICATION_ID" - // $ANTLR start "RULE_VALUE_SPECIFICATION_INT" - public final void mRULE_VALUE_SPECIFICATION_INT() throws RecognitionException { + // $ANTLR start "RULE_VALUE_SPECIFICATION_NEGATIVE_INT" + public final void mRULE_VALUE_SPECIFICATION_NEGATIVE_INT() throws RecognitionException { try { - int _type = RULE_VALUE_SPECIFICATION_INT; + int _type = RULE_VALUE_SPECIFICATION_NEGATIVE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:30: ( ( ( '-' )? ( '0' .. '9' )+ | '*' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:32: ( ( '-' )? ( '0' .. '9' )+ | '*' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:857:39: ( '-' RULE_INT ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:857:41: '-' RULE_INT { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:32: ( ( '-' )? ( '0' .. '9' )+ | '*' ) - int alt5=2; - int LA5_0 = input.LA(1); - - if ( (LA5_0=='-'||(LA5_0>='0' && LA5_0<='9')) ) { - alt5=1; - } - else if ( (LA5_0=='*') ) { - alt5=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 5, 0, input); - - throw nvae; - } - switch (alt5) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:33: ( '-' )? ( '0' .. '9' )+ - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:33: ( '-' )? - int alt3=2; - int LA3_0 = input.LA(1); - - if ( (LA3_0=='-') ) { - alt3=1; - } - switch (alt3) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:33: '-' - { - match('-'); - - } - break; - - } - - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:38: ( '0' .. '9' )+ - int cnt4=0; - loop4: - do { - int alt4=2; - int LA4_0 = input.LA(1); - - if ( ((LA4_0>='0' && LA4_0<='9')) ) { - alt4=1; - } - - - switch (alt4) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:39: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt4 >= 1 ) break loop4; - EarlyExitException eee = - new EarlyExitException(4, input); - throw eee; - } - cnt4++; - } while (true); - - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:868:50: '*' - { - match('*'); - - } - break; - - } - + match('-'); + mRULE_INT(); } @@ -408,26 +311,26 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "RULE_VALUE_SPECIFICATION_INT" + // $ANTLR end "RULE_VALUE_SPECIFICATION_NEGATIVE_INT" // $ANTLR start "RULE_VALUE_SPECIFICATION_DOUBLE" public final void mRULE_VALUE_SPECIFICATION_DOUBLE() throws RecognitionException { try { int _type = RULE_VALUE_SPECIFICATION_DOUBLE; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:33: ( ( '-' )? ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:35: ( '-' )? ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:33: ( ( '-' )? ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:35: ( '-' )? ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:35: ( '-' )? - int alt6=2; - int LA6_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:35: ( '-' )? + int alt2=2; + int LA2_0 = input.LA(1); - if ( (LA6_0=='-') ) { - alt6=1; + if ( (LA2_0=='-') ) { + alt2=1; } - switch (alt6) { + switch (alt2) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:35: '-' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:35: '-' { match('-'); @@ -436,43 +339,14 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:40: ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ ) - int alt11=2; - alt11 = dfa11.predict(input); - switch (alt11) { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:40: ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT ) + int alt3=3; + alt3 = dfa3.predict(input); + switch (alt3) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:41: ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:41: RULE_INT ( '.' | ',' ) RULE_INT { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:41: ( '0' .. '9' )+ - int cnt7=0; - loop7: - do { - int alt7=2; - int LA7_0 = input.LA(1); - - if ( ((LA7_0>='0' && LA7_0<='9')) ) { - alt7=1; - } - - - switch (alt7) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:42: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt7 >= 1 ) break loop7; - EarlyExitException eee = - new EarlyExitException(7, input); - throw eee; - } - cnt7++; - } while (true); - + mRULE_INT(); if ( input.LA(1)==','||input.LA(1)=='.' ) { input.consume(); @@ -482,62 +356,14 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:63: ( '0' .. '9' )* - loop8: - do { - int alt8=2; - int LA8_0 = input.LA(1); - - if ( ((LA8_0>='0' && LA8_0<='9')) ) { - alt8=1; - } - - - switch (alt8) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:64: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - break loop8; - } - } while (true); - + mRULE_INT(); } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:75: ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:69: RULE_INT ( '.' | ',' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:75: ( '0' .. '9' )* - loop9: - do { - int alt9=2; - int LA9_0 = input.LA(1); - - if ( ((LA9_0>='0' && LA9_0<='9')) ) { - alt9=1; - } - - - switch (alt9) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:76: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - break loop9; - } - } while (true); - + mRULE_INT(); if ( input.LA(1)==','||input.LA(1)=='.' ) { input.consume(); @@ -547,179 +373,22 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:97: ( '0' .. '9' )+ - int cnt10=0; - loop10: - do { - int alt10=2; - int LA10_0 = input.LA(1); - - if ( ((LA10_0>='0' && LA10_0<='9')) ) { - alt10=1; - } - - - switch (alt10) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:870:98: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt10 >= 1 ) break loop10; - EarlyExitException eee = - new EarlyExitException(10, input); - throw eee; - } - cnt10++; - } while (true); - } break; - - } - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "RULE_VALUE_SPECIFICATION_DOUBLE" - - // $ANTLR start "RULE_VALUE_SPECIFICATION_STRING" - public final void mRULE_VALUE_SPECIFICATION_STRING() throws RecognitionException { - try { - int _type = RULE_VALUE_SPECIFICATION_STRING; - int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:33: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:35: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:35: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - int alt14=2; - int LA14_0 = input.LA(1); - - if ( (LA14_0=='\"') ) { - alt14=1; - } - else if ( (LA14_0=='\'') ) { - alt14=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 14, 0, input); - - throw nvae; - } - switch (alt14) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:36: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + case 3 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:859:88: ( '.' | ',' ) RULE_INT { - match('\"'); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:40: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* - loop12: - do { - int alt12=3; - int LA12_0 = input.LA(1); - - if ( (LA12_0=='\\') ) { - alt12=1; - } - else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) { - alt12=2; - } - - - switch (alt12) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:41: '\\\\' . - { - match('\\'); - matchAny(); - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:48: ~ ( ( '\\\\' | '\"' ) ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse;} - - - } - break; - - default : - break loop12; - } - } while (true); - - match('\"'); + if ( input.LA(1)==','||input.LA(1)=='.' ) { + input.consume(); } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:68: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' - { - match('\''); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:73: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* - loop13: - do { - int alt13=3; - int LA13_0 = input.LA(1); - - if ( (LA13_0=='\\') ) { - alt13=1; - } - else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) { - alt13=2; - } - - - switch (alt13) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:74: '\\\\' . - { - match('\\'); - matchAny(); - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:872:81: ~ ( ( '\\\\' | '\\'' ) ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse;} - - - } - break; - - default : - break loop13; - } - } while (true); + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} - match('\''); + mRULE_INT(); } break; @@ -735,26 +404,26 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "RULE_VALUE_SPECIFICATION_STRING" + // $ANTLR end "RULE_VALUE_SPECIFICATION_DOUBLE" // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:874:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:874:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:861:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:861:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:874:11: ( '^' )? - int alt15=2; - int LA15_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:861:11: ( '^' )? + int alt4=2; + int LA4_0 = input.LA(1); - if ( (LA15_0=='^') ) { - alt15=1; + if ( (LA4_0=='^') ) { + alt4=1; } - switch (alt15) { + switch (alt4) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:874:11: '^' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:861:11: '^' { match('^'); @@ -772,18 +441,18 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:874:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* - loop16: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:861:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + loop5: do { - int alt16=2; - int LA16_0 = input.LA(1); + int alt5=2; + int LA5_0 = input.LA(1); - if ( ((LA16_0>='0' && LA16_0<='9')||(LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='z')) ) { - alt16=1; + if ( ((LA5_0>='0' && LA5_0<='9')||(LA5_0>='A' && LA5_0<='Z')||LA5_0=='_'||(LA5_0>='a' && LA5_0<='z')) ) { + alt5=1; } - switch (alt16) { + switch (alt5) { case 1 : // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g: { @@ -801,7 +470,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop16; + break loop5; } } while (true); @@ -821,24 +490,24 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:876:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:876:12: ( '0' .. '9' )+ + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:863:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:863:12: ( '0' .. '9' )+ { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:876:12: ( '0' .. '9' )+ - int cnt17=0; - loop17: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:863:12: ( '0' .. '9' )+ + int cnt6=0; + loop6: do { - int alt17=2; - int LA17_0 = input.LA(1); + int alt6=2; + int LA6_0 = input.LA(1); - if ( ((LA17_0>='0' && LA17_0<='9')) ) { - alt17=1; + if ( ((LA6_0>='0' && LA6_0<='9')) ) { + alt6=1; } - switch (alt17) { + switch (alt6) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:876:13: '0' .. '9' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:863:13: '0' .. '9' { matchRange('0','9'); @@ -846,12 +515,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - if ( cnt17 >= 1 ) break loop17; + if ( cnt6 >= 1 ) break loop6; EarlyExitException eee = - new EarlyExitException(17, input); + new EarlyExitException(6, input); throw eee; } - cnt17++; + cnt6++; } while (true); @@ -870,47 +539,47 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - int alt20=2; - int LA20_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + int alt9=2; + int LA9_0 = input.LA(1); - if ( (LA20_0=='\"') ) { - alt20=1; + if ( (LA9_0=='\"') ) { + alt9=1; } - else if ( (LA20_0=='\'') ) { - alt20=2; + else if ( (LA9_0=='\'') ) { + alt9=2; } else { NoViableAltException nvae = - new NoViableAltException("", 20, 0, input); + new NoViableAltException("", 9, 0, input); throw nvae; } - switch (alt20) { + switch (alt9) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* - loop18: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + loop7: do { - int alt18=3; - int LA18_0 = input.LA(1); + int alt7=3; + int LA7_0 = input.LA(1); - if ( (LA18_0=='\\') ) { - alt18=1; + if ( (LA7_0=='\\') ) { + alt7=1; } - else if ( ((LA18_0>='\u0000' && LA18_0<='!')||(LA18_0>='#' && LA18_0<='[')||(LA18_0>=']' && LA18_0<='\uFFFF')) ) { - alt18=2; + else if ( ((LA7_0>='\u0000' && LA7_0<='!')||(LA7_0>='#' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) { + alt7=2; } - switch (alt18) { + switch (alt7) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:21: '\\\\' . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:21: '\\\\' . { match('\\'); matchAny(); @@ -918,7 +587,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:28: ~ ( ( '\\\\' | '\"' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -934,7 +603,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop18; + break loop7; } } while (true); @@ -943,26 +612,26 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* - loop19: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + loop8: do { - int alt19=3; - int LA19_0 = input.LA(1); + int alt8=3; + int LA8_0 = input.LA(1); - if ( (LA19_0=='\\') ) { - alt19=1; + if ( (LA8_0=='\\') ) { + alt8=1; } - else if ( ((LA19_0>='\u0000' && LA19_0<='&')||(LA19_0>='(' && LA19_0<='[')||(LA19_0>=']' && LA19_0<='\uFFFF')) ) { - alt19=2; + else if ( ((LA8_0>='\u0000' && LA8_0<='&')||(LA8_0>='(' && LA8_0<='[')||(LA8_0>=']' && LA8_0<='\uFFFF')) ) { + alt8=2; } - switch (alt19) { + switch (alt8) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:54: '\\\\' . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:54: '\\\\' . { match('\\'); matchAny(); @@ -970,7 +639,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:878:61: ~ ( ( '\\\\' | '\\'' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:865:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -986,7 +655,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop19; + break loop8; } } while (true); @@ -1013,37 +682,37 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:880:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:880:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:867:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:867:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:880:24: ( options {greedy=false; } : . )* - loop21: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:867:24: ( options {greedy=false; } : . )* + loop10: do { - int alt21=2; - int LA21_0 = input.LA(1); + int alt10=2; + int LA10_0 = input.LA(1); - if ( (LA21_0=='*') ) { - int LA21_1 = input.LA(2); + if ( (LA10_0=='*') ) { + int LA10_1 = input.LA(2); - if ( (LA21_1=='/') ) { - alt21=2; + if ( (LA10_1=='/') ) { + alt10=2; } - else if ( ((LA21_1>='\u0000' && LA21_1<='.')||(LA21_1>='0' && LA21_1<='\uFFFF')) ) { - alt21=1; + else if ( ((LA10_1>='\u0000' && LA10_1<='.')||(LA10_1>='0' && LA10_1<='\uFFFF')) ) { + alt10=1; } } - else if ( ((LA21_0>='\u0000' && LA21_0<=')')||(LA21_0>='+' && LA21_0<='\uFFFF')) ) { - alt21=1; + else if ( ((LA10_0>='\u0000' && LA10_0<=')')||(LA10_0>='+' && LA10_0<='\uFFFF')) ) { + alt10=1; } - switch (alt21) { + switch (alt10) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:880:52: . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:867:52: . { matchAny(); @@ -1051,7 +720,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop21; + break loop10; } } while (true); @@ -1073,25 +742,25 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:24: (~ ( ( '\\n' | '\\r' ) ) )* - loop22: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:24: (~ ( ( '\\n' | '\\r' ) ) )* + loop11: do { - int alt22=2; - int LA22_0 = input.LA(1); + int alt11=2; + int LA11_0 = input.LA(1); - if ( ((LA22_0>='\u0000' && LA22_0<='\t')||(LA22_0>='\u000B' && LA22_0<='\f')||(LA22_0>='\u000E' && LA22_0<='\uFFFF')) ) { - alt22=1; + if ( ((LA11_0>='\u0000' && LA11_0<='\t')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\uFFFF')) ) { + alt11=1; } - switch (alt22) { + switch (alt11) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1107,31 +776,31 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop22; + break loop11; } } while (true); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:40: ( ( '\\r' )? '\\n' )? - int alt24=2; - int LA24_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:40: ( ( '\\r' )? '\\n' )? + int alt13=2; + int LA13_0 = input.LA(1); - if ( (LA24_0=='\n'||LA24_0=='\r') ) { - alt24=1; + if ( (LA13_0=='\n'||LA13_0=='\r') ) { + alt13=1; } - switch (alt24) { + switch (alt13) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:41: ( '\\r' )? '\\n' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:41: ( '\\r' )? '\\n' { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:41: ( '\\r' )? - int alt23=2; - int LA23_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:41: ( '\\r' )? + int alt12=2; + int LA12_0 = input.LA(1); - if ( (LA23_0=='\r') ) { - alt23=1; + if ( (LA12_0=='\r') ) { + alt12=1; } - switch (alt23) { + switch (alt12) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:882:41: '\\r' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:869:41: '\\r' { match('\r'); @@ -1163,22 +832,22 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:884:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:884:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:871:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:871:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:884:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ - int cnt25=0; - loop25: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:871:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + int cnt14=0; + loop14: do { - int alt25=2; - int LA25_0 = input.LA(1); + int alt14=2; + int LA14_0 = input.LA(1); - if ( ((LA25_0>='\t' && LA25_0<='\n')||LA25_0=='\r'||LA25_0==' ') ) { - alt25=1; + if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) { + alt14=1; } - switch (alt25) { + switch (alt14) { case 1 : // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g: { @@ -1196,12 +865,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - if ( cnt25 >= 1 ) break loop25; + if ( cnt14 >= 1 ) break loop14; EarlyExitException eee = - new EarlyExitException(25, input); + new EarlyExitException(14, input); throw eee; } - cnt25++; + cnt14++; } while (true); @@ -1220,8 +889,8 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:886:16: ( . ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:886:18: . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:873:16: ( . ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:873:18: . { matchAny(); @@ -1236,70 +905,70 @@ public class InternalUmlValueSpecificationLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:8: ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_VALUE_SPECIFICATION_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt26=20; - alt26 = dfa26.predict(input); - switch (alt26) { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:8: ( T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_NEGATIVE_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt15=19; + alt15 = dfa15.predict(input); + switch (alt15) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:10: T__15 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:10: T__14 { - mT__15(); + mT__14(); } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:16: T__16 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:16: T__15 { - mT__16(); + mT__15(); } break; case 3 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:22: T__17 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:22: T__16 { - mT__17(); + mT__16(); } break; case 4 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:28: T__18 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:28: T__17 { - mT__18(); + mT__17(); } break; case 5 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:34: T__19 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:34: T__18 { - mT__19(); + mT__18(); } break; case 6 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:40: T__20 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:40: T__19 { - mT__20(); + mT__19(); } break; case 7 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:46: T__21 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:46: T__20 { - mT__21(); + mT__20(); } break; case 8 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:52: T__22 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:52: T__21 { - mT__22(); + mT__21(); } break; case 9 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:58: T__23 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:58: T__22 { - mT__23(); + mT__22(); } break; @@ -1311,70 +980,63 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 11 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:92: RULE_VALUE_SPECIFICATION_INT + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:92: RULE_VALUE_SPECIFICATION_NEGATIVE_INT { - mRULE_VALUE_SPECIFICATION_INT(); + mRULE_VALUE_SPECIFICATION_NEGATIVE_INT(); } break; case 12 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:121: RULE_VALUE_SPECIFICATION_DOUBLE + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:130: RULE_VALUE_SPECIFICATION_DOUBLE { mRULE_VALUE_SPECIFICATION_DOUBLE(); } break; case 13 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:153: RULE_VALUE_SPECIFICATION_STRING - { - mRULE_VALUE_SPECIFICATION_STRING(); - - } - break; - case 14 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:185: RULE_ID + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:162: RULE_ID { mRULE_ID(); } break; - case 15 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:193: RULE_INT + case 14 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:170: RULE_INT { mRULE_INT(); } break; - case 16 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:202: RULE_STRING + case 15 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:179: RULE_STRING { mRULE_STRING(); } break; - case 17 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:214: RULE_ML_COMMENT + case 16 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:191: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; - case 18 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:230: RULE_SL_COMMENT + case 17 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:207: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; - case 19 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:246: RULE_WS + case 18 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:223: RULE_WS { mRULE_WS(); } break; - case 20 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:254: RULE_ANY_OTHER + case 19 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:1:231: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1386,326 +1048,256 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } - protected DFA11 dfa11 = new DFA11(this); - protected DFA26 dfa26 = new DFA26(this); - static final String DFA11_eotS = - "\3\uffff\1\4\1\uffff"; - static final String DFA11_eofS = - "\5\uffff"; - static final String DFA11_minS = - "\2\54\1\uffff\1\0\1\uffff"; - static final String DFA11_maxS = - "\2\71\1\uffff\1\0\1\uffff"; - static final String DFA11_acceptS = - "\2\uffff\1\2\1\uffff\1\1"; - static final String DFA11_specialS = - "\5\uffff}>"; - static final String[] DFA11_transitionS = { + protected DFA3 dfa3 = new DFA3(this); + protected DFA15 dfa15 = new DFA15(this); + static final String DFA3_eotS = + "\3\uffff\1\4\2\uffff"; + static final String DFA3_eofS = + "\6\uffff"; + static final String DFA3_minS = + "\2\54\1\uffff\1\60\2\uffff"; + static final String DFA3_maxS = + "\2\71\1\uffff\1\71\2\uffff"; + static final String DFA3_acceptS = + "\2\uffff\1\3\1\uffff\1\2\1\1"; + static final String DFA3_specialS = + "\6\uffff}>"; + static final String[] DFA3_transitionS = { "\1\2\1\uffff\1\2\1\uffff\12\1", "\1\3\1\uffff\1\3\1\uffff\12\1", "", - "\1\uffff", + "\12\5", + "", "" }; - static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS); - static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS); - static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS); - static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS); - static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS); - static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS); - static final short[][] DFA11_transition; + static final short[] DFA3_eot = DFA.unpackEncodedString(DFA3_eotS); + static final short[] DFA3_eof = DFA.unpackEncodedString(DFA3_eofS); + static final char[] DFA3_min = DFA.unpackEncodedStringToUnsignedChars(DFA3_minS); + static final char[] DFA3_max = DFA.unpackEncodedStringToUnsignedChars(DFA3_maxS); + static final short[] DFA3_accept = DFA.unpackEncodedString(DFA3_acceptS); + static final short[] DFA3_special = DFA.unpackEncodedString(DFA3_specialS); + static final short[][] DFA3_transition; static { - int numStates = DFA11_transitionS.length; - DFA11_transition = new short[numStates][]; + int numStates = DFA3_transitionS.length; + DFA3_transition = new short[numStates][]; for (int i=0; i<numStates; i++) { - DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]); + DFA3_transition[i] = DFA.unpackEncodedString(DFA3_transitionS[i]); } } - class DFA11 extends DFA { + class DFA3 extends DFA { - public DFA11(BaseRecognizer recognizer) { + public DFA3(BaseRecognizer recognizer) { this.recognizer = recognizer; - this.decisionNumber = 11; - this.eot = DFA11_eot; - this.eof = DFA11_eof; - this.min = DFA11_min; - this.max = DFA11_max; - this.accept = DFA11_accept; - this.special = DFA11_special; - this.transition = DFA11_transition; + this.decisionNumber = 3; + this.eot = DFA3_eot; + this.eof = DFA3_eof; + this.min = DFA3_min; + this.max = DFA3_max; + this.accept = DFA3_accept; + this.special = DFA3_special; + this.transition = DFA3_transition; } public String getDescription() { - return "870:40: ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ )"; + return "859:40: ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT )"; } } - static final String DFA26_eotS = - "\1\uffff\2\26\1\uffff\1\26\1\23\1\uffff\1\36\2\uffff\1\23\1\26"+ - "\1\42\1\uffff\4\23\2\uffff\2\26\1\uffff\1\26\1\uffff\1\26\2\uffff"+ - "\1\42\4\uffff\1\26\1\uffff\1\42\11\uffff\3\26\3\uffff\1\66\1\26"+ - "\1\70\1\uffff\1\71\2\uffff"; - static final String DFA26_eofS = - "\72\uffff"; - static final String DFA26_minS = - "\1\0\2\60\1\uffff\1\60\1\125\1\uffff\1\54\2\uffff\1\101\1\60\1"+ - "\54\1\uffff\1\60\2\0\1\52\2\uffff\2\60\1\uffff\1\60\1\uffff\1\60"+ - "\2\uffff\1\54\4\uffff\1\60\1\uffff\1\54\2\0\1\uffff\2\0\4\uffff"+ - "\3\60\1\0\1\uffff\1\0\3\60\1\uffff\1\60\2\uffff"; - static final String DFA26_maxS = - "\1\uffff\2\172\1\uffff\1\172\1\125\1\uffff\1\71\2\uffff\2\172\1"+ - "\71\1\uffff\1\71\2\uffff\1\57\2\uffff\2\172\1\uffff\1\172\1\uffff"+ - "\1\172\2\uffff\1\71\4\uffff\1\172\1\uffff\1\71\2\uffff\1\uffff\2"+ - "\uffff\4\uffff\3\172\1\uffff\1\uffff\1\uffff\3\172\1\uffff\1\172"+ - "\2\uffff"; - static final String DFA26_acceptS = - "\3\uffff\1\3\2\uffff\1\6\1\uffff\1\10\1\11\3\uffff\1\13\4\uffff"+ - "\1\23\1\24\2\uffff\1\12\1\uffff\1\3\1\uffff\1\5\1\6\1\uffff\1\14"+ - "\1\7\1\10\1\11\1\uffff\1\13\3\uffff\1\15\2\uffff\1\15\1\21\1\22"+ - "\1\23\4\uffff\1\15\4\uffff\1\1\1\uffff\1\4\1\2"; - static final String DFA26_specialS = - "\1\6\16\uffff\1\5\1\0\23\uffff\1\1\1\4\1\uffff\1\3\1\10\7\uffff"+ - "\1\2\1\uffff\1\7\7\uffff}>"; - static final String[] DFA26_transitionS = { - "\11\23\2\22\2\23\1\22\22\23\1\22\1\23\1\17\1\10\3\23\1\20\2"+ - "\23\1\15\1\6\1\16\1\7\1\16\1\21\12\14\2\23\1\5\1\3\3\23\32\13"+ - "\3\23\1\12\1\13\1\23\5\13\1\2\7\13\1\4\5\13\1\1\6\13\3\23\1"+ - "\11\uff81\23", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\21\25\1\24\10\25", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\1\27\31\25", + static final String DFA15_eotS = + "\1\uffff\2\26\1\uffff\1\26\1\22\1\uffff\1\36\2\uffff\1\26\1\41"+ + "\5\22\2\uffff\2\26\2\uffff\1\26\1\uffff\1\26\2\uffff\1\52\5\uffff"+ + "\1\41\4\uffff\3\26\1\uffff\1\56\1\26\1\60\1\uffff\1\61\2\uffff"; + static final String DFA15_eofS = + "\62\uffff"; + static final String DFA15_minS = + "\1\0\2\55\1\uffff\1\55\1\125\1\uffff\1\54\2\uffff\1\55\1\54\1\60"+ + "\1\101\2\0\1\52\2\uffff\2\55\2\uffff\1\55\1\uffff\1\55\2\uffff\1"+ + "\54\5\uffff\1\54\4\uffff\3\55\1\uffff\3\55\1\uffff\1\55\2\uffff"; + static final String DFA15_maxS = + "\1\uffff\2\172\1\uffff\1\172\1\125\1\uffff\1\71\2\uffff\1\172\2"+ + "\71\1\172\2\uffff\1\57\2\uffff\2\172\2\uffff\1\172\1\uffff\1\172"+ + "\2\uffff\1\71\5\uffff\1\71\4\uffff\3\172\1\uffff\3\172\1\uffff\1"+ + "\172\2\uffff"; + static final String DFA15_acceptS = + "\3\uffff\1\3\2\uffff\1\6\1\uffff\1\10\1\11\7\uffff\1\22\1\23\2"+ + "\uffff\1\12\1\15\1\uffff\1\3\1\uffff\1\5\1\6\1\uffff\1\14\1\7\1"+ + "\10\1\11\1\16\1\uffff\1\17\1\20\1\21\1\22\3\uffff\1\13\3\uffff\1"+ + "\1\1\uffff\1\4\1\2"; + static final String DFA15_specialS = + "\1\1\15\uffff\1\0\1\2\42\uffff}>"; + static final String[] DFA15_transitionS = { + "\11\22\2\21\2\22\1\21\22\22\1\21\1\22\1\16\1\10\3\22\1\17\2"+ + "\22\1\3\1\6\1\14\1\7\1\14\1\20\12\13\2\22\1\5\4\22\32\12\3\22"+ + "\1\15\1\12\1\22\5\12\1\2\7\12\1\4\5\12\1\1\6\12\3\22\1\11\uff81"+ + "\22", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\21\24\1\23\10\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\1\27\31\24", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\24\25\1\31\5\25", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\24\24\1\31\5\24", "\1\32", "", "\1\35\1\uffff\1\35\1\uffff\12\34", "", "", - "\32\41\4\uffff\1\41\1\uffff\32\41", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", - "\1\35\1\uffff\1\35\1\uffff\12\43", - "", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", + "\1\35\1\uffff\1\35\1\uffff\12\42", "\12\35", - "\42\45\1\46\71\45\1\44\uffa3\45", - "\47\50\1\51\64\50\1\47\uffa3\50", - "\1\52\4\uffff\1\53", + "\32\26\4\uffff\1\26\1\uffff\32\26", + "\0\43", + "\0\43", + "\1\44\4\uffff\1\45", "", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\24\25\1\55\5\25", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\24\24\1\47\5\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\13\25\1\56\16\25", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\13\25\1\57\16\25", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\13\24\1\50\16\24", "", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\13\24\1\51\16\24", "", - "\1\35\1\uffff\1\35\1\uffff\12\34", "", + "\1\35\1\uffff\1\35\1\uffff\12\34", "", "", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", "", - "\1\35\1\uffff\1\35\1\uffff\12\43", - "\0\60", - "\42\45\1\46\71\45\1\44\uffa3\45", "", - "\0\62", - "\47\50\1\51\64\50\1\47\uffa3\50", + "\1\35\1\uffff\1\35\1\uffff\12\42", "", "", "", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\4\25\1\63\25\25", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\22\25\1\64\7\25", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\13\25\1\65\16\25", - "\42\45\1\46\71\45\1\44\uffa3\45", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\4\24\1\53\25\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\22\24\1\54\7\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\13\24\1\55\16\24", "", - "\47\50\1\51\64\50\1\47\uffa3\50", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\4\25\1\67\25\25", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\4\24\1\57\25\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", "", - "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", "", "" }; - static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS); - static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS); - static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS); - static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS); - static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS); - static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS); - static final short[][] DFA26_transition; + static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS); + static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS); + static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS); + static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS); + static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS); + static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS); + static final short[][] DFA15_transition; static { - int numStates = DFA26_transitionS.length; - DFA26_transition = new short[numStates][]; + int numStates = DFA15_transitionS.length; + DFA15_transition = new short[numStates][]; for (int i=0; i<numStates; i++) { - DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]); + DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]); } } - class DFA26 extends DFA { + class DFA15 extends DFA { - public DFA26(BaseRecognizer recognizer) { + public DFA15(BaseRecognizer recognizer) { this.recognizer = recognizer; - this.decisionNumber = 26; - this.eot = DFA26_eot; - this.eof = DFA26_eof; - this.min = DFA26_min; - this.max = DFA26_max; - this.accept = DFA26_accept; - this.special = DFA26_special; - this.transition = DFA26_transition; + this.decisionNumber = 15; + this.eot = DFA15_eot; + this.eof = DFA15_eof; + this.min = DFA15_min; + this.max = DFA15_max; + this.accept = DFA15_accept; + this.special = DFA15_special; + this.transition = DFA15_transition; } public String getDescription() { - return "1:1: Tokens : ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_VALUE_SPECIFICATION_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_NEGATIVE_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; int _s = s; switch ( s ) { case 0 : - int LA26_16 = input.LA(1); + int LA15_14 = input.LA(1); s = -1; - if ( (LA26_16=='\\') ) {s = 39;} + if ( ((LA15_14>='\u0000' && LA15_14<='\uFFFF')) ) {s = 35;} - else if ( ((LA26_16>='\u0000' && LA26_16<='&')||(LA26_16>='(' && LA26_16<='[')||(LA26_16>=']' && LA26_16<='\uFFFF')) ) {s = 40;} - - else if ( (LA26_16=='\'') ) {s = 41;} - - else s = 19; + else s = 18; if ( s>=0 ) return s; break; case 1 : - int LA26_36 = input.LA(1); - - s = -1; - if ( ((LA26_36>='\u0000' && LA26_36<='\uFFFF')) ) {s = 48;} - - if ( s>=0 ) return s; - break; - case 2 : - int LA26_48 = input.LA(1); - - s = -1; - if ( (LA26_48=='\"') ) {s = 38;} - - else if ( (LA26_48=='\\') ) {s = 36;} - - else if ( ((LA26_48>='\u0000' && LA26_48<='!')||(LA26_48>='#' && LA26_48<='[')||(LA26_48>=']' && LA26_48<='\uFFFF')) ) {s = 37;} - - if ( s>=0 ) return s; - break; - case 3 : - int LA26_39 = input.LA(1); - - s = -1; - if ( ((LA26_39>='\u0000' && LA26_39<='\uFFFF')) ) {s = 50;} - - if ( s>=0 ) return s; - break; - case 4 : - int LA26_37 = input.LA(1); - - s = -1; - if ( (LA26_37=='\"') ) {s = 38;} - - else if ( (LA26_37=='\\') ) {s = 36;} - - else if ( ((LA26_37>='\u0000' && LA26_37<='!')||(LA26_37>='#' && LA26_37<='[')||(LA26_37>=']' && LA26_37<='\uFFFF')) ) {s = 37;} - - if ( s>=0 ) return s; - break; - case 5 : - int LA26_15 = input.LA(1); - - s = -1; - if ( (LA26_15=='\\') ) {s = 36;} - - else if ( ((LA26_15>='\u0000' && LA26_15<='!')||(LA26_15>='#' && LA26_15<='[')||(LA26_15>=']' && LA26_15<='\uFFFF')) ) {s = 37;} - - else if ( (LA26_15=='\"') ) {s = 38;} - - else s = 19; - - if ( s>=0 ) return s; - break; - case 6 : - int LA26_0 = input.LA(1); + int LA15_0 = input.LA(1); s = -1; - if ( (LA26_0=='t') ) {s = 1;} - - else if ( (LA26_0=='f') ) {s = 2;} - - else if ( (LA26_0=='=') ) {s = 3;} - - else if ( (LA26_0=='n') ) {s = 4;} - - else if ( (LA26_0=='<') ) {s = 5;} + if ( (LA15_0=='t') ) {s = 1;} - else if ( (LA26_0=='+') ) {s = 6;} + else if ( (LA15_0=='f') ) {s = 2;} - else if ( (LA26_0=='-') ) {s = 7;} + else if ( (LA15_0=='*') ) {s = 3;} - else if ( (LA26_0=='#') ) {s = 8;} + else if ( (LA15_0=='n') ) {s = 4;} - else if ( (LA26_0=='~') ) {s = 9;} + else if ( (LA15_0=='<') ) {s = 5;} - else if ( (LA26_0=='^') ) {s = 10;} + else if ( (LA15_0=='+') ) {s = 6;} - else if ( ((LA26_0>='A' && LA26_0<='Z')||LA26_0=='_'||(LA26_0>='a' && LA26_0<='e')||(LA26_0>='g' && LA26_0<='m')||(LA26_0>='o' && LA26_0<='s')||(LA26_0>='u' && LA26_0<='z')) ) {s = 11;} + else if ( (LA15_0=='-') ) {s = 7;} - else if ( ((LA26_0>='0' && LA26_0<='9')) ) {s = 12;} + else if ( (LA15_0=='#') ) {s = 8;} - else if ( (LA26_0=='*') ) {s = 13;} + else if ( (LA15_0=='~') ) {s = 9;} - else if ( (LA26_0==','||LA26_0=='.') ) {s = 14;} + else if ( ((LA15_0>='A' && LA15_0<='Z')||LA15_0=='_'||(LA15_0>='a' && LA15_0<='e')||(LA15_0>='g' && LA15_0<='m')||(LA15_0>='o' && LA15_0<='s')||(LA15_0>='u' && LA15_0<='z')) ) {s = 10;} - else if ( (LA26_0=='\"') ) {s = 15;} + else if ( ((LA15_0>='0' && LA15_0<='9')) ) {s = 11;} - else if ( (LA26_0=='\'') ) {s = 16;} + else if ( (LA15_0==','||LA15_0=='.') ) {s = 12;} - else if ( (LA26_0=='/') ) {s = 17;} + else if ( (LA15_0=='^') ) {s = 13;} - else if ( ((LA26_0>='\t' && LA26_0<='\n')||LA26_0=='\r'||LA26_0==' ') ) {s = 18;} + else if ( (LA15_0=='\"') ) {s = 14;} - else if ( ((LA26_0>='\u0000' && LA26_0<='\b')||(LA26_0>='\u000B' && LA26_0<='\f')||(LA26_0>='\u000E' && LA26_0<='\u001F')||LA26_0=='!'||(LA26_0>='$' && LA26_0<='&')||(LA26_0>='(' && LA26_0<=')')||(LA26_0>=':' && LA26_0<=';')||(LA26_0>='>' && LA26_0<='@')||(LA26_0>='[' && LA26_0<=']')||LA26_0=='`'||(LA26_0>='{' && LA26_0<='}')||(LA26_0>='\u007F' && LA26_0<='\uFFFF')) ) {s = 19;} + else if ( (LA15_0=='\'') ) {s = 15;} - if ( s>=0 ) return s; - break; - case 7 : - int LA26_50 = input.LA(1); - - s = -1; - if ( (LA26_50=='\'') ) {s = 41;} + else if ( (LA15_0=='/') ) {s = 16;} - else if ( (LA26_50=='\\') ) {s = 39;} + else if ( ((LA15_0>='\t' && LA15_0<='\n')||LA15_0=='\r'||LA15_0==' ') ) {s = 17;} - else if ( ((LA26_50>='\u0000' && LA26_50<='&')||(LA26_50>='(' && LA26_50<='[')||(LA26_50>=']' && LA26_50<='\uFFFF')) ) {s = 40;} + else if ( ((LA15_0>='\u0000' && LA15_0<='\b')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\u001F')||LA15_0=='!'||(LA15_0>='$' && LA15_0<='&')||(LA15_0>='(' && LA15_0<=')')||(LA15_0>=':' && LA15_0<=';')||(LA15_0>='=' && LA15_0<='@')||(LA15_0>='[' && LA15_0<=']')||LA15_0=='`'||(LA15_0>='{' && LA15_0<='}')||(LA15_0>='\u007F' && LA15_0<='\uFFFF')) ) {s = 18;} if ( s>=0 ) return s; break; - case 8 : - int LA26_40 = input.LA(1); + case 2 : + int LA15_15 = input.LA(1); s = -1; - if ( (LA26_40=='\'') ) {s = 41;} - - else if ( (LA26_40=='\\') ) {s = 39;} + if ( ((LA15_15>='\u0000' && LA15_15<='\uFFFF')) ) {s = 35;} - else if ( ((LA26_40>='\u0000' && LA26_40<='&')||(LA26_40>='(' && LA26_40<='[')||(LA26_40>=']' && LA26_40<='\uFFFF')) ) {s = 40;} + else s = 18; if ( s>=0 ) return s; break; } NoViableAltException nvae = - new NoViableAltException(getDescription(), 26, _s, input); + new NoViableAltException(getDescription(), 15, _s, input); error(nvae); throw nvae; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationParser.java index 5525da99a0c..ca2ff9ed828 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationParser.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecificationParser.java @@ -22,29 +22,28 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalUmlValueSpecificationParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_VALUE_SPECIFICATION_ID", "RULE_ID", "RULE_VALUE_SPECIFICATION_INT", "RULE_VALUE_SPECIFICATION_DOUBLE", "RULE_VALUE_SPECIFICATION_STRING", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'true'", "'false'", "'='", "'null'", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_VALUE_SPECIFICATION_NEGATIVE_INT", "RULE_VALUE_SPECIFICATION_ID", "RULE_ID", "RULE_VALUE_SPECIFICATION_DOUBLE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'true'", "'false'", "'*'", "'null'", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'" }; - public static final int RULE_ID=5; - public static final int RULE_VALUE_SPECIFICATION_DOUBLE=7; - public static final int T__23=23; + public static final int RULE_ID=7; + public static final int RULE_VALUE_SPECIFICATION_DOUBLE=8; public static final int T__22=22; - public static final int RULE_ANY_OTHER=14; + public static final int RULE_ANY_OTHER=13; public static final int T__21=21; public static final int T__20=20; - public static final int RULE_VALUE_SPECIFICATION_INT=6; - public static final int RULE_SL_COMMENT=12; + public static final int RULE_SL_COMMENT=11; public static final int EOF=-1; - public static final int RULE_ML_COMMENT=11; + public static final int RULE_ML_COMMENT=10; public static final int T__19=19; - public static final int RULE_STRING=10; + public static final int RULE_STRING=9; public static final int T__16=16; public static final int T__15=15; public static final int T__18=18; public static final int T__17=17; - public static final int RULE_VALUE_SPECIFICATION_STRING=8; - public static final int RULE_INT=9; - public static final int RULE_VALUE_SPECIFICATION_ID=4; - public static final int RULE_WS=13; + public static final int T__14=14; + public static final int RULE_INT=4; + public static final int RULE_VALUE_SPECIFICATION_ID=6; + public static final int RULE_WS=12; + public static final int RULE_VALUE_SPECIFICATION_NEGATIVE_INT=5; // delegates // delegators @@ -114,31 +113,31 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "ruleAbstractRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:69:1: ruleAbstractRule : ( ( rule__AbstractRule__Alternatives ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:69:1: ruleAbstractRule : ( ( rule__AbstractRule__Group__0 ) ) ; public final void ruleAbstractRule() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:73:2: ( ( ( rule__AbstractRule__Alternatives ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:74:1: ( ( rule__AbstractRule__Alternatives ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:73:2: ( ( ( rule__AbstractRule__Group__0 ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:74:1: ( ( rule__AbstractRule__Group__0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:74:1: ( ( rule__AbstractRule__Alternatives ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:75:1: ( rule__AbstractRule__Alternatives ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:74:1: ( ( rule__AbstractRule__Group__0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:75:1: ( rule__AbstractRule__Group__0 ) { - before(grammarAccess.getAbstractRuleAccess().getAlternatives()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:76:1: ( rule__AbstractRule__Alternatives ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:76:2: rule__AbstractRule__Alternatives + before(grammarAccess.getAbstractRuleAccess().getGroup()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:76:1: ( rule__AbstractRule__Group__0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:76:2: rule__AbstractRule__Group__0 { - pushFollow(FOLLOW_rule__AbstractRule__Alternatives_in_ruleAbstractRule94); - rule__AbstractRule__Alternatives(); + pushFollow(FOLLOW_rule__AbstractRule__Group__0_in_ruleAbstractRule94); + rule__AbstractRule__Group__0(); state._fsp--; } - after(grammarAccess.getAbstractRuleAccess().getAlternatives()); + after(grammarAccess.getAbstractRuleAccess().getGroup()); } @@ -268,31 +267,31 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "ruleLiteralIntegerOrUnlimitedNaturalRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:125:1: ruleLiteralIntegerOrUnlimitedNaturalRule : ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:125:1: ruleLiteralIntegerOrUnlimitedNaturalRule : ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives ) ) ; public final void ruleLiteralIntegerOrUnlimitedNaturalRule() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:129:2: ( ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:130:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:129:2: ( ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:130:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:130:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:131:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:130:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:131:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives ) { - before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:132:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:132:2: rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getAlternatives()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:132:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:132:2: rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives { - pushFollow(FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_in_ruleLiteralIntegerOrUnlimitedNaturalRule214); - rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment(); + pushFollow(FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives_in_ruleLiteralIntegerOrUnlimitedNaturalRule214); + rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives(); state._fsp--; } - after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment()); + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getAlternatives()); } @@ -699,49 +698,65 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR end "ruleVisibilityKind" - // $ANTLR start "rule__AbstractRule__Alternatives" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:284:1: rule__AbstractRule__Alternatives : ( ( ( rule__AbstractRule__Group_0__0 ) ) | ( ( rule__AbstractRule__UndefinedAssignment_1 ) ) ); - public final void rule__AbstractRule__Alternatives() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Alternatives_2" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:284:1: rule__AbstractRule__Alternatives_2 : ( ( ( rule__AbstractRule__InstanceSpecificationAssignment_2_0 ) ) | ( ( rule__AbstractRule__ValueAssignment_2_1 ) ) | ( ( rule__AbstractRule__UndefinedAssignment_2_2 ) ) ); + public final void rule__AbstractRule__Alternatives_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:288:1: ( ( ( rule__AbstractRule__Group_0__0 ) ) | ( ( rule__AbstractRule__UndefinedAssignment_1 ) ) ) - int alt1=2; - int LA1_0 = input.LA(1); - - if ( ((LA1_0>=RULE_VALUE_SPECIFICATION_ID && LA1_0<=RULE_VALUE_SPECIFICATION_STRING)||(LA1_0>=15 && LA1_0<=16)||LA1_0==18||(LA1_0>=20 && LA1_0<=23)) ) { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:288:1: ( ( ( rule__AbstractRule__InstanceSpecificationAssignment_2_0 ) ) | ( ( rule__AbstractRule__ValueAssignment_2_1 ) ) | ( ( rule__AbstractRule__UndefinedAssignment_2_2 ) ) ) + int alt1=3; + switch ( input.LA(1) ) { + case RULE_ID: + { alt1=1; - } - else if ( (LA1_0==19) ) { + } + break; + case RULE_INT: + case RULE_VALUE_SPECIFICATION_NEGATIVE_INT: + case RULE_VALUE_SPECIFICATION_DOUBLE: + case RULE_STRING: + case 14: + case 15: + case 16: + case 17: + { alt1=2; - } - else { + } + break; + case 18: + { + alt1=3; + } + break; + default: NoViableAltException nvae = new NoViableAltException("", 1, 0, input); throw nvae; } + switch (alt1) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:289:1: ( ( rule__AbstractRule__Group_0__0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:289:1: ( ( rule__AbstractRule__InstanceSpecificationAssignment_2_0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:289:1: ( ( rule__AbstractRule__Group_0__0 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:290:1: ( rule__AbstractRule__Group_0__0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:289:1: ( ( rule__AbstractRule__InstanceSpecificationAssignment_2_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:290:1: ( rule__AbstractRule__InstanceSpecificationAssignment_2_0 ) { - before(grammarAccess.getAbstractRuleAccess().getGroup_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:291:1: ( rule__AbstractRule__Group_0__0 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:291:2: rule__AbstractRule__Group_0__0 + before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_2_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:291:1: ( rule__AbstractRule__InstanceSpecificationAssignment_2_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:291:2: rule__AbstractRule__InstanceSpecificationAssignment_2_0 { - pushFollow(FOLLOW_rule__AbstractRule__Group_0__0_in_rule__AbstractRule__Alternatives550); - rule__AbstractRule__Group_0__0(); + pushFollow(FOLLOW_rule__AbstractRule__InstanceSpecificationAssignment_2_0_in_rule__AbstractRule__Alternatives_2550); + rule__AbstractRule__InstanceSpecificationAssignment_2_0(); state._fsp--; } - after(grammarAccess.getAbstractRuleAccess().getGroup_0()); + after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_2_0()); } @@ -749,115 +764,49 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:295:6: ( ( rule__AbstractRule__UndefinedAssignment_1 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:295:6: ( ( rule__AbstractRule__ValueAssignment_2_1 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:295:6: ( ( rule__AbstractRule__UndefinedAssignment_1 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:296:1: ( rule__AbstractRule__UndefinedAssignment_1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:295:6: ( ( rule__AbstractRule__ValueAssignment_2_1 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:296:1: ( rule__AbstractRule__ValueAssignment_2_1 ) { - before(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_1()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:297:1: ( rule__AbstractRule__UndefinedAssignment_1 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:297:2: rule__AbstractRule__UndefinedAssignment_1 + before(grammarAccess.getAbstractRuleAccess().getValueAssignment_2_1()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:297:1: ( rule__AbstractRule__ValueAssignment_2_1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:297:2: rule__AbstractRule__ValueAssignment_2_1 { - pushFollow(FOLLOW_rule__AbstractRule__UndefinedAssignment_1_in_rule__AbstractRule__Alternatives568); - rule__AbstractRule__UndefinedAssignment_1(); + pushFollow(FOLLOW_rule__AbstractRule__ValueAssignment_2_1_in_rule__AbstractRule__Alternatives_2568); + rule__AbstractRule__ValueAssignment_2_1(); state._fsp--; } - after(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_1()); + after(grammarAccess.getAbstractRuleAccess().getValueAssignment_2_1()); } } break; - - } - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__AbstractRule__Alternatives" - - - // $ANTLR start "rule__AbstractRule__Alternatives_0_2" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:306:1: rule__AbstractRule__Alternatives_0_2 : ( ( ( rule__AbstractRule__ValueAssignment_0_2_0 ) ) | ( ( rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 ) ) ); - public final void rule__AbstractRule__Alternatives_0_2() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:310:1: ( ( ( rule__AbstractRule__ValueAssignment_0_2_0 ) ) | ( ( rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 ) ) ) - int alt2=2; - int LA2_0 = input.LA(1); - - if ( ((LA2_0>=RULE_VALUE_SPECIFICATION_INT && LA2_0<=RULE_VALUE_SPECIFICATION_STRING)||(LA2_0>=15 && LA2_0<=16)||LA2_0==18) ) { - alt2=1; - } - else if ( (LA2_0==RULE_ID) ) { - alt2=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 2, 0, input); - - throw nvae; - } - switch (alt2) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:311:1: ( ( rule__AbstractRule__ValueAssignment_0_2_0 ) ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:311:1: ( ( rule__AbstractRule__ValueAssignment_0_2_0 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:312:1: ( rule__AbstractRule__ValueAssignment_0_2_0 ) - { - before(grammarAccess.getAbstractRuleAccess().getValueAssignment_0_2_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:313:1: ( rule__AbstractRule__ValueAssignment_0_2_0 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:313:2: rule__AbstractRule__ValueAssignment_0_2_0 - { - pushFollow(FOLLOW_rule__AbstractRule__ValueAssignment_0_2_0_in_rule__AbstractRule__Alternatives_0_2601); - rule__AbstractRule__ValueAssignment_0_2_0(); - - state._fsp--; - - - } - - after(grammarAccess.getAbstractRuleAccess().getValueAssignment_0_2_0()); - - } - - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:317:6: ( ( rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 ) ) + case 3 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:301:6: ( ( rule__AbstractRule__UndefinedAssignment_2_2 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:317:6: ( ( rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:318:1: ( rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:301:6: ( ( rule__AbstractRule__UndefinedAssignment_2_2 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:302:1: ( rule__AbstractRule__UndefinedAssignment_2_2 ) { - before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_0_2_1()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:319:1: ( rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:319:2: rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 + before(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_2_2()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:303:1: ( rule__AbstractRule__UndefinedAssignment_2_2 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:303:2: rule__AbstractRule__UndefinedAssignment_2_2 { - pushFollow(FOLLOW_rule__AbstractRule__InstanceSpecificationAssignment_0_2_1_in_rule__AbstractRule__Alternatives_0_2619); - rule__AbstractRule__InstanceSpecificationAssignment_0_2_1(); + pushFollow(FOLLOW_rule__AbstractRule__UndefinedAssignment_2_2_in_rule__AbstractRule__Alternatives_2586); + rule__AbstractRule__UndefinedAssignment_2_2(); state._fsp--; } - after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationAssignment_0_2_1()); + after(grammarAccess.getAbstractRuleAccess().getUndefinedAssignment_2_2()); } @@ -878,66 +827,68 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Alternatives_0_2" + // $ANTLR end "rule__AbstractRule__Alternatives_2" - // $ANTLR start "rule__AbstractRule__ValueAlternatives_0_2_0_0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:328:1: rule__AbstractRule__ValueAlternatives_0_2_0_0 : ( ( ruleLiteralBooleanRule ) | ( ruleLiteralIntegerOrUnlimitedNaturalRule ) | ( ruleLiteralRealRule ) | ( ruleLiteralNullRule ) | ( ruleLiteralStringRule ) ); - public final void rule__AbstractRule__ValueAlternatives_0_2_0_0() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__ValueAlternatives_2_1_0" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:312:1: rule__AbstractRule__ValueAlternatives_2_1_0 : ( ( ruleLiteralBooleanRule ) | ( ruleLiteralIntegerOrUnlimitedNaturalRule ) | ( ruleLiteralRealRule ) | ( ruleLiteralNullRule ) | ( ruleLiteralStringRule ) ); + public final void rule__AbstractRule__ValueAlternatives_2_1_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:332:1: ( ( ruleLiteralBooleanRule ) | ( ruleLiteralIntegerOrUnlimitedNaturalRule ) | ( ruleLiteralRealRule ) | ( ruleLiteralNullRule ) | ( ruleLiteralStringRule ) ) - int alt3=5; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:316:1: ( ( ruleLiteralBooleanRule ) | ( ruleLiteralIntegerOrUnlimitedNaturalRule ) | ( ruleLiteralRealRule ) | ( ruleLiteralNullRule ) | ( ruleLiteralStringRule ) ) + int alt2=5; switch ( input.LA(1) ) { + case 14: case 15: - case 16: { - alt3=1; + alt2=1; } break; - case RULE_VALUE_SPECIFICATION_INT: + case RULE_INT: + case RULE_VALUE_SPECIFICATION_NEGATIVE_INT: + case 16: { - alt3=2; + alt2=2; } break; case RULE_VALUE_SPECIFICATION_DOUBLE: { - alt3=3; + alt2=3; } break; - case 18: + case 17: { - alt3=4; + alt2=4; } break; - case RULE_VALUE_SPECIFICATION_STRING: + case RULE_STRING: { - alt3=5; + alt2=5; } break; default: NoViableAltException nvae = - new NoViableAltException("", 3, 0, input); + new NoViableAltException("", 2, 0, input); throw nvae; } - switch (alt3) { + switch (alt2) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:333:1: ( ruleLiteralBooleanRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:317:1: ( ruleLiteralBooleanRule ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:333:1: ( ruleLiteralBooleanRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:334:1: ruleLiteralBooleanRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:317:1: ( ruleLiteralBooleanRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:318:1: ruleLiteralBooleanRule { - before(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0()); - pushFollow(FOLLOW_ruleLiteralBooleanRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0652); + before(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_2_1_0_0()); + pushFollow(FOLLOW_ruleLiteralBooleanRule_in_rule__AbstractRule__ValueAlternatives_2_1_0619); ruleLiteralBooleanRule(); state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0()); + after(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_2_1_0_0()); } @@ -945,18 +896,18 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:339:6: ( ruleLiteralIntegerOrUnlimitedNaturalRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:323:6: ( ruleLiteralIntegerOrUnlimitedNaturalRule ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:339:6: ( ruleLiteralIntegerOrUnlimitedNaturalRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:340:1: ruleLiteralIntegerOrUnlimitedNaturalRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:323:6: ( ruleLiteralIntegerOrUnlimitedNaturalRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:324:1: ruleLiteralIntegerOrUnlimitedNaturalRule { - before(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1()); - pushFollow(FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0669); + before(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1()); + pushFollow(FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_rule__AbstractRule__ValueAlternatives_2_1_0636); ruleLiteralIntegerOrUnlimitedNaturalRule(); state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1()); + after(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1()); } @@ -964,18 +915,18 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 3 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:345:6: ( ruleLiteralRealRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:329:6: ( ruleLiteralRealRule ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:345:6: ( ruleLiteralRealRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:346:1: ruleLiteralRealRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:329:6: ( ruleLiteralRealRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:330:1: ruleLiteralRealRule { - before(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_0_2_0_0_2()); - pushFollow(FOLLOW_ruleLiteralRealRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0686); + before(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_2_1_0_2()); + pushFollow(FOLLOW_ruleLiteralRealRule_in_rule__AbstractRule__ValueAlternatives_2_1_0653); ruleLiteralRealRule(); state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_0_2_0_0_2()); + after(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_2_1_0_2()); } @@ -983,18 +934,18 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 4 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:351:6: ( ruleLiteralNullRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:335:6: ( ruleLiteralNullRule ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:351:6: ( ruleLiteralNullRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:352:1: ruleLiteralNullRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:335:6: ( ruleLiteralNullRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:336:1: ruleLiteralNullRule { - before(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_0_2_0_0_3()); - pushFollow(FOLLOW_ruleLiteralNullRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0703); + before(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_2_1_0_3()); + pushFollow(FOLLOW_ruleLiteralNullRule_in_rule__AbstractRule__ValueAlternatives_2_1_0670); ruleLiteralNullRule(); state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_0_2_0_0_3()); + after(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_2_1_0_3()); } @@ -1002,18 +953,18 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 5 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:357:6: ( ruleLiteralStringRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:341:6: ( ruleLiteralStringRule ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:357:6: ( ruleLiteralStringRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:358:1: ruleLiteralStringRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:341:6: ( ruleLiteralStringRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:342:1: ruleLiteralStringRule { - before(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_0_2_0_0_4()); - pushFollow(FOLLOW_ruleLiteralStringRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0720); + before(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_2_1_0_4()); + pushFollow(FOLLOW_ruleLiteralStringRule_in_rule__AbstractRule__ValueAlternatives_2_1_0687); ruleLiteralStringRule(); state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_0_2_0_0_4()); + after(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_2_1_0_4()); } @@ -1034,21 +985,92 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__ValueAlternatives_0_2_0_0" + // $ANTLR end "rule__AbstractRule__ValueAlternatives_2_1_0" // $ANTLR start "rule__LiteralBooleanRule__ValueAlternatives_0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:368:1: rule__LiteralBooleanRule__ValueAlternatives_0 : ( ( 'true' ) | ( 'false' ) ); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:352:1: rule__LiteralBooleanRule__ValueAlternatives_0 : ( ( 'true' ) | ( 'false' ) ); public final void rule__LiteralBooleanRule__ValueAlternatives_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:372:1: ( ( 'true' ) | ( 'false' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:356:1: ( ( 'true' ) | ( 'false' ) ) + int alt3=2; + int LA3_0 = input.LA(1); + + if ( (LA3_0==14) ) { + alt3=1; + } + else if ( (LA3_0==15) ) { + alt3=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 3, 0, input); + + throw nvae; + } + switch (alt3) { + case 1 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:357:1: ( 'true' ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:357:1: ( 'true' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:358:1: 'true' + { + before(grammarAccess.getLiteralBooleanRuleAccess().getValueTrueKeyword_0_0()); + match(input,14,FOLLOW_14_in_rule__LiteralBooleanRule__ValueAlternatives_0720); + after(grammarAccess.getLiteralBooleanRuleAccess().getValueTrueKeyword_0_0()); + + } + + + } + break; + case 2 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:365:6: ( 'false' ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:365:6: ( 'false' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:366:1: 'false' + { + before(grammarAccess.getLiteralBooleanRuleAccess().getValueFalseKeyword_0_1()); + match(input,15,FOLLOW_15_in_rule__LiteralBooleanRule__ValueAlternatives_0740); + after(grammarAccess.getLiteralBooleanRuleAccess().getValueFalseKeyword_0_1()); + + } + + + } + break; + + } + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__LiteralBooleanRule__ValueAlternatives_0" + + + // $ANTLR start "rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:378:1: rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives : ( ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 ) ) | ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 ) ) ); + public final void rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:382:1: ( ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 ) ) | ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 ) ) ) int alt4=2; int LA4_0 = input.LA(1); - if ( (LA4_0==15) ) { + if ( ((LA4_0>=RULE_INT && LA4_0<=RULE_VALUE_SPECIFICATION_NEGATIVE_INT)) ) { alt4=1; } else if ( (LA4_0==16) ) { @@ -1062,14 +1084,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } switch (alt4) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:373:1: ( 'true' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:383:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:373:1: ( 'true' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:374:1: 'true' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:383:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:384:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 ) { - before(grammarAccess.getLiteralBooleanRuleAccess().getValueTrueKeyword_0_0()); - match(input,15,FOLLOW_15_in_rule__LiteralBooleanRule__ValueAlternatives_0753); - after(grammarAccess.getLiteralBooleanRuleAccess().getValueTrueKeyword_0_0()); + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:385:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:385:2: rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 + { + pushFollow(FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0_in_rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives774); + rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0(); + + state._fsp--; + + + } + + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAssignment_0()); } @@ -1077,14 +1109,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:381:6: ( 'false' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:389:6: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:381:6: ( 'false' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:382:1: 'false' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:389:6: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:390:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 ) { - before(grammarAccess.getLiteralBooleanRuleAccess().getValueFalseKeyword_0_1()); - match(input,16,FOLLOW_16_in_rule__LiteralBooleanRule__ValueAlternatives_0773); - after(grammarAccess.getLiteralBooleanRuleAccess().getValueFalseKeyword_0_1()); + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAssignment_1()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:391:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:391:2: rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 + { + pushFollow(FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1_in_rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives792); + rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1(); + + state._fsp--; + + + } + + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAssignment_1()); } @@ -1105,58 +1147,129 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__LiteralBooleanRule__ValueAlternatives_0" + // $ANTLR end "rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives" + + + // $ANTLR start "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:400:1: rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 : ( ( RULE_INT ) | ( RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ); + public final void rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:404:1: ( ( RULE_INT ) | ( RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) + int alt5=2; + int LA5_0 = input.LA(1); + + if ( (LA5_0==RULE_INT) ) { + alt5=1; + } + else if ( (LA5_0==RULE_VALUE_SPECIFICATION_NEGATIVE_INT) ) { + alt5=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 5, 0, input); + + throw nvae; + } + switch (alt5) { + case 1 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:405:1: ( RULE_INT ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:405:1: ( RULE_INT ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:406:1: RULE_INT + { + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueINTTerminalRuleCall_0_0_0()); + match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0825); + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueINTTerminalRuleCall_0_0_0()); + + } + + + } + break; + case 2 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:411:6: ( RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:411:6: ( RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:412:1: RULE_VALUE_SPECIFICATION_NEGATIVE_INT + { + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1()); + match(input,RULE_VALUE_SPECIFICATION_NEGATIVE_INT,FOLLOW_RULE_VALUE_SPECIFICATION_NEGATIVE_INT_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0842); + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1()); + + } + + + } + break; + + } + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0" // $ANTLR start "rule__VisibilityKind__Alternatives" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:394:1: rule__VisibilityKind__Alternatives : ( ( ( rule__VisibilityKind__PublicAssignment_0 ) ) | ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) | ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) | ( ( rule__VisibilityKind__PackageAssignment_3 ) ) ); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:422:1: rule__VisibilityKind__Alternatives : ( ( ( rule__VisibilityKind__PublicAssignment_0 ) ) | ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) | ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) | ( ( rule__VisibilityKind__PackageAssignment_3 ) ) ); public final void rule__VisibilityKind__Alternatives() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:398:1: ( ( ( rule__VisibilityKind__PublicAssignment_0 ) ) | ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) | ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) | ( ( rule__VisibilityKind__PackageAssignment_3 ) ) ) - int alt5=4; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:426:1: ( ( ( rule__VisibilityKind__PublicAssignment_0 ) ) | ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) | ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) | ( ( rule__VisibilityKind__PackageAssignment_3 ) ) ) + int alt6=4; switch ( input.LA(1) ) { - case 20: + case 19: { - alt5=1; + alt6=1; } break; - case 21: + case 20: { - alt5=2; + alt6=2; } break; - case 22: + case 21: { - alt5=3; + alt6=3; } break; - case 23: + case 22: { - alt5=4; + alt6=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 5, 0, input); + new NoViableAltException("", 6, 0, input); throw nvae; } - switch (alt5) { + switch (alt6) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:399:1: ( ( rule__VisibilityKind__PublicAssignment_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:427:1: ( ( rule__VisibilityKind__PublicAssignment_0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:399:1: ( ( rule__VisibilityKind__PublicAssignment_0 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:400:1: ( rule__VisibilityKind__PublicAssignment_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:427:1: ( ( rule__VisibilityKind__PublicAssignment_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:428:1: ( rule__VisibilityKind__PublicAssignment_0 ) { before(grammarAccess.getVisibilityKindAccess().getPublicAssignment_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:401:1: ( rule__VisibilityKind__PublicAssignment_0 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:401:2: rule__VisibilityKind__PublicAssignment_0 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:429:1: ( rule__VisibilityKind__PublicAssignment_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:429:2: rule__VisibilityKind__PublicAssignment_0 { - pushFollow(FOLLOW_rule__VisibilityKind__PublicAssignment_0_in_rule__VisibilityKind__Alternatives807); + pushFollow(FOLLOW_rule__VisibilityKind__PublicAssignment_0_in_rule__VisibilityKind__Alternatives874); rule__VisibilityKind__PublicAssignment_0(); state._fsp--; @@ -1172,16 +1285,16 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:405:6: ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:433:6: ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:405:6: ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:406:1: ( rule__VisibilityKind__PrivateAssignment_1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:433:6: ( ( rule__VisibilityKind__PrivateAssignment_1 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:434:1: ( rule__VisibilityKind__PrivateAssignment_1 ) { before(grammarAccess.getVisibilityKindAccess().getPrivateAssignment_1()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:407:1: ( rule__VisibilityKind__PrivateAssignment_1 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:407:2: rule__VisibilityKind__PrivateAssignment_1 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:435:1: ( rule__VisibilityKind__PrivateAssignment_1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:435:2: rule__VisibilityKind__PrivateAssignment_1 { - pushFollow(FOLLOW_rule__VisibilityKind__PrivateAssignment_1_in_rule__VisibilityKind__Alternatives825); + pushFollow(FOLLOW_rule__VisibilityKind__PrivateAssignment_1_in_rule__VisibilityKind__Alternatives892); rule__VisibilityKind__PrivateAssignment_1(); state._fsp--; @@ -1197,16 +1310,16 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 3 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:411:6: ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:439:6: ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:411:6: ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:412:1: ( rule__VisibilityKind__ProtectedAssignment_2 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:439:6: ( ( rule__VisibilityKind__ProtectedAssignment_2 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:440:1: ( rule__VisibilityKind__ProtectedAssignment_2 ) { before(grammarAccess.getVisibilityKindAccess().getProtectedAssignment_2()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:413:1: ( rule__VisibilityKind__ProtectedAssignment_2 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:413:2: rule__VisibilityKind__ProtectedAssignment_2 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:441:1: ( rule__VisibilityKind__ProtectedAssignment_2 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:441:2: rule__VisibilityKind__ProtectedAssignment_2 { - pushFollow(FOLLOW_rule__VisibilityKind__ProtectedAssignment_2_in_rule__VisibilityKind__Alternatives843); + pushFollow(FOLLOW_rule__VisibilityKind__ProtectedAssignment_2_in_rule__VisibilityKind__Alternatives910); rule__VisibilityKind__ProtectedAssignment_2(); state._fsp--; @@ -1222,16 +1335,16 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } break; case 4 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:417:6: ( ( rule__VisibilityKind__PackageAssignment_3 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:445:6: ( ( rule__VisibilityKind__PackageAssignment_3 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:417:6: ( ( rule__VisibilityKind__PackageAssignment_3 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:418:1: ( rule__VisibilityKind__PackageAssignment_3 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:445:6: ( ( rule__VisibilityKind__PackageAssignment_3 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:446:1: ( rule__VisibilityKind__PackageAssignment_3 ) { before(grammarAccess.getVisibilityKindAccess().getPackageAssignment_3()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:419:1: ( rule__VisibilityKind__PackageAssignment_3 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:419:2: rule__VisibilityKind__PackageAssignment_3 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:447:1: ( rule__VisibilityKind__PackageAssignment_3 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:447:2: rule__VisibilityKind__PackageAssignment_3 { - pushFollow(FOLLOW_rule__VisibilityKind__PackageAssignment_3_in_rule__VisibilityKind__Alternatives861); + pushFollow(FOLLOW_rule__VisibilityKind__PackageAssignment_3_in_rule__VisibilityKind__Alternatives928); rule__VisibilityKind__PackageAssignment_3(); state._fsp--; @@ -1263,23 +1376,23 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR end "rule__VisibilityKind__Alternatives" - // $ANTLR start "rule__AbstractRule__Group_0__0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:430:1: rule__AbstractRule__Group_0__0 : rule__AbstractRule__Group_0__0__Impl rule__AbstractRule__Group_0__1 ; - public final void rule__AbstractRule__Group_0__0() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Group__0" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:458:1: rule__AbstractRule__Group__0 : rule__AbstractRule__Group__0__Impl rule__AbstractRule__Group__1 ; + public final void rule__AbstractRule__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:434:1: ( rule__AbstractRule__Group_0__0__Impl rule__AbstractRule__Group_0__1 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:435:2: rule__AbstractRule__Group_0__0__Impl rule__AbstractRule__Group_0__1 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:462:1: ( rule__AbstractRule__Group__0__Impl rule__AbstractRule__Group__1 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:463:2: rule__AbstractRule__Group__0__Impl rule__AbstractRule__Group__1 { - pushFollow(FOLLOW_rule__AbstractRule__Group_0__0__Impl_in_rule__AbstractRule__Group_0__0892); - rule__AbstractRule__Group_0__0__Impl(); + pushFollow(FOLLOW_rule__AbstractRule__Group__0__Impl_in_rule__AbstractRule__Group__0959); + rule__AbstractRule__Group__0__Impl(); state._fsp--; - pushFollow(FOLLOW_rule__AbstractRule__Group_0__1_in_rule__AbstractRule__Group_0__0895); - rule__AbstractRule__Group_0__1(); + pushFollow(FOLLOW_rule__AbstractRule__Group__1_in_rule__AbstractRule__Group__0962); + rule__AbstractRule__Group__1(); state._fsp--; @@ -1298,36 +1411,36 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0__0" + // $ANTLR end "rule__AbstractRule__Group__0" - // $ANTLR start "rule__AbstractRule__Group_0__0__Impl" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:442:1: rule__AbstractRule__Group_0__0__Impl : ( ( rule__AbstractRule__VisibilityAssignment_0_0 )? ) ; - public final void rule__AbstractRule__Group_0__0__Impl() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Group__0__Impl" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:470:1: rule__AbstractRule__Group__0__Impl : ( ( rule__AbstractRule__VisibilityAssignment_0 )? ) ; + public final void rule__AbstractRule__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:446:1: ( ( ( rule__AbstractRule__VisibilityAssignment_0_0 )? ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:447:1: ( ( rule__AbstractRule__VisibilityAssignment_0_0 )? ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:474:1: ( ( ( rule__AbstractRule__VisibilityAssignment_0 )? ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:475:1: ( ( rule__AbstractRule__VisibilityAssignment_0 )? ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:447:1: ( ( rule__AbstractRule__VisibilityAssignment_0_0 )? ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:448:1: ( rule__AbstractRule__VisibilityAssignment_0_0 )? + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:475:1: ( ( rule__AbstractRule__VisibilityAssignment_0 )? ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:476:1: ( rule__AbstractRule__VisibilityAssignment_0 )? { - before(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:449:1: ( rule__AbstractRule__VisibilityAssignment_0_0 )? - int alt6=2; - int LA6_0 = input.LA(1); + before(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:477:1: ( rule__AbstractRule__VisibilityAssignment_0 )? + int alt7=2; + int LA7_0 = input.LA(1); - if ( ((LA6_0>=20 && LA6_0<=23)) ) { - alt6=1; + if ( ((LA7_0>=19 && LA7_0<=22)) ) { + alt7=1; } - switch (alt6) { + switch (alt7) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:449:2: rule__AbstractRule__VisibilityAssignment_0_0 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:477:2: rule__AbstractRule__VisibilityAssignment_0 { - pushFollow(FOLLOW_rule__AbstractRule__VisibilityAssignment_0_0_in_rule__AbstractRule__Group_0__0__Impl922); - rule__AbstractRule__VisibilityAssignment_0_0(); + pushFollow(FOLLOW_rule__AbstractRule__VisibilityAssignment_0_in_rule__AbstractRule__Group__0__Impl989); + rule__AbstractRule__VisibilityAssignment_0(); state._fsp--; @@ -1337,7 +1450,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } - after(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0_0()); + after(grammarAccess.getAbstractRuleAccess().getVisibilityAssignment_0()); } @@ -1356,26 +1469,26 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0__0__Impl" + // $ANTLR end "rule__AbstractRule__Group__0__Impl" - // $ANTLR start "rule__AbstractRule__Group_0__1" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:459:1: rule__AbstractRule__Group_0__1 : rule__AbstractRule__Group_0__1__Impl rule__AbstractRule__Group_0__2 ; - public final void rule__AbstractRule__Group_0__1() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Group__1" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:487:1: rule__AbstractRule__Group__1 : rule__AbstractRule__Group__1__Impl rule__AbstractRule__Group__2 ; + public final void rule__AbstractRule__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:463:1: ( rule__AbstractRule__Group_0__1__Impl rule__AbstractRule__Group_0__2 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:464:2: rule__AbstractRule__Group_0__1__Impl rule__AbstractRule__Group_0__2 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:491:1: ( rule__AbstractRule__Group__1__Impl rule__AbstractRule__Group__2 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:492:2: rule__AbstractRule__Group__1__Impl rule__AbstractRule__Group__2 { - pushFollow(FOLLOW_rule__AbstractRule__Group_0__1__Impl_in_rule__AbstractRule__Group_0__1953); - rule__AbstractRule__Group_0__1__Impl(); + pushFollow(FOLLOW_rule__AbstractRule__Group__1__Impl_in_rule__AbstractRule__Group__11020); + rule__AbstractRule__Group__1__Impl(); state._fsp--; - pushFollow(FOLLOW_rule__AbstractRule__Group_0__2_in_rule__AbstractRule__Group_0__1956); - rule__AbstractRule__Group_0__2(); + pushFollow(FOLLOW_rule__AbstractRule__Group__2_in_rule__AbstractRule__Group__11023); + rule__AbstractRule__Group__2(); state._fsp--; @@ -1394,36 +1507,36 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0__1" + // $ANTLR end "rule__AbstractRule__Group__1" - // $ANTLR start "rule__AbstractRule__Group_0__1__Impl" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:471:1: rule__AbstractRule__Group_0__1__Impl : ( ( rule__AbstractRule__Group_0_1__0 )? ) ; - public final void rule__AbstractRule__Group_0__1__Impl() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Group__1__Impl" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:499:1: rule__AbstractRule__Group__1__Impl : ( ( rule__AbstractRule__NameAssignment_1 )? ) ; + public final void rule__AbstractRule__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:475:1: ( ( ( rule__AbstractRule__Group_0_1__0 )? ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:476:1: ( ( rule__AbstractRule__Group_0_1__0 )? ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:503:1: ( ( ( rule__AbstractRule__NameAssignment_1 )? ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:504:1: ( ( rule__AbstractRule__NameAssignment_1 )? ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:476:1: ( ( rule__AbstractRule__Group_0_1__0 )? ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:477:1: ( rule__AbstractRule__Group_0_1__0 )? + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:504:1: ( ( rule__AbstractRule__NameAssignment_1 )? ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:505:1: ( rule__AbstractRule__NameAssignment_1 )? { - before(grammarAccess.getAbstractRuleAccess().getGroup_0_1()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:478:1: ( rule__AbstractRule__Group_0_1__0 )? - int alt7=2; - int LA7_0 = input.LA(1); + before(grammarAccess.getAbstractRuleAccess().getNameAssignment_1()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:506:1: ( rule__AbstractRule__NameAssignment_1 )? + int alt8=2; + int LA8_0 = input.LA(1); - if ( (LA7_0==RULE_VALUE_SPECIFICATION_ID) ) { - alt7=1; + if ( (LA8_0==RULE_VALUE_SPECIFICATION_ID) ) { + alt8=1; } - switch (alt7) { + switch (alt8) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:478:2: rule__AbstractRule__Group_0_1__0 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:506:2: rule__AbstractRule__NameAssignment_1 { - pushFollow(FOLLOW_rule__AbstractRule__Group_0_1__0_in_rule__AbstractRule__Group_0__1__Impl983); - rule__AbstractRule__Group_0_1__0(); + pushFollow(FOLLOW_rule__AbstractRule__NameAssignment_1_in_rule__AbstractRule__Group__1__Impl1050); + rule__AbstractRule__NameAssignment_1(); state._fsp--; @@ -1433,7 +1546,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } - after(grammarAccess.getAbstractRuleAccess().getGroup_0_1()); + after(grammarAccess.getAbstractRuleAccess().getNameAssignment_1()); } @@ -1452,21 +1565,21 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0__1__Impl" + // $ANTLR end "rule__AbstractRule__Group__1__Impl" - // $ANTLR start "rule__AbstractRule__Group_0__2" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:488:1: rule__AbstractRule__Group_0__2 : rule__AbstractRule__Group_0__2__Impl ; - public final void rule__AbstractRule__Group_0__2() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Group__2" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:516:1: rule__AbstractRule__Group__2 : rule__AbstractRule__Group__2__Impl ; + public final void rule__AbstractRule__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:492:1: ( rule__AbstractRule__Group_0__2__Impl ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:493:2: rule__AbstractRule__Group_0__2__Impl + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:520:1: ( rule__AbstractRule__Group__2__Impl ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:521:2: rule__AbstractRule__Group__2__Impl { - pushFollow(FOLLOW_rule__AbstractRule__Group_0__2__Impl_in_rule__AbstractRule__Group_0__21014); - rule__AbstractRule__Group_0__2__Impl(); + pushFollow(FOLLOW_rule__AbstractRule__Group__2__Impl_in_rule__AbstractRule__Group__21081); + rule__AbstractRule__Group__2__Impl(); state._fsp--; @@ -1485,35 +1598,35 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0__2" + // $ANTLR end "rule__AbstractRule__Group__2" - // $ANTLR start "rule__AbstractRule__Group_0__2__Impl" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:499:1: rule__AbstractRule__Group_0__2__Impl : ( ( rule__AbstractRule__Alternatives_0_2 ) ) ; - public final void rule__AbstractRule__Group_0__2__Impl() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__Group__2__Impl" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:527:1: rule__AbstractRule__Group__2__Impl : ( ( rule__AbstractRule__Alternatives_2 ) ) ; + public final void rule__AbstractRule__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:503:1: ( ( ( rule__AbstractRule__Alternatives_0_2 ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:504:1: ( ( rule__AbstractRule__Alternatives_0_2 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:531:1: ( ( ( rule__AbstractRule__Alternatives_2 ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:532:1: ( ( rule__AbstractRule__Alternatives_2 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:504:1: ( ( rule__AbstractRule__Alternatives_0_2 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:505:1: ( rule__AbstractRule__Alternatives_0_2 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:532:1: ( ( rule__AbstractRule__Alternatives_2 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:533:1: ( rule__AbstractRule__Alternatives_2 ) { - before(grammarAccess.getAbstractRuleAccess().getAlternatives_0_2()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:506:1: ( rule__AbstractRule__Alternatives_0_2 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:506:2: rule__AbstractRule__Alternatives_0_2 + before(grammarAccess.getAbstractRuleAccess().getAlternatives_2()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:534:1: ( rule__AbstractRule__Alternatives_2 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:534:2: rule__AbstractRule__Alternatives_2 { - pushFollow(FOLLOW_rule__AbstractRule__Alternatives_0_2_in_rule__AbstractRule__Group_0__2__Impl1041); - rule__AbstractRule__Alternatives_0_2(); + pushFollow(FOLLOW_rule__AbstractRule__Alternatives_2_in_rule__AbstractRule__Group__2__Impl1108); + rule__AbstractRule__Alternatives_2(); state._fsp--; } - after(grammarAccess.getAbstractRuleAccess().getAlternatives_0_2()); + after(grammarAccess.getAbstractRuleAccess().getAlternatives_2()); } @@ -1532,109 +1645,32 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0__2__Impl" + // $ANTLR end "rule__AbstractRule__Group__2__Impl" - // $ANTLR start "rule__AbstractRule__Group_0_1__0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:522:1: rule__AbstractRule__Group_0_1__0 : rule__AbstractRule__Group_0_1__0__Impl rule__AbstractRule__Group_0_1__1 ; - public final void rule__AbstractRule__Group_0_1__0() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__VisibilityAssignment_0" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:551:1: rule__AbstractRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ; + public final void rule__AbstractRule__VisibilityAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:526:1: ( rule__AbstractRule__Group_0_1__0__Impl rule__AbstractRule__Group_0_1__1 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:527:2: rule__AbstractRule__Group_0_1__0__Impl rule__AbstractRule__Group_0_1__1 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:555:1: ( ( ruleVisibilityKind ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:556:1: ( ruleVisibilityKind ) { - pushFollow(FOLLOW_rule__AbstractRule__Group_0_1__0__Impl_in_rule__AbstractRule__Group_0_1__01077); - rule__AbstractRule__Group_0_1__0__Impl(); - - state._fsp--; - - pushFollow(FOLLOW_rule__AbstractRule__Group_0_1__1_in_rule__AbstractRule__Group_0_1__01080); - rule__AbstractRule__Group_0_1__1(); - - state._fsp--; - - - } - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__AbstractRule__Group_0_1__0" - - - // $ANTLR start "rule__AbstractRule__Group_0_1__0__Impl" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:534:1: rule__AbstractRule__Group_0_1__0__Impl : ( ( rule__AbstractRule__NameAssignment_0_1_0 ) ) ; - public final void rule__AbstractRule__Group_0_1__0__Impl() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:538:1: ( ( ( rule__AbstractRule__NameAssignment_0_1_0 ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:539:1: ( ( rule__AbstractRule__NameAssignment_0_1_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:556:1: ( ruleVisibilityKind ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:557:1: ruleVisibilityKind { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:539:1: ( ( rule__AbstractRule__NameAssignment_0_1_0 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:540:1: ( rule__AbstractRule__NameAssignment_0_1_0 ) - { - before(grammarAccess.getAbstractRuleAccess().getNameAssignment_0_1_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:541:1: ( rule__AbstractRule__NameAssignment_0_1_0 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:541:2: rule__AbstractRule__NameAssignment_0_1_0 - { - pushFollow(FOLLOW_rule__AbstractRule__NameAssignment_0_1_0_in_rule__AbstractRule__Group_0_1__0__Impl1107); - rule__AbstractRule__NameAssignment_0_1_0(); + before(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0()); + pushFollow(FOLLOW_ruleVisibilityKind_in_rule__AbstractRule__VisibilityAssignment_01149); + ruleVisibilityKind(); state._fsp--; + after(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0()); } - after(grammarAccess.getAbstractRuleAccess().getNameAssignment_0_1_0()); - - } - - - } - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__AbstractRule__Group_0_1__0__Impl" - - - // $ANTLR start "rule__AbstractRule__Group_0_1__1" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:551:1: rule__AbstractRule__Group_0_1__1 : rule__AbstractRule__Group_0_1__1__Impl ; - public final void rule__AbstractRule__Group_0_1__1() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:555:1: ( rule__AbstractRule__Group_0_1__1__Impl ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:556:2: rule__AbstractRule__Group_0_1__1__Impl - { - pushFollow(FOLLOW_rule__AbstractRule__Group_0_1__1__Impl_in_rule__AbstractRule__Group_0_1__11137); - rule__AbstractRule__Group_0_1__1__Impl(); - - state._fsp--; - } @@ -1650,25 +1686,25 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0_1__1" + // $ANTLR end "rule__AbstractRule__VisibilityAssignment_0" - // $ANTLR start "rule__AbstractRule__Group_0_1__1__Impl" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:562:1: rule__AbstractRule__Group_0_1__1__Impl : ( '=' ) ; - public final void rule__AbstractRule__Group_0_1__1__Impl() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__NameAssignment_1" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:566:1: rule__AbstractRule__NameAssignment_1 : ( RULE_VALUE_SPECIFICATION_ID ) ; + public final void rule__AbstractRule__NameAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:566:1: ( ( '=' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:567:1: ( '=' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:570:1: ( ( RULE_VALUE_SPECIFICATION_ID ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:571:1: ( RULE_VALUE_SPECIFICATION_ID ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:567:1: ( '=' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:568:1: '=' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:571:1: ( RULE_VALUE_SPECIFICATION_ID ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:572:1: RULE_VALUE_SPECIFICATION_ID { - before(grammarAccess.getAbstractRuleAccess().getEqualsSignKeyword_0_1_1()); - match(input,17,FOLLOW_17_in_rule__AbstractRule__Group_0_1__1__Impl1165); - after(grammarAccess.getAbstractRuleAccess().getEqualsSignKeyword_0_1_1()); + before(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0()); + match(input,RULE_VALUE_SPECIFICATION_ID,FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_rule__AbstractRule__NameAssignment_11180); + after(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0()); } @@ -1687,66 +1723,33 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__Group_0_1__1__Impl" + // $ANTLR end "rule__AbstractRule__NameAssignment_1" - // $ANTLR start "rule__AbstractRule__VisibilityAssignment_0_0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:586:1: rule__AbstractRule__VisibilityAssignment_0_0 : ( ruleVisibilityKind ) ; - public final void rule__AbstractRule__VisibilityAssignment_0_0() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__InstanceSpecificationAssignment_2_0" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:581:1: rule__AbstractRule__InstanceSpecificationAssignment_2_0 : ( ( RULE_ID ) ) ; + public final void rule__AbstractRule__InstanceSpecificationAssignment_2_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:590:1: ( ( ruleVisibilityKind ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:591:1: ( ruleVisibilityKind ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:585:1: ( ( ( RULE_ID ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:586:1: ( ( RULE_ID ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:591:1: ( ruleVisibilityKind ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:592:1: ruleVisibilityKind + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:586:1: ( ( RULE_ID ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:587:1: ( RULE_ID ) { - before(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0_0()); - pushFollow(FOLLOW_ruleVisibilityKind_in_rule__AbstractRule__VisibilityAssignment_0_01205); - ruleVisibilityKind(); - - state._fsp--; - - after(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0_0()); - - } - + before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:588:1: ( RULE_ID ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:589:1: RULE_ID + { + before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1()); + match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__AbstractRule__InstanceSpecificationAssignment_2_01215); + after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1()); } - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__AbstractRule__VisibilityAssignment_0_0" - - - // $ANTLR start "rule__AbstractRule__NameAssignment_0_1_0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:601:1: rule__AbstractRule__NameAssignment_0_1_0 : ( RULE_VALUE_SPECIFICATION_ID ) ; - public final void rule__AbstractRule__NameAssignment_0_1_0() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:605:1: ( ( RULE_VALUE_SPECIFICATION_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:606:1: ( RULE_VALUE_SPECIFICATION_ID ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:606:1: ( RULE_VALUE_SPECIFICATION_ID ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:607:1: RULE_VALUE_SPECIFICATION_ID - { - before(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0()); - match(input,RULE_VALUE_SPECIFICATION_ID,FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_rule__AbstractRule__NameAssignment_0_1_01236); - after(grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0()); + after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0()); } @@ -1765,35 +1768,35 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__NameAssignment_0_1_0" + // $ANTLR end "rule__AbstractRule__InstanceSpecificationAssignment_2_0" - // $ANTLR start "rule__AbstractRule__ValueAssignment_0_2_0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:616:1: rule__AbstractRule__ValueAssignment_0_2_0 : ( ( rule__AbstractRule__ValueAlternatives_0_2_0_0 ) ) ; - public final void rule__AbstractRule__ValueAssignment_0_2_0() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__ValueAssignment_2_1" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:600:1: rule__AbstractRule__ValueAssignment_2_1 : ( ( rule__AbstractRule__ValueAlternatives_2_1_0 ) ) ; + public final void rule__AbstractRule__ValueAssignment_2_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:620:1: ( ( ( rule__AbstractRule__ValueAlternatives_0_2_0_0 ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:621:1: ( ( rule__AbstractRule__ValueAlternatives_0_2_0_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:604:1: ( ( ( rule__AbstractRule__ValueAlternatives_2_1_0 ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:605:1: ( ( rule__AbstractRule__ValueAlternatives_2_1_0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:621:1: ( ( rule__AbstractRule__ValueAlternatives_0_2_0_0 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:622:1: ( rule__AbstractRule__ValueAlternatives_0_2_0_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:605:1: ( ( rule__AbstractRule__ValueAlternatives_2_1_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:606:1: ( rule__AbstractRule__ValueAlternatives_2_1_0 ) { - before(grammarAccess.getAbstractRuleAccess().getValueAlternatives_0_2_0_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:623:1: ( rule__AbstractRule__ValueAlternatives_0_2_0_0 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:623:2: rule__AbstractRule__ValueAlternatives_0_2_0_0 + before(grammarAccess.getAbstractRuleAccess().getValueAlternatives_2_1_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:607:1: ( rule__AbstractRule__ValueAlternatives_2_1_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:607:2: rule__AbstractRule__ValueAlternatives_2_1_0 { - pushFollow(FOLLOW_rule__AbstractRule__ValueAlternatives_0_2_0_0_in_rule__AbstractRule__ValueAssignment_0_2_01267); - rule__AbstractRule__ValueAlternatives_0_2_0_0(); + pushFollow(FOLLOW_rule__AbstractRule__ValueAlternatives_2_1_0_in_rule__AbstractRule__ValueAssignment_2_11250); + rule__AbstractRule__ValueAlternatives_2_1_0(); state._fsp--; } - after(grammarAccess.getAbstractRuleAccess().getValueAlternatives_0_2_0_0()); + after(grammarAccess.getAbstractRuleAccess().getValueAlternatives_2_1_0()); } @@ -1812,33 +1815,29 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__ValueAssignment_0_2_0" + // $ANTLR end "rule__AbstractRule__ValueAssignment_2_1" - // $ANTLR start "rule__AbstractRule__InstanceSpecificationAssignment_0_2_1" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:632:1: rule__AbstractRule__InstanceSpecificationAssignment_0_2_1 : ( ( RULE_ID ) ) ; - public final void rule__AbstractRule__InstanceSpecificationAssignment_0_2_1() throws RecognitionException { + // $ANTLR start "rule__AbstractRule__UndefinedAssignment_2_2" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:616:1: rule__AbstractRule__UndefinedAssignment_2_2 : ( ruleUndefinedRule ) ; + public final void rule__AbstractRule__UndefinedAssignment_2_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:636:1: ( ( ( RULE_ID ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:637:1: ( ( RULE_ID ) ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:637:1: ( ( RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:638:1: ( RULE_ID ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:620:1: ( ( ruleUndefinedRule ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:621:1: ( ruleUndefinedRule ) { - before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:639:1: ( RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:640:1: RULE_ID + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:621:1: ( ruleUndefinedRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:622:1: ruleUndefinedRule { - before(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1()); - match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__AbstractRule__InstanceSpecificationAssignment_0_2_11304); - after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1()); + before(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_2_2_0()); + pushFollow(FOLLOW_ruleUndefinedRule_in_rule__AbstractRule__UndefinedAssignment_2_21283); + ruleUndefinedRule(); - } + state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0()); + after(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_2_2_0()); } @@ -1857,29 +1856,35 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__InstanceSpecificationAssignment_0_2_1" + // $ANTLR end "rule__AbstractRule__UndefinedAssignment_2_2" - // $ANTLR start "rule__AbstractRule__UndefinedAssignment_1" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:651:1: rule__AbstractRule__UndefinedAssignment_1 : ( ruleUndefinedRule ) ; - public final void rule__AbstractRule__UndefinedAssignment_1() throws RecognitionException { + // $ANTLR start "rule__LiteralBooleanRule__ValueAssignment" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:631:1: rule__LiteralBooleanRule__ValueAssignment : ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) ; + public final void rule__LiteralBooleanRule__ValueAssignment() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:655:1: ( ( ruleUndefinedRule ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:656:1: ( ruleUndefinedRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:635:1: ( ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:636:1: ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:656:1: ( ruleUndefinedRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:657:1: ruleUndefinedRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:636:1: ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:637:1: ( rule__LiteralBooleanRule__ValueAlternatives_0 ) { - before(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_1_0()); - pushFollow(FOLLOW_ruleUndefinedRule_in_rule__AbstractRule__UndefinedAssignment_11339); - ruleUndefinedRule(); + before(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:638:1: ( rule__LiteralBooleanRule__ValueAlternatives_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:638:2: rule__LiteralBooleanRule__ValueAlternatives_0 + { + pushFollow(FOLLOW_rule__LiteralBooleanRule__ValueAlternatives_0_in_rule__LiteralBooleanRule__ValueAssignment1314); + rule__LiteralBooleanRule__ValueAlternatives_0(); state._fsp--; - after(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_1_0()); + + } + + after(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); } @@ -1898,35 +1903,35 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__AbstractRule__UndefinedAssignment_1" + // $ANTLR end "rule__LiteralBooleanRule__ValueAssignment" - // $ANTLR start "rule__LiteralBooleanRule__ValueAssignment" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:666:1: rule__LiteralBooleanRule__ValueAssignment : ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) ; - public final void rule__LiteralBooleanRule__ValueAssignment() throws RecognitionException { + // $ANTLR start "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:647:1: rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0 : ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 ) ) ; + public final void rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:670:1: ( ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:671:1: ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:651:1: ( ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:652:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:671:1: ( ( rule__LiteralBooleanRule__ValueAlternatives_0 ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:672:1: ( rule__LiteralBooleanRule__ValueAlternatives_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:652:1: ( ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:653:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 ) { - before(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:673:1: ( rule__LiteralBooleanRule__ValueAlternatives_0 ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:673:2: rule__LiteralBooleanRule__ValueAlternatives_0 + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAlternatives_0_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:654:1: ( rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:654:2: rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0 { - pushFollow(FOLLOW_rule__LiteralBooleanRule__ValueAlternatives_0_in_rule__LiteralBooleanRule__ValueAssignment1370); - rule__LiteralBooleanRule__ValueAlternatives_0(); + pushFollow(FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_01347); + rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0(); state._fsp--; } - after(grammarAccess.getLiteralBooleanRuleAccess().getValueAlternatives_0()); + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueAlternatives_0_0()); } @@ -1945,25 +1950,33 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__LiteralBooleanRule__ValueAssignment" + // $ANTLR end "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0" - // $ANTLR start "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:682:1: rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment : ( RULE_VALUE_SPECIFICATION_INT ) ; - public final void rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment() throws RecognitionException { + // $ANTLR start "rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1" + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:663:1: rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1 : ( ( '*' ) ) ; + public final void rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:686:1: ( ( RULE_VALUE_SPECIFICATION_INT ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:687:1: ( RULE_VALUE_SPECIFICATION_INT ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:667:1: ( ( ( '*' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:668:1: ( ( '*' ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:668:1: ( ( '*' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:669:1: ( '*' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:687:1: ( RULE_VALUE_SPECIFICATION_INT ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:688:1: RULE_VALUE_SPECIFICATION_INT + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:670:1: ( '*' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:671:1: '*' { - before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0()); - match(input,RULE_VALUE_SPECIFICATION_INT,FOLLOW_RULE_VALUE_SPECIFICATION_INT_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment1403); - after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0()); + before(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); + match(input,16,FOLLOW_16_in_rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_11385); + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); + + } + + after(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); } @@ -1982,24 +1995,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent } return ; } - // $ANTLR end "rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment" + // $ANTLR end "rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1" // $ANTLR start "rule__LiteralRealRule__ValueAssignment" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:697:1: rule__LiteralRealRule__ValueAssignment : ( RULE_VALUE_SPECIFICATION_DOUBLE ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:686:1: rule__LiteralRealRule__ValueAssignment : ( RULE_VALUE_SPECIFICATION_DOUBLE ) ; public final void rule__LiteralRealRule__ValueAssignment() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:701:1: ( ( RULE_VALUE_SPECIFICATION_DOUBLE ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:702:1: ( RULE_VALUE_SPECIFICATION_DOUBLE ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:690:1: ( ( RULE_VALUE_SPECIFICATION_DOUBLE ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:691:1: ( RULE_VALUE_SPECIFICATION_DOUBLE ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:702:1: ( RULE_VALUE_SPECIFICATION_DOUBLE ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:703:1: RULE_VALUE_SPECIFICATION_DOUBLE + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:691:1: ( RULE_VALUE_SPECIFICATION_DOUBLE ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:692:1: RULE_VALUE_SPECIFICATION_DOUBLE { before(grammarAccess.getLiteralRealRuleAccess().getValueVALUE_SPECIFICATION_DOUBLETerminalRuleCall_0()); - match(input,RULE_VALUE_SPECIFICATION_DOUBLE,FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_rule__LiteralRealRule__ValueAssignment1434); + match(input,RULE_VALUE_SPECIFICATION_DOUBLE,FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_rule__LiteralRealRule__ValueAssignment1424); after(grammarAccess.getLiteralRealRuleAccess().getValueVALUE_SPECIFICATION_DOUBLETerminalRuleCall_0()); } @@ -2023,24 +2036,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__LiteralNullRule__ValueAssignment" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:712:1: rule__LiteralNullRule__ValueAssignment : ( ( 'null' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:701:1: rule__LiteralNullRule__ValueAssignment : ( ( 'null' ) ) ; public final void rule__LiteralNullRule__ValueAssignment() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:716:1: ( ( ( 'null' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:717:1: ( ( 'null' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:705:1: ( ( ( 'null' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:706:1: ( ( 'null' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:717:1: ( ( 'null' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:718:1: ( 'null' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:706:1: ( ( 'null' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:707:1: ( 'null' ) { before(grammarAccess.getLiteralNullRuleAccess().getValueNullKeyword_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:719:1: ( 'null' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:720:1: 'null' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:708:1: ( 'null' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:709:1: 'null' { before(grammarAccess.getLiteralNullRuleAccess().getValueNullKeyword_0()); - match(input,18,FOLLOW_18_in_rule__LiteralNullRule__ValueAssignment1470); + match(input,17,FOLLOW_17_in_rule__LiteralNullRule__ValueAssignment1460); after(grammarAccess.getLiteralNullRuleAccess().getValueNullKeyword_0()); } @@ -2068,21 +2081,21 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__LiteralStringRule__ValueAssignment" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:735:1: rule__LiteralStringRule__ValueAssignment : ( RULE_VALUE_SPECIFICATION_STRING ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:724:1: rule__LiteralStringRule__ValueAssignment : ( RULE_STRING ) ; public final void rule__LiteralStringRule__ValueAssignment() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:739:1: ( ( RULE_VALUE_SPECIFICATION_STRING ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:740:1: ( RULE_VALUE_SPECIFICATION_STRING ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:728:1: ( ( RULE_STRING ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:729:1: ( RULE_STRING ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:740:1: ( RULE_VALUE_SPECIFICATION_STRING ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:741:1: RULE_VALUE_SPECIFICATION_STRING + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:729:1: ( RULE_STRING ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:730:1: RULE_STRING { - before(grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0()); - match(input,RULE_VALUE_SPECIFICATION_STRING,FOLLOW_RULE_VALUE_SPECIFICATION_STRING_in_rule__LiteralStringRule__ValueAssignment1509); - after(grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0()); + before(grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0()); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__LiteralStringRule__ValueAssignment1499); + after(grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0()); } @@ -2105,24 +2118,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__UndefinedRule__ValueAssignment" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:750:1: rule__UndefinedRule__ValueAssignment : ( ( '<Undefined>' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:739:1: rule__UndefinedRule__ValueAssignment : ( ( '<Undefined>' ) ) ; public final void rule__UndefinedRule__ValueAssignment() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:754:1: ( ( ( '<Undefined>' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:755:1: ( ( '<Undefined>' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:743:1: ( ( ( '<Undefined>' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:744:1: ( ( '<Undefined>' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:755:1: ( ( '<Undefined>' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:756:1: ( '<Undefined>' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:744:1: ( ( '<Undefined>' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:745:1: ( '<Undefined>' ) { before(grammarAccess.getUndefinedRuleAccess().getValueUndefinedKeyword_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:757:1: ( '<Undefined>' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:758:1: '<Undefined>' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:746:1: ( '<Undefined>' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:747:1: '<Undefined>' { before(grammarAccess.getUndefinedRuleAccess().getValueUndefinedKeyword_0()); - match(input,19,FOLLOW_19_in_rule__UndefinedRule__ValueAssignment1545); + match(input,18,FOLLOW_18_in_rule__UndefinedRule__ValueAssignment1535); after(grammarAccess.getUndefinedRuleAccess().getValueUndefinedKeyword_0()); } @@ -2150,24 +2163,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__VisibilityKind__PublicAssignment_0" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:773:1: rule__VisibilityKind__PublicAssignment_0 : ( ( '+' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:762:1: rule__VisibilityKind__PublicAssignment_0 : ( ( '+' ) ) ; public final void rule__VisibilityKind__PublicAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:777:1: ( ( ( '+' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:778:1: ( ( '+' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:766:1: ( ( ( '+' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:767:1: ( ( '+' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:778:1: ( ( '+' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:779:1: ( '+' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:767:1: ( ( '+' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:768:1: ( '+' ) { before(grammarAccess.getVisibilityKindAccess().getPublicPlusSignKeyword_0_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:780:1: ( '+' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:781:1: '+' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:769:1: ( '+' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:770:1: '+' { before(grammarAccess.getVisibilityKindAccess().getPublicPlusSignKeyword_0_0()); - match(input,20,FOLLOW_20_in_rule__VisibilityKind__PublicAssignment_01589); + match(input,19,FOLLOW_19_in_rule__VisibilityKind__PublicAssignment_01579); after(grammarAccess.getVisibilityKindAccess().getPublicPlusSignKeyword_0_0()); } @@ -2195,24 +2208,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__VisibilityKind__PrivateAssignment_1" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:796:1: rule__VisibilityKind__PrivateAssignment_1 : ( ( '-' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:785:1: rule__VisibilityKind__PrivateAssignment_1 : ( ( '-' ) ) ; public final void rule__VisibilityKind__PrivateAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:800:1: ( ( ( '-' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:801:1: ( ( '-' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:789:1: ( ( ( '-' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:790:1: ( ( '-' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:801:1: ( ( '-' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:802:1: ( '-' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:790:1: ( ( '-' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:791:1: ( '-' ) { before(grammarAccess.getVisibilityKindAccess().getPrivateHyphenMinusKeyword_1_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:803:1: ( '-' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:804:1: '-' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:792:1: ( '-' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:793:1: '-' { before(grammarAccess.getVisibilityKindAccess().getPrivateHyphenMinusKeyword_1_0()); - match(input,21,FOLLOW_21_in_rule__VisibilityKind__PrivateAssignment_11633); + match(input,20,FOLLOW_20_in_rule__VisibilityKind__PrivateAssignment_11623); after(grammarAccess.getVisibilityKindAccess().getPrivateHyphenMinusKeyword_1_0()); } @@ -2240,24 +2253,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__VisibilityKind__ProtectedAssignment_2" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:819:1: rule__VisibilityKind__ProtectedAssignment_2 : ( ( '#' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:808:1: rule__VisibilityKind__ProtectedAssignment_2 : ( ( '#' ) ) ; public final void rule__VisibilityKind__ProtectedAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:823:1: ( ( ( '#' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:824:1: ( ( '#' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:812:1: ( ( ( '#' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:813:1: ( ( '#' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:824:1: ( ( '#' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:825:1: ( '#' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:813:1: ( ( '#' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:814:1: ( '#' ) { before(grammarAccess.getVisibilityKindAccess().getProtectedNumberSignKeyword_2_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:826:1: ( '#' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:827:1: '#' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:815:1: ( '#' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:816:1: '#' { before(grammarAccess.getVisibilityKindAccess().getProtectedNumberSignKeyword_2_0()); - match(input,22,FOLLOW_22_in_rule__VisibilityKind__ProtectedAssignment_21677); + match(input,21,FOLLOW_21_in_rule__VisibilityKind__ProtectedAssignment_21667); after(grammarAccess.getVisibilityKindAccess().getProtectedNumberSignKeyword_2_0()); } @@ -2285,24 +2298,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent // $ANTLR start "rule__VisibilityKind__PackageAssignment_3" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:842:1: rule__VisibilityKind__PackageAssignment_3 : ( ( '~' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:831:1: rule__VisibilityKind__PackageAssignment_3 : ( ( '~' ) ) ; public final void rule__VisibilityKind__PackageAssignment_3() throws RecognitionException { int stackSize = keepStackSize(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:846:1: ( ( ( '~' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:847:1: ( ( '~' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:835:1: ( ( ( '~' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:836:1: ( ( '~' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:847:1: ( ( '~' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:848:1: ( '~' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:836:1: ( ( '~' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:837:1: ( '~' ) { before(grammarAccess.getVisibilityKindAccess().getPackageTildeKeyword_3_0()); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:849:1: ( '~' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:850:1: '~' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:838:1: ( '~' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/ui/contentassist/antlr/internal/InternalUmlValueSpecification.g:839:1: '~' { before(grammarAccess.getVisibilityKindAccess().getPackageTildeKeyword_3_0()); - match(input,23,FOLLOW_23_in_rule__VisibilityKind__PackageAssignment_31721); + match(input,22,FOLLOW_22_in_rule__VisibilityKind__PackageAssignment_31711); after(grammarAccess.getVisibilityKindAccess().getPackageTildeKeyword_3_0()); } @@ -2335,13 +2348,13 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent public static final BitSet FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule61 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAbstractRule68 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Alternatives_in_ruleAbstractRule94 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__Group__0_in_ruleAbstractRule94 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_entryRuleLiteralBooleanRule121 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleLiteralBooleanRule128 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__LiteralBooleanRule__ValueAssignment_in_ruleLiteralBooleanRule154 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule181 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule188 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_in_ruleLiteralIntegerOrUnlimitedNaturalRule214 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives_in_ruleLiteralIntegerOrUnlimitedNaturalRule214 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleLiteralRealRule_in_entryRuleLiteralRealRule241 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleLiteralRealRule248 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__LiteralRealRule__ValueAssignment_in_ruleLiteralRealRule274 = new BitSet(new long[]{0x0000000000000002L}); @@ -2357,48 +2370,47 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalContent public static final BitSet FOLLOW_ruleVisibilityKind_in_entryRuleVisibilityKind481 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleVisibilityKind488 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind514 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0__0_in_rule__AbstractRule__Alternatives550 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__UndefinedAssignment_1_in_rule__AbstractRule__Alternatives568 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__ValueAssignment_0_2_0_in_rule__AbstractRule__Alternatives_0_2601 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__InstanceSpecificationAssignment_0_2_1_in_rule__AbstractRule__Alternatives_0_2619 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0652 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0669 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralRealRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0686 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralNullRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0703 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralStringRule_in_rule__AbstractRule__ValueAlternatives_0_2_0_0720 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_15_in_rule__LiteralBooleanRule__ValueAlternatives_0753 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_16_in_rule__LiteralBooleanRule__ValueAlternatives_0773 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__VisibilityKind__PublicAssignment_0_in_rule__VisibilityKind__Alternatives807 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__VisibilityKind__PrivateAssignment_1_in_rule__VisibilityKind__Alternatives825 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__VisibilityKind__ProtectedAssignment_2_in_rule__VisibilityKind__Alternatives843 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__VisibilityKind__PackageAssignment_3_in_rule__VisibilityKind__Alternatives861 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0__0__Impl_in_rule__AbstractRule__Group_0__0892 = new BitSet(new long[]{0x00000000000581F0L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0__1_in_rule__AbstractRule__Group_0__0895 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__VisibilityAssignment_0_0_in_rule__AbstractRule__Group_0__0__Impl922 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0__1__Impl_in_rule__AbstractRule__Group_0__1953 = new BitSet(new long[]{0x00000000000581F0L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0__2_in_rule__AbstractRule__Group_0__1956 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0_1__0_in_rule__AbstractRule__Group_0__1__Impl983 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0__2__Impl_in_rule__AbstractRule__Group_0__21014 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Alternatives_0_2_in_rule__AbstractRule__Group_0__2__Impl1041 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0_1__0__Impl_in_rule__AbstractRule__Group_0_1__01077 = new BitSet(new long[]{0x0000000000020000L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0_1__1_in_rule__AbstractRule__Group_0_1__01080 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__NameAssignment_0_1_0_in_rule__AbstractRule__Group_0_1__0__Impl1107 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__Group_0_1__1__Impl_in_rule__AbstractRule__Group_0_1__11137 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_rule__AbstractRule__Group_0_1__1__Impl1165 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__AbstractRule__VisibilityAssignment_0_01205 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_rule__AbstractRule__NameAssignment_0_1_01236 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__AbstractRule__ValueAlternatives_0_2_0_0_in_rule__AbstractRule__ValueAssignment_0_2_01267 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_rule__AbstractRule__InstanceSpecificationAssignment_0_2_11304 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUndefinedRule_in_rule__AbstractRule__UndefinedAssignment_11339 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rule__LiteralBooleanRule__ValueAlternatives_0_in_rule__LiteralBooleanRule__ValueAssignment1370 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_INT_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment1403 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_rule__LiteralRealRule__ValueAssignment1434 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_rule__LiteralNullRule__ValueAssignment1470 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_STRING_in_rule__LiteralStringRule__ValueAssignment1509 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_19_in_rule__UndefinedRule__ValueAssignment1545 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_20_in_rule__VisibilityKind__PublicAssignment_01589 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_21_in_rule__VisibilityKind__PrivateAssignment_11633 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_rule__VisibilityKind__ProtectedAssignment_21677 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_23_in_rule__VisibilityKind__PackageAssignment_31721 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__InstanceSpecificationAssignment_2_0_in_rule__AbstractRule__Alternatives_2550 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__ValueAssignment_2_1_in_rule__AbstractRule__Alternatives_2568 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__UndefinedAssignment_2_2_in_rule__AbstractRule__Alternatives_2586 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_rule__AbstractRule__ValueAlternatives_2_1_0619 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_rule__AbstractRule__ValueAlternatives_2_1_0636 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralRealRule_in_rule__AbstractRule__ValueAlternatives_2_1_0653 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralNullRule_in_rule__AbstractRule__ValueAlternatives_2_1_0670 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralStringRule_in_rule__AbstractRule__ValueAlternatives_2_1_0687 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_rule__LiteralBooleanRule__ValueAlternatives_0720 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_rule__LiteralBooleanRule__ValueAlternatives_0740 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_0_in_rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives774 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_1_in_rule__LiteralIntegerOrUnlimitedNaturalRule__Alternatives792 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0825 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_NEGATIVE_INT_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0842 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__VisibilityKind__PublicAssignment_0_in_rule__VisibilityKind__Alternatives874 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__VisibilityKind__PrivateAssignment_1_in_rule__VisibilityKind__Alternatives892 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__VisibilityKind__ProtectedAssignment_2_in_rule__VisibilityKind__Alternatives910 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__VisibilityKind__PackageAssignment_3_in_rule__VisibilityKind__Alternatives928 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__Group__0__Impl_in_rule__AbstractRule__Group__0959 = new BitSet(new long[]{0x000000000007C3F0L}); + public static final BitSet FOLLOW_rule__AbstractRule__Group__1_in_rule__AbstractRule__Group__0962 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__VisibilityAssignment_0_in_rule__AbstractRule__Group__0__Impl989 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__Group__1__Impl_in_rule__AbstractRule__Group__11020 = new BitSet(new long[]{0x000000000007C3F0L}); + public static final BitSet FOLLOW_rule__AbstractRule__Group__2_in_rule__AbstractRule__Group__11023 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__NameAssignment_1_in_rule__AbstractRule__Group__1__Impl1050 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__Group__2__Impl_in_rule__AbstractRule__Group__21081 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__Alternatives_2_in_rule__AbstractRule__Group__2__Impl1108 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__AbstractRule__VisibilityAssignment_01149 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_rule__AbstractRule__NameAssignment_11180 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_rule__AbstractRule__InstanceSpecificationAssignment_2_01215 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__AbstractRule__ValueAlternatives_2_1_0_in_rule__AbstractRule__ValueAssignment_2_11250 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUndefinedRule_in_rule__AbstractRule__UndefinedAssignment_2_21283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LiteralBooleanRule__ValueAlternatives_0_in_rule__LiteralBooleanRule__ValueAssignment1314 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAlternatives_0_0_in_rule__LiteralIntegerOrUnlimitedNaturalRule__ValueAssignment_01347 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_16_in_rule__LiteralIntegerOrUnlimitedNaturalRule__UnlimitedAssignment_11385 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_rule__LiteralRealRule__ValueAssignment1424 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_rule__LiteralNullRule__ValueAssignment1460 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_STRING_in_rule__LiteralStringRule__ValueAssignment1499 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_rule__UndefinedRule__ValueAssignment1535 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_rule__VisibilityKind__PublicAssignment_01579 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_20_in_rule__VisibilityKind__PrivateAssignment_11623 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_21_in_rule__VisibilityKind__ProtectedAssignment_21667 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_rule__VisibilityKind__PackageAssignment_31711 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java index bec4511e61b..c7be4974bf8 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/utils/commands/ValueSpecificationSetCommand.java @@ -67,11 +67,6 @@ import com.google.inject.Injector; public class ValueSpecificationSetCommand { /** - * The unlimited value for the LiteralunlimitedNatural - */ - private static final String UNLIMITED = "*"; //$NON-NLS-1$ - - /** * The instance of the class. */ private static ValueSpecificationSetCommand instance = new ValueSpecificationSetCommand(); @@ -382,7 +377,7 @@ public class ValueSpecificationSetCommand { // Check that the value is upper than 0 and the type of the // parent is a integer - if (integerValue.getValue().equals(UNLIMITED)) { + if (null != integerValue.getUnlimited()) { // Create a literal unlimited natural createdValueSpecification = UMLFactory.eINSTANCE .createLiteralUnlimitedNatural(); @@ -392,7 +387,7 @@ public class ValueSpecificationSetCommand { .setValue(-1); created = true; } else { - int intValue = Integer.parseInt(integerValue.getValue()); + int intValue = integerValue.getValue(); if (0 <= intValue && isTypeNeeeded( objectToEdit, UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL)) { @@ -497,8 +492,8 @@ public class ValueSpecificationSetCommand { } // Set the name if it was created - if (null != abstractRule.getName()) { - createdValueSpecification.setName(abstractRule.getName()); + if (null != getName(abstractRule)) { + createdValueSpecification.setName(getName(abstractRule)); } } @@ -548,9 +543,9 @@ public class ValueSpecificationSetCommand { } // Set the name if it was created - if (null != abstractRule.getName()) { + if (null != getName(abstractRule)) { // Set the name by command - final ICommand setNameCommand = createSetNameCommand(valueSpecification, abstractRule.getName()); + final ICommand setNameCommand = createSetNameCommand(valueSpecification, getName(abstractRule)); if (null != setNameCommand && setNameCommand.canExecute()) { setAttributesCommand.add(setNameCommand); @@ -637,19 +632,18 @@ public class ValueSpecificationSetCommand { if (valueSpecification instanceof LiteralBoolean && xtextValue instanceof LiteralBooleanRule) { request = new SetRequest(valueSpecification, UMLPackage.Literals.LITERAL_BOOLEAN__VALUE, Boolean.parseBoolean(((LiteralBooleanRule) xtextValue).getValue())); - } else if (valueSpecification instanceof LiteralInteger && xtextValue instanceof LiteralIntegerOrUnlimitedNaturalRule) { - request = new SetRequest(valueSpecification, - UMLPackage.Literals.LITERAL_INTEGER__VALUE, ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getValue()); + } else if (valueSpecification instanceof LiteralInteger && xtextValue instanceof LiteralIntegerOrUnlimitedNaturalRule && null == ((LiteralIntegerOrUnlimitedNaturalRule)xtextValue).getUnlimited()) { + request = new SetRequest(valueSpecification, + UMLPackage.Literals.LITERAL_INTEGER__VALUE, ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getValue()); } else if (valueSpecification instanceof LiteralUnlimitedNatural && xtextValue instanceof LiteralIntegerOrUnlimitedNaturalRule) { - final String stringValue = ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getValue(); - int intValue = 0; - if (UNLIMITED.equals(stringValue)) { - intValue = -1; - } else { - intValue = Integer.parseInt(stringValue); - } - request = new SetRequest(valueSpecification, - UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL__VALUE, intValue); + int intValue = 0; + if (null != ((LiteralIntegerOrUnlimitedNaturalRule)xtextValue).getUnlimited()) { + intValue = -1; + } else { + intValue = ((LiteralIntegerOrUnlimitedNaturalRule)xtextValue).getValue(); + } + request = new SetRequest(valueSpecification, + UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL__VALUE, intValue); } else if (valueSpecification instanceof LiteralReal && xtextValue instanceof LiteralRealRule) { request = new SetRequest(valueSpecification, UMLPackage.Literals.LITERAL_REAL__VALUE, ((LiteralRealRule) xtextValue).getValue()); @@ -863,13 +857,13 @@ public class ValueSpecificationSetCommand { if (initialValueSpecification instanceof LiteralBoolean && xtextValue instanceof LiteralBooleanRule && isTypeNeeeded(objectToEdit, UMLPackage.Literals.LITERAL_BOOLEAN)) { result = (LiteralBoolean) initialValueSpecification; } else if (initialValueSpecification instanceof LiteralInteger && xtextValue instanceof LiteralIntegerOrUnlimitedNaturalRule && isTypeNeeeded(objectToEdit, UMLPackage.Literals.LITERAL_INTEGER)) { - if (!UNLIMITED.equals(((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getValue())) { + if (null != ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getUnlimited()) { result = (LiteralInteger) initialValueSpecification; } } else if (initialValueSpecification instanceof LiteralUnlimitedNatural && xtextValue instanceof LiteralIntegerOrUnlimitedNaturalRule && isTypeNeeeded(objectToEdit, UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL)) { // Check that the value if positive for the unlimited natural type - final String value = ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getValue(); - if (UNLIMITED.equals(value) || Integer.parseInt(value) >= 0) { + + if (null != ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getUnlimited() || 0 <= ((LiteralIntegerOrUnlimitedNaturalRule) xtextValue).getValue()) { result = (LiteralUnlimitedNatural) initialValueSpecification; } } else if (initialValueSpecification instanceof LiteralReal && xtextValue instanceof LiteralRealRule && isTypeNeeeded(objectToEdit, UMLPackage.Literals.LITERAL_REAL)) { @@ -883,4 +877,15 @@ public class ValueSpecificationSetCommand { } return result; } + + /** + * Get the name from the abstractRule. + * + * @param abstractRule + * The abstract rule. + * @return The string corresponding to the name. + */ + protected String getName(final AbstractRule abstractRule) { + return null == abstractRule.getName() ? null : abstractRule.getName().substring(0, abstractRule.getName().length() - 1); + } } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.ecore b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.ecore index 74b49109018..3704492c926 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.ecore +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.ecore @@ -6,10 +6,10 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="visibility" eType="#//VisibilityKind" containment="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject" - containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="instanceSpecification" eType="ecore:EClass platform:/resource/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject" + containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="undefined" eType="#//UndefinedRule" containment="true"/> </eClassifiers> @@ -17,7 +17,8 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="LiteralIntegerOrUnlimitedNaturalRule"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="unlimited" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="LiteralRealRule"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.genmodel b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.genmodel index 8d4f06065bb..6ef6096771c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.genmodel +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.genmodel @@ -13,8 +13,8 @@ <genClasses ecoreClass="UmlValueSpecification.ecore#//AbstractRule"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlValueSpecification.ecore#//AbstractRule/visibility"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlValueSpecification.ecore#//AbstractRule/name"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlValueSpecification.ecore#//AbstractRule/value"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlValueSpecification.ecore#//AbstractRule/instanceSpecification"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlValueSpecification.ecore#//AbstractRule/value"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlValueSpecification.ecore#//AbstractRule/undefined"/> </genClasses> <genClasses ecoreClass="UmlValueSpecification.ecore#//LiteralBooleanRule"> @@ -22,6 +22,7 @@ </genClasses> <genClasses ecoreClass="UmlValueSpecification.ecore#//LiteralIntegerOrUnlimitedNaturalRule"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlValueSpecification.ecore#//LiteralIntegerOrUnlimitedNaturalRule/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlValueSpecification.ecore#//LiteralIntegerOrUnlimitedNaturalRule/unlimited"/> </genClasses> <genClasses ecoreClass="UmlValueSpecification.ecore#//LiteralRealRule"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlValueSpecification.ecore#//LiteralRealRule/value"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtextbin b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtextbin Binary files differindex 4bb6bcd1ec0..e6a7941e2e8 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtextbin +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtextbin diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g index 02e6bb24fa0..d0b0f385861 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g @@ -77,10 +77,10 @@ ruleAbstractRule returns [EObject current=null] @init { enterRule(); } @after { leaveRule(); }: -((( +(( ( { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0_0()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0()); } lv_visibility_0_0=ruleVisibilityKind { if ($current==null) { @@ -95,11 +95,11 @@ ruleAbstractRule returns [EObject current=null] } ) -)?(( +)?( ( lv_name_1_0=RULE_VALUE_SPECIFICATION_ID { - newLeafNode(lv_name_1_0, grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0()); + newLeafNode(lv_name_1_0, grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0()); } { if ($current==null) { @@ -113,15 +113,25 @@ ruleAbstractRule returns [EObject current=null] } ) -) otherlv_2='=' - { - newLeafNode(otherlv_2, grammarAccess.getAbstractRuleAccess().getEqualsSignKeyword_0_1_1()); - } )?(( ( + { + if ($current==null) { + $current = createModelElement(grammarAccess.getAbstractRuleRule()); + } + } + otherlv_2=RULE_ID + { + newLeafNode(otherlv_2, grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0()); + } + +) +) + |( +( ( { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_2_1_0_0()); } lv_value_3_1=ruleLiteralBooleanRule { if ($current==null) { @@ -136,7 +146,7 @@ ruleAbstractRule returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1()); } lv_value_3_2=ruleLiteralIntegerOrUnlimitedNaturalRule { if ($current==null) { @@ -151,7 +161,7 @@ ruleAbstractRule returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_0_2_0_0_2()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_2_1_0_2()); } lv_value_3_3=ruleLiteralRealRule { if ($current==null) { @@ -166,7 +176,7 @@ ruleAbstractRule returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_0_2_0_0_3()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_2_1_0_3()); } lv_value_3_4=ruleLiteralNullRule { if ($current==null) { @@ -181,7 +191,7 @@ ruleAbstractRule returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_0_2_0_0_4()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_2_1_0_4()); } lv_value_3_5=ruleLiteralStringRule { if ($current==null) { @@ -201,37 +211,23 @@ ruleAbstractRule returns [EObject current=null] ) |( ( - { - if ($current==null) { - $current = createModelElement(grammarAccess.getAbstractRuleRule()); - } - } - otherlv_4=RULE_ID - { - newLeafNode(otherlv_4, grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0()); - } - -) -))) - |( -( { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_1_0()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_2_2_0()); } - lv_undefined_5_0=ruleUndefinedRule { + lv_undefined_4_0=ruleUndefinedRule { if ($current==null) { $current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); } set( $current, "undefined", - lv_undefined_5_0, + lv_undefined_4_0, "UndefinedRule"); afterParserOrEnumRuleCall(); } ) -)) +))) ; @@ -303,11 +299,12 @@ ruleLiteralIntegerOrUnlimitedNaturalRule returns [EObject current=null] @init { enterRule(); } @after { leaveRule(); }: +(( ( ( - lv_value_0_0=RULE_VALUE_SPECIFICATION_INT + lv_value_0_1=RULE_INT { - newLeafNode(lv_value_0_0, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0()); + newLeafNode(lv_value_0_1, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueINTTerminalRuleCall_0_0_0()); } { if ($current==null) { @@ -316,12 +313,45 @@ ruleLiteralIntegerOrUnlimitedNaturalRule returns [EObject current=null] setWithLastConsumed( $current, "value", - lv_value_0_0, - "VALUE_SPECIFICATION_INT"); + lv_value_0_1, + "INT"); } + | lv_value_0_2=RULE_VALUE_SPECIFICATION_NEGATIVE_INT + { + newLeafNode(lv_value_0_2, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1()); + } + { + if ($current==null) { + $current = createModelElement(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); + } + setWithLastConsumed( + $current, + "value", + lv_value_0_2, + "VALUE_SPECIFICATION_NEGATIVE_INT"); + } + +) + ) ) + |( +( + lv_unlimited_1_0= '*' + { + newLeafNode(lv_unlimited_1_0, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); + } + + { + if ($current==null) { + $current = createModelElement(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); + } + setWithLastConsumed($current, "unlimited", lv_unlimited_1_0, "*"); + } + +) +)) ; @@ -419,9 +449,9 @@ ruleLiteralStringRule returns [EObject current=null] @after { leaveRule(); }: ( ( - lv_value_0_0=RULE_VALUE_SPECIFICATION_STRING + lv_value_0_0=RULE_STRING { - newLeafNode(lv_value_0_0, grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0()); + newLeafNode(lv_value_0_0, grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0()); } { if ($current==null) { @@ -431,7 +461,7 @@ ruleLiteralStringRule returns [EObject current=null] $current, "value", lv_value_0_0, - "VALUE_SPECIFICATION_STRING"); + "STRING"); } ) @@ -562,13 +592,11 @@ ruleVisibilityKind returns [EObject current=null] -RULE_VALUE_SPECIFICATION_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; - -RULE_VALUE_SPECIFICATION_INT : ('-'? ('0'..'9')+|'*'); +RULE_VALUE_SPECIFICATION_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9')* '='; -RULE_VALUE_SPECIFICATION_DOUBLE : '-'? (('0'..'9')+ ('.'|',') ('0'..'9')*|('0'..'9')* ('.'|',') ('0'..'9')+); +RULE_VALUE_SPECIFICATION_NEGATIVE_INT : '-' RULE_INT; -RULE_VALUE_SPECIFICATION_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\''); +RULE_VALUE_SPECIFICATION_DOUBLE : '-'? (RULE_INT ('.'|',') RULE_INT|RULE_INT ('.'|',')|('.'|',') RULE_INT); RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.tokens b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.tokens index b3b14143c10..2ec3293ad55 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.tokens +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.tokens @@ -1,23 +1,23 @@ -'#'=22 -'+'=20 -'-'=21 -'<Undefined>'=19 -'='=15 -'false'=17 -'null'=18 -'true'=16 -'~'=23 -RULE_ANY_OTHER=14 +'#'=21 +'*'=16 +'+'=19 +'-'=20 +'<Undefined>'=18 +'false'=15 +'null'=17 +'true'=14 +'~'=22 +RULE_ANY_OTHER=13 RULE_ID=5 -RULE_INT=9 -RULE_ML_COMMENT=11 -RULE_SL_COMMENT=12 -RULE_STRING=10 -RULE_VALUE_SPECIFICATION_DOUBLE=7 +RULE_INT=6 +RULE_ML_COMMENT=10 +RULE_SL_COMMENT=11 +RULE_STRING=9 +RULE_VALUE_SPECIFICATION_DOUBLE=8 RULE_VALUE_SPECIFICATION_ID=4 -RULE_VALUE_SPECIFICATION_INT=6 -RULE_VALUE_SPECIFICATION_STRING=8 -RULE_WS=13 +RULE_VALUE_SPECIFICATION_NEGATIVE_INT=7 +RULE_WS=12 +T__14=14 T__15=15 T__16=16 T__17=17 @@ -26,4 +26,3 @@ T__19=19 T__20=20 T__21=21 T__22=22 -T__23=23 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationLexer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationLexer.java index 4a38c1e7751..2a08a6b085e 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationLexer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationLexer.java @@ -13,26 +13,25 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalUmlValueSpecificationLexer extends Lexer { public static final int RULE_ID=5; - public static final int RULE_VALUE_SPECIFICATION_DOUBLE=7; - public static final int T__23=23; + public static final int RULE_VALUE_SPECIFICATION_DOUBLE=8; public static final int T__22=22; - public static final int RULE_ANY_OTHER=14; + public static final int RULE_ANY_OTHER=13; public static final int T__21=21; public static final int T__20=20; - public static final int RULE_VALUE_SPECIFICATION_INT=6; public static final int EOF=-1; - public static final int RULE_SL_COMMENT=12; - public static final int RULE_ML_COMMENT=11; + public static final int RULE_SL_COMMENT=11; + public static final int RULE_ML_COMMENT=10; public static final int T__19=19; - public static final int RULE_STRING=10; + public static final int RULE_STRING=9; public static final int T__16=16; public static final int T__15=15; public static final int T__18=18; public static final int T__17=17; - public static final int RULE_VALUE_SPECIFICATION_STRING=8; - public static final int RULE_INT=9; + public static final int T__14=14; + public static final int RULE_INT=6; public static final int RULE_VALUE_SPECIFICATION_ID=4; - public static final int RULE_WS=13; + public static final int RULE_WS=12; + public static final int RULE_VALUE_SPECIFICATION_NEGATIVE_INT=7; // delegates // delegators @@ -47,15 +46,37 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } public String getGrammarFileName() { return "../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g"; } + // $ANTLR start "T__14" + public final void mT__14() throws RecognitionException { + try { + int _type = T__14; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:11:7: ( 'true' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:11:9: 'true' + { + match("true"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__14" + // $ANTLR start "T__15" public final void mT__15() throws RecognitionException { try { int _type = T__15; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:11:7: ( '=' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:11:9: '=' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:12:7: ( 'false' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:12:9: 'false' { - match('='); + match("false"); + } @@ -72,11 +93,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:12:7: ( 'true' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:12:9: 'true' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:13:7: ( '*' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:13:9: '*' { - match("true"); - + match('*'); } @@ -93,10 +113,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:13:7: ( 'false' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:13:9: 'false' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:14:7: ( 'null' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:14:9: 'null' { - match("false"); + match("null"); } @@ -114,10 +134,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__18; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:14:7: ( 'null' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:14:9: 'null' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:15:7: ( '<Undefined>' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:15:9: '<Undefined>' { - match("null"); + match("<Undefined>"); } @@ -135,11 +155,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__19; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:15:7: ( '<Undefined>' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:15:9: '<Undefined>' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:16:7: ( '+' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:16:9: '+' { - match("<Undefined>"); - + match('+'); } @@ -156,10 +175,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__20; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:16:7: ( '+' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:16:9: '+' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:17:7: ( '-' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:17:9: '-' { - match('+'); + match('-'); } @@ -176,10 +195,10 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__21; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:17:7: ( '-' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:17:9: '-' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:18:7: ( '#' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:18:9: '#' { - match('-'); + match('#'); } @@ -196,26 +215,6 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = T__22; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:18:7: ( '#' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:18:9: '#' - { - match('#'); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__22" - - // $ANTLR start "T__23" - public final void mT__23() throws RecognitionException { - try { - int _type = T__23; - int _channel = DEFAULT_TOKEN_CHANNEL; // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:19:7: ( '~' ) // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:19:9: '~' { @@ -229,34 +228,16 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "T__23" + // $ANTLR end "T__22" // $ANTLR start "RULE_VALUE_SPECIFICATION_ID" public final void mRULE_VALUE_SPECIFICATION_ID() throws RecognitionException { try { int _type = RULE_VALUE_SPECIFICATION_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:565:29: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:565:31: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:595:29: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* '=' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:595:31: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* '=' { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:565:31: ( '^' )? - int alt1=2; - int LA1_0 = input.LA(1); - - if ( (LA1_0=='^') ) { - alt1=1; - } - switch (alt1) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:565:31: '^' - { - match('^'); - - } - break; - - } - if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -266,22 +247,22 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:565:60: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* - loop2: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:595:55: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* + loop1: do { - int alt2=2; - int LA2_0 = input.LA(1); + int alt1=2; + int LA1_0 = input.LA(1); - if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) { - alt2=1; + if ( (LA1_0=='-'||(LA1_0>='0' && LA1_0<='9')||(LA1_0>='A' && LA1_0<='Z')||LA1_0=='_'||(LA1_0>='a' && LA1_0<='z')) ) { + alt1=1; } - switch (alt2) { + switch (alt1) { case 1 : // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g: { - if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { + if ( input.LA(1)=='-'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); } @@ -295,10 +276,11 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop2; + break loop1; } } while (true); + match('='); } @@ -310,95 +292,16 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } // $ANTLR end "RULE_VALUE_SPECIFICATION_ID" - // $ANTLR start "RULE_VALUE_SPECIFICATION_INT" - public final void mRULE_VALUE_SPECIFICATION_INT() throws RecognitionException { + // $ANTLR start "RULE_VALUE_SPECIFICATION_NEGATIVE_INT" + public final void mRULE_VALUE_SPECIFICATION_NEGATIVE_INT() throws RecognitionException { try { - int _type = RULE_VALUE_SPECIFICATION_INT; + int _type = RULE_VALUE_SPECIFICATION_NEGATIVE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:30: ( ( ( '-' )? ( '0' .. '9' )+ | '*' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:32: ( ( '-' )? ( '0' .. '9' )+ | '*' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:597:39: ( '-' RULE_INT ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:597:41: '-' RULE_INT { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:32: ( ( '-' )? ( '0' .. '9' )+ | '*' ) - int alt5=2; - int LA5_0 = input.LA(1); - - if ( (LA5_0=='-'||(LA5_0>='0' && LA5_0<='9')) ) { - alt5=1; - } - else if ( (LA5_0=='*') ) { - alt5=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 5, 0, input); - - throw nvae; - } - switch (alt5) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:33: ( '-' )? ( '0' .. '9' )+ - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:33: ( '-' )? - int alt3=2; - int LA3_0 = input.LA(1); - - if ( (LA3_0=='-') ) { - alt3=1; - } - switch (alt3) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:33: '-' - { - match('-'); - - } - break; - - } - - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:38: ( '0' .. '9' )+ - int cnt4=0; - loop4: - do { - int alt4=2; - int LA4_0 = input.LA(1); - - if ( ((LA4_0>='0' && LA4_0<='9')) ) { - alt4=1; - } - - - switch (alt4) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:39: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt4 >= 1 ) break loop4; - EarlyExitException eee = - new EarlyExitException(4, input); - throw eee; - } - cnt4++; - } while (true); - - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:567:50: '*' - { - match('*'); - - } - break; - - } - + match('-'); + mRULE_INT(); } @@ -408,26 +311,26 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "RULE_VALUE_SPECIFICATION_INT" + // $ANTLR end "RULE_VALUE_SPECIFICATION_NEGATIVE_INT" // $ANTLR start "RULE_VALUE_SPECIFICATION_DOUBLE" public final void mRULE_VALUE_SPECIFICATION_DOUBLE() throws RecognitionException { try { int _type = RULE_VALUE_SPECIFICATION_DOUBLE; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:33: ( ( '-' )? ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:35: ( '-' )? ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:33: ( ( '-' )? ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:35: ( '-' )? ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:35: ( '-' )? - int alt6=2; - int LA6_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:35: ( '-' )? + int alt2=2; + int LA2_0 = input.LA(1); - if ( (LA6_0=='-') ) { - alt6=1; + if ( (LA2_0=='-') ) { + alt2=1; } - switch (alt6) { + switch (alt2) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:35: '-' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:35: '-' { match('-'); @@ -436,43 +339,14 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:40: ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ ) - int alt11=2; - alt11 = dfa11.predict(input); - switch (alt11) { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:40: ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT ) + int alt3=3; + alt3 = dfa3.predict(input); + switch (alt3) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:41: ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:41: RULE_INT ( '.' | ',' ) RULE_INT { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:41: ( '0' .. '9' )+ - int cnt7=0; - loop7: - do { - int alt7=2; - int LA7_0 = input.LA(1); - - if ( ((LA7_0>='0' && LA7_0<='9')) ) { - alt7=1; - } - - - switch (alt7) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:42: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt7 >= 1 ) break loop7; - EarlyExitException eee = - new EarlyExitException(7, input); - throw eee; - } - cnt7++; - } while (true); - + mRULE_INT(); if ( input.LA(1)==','||input.LA(1)=='.' ) { input.consume(); @@ -482,62 +356,14 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:63: ( '0' .. '9' )* - loop8: - do { - int alt8=2; - int LA8_0 = input.LA(1); - - if ( ((LA8_0>='0' && LA8_0<='9')) ) { - alt8=1; - } - - - switch (alt8) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:64: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - break loop8; - } - } while (true); - + mRULE_INT(); } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:75: ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:69: RULE_INT ( '.' | ',' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:75: ( '0' .. '9' )* - loop9: - do { - int alt9=2; - int LA9_0 = input.LA(1); - - if ( ((LA9_0>='0' && LA9_0<='9')) ) { - alt9=1; - } - - - switch (alt9) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:76: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - break loop9; - } - } while (true); - + mRULE_INT(); if ( input.LA(1)==','||input.LA(1)=='.' ) { input.consume(); @@ -547,179 +373,22 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:97: ( '0' .. '9' )+ - int cnt10=0; - loop10: - do { - int alt10=2; - int LA10_0 = input.LA(1); - - if ( ((LA10_0>='0' && LA10_0<='9')) ) { - alt10=1; - } - - - switch (alt10) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:569:98: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt10 >= 1 ) break loop10; - EarlyExitException eee = - new EarlyExitException(10, input); - throw eee; - } - cnt10++; - } while (true); - } break; - - } - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "RULE_VALUE_SPECIFICATION_DOUBLE" - - // $ANTLR start "RULE_VALUE_SPECIFICATION_STRING" - public final void mRULE_VALUE_SPECIFICATION_STRING() throws RecognitionException { - try { - int _type = RULE_VALUE_SPECIFICATION_STRING; - int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:33: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:35: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:35: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - int alt14=2; - int LA14_0 = input.LA(1); - - if ( (LA14_0=='\"') ) { - alt14=1; - } - else if ( (LA14_0=='\'') ) { - alt14=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 14, 0, input); - - throw nvae; - } - switch (alt14) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:36: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + case 3 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:599:88: ( '.' | ',' ) RULE_INT { - match('\"'); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:40: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* - loop12: - do { - int alt12=3; - int LA12_0 = input.LA(1); - - if ( (LA12_0=='\\') ) { - alt12=1; - } - else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) { - alt12=2; - } - - - switch (alt12) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:41: '\\\\' . - { - match('\\'); - matchAny(); - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:48: ~ ( ( '\\\\' | '\"' ) ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse;} - - - } - break; - - default : - break loop12; - } - } while (true); - - match('\"'); + if ( input.LA(1)==','||input.LA(1)=='.' ) { + input.consume(); } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:68: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' - { - match('\''); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:73: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* - loop13: - do { - int alt13=3; - int LA13_0 = input.LA(1); - - if ( (LA13_0=='\\') ) { - alt13=1; - } - else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) { - alt13=2; - } - - - switch (alt13) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:74: '\\\\' . - { - match('\\'); - matchAny(); - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:571:81: ~ ( ( '\\\\' | '\\'' ) ) - { - if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse;} - - - } - break; - - default : - break loop13; - } - } while (true); + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} - match('\''); + mRULE_INT(); } break; @@ -735,26 +404,26 @@ public class InternalUmlValueSpecificationLexer extends Lexer { finally { } } - // $ANTLR end "RULE_VALUE_SPECIFICATION_STRING" + // $ANTLR end "RULE_VALUE_SPECIFICATION_DOUBLE" // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:601:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:601:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:11: ( '^' )? - int alt15=2; - int LA15_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:601:11: ( '^' )? + int alt4=2; + int LA4_0 = input.LA(1); - if ( (LA15_0=='^') ) { - alt15=1; + if ( (LA4_0=='^') ) { + alt4=1; } - switch (alt15) { + switch (alt4) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:11: '^' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:601:11: '^' { match('^'); @@ -772,18 +441,18 @@ public class InternalUmlValueSpecificationLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* - loop16: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:601:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + loop5: do { - int alt16=2; - int LA16_0 = input.LA(1); + int alt5=2; + int LA5_0 = input.LA(1); - if ( ((LA16_0>='0' && LA16_0<='9')||(LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='z')) ) { - alt16=1; + if ( ((LA5_0>='0' && LA5_0<='9')||(LA5_0>='A' && LA5_0<='Z')||LA5_0=='_'||(LA5_0>='a' && LA5_0<='z')) ) { + alt5=1; } - switch (alt16) { + switch (alt5) { case 1 : // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g: { @@ -801,7 +470,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop16; + break loop5; } } while (true); @@ -821,24 +490,24 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:575:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:575:12: ( '0' .. '9' )+ + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:603:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:603:12: ( '0' .. '9' )+ { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:575:12: ( '0' .. '9' )+ - int cnt17=0; - loop17: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:603:12: ( '0' .. '9' )+ + int cnt6=0; + loop6: do { - int alt17=2; - int LA17_0 = input.LA(1); + int alt6=2; + int LA6_0 = input.LA(1); - if ( ((LA17_0>='0' && LA17_0<='9')) ) { - alt17=1; + if ( ((LA6_0>='0' && LA6_0<='9')) ) { + alt6=1; } - switch (alt17) { + switch (alt6) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:575:13: '0' .. '9' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:603:13: '0' .. '9' { matchRange('0','9'); @@ -846,12 +515,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - if ( cnt17 >= 1 ) break loop17; + if ( cnt6 >= 1 ) break loop6; EarlyExitException eee = - new EarlyExitException(17, input); + new EarlyExitException(6, input); throw eee; } - cnt17++; + cnt6++; } while (true); @@ -870,47 +539,47 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - int alt20=2; - int LA20_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + int alt9=2; + int LA9_0 = input.LA(1); - if ( (LA20_0=='\"') ) { - alt20=1; + if ( (LA9_0=='\"') ) { + alt9=1; } - else if ( (LA20_0=='\'') ) { - alt20=2; + else if ( (LA9_0=='\'') ) { + alt9=2; } else { NoViableAltException nvae = - new NoViableAltException("", 20, 0, input); + new NoViableAltException("", 9, 0, input); throw nvae; } - switch (alt20) { + switch (alt9) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* - loop18: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + loop7: do { - int alt18=3; - int LA18_0 = input.LA(1); + int alt7=3; + int LA7_0 = input.LA(1); - if ( (LA18_0=='\\') ) { - alt18=1; + if ( (LA7_0=='\\') ) { + alt7=1; } - else if ( ((LA18_0>='\u0000' && LA18_0<='!')||(LA18_0>='#' && LA18_0<='[')||(LA18_0>=']' && LA18_0<='\uFFFF')) ) { - alt18=2; + else if ( ((LA7_0>='\u0000' && LA7_0<='!')||(LA7_0>='#' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) { + alt7=2; } - switch (alt18) { + switch (alt7) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:21: '\\\\' . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:21: '\\\\' . { match('\\'); matchAny(); @@ -918,7 +587,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:28: ~ ( ( '\\\\' | '\"' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -934,7 +603,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop18; + break loop7; } } while (true); @@ -943,26 +612,26 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* - loop19: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + loop8: do { - int alt19=3; - int LA19_0 = input.LA(1); + int alt8=3; + int LA8_0 = input.LA(1); - if ( (LA19_0=='\\') ) { - alt19=1; + if ( (LA8_0=='\\') ) { + alt8=1; } - else if ( ((LA19_0>='\u0000' && LA19_0<='&')||(LA19_0>='(' && LA19_0<='[')||(LA19_0>=']' && LA19_0<='\uFFFF')) ) { - alt19=2; + else if ( ((LA8_0>='\u0000' && LA8_0<='&')||(LA8_0>='(' && LA8_0<='[')||(LA8_0>=']' && LA8_0<='\uFFFF')) ) { + alt8=2; } - switch (alt19) { + switch (alt8) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:54: '\\\\' . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:54: '\\\\' . { match('\\'); matchAny(); @@ -970,7 +639,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:577:61: ~ ( ( '\\\\' | '\\'' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:605:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -986,7 +655,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop19; + break loop8; } } while (true); @@ -1013,37 +682,37 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:579:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:579:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:607:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:607:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:579:24: ( options {greedy=false; } : . )* - loop21: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:607:24: ( options {greedy=false; } : . )* + loop10: do { - int alt21=2; - int LA21_0 = input.LA(1); + int alt10=2; + int LA10_0 = input.LA(1); - if ( (LA21_0=='*') ) { - int LA21_1 = input.LA(2); + if ( (LA10_0=='*') ) { + int LA10_1 = input.LA(2); - if ( (LA21_1=='/') ) { - alt21=2; + if ( (LA10_1=='/') ) { + alt10=2; } - else if ( ((LA21_1>='\u0000' && LA21_1<='.')||(LA21_1>='0' && LA21_1<='\uFFFF')) ) { - alt21=1; + else if ( ((LA10_1>='\u0000' && LA10_1<='.')||(LA10_1>='0' && LA10_1<='\uFFFF')) ) { + alt10=1; } } - else if ( ((LA21_0>='\u0000' && LA21_0<=')')||(LA21_0>='+' && LA21_0<='\uFFFF')) ) { - alt21=1; + else if ( ((LA10_0>='\u0000' && LA10_0<=')')||(LA10_0>='+' && LA10_0<='\uFFFF')) ) { + alt10=1; } - switch (alt21) { + switch (alt10) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:579:52: . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:607:52: . { matchAny(); @@ -1051,7 +720,7 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop21; + break loop10; } } while (true); @@ -1073,25 +742,25 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:24: (~ ( ( '\\n' | '\\r' ) ) )* - loop22: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:24: (~ ( ( '\\n' | '\\r' ) ) )* + loop11: do { - int alt22=2; - int LA22_0 = input.LA(1); + int alt11=2; + int LA11_0 = input.LA(1); - if ( ((LA22_0>='\u0000' && LA22_0<='\t')||(LA22_0>='\u000B' && LA22_0<='\f')||(LA22_0>='\u000E' && LA22_0<='\uFFFF')) ) { - alt22=1; + if ( ((LA11_0>='\u0000' && LA11_0<='\t')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\uFFFF')) ) { + alt11=1; } - switch (alt22) { + switch (alt11) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1107,31 +776,31 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - break loop22; + break loop11; } } while (true); - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:40: ( ( '\\r' )? '\\n' )? - int alt24=2; - int LA24_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:40: ( ( '\\r' )? '\\n' )? + int alt13=2; + int LA13_0 = input.LA(1); - if ( (LA24_0=='\n'||LA24_0=='\r') ) { - alt24=1; + if ( (LA13_0=='\n'||LA13_0=='\r') ) { + alt13=1; } - switch (alt24) { + switch (alt13) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:41: ( '\\r' )? '\\n' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:41: ( '\\r' )? '\\n' { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:41: ( '\\r' )? - int alt23=2; - int LA23_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:41: ( '\\r' )? + int alt12=2; + int LA12_0 = input.LA(1); - if ( (LA23_0=='\r') ) { - alt23=1; + if ( (LA12_0=='\r') ) { + alt12=1; } - switch (alt23) { + switch (alt12) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:581:41: '\\r' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:609:41: '\\r' { match('\r'); @@ -1163,22 +832,22 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:583:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:583:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:611:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:611:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:583:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ - int cnt25=0; - loop25: + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:611:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + int cnt14=0; + loop14: do { - int alt25=2; - int LA25_0 = input.LA(1); + int alt14=2; + int LA14_0 = input.LA(1); - if ( ((LA25_0>='\t' && LA25_0<='\n')||LA25_0=='\r'||LA25_0==' ') ) { - alt25=1; + if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) { + alt14=1; } - switch (alt25) { + switch (alt14) { case 1 : // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g: { @@ -1196,12 +865,12 @@ public class InternalUmlValueSpecificationLexer extends Lexer { break; default : - if ( cnt25 >= 1 ) break loop25; + if ( cnt14 >= 1 ) break loop14; EarlyExitException eee = - new EarlyExitException(25, input); + new EarlyExitException(14, input); throw eee; } - cnt25++; + cnt14++; } while (true); @@ -1220,8 +889,8 @@ public class InternalUmlValueSpecificationLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:585:16: ( . ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:585:18: . + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:613:16: ( . ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:613:18: . { matchAny(); @@ -1236,70 +905,70 @@ public class InternalUmlValueSpecificationLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:8: ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_VALUE_SPECIFICATION_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt26=20; - alt26 = dfa26.predict(input); - switch (alt26) { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:8: ( T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_NEGATIVE_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt15=19; + alt15 = dfa15.predict(input); + switch (alt15) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:10: T__15 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:10: T__14 { - mT__15(); + mT__14(); } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:16: T__16 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:16: T__15 { - mT__16(); + mT__15(); } break; case 3 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:22: T__17 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:22: T__16 { - mT__17(); + mT__16(); } break; case 4 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:28: T__18 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:28: T__17 { - mT__18(); + mT__17(); } break; case 5 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:34: T__19 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:34: T__18 { - mT__19(); + mT__18(); } break; case 6 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:40: T__20 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:40: T__19 { - mT__20(); + mT__19(); } break; case 7 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:46: T__21 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:46: T__20 { - mT__21(); + mT__20(); } break; case 8 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:52: T__22 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:52: T__21 { - mT__22(); + mT__21(); } break; case 9 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:58: T__23 + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:58: T__22 { - mT__23(); + mT__22(); } break; @@ -1311,70 +980,63 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } break; case 11 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:92: RULE_VALUE_SPECIFICATION_INT + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:92: RULE_VALUE_SPECIFICATION_NEGATIVE_INT { - mRULE_VALUE_SPECIFICATION_INT(); + mRULE_VALUE_SPECIFICATION_NEGATIVE_INT(); } break; case 12 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:121: RULE_VALUE_SPECIFICATION_DOUBLE + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:130: RULE_VALUE_SPECIFICATION_DOUBLE { mRULE_VALUE_SPECIFICATION_DOUBLE(); } break; case 13 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:153: RULE_VALUE_SPECIFICATION_STRING - { - mRULE_VALUE_SPECIFICATION_STRING(); - - } - break; - case 14 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:185: RULE_ID + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:162: RULE_ID { mRULE_ID(); } break; - case 15 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:193: RULE_INT + case 14 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:170: RULE_INT { mRULE_INT(); } break; - case 16 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:202: RULE_STRING + case 15 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:179: RULE_STRING { mRULE_STRING(); } break; - case 17 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:214: RULE_ML_COMMENT + case 16 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:191: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; - case 18 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:230: RULE_SL_COMMENT + case 17 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:207: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; - case 19 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:246: RULE_WS + case 18 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:223: RULE_WS { mRULE_WS(); } break; - case 20 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:254: RULE_ANY_OTHER + case 19 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:1:231: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1386,324 +1048,256 @@ public class InternalUmlValueSpecificationLexer extends Lexer { } - protected DFA11 dfa11 = new DFA11(this); - protected DFA26 dfa26 = new DFA26(this); - static final String DFA11_eotS = - "\3\uffff\1\4\1\uffff"; - static final String DFA11_eofS = - "\5\uffff"; - static final String DFA11_minS = - "\2\54\1\uffff\1\0\1\uffff"; - static final String DFA11_maxS = - "\2\71\1\uffff\1\0\1\uffff"; - static final String DFA11_acceptS = - "\2\uffff\1\2\1\uffff\1\1"; - static final String DFA11_specialS = - "\5\uffff}>"; - static final String[] DFA11_transitionS = { + protected DFA3 dfa3 = new DFA3(this); + protected DFA15 dfa15 = new DFA15(this); + static final String DFA3_eotS = + "\3\uffff\1\4\2\uffff"; + static final String DFA3_eofS = + "\6\uffff"; + static final String DFA3_minS = + "\2\54\1\uffff\1\60\2\uffff"; + static final String DFA3_maxS = + "\2\71\1\uffff\1\71\2\uffff"; + static final String DFA3_acceptS = + "\2\uffff\1\3\1\uffff\1\2\1\1"; + static final String DFA3_specialS = + "\6\uffff}>"; + static final String[] DFA3_transitionS = { "\1\2\1\uffff\1\2\1\uffff\12\1", "\1\3\1\uffff\1\3\1\uffff\12\1", "", - "\1\uffff", + "\12\5", + "", "" }; - static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS); - static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS); - static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS); - static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS); - static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS); - static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS); - static final short[][] DFA11_transition; + static final short[] DFA3_eot = DFA.unpackEncodedString(DFA3_eotS); + static final short[] DFA3_eof = DFA.unpackEncodedString(DFA3_eofS); + static final char[] DFA3_min = DFA.unpackEncodedStringToUnsignedChars(DFA3_minS); + static final char[] DFA3_max = DFA.unpackEncodedStringToUnsignedChars(DFA3_maxS); + static final short[] DFA3_accept = DFA.unpackEncodedString(DFA3_acceptS); + static final short[] DFA3_special = DFA.unpackEncodedString(DFA3_specialS); + static final short[][] DFA3_transition; static { - int numStates = DFA11_transitionS.length; - DFA11_transition = new short[numStates][]; + int numStates = DFA3_transitionS.length; + DFA3_transition = new short[numStates][]; for (int i=0; i<numStates; i++) { - DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]); + DFA3_transition[i] = DFA.unpackEncodedString(DFA3_transitionS[i]); } } - class DFA11 extends DFA { + class DFA3 extends DFA { - public DFA11(BaseRecognizer recognizer) { + public DFA3(BaseRecognizer recognizer) { this.recognizer = recognizer; - this.decisionNumber = 11; - this.eot = DFA11_eot; - this.eof = DFA11_eof; - this.min = DFA11_min; - this.max = DFA11_max; - this.accept = DFA11_accept; - this.special = DFA11_special; - this.transition = DFA11_transition; + this.decisionNumber = 3; + this.eot = DFA3_eot; + this.eof = DFA3_eof; + this.min = DFA3_min; + this.max = DFA3_max; + this.accept = DFA3_accept; + this.special = DFA3_special; + this.transition = DFA3_transition; } public String getDescription() { - return "569:40: ( ( '0' .. '9' )+ ( '.' | ',' ) ( '0' .. '9' )* | ( '0' .. '9' )* ( '.' | ',' ) ( '0' .. '9' )+ )"; + return "599:40: ( RULE_INT ( '.' | ',' ) RULE_INT | RULE_INT ( '.' | ',' ) | ( '.' | ',' ) RULE_INT )"; } } - static final String DFA26_eotS = - "\2\uffff\3\27\1\23\1\uffff\1\36\2\uffff\1\23\1\27\1\42\1\uffff"+ - "\4\23\3\uffff\2\27\1\uffff\2\27\2\uffff\1\42\4\uffff\1\27\1\uffff"+ - "\1\42\11\uffff\3\27\3\uffff\1\66\1\27\1\70\1\uffff\1\71\2\uffff"; - static final String DFA26_eofS = - "\72\uffff"; - static final String DFA26_minS = - "\1\0\1\uffff\3\60\1\125\1\uffff\1\54\2\uffff\1\101\1\60\1\54\1"+ - "\uffff\1\60\2\0\1\52\3\uffff\2\60\1\uffff\2\60\2\uffff\1\54\4\uffff"+ - "\1\60\1\uffff\1\54\2\0\1\uffff\2\0\4\uffff\3\60\1\0\1\uffff\1\0"+ - "\3\60\1\uffff\1\60\2\uffff"; - static final String DFA26_maxS = - "\1\uffff\1\uffff\3\172\1\125\1\uffff\1\71\2\uffff\2\172\1\71\1"+ - "\uffff\1\71\2\uffff\1\57\3\uffff\2\172\1\uffff\2\172\2\uffff\1\71"+ - "\4\uffff\1\172\1\uffff\1\71\2\uffff\1\uffff\2\uffff\4\uffff\3\172"+ - "\1\uffff\1\uffff\1\uffff\3\172\1\uffff\1\172\2\uffff"; - static final String DFA26_acceptS = - "\1\uffff\1\1\4\uffff\1\6\1\uffff\1\10\1\11\3\uffff\1\13\4\uffff"+ - "\1\23\1\24\1\1\2\uffff\1\12\2\uffff\1\5\1\6\1\uffff\1\14\1\7\1\10"+ - "\1\11\1\uffff\1\13\3\uffff\1\15\2\uffff\1\15\1\21\1\22\1\23\4\uffff"+ - "\1\15\4\uffff\1\2\1\uffff\1\4\1\3"; - static final String DFA26_specialS = - "\1\6\16\uffff\1\5\1\0\23\uffff\1\1\1\4\1\uffff\1\3\1\10\7\uffff"+ - "\1\2\1\uffff\1\7\7\uffff}>"; - static final String[] DFA26_transitionS = { - "\11\23\2\22\2\23\1\22\22\23\1\22\1\23\1\17\1\10\3\23\1\20\2"+ - "\23\1\15\1\6\1\16\1\7\1\16\1\21\12\14\2\23\1\5\1\1\3\23\32\13"+ - "\3\23\1\12\1\13\1\23\5\13\1\3\7\13\1\4\5\13\1\2\6\13\3\23\1"+ - "\11\uff81\23", + static final String DFA15_eotS = + "\1\uffff\2\26\1\uffff\1\26\1\22\1\uffff\1\36\2\uffff\1\26\1\41"+ + "\5\22\2\uffff\2\26\2\uffff\1\26\1\uffff\1\26\2\uffff\1\52\5\uffff"+ + "\1\41\4\uffff\3\26\1\uffff\1\56\1\26\1\60\1\uffff\1\61\2\uffff"; + static final String DFA15_eofS = + "\62\uffff"; + static final String DFA15_minS = + "\1\0\2\55\1\uffff\1\55\1\125\1\uffff\1\54\2\uffff\1\55\1\54\1\60"+ + "\1\101\2\0\1\52\2\uffff\2\55\2\uffff\1\55\1\uffff\1\55\2\uffff\1"+ + "\54\5\uffff\1\54\4\uffff\3\55\1\uffff\3\55\1\uffff\1\55\2\uffff"; + static final String DFA15_maxS = + "\1\uffff\2\172\1\uffff\1\172\1\125\1\uffff\1\71\2\uffff\1\172\2"+ + "\71\1\172\2\uffff\1\57\2\uffff\2\172\2\uffff\1\172\1\uffff\1\172"+ + "\2\uffff\1\71\5\uffff\1\71\4\uffff\3\172\1\uffff\3\172\1\uffff\1"+ + "\172\2\uffff"; + static final String DFA15_acceptS = + "\3\uffff\1\3\2\uffff\1\6\1\uffff\1\10\1\11\7\uffff\1\22\1\23\2"+ + "\uffff\1\12\1\15\1\uffff\1\3\1\uffff\1\5\1\6\1\uffff\1\14\1\7\1"+ + "\10\1\11\1\16\1\uffff\1\17\1\20\1\21\1\22\3\uffff\1\13\3\uffff\1"+ + "\1\1\uffff\1\4\1\2"; + static final String DFA15_specialS = + "\1\1\15\uffff\1\0\1\2\42\uffff}>"; + static final String[] DFA15_transitionS = { + "\11\22\2\21\2\22\1\21\22\22\1\21\1\22\1\16\1\10\3\22\1\17\2"+ + "\22\1\3\1\6\1\14\1\7\1\14\1\20\12\13\2\22\1\5\4\22\32\12\3\22"+ + "\1\15\1\12\1\22\5\12\1\2\7\12\1\4\5\12\1\1\6\12\3\22\1\11\uff81"+ + "\22", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\21\24\1\23\10\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\1\27\31\24", "", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\21\26\1\25\10\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\1\30\31\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\24\26\1\31\5\26", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\24\24\1\31\5\24", "\1\32", "", "\1\35\1\uffff\1\35\1\uffff\12\34", "", "", - "\32\41\4\uffff\1\41\1\uffff\32\41", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", - "\1\35\1\uffff\1\35\1\uffff\12\43", - "", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", + "\1\35\1\uffff\1\35\1\uffff\12\42", "\12\35", - "\42\45\1\46\71\45\1\44\uffa3\45", - "\47\50\1\51\64\50\1\47\uffa3\50", - "\1\52\4\uffff\1\53", + "\32\26\4\uffff\1\26\1\uffff\32\26", + "\0\43", + "\0\43", + "\1\44\4\uffff\1\45", "", "", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\24\24\1\47\5\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", "", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\24\26\1\55\5\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", "", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\13\26\1\56\16\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\13\26\1\57\16\26", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\13\24\1\50\16\24", "", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\13\24\1\51\16\24", "", - "\1\35\1\uffff\1\35\1\uffff\12\34", "", + "\1\35\1\uffff\1\35\1\uffff\12\34", "", "", "", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", "", - "\1\35\1\uffff\1\35\1\uffff\12\43", - "\0\60", - "\42\45\1\46\71\45\1\44\uffa3\45", "", - "\0\62", - "\47\50\1\51\64\50\1\47\uffa3\50", + "\1\35\1\uffff\1\35\1\uffff\12\42", "", "", "", "", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\4\26\1\63\25\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\22\26\1\64\7\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\13\26\1\65\16\26", - "\42\45\1\46\71\45\1\44\uffa3\45", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\4\24\1\53\25\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\22\24\1\54\7\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\13\24\1\55\16\24", "", - "\47\50\1\51\64\50\1\47\uffa3\50", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\4\26\1\67\25\26", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\4\24\1\57\25\24", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", "", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", + "\1\25\2\uffff\12\24\3\uffff\1\25\3\uffff\32\24\4\uffff\1\24"+ + "\1\uffff\32\24", "", "" }; - static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS); - static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS); - static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS); - static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS); - static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS); - static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS); - static final short[][] DFA26_transition; + static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS); + static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS); + static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS); + static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS); + static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS); + static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS); + static final short[][] DFA15_transition; static { - int numStates = DFA26_transitionS.length; - DFA26_transition = new short[numStates][]; + int numStates = DFA15_transitionS.length; + DFA15_transition = new short[numStates][]; for (int i=0; i<numStates; i++) { - DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]); + DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]); } } - class DFA26 extends DFA { + class DFA15 extends DFA { - public DFA26(BaseRecognizer recognizer) { + public DFA15(BaseRecognizer recognizer) { this.recognizer = recognizer; - this.decisionNumber = 26; - this.eot = DFA26_eot; - this.eof = DFA26_eof; - this.min = DFA26_min; - this.max = DFA26_max; - this.accept = DFA26_accept; - this.special = DFA26_special; - this.transition = DFA26_transition; + this.decisionNumber = 15; + this.eot = DFA15_eot; + this.eof = DFA15_eof; + this.min = DFA15_min; + this.max = DFA15_max; + this.accept = DFA15_accept; + this.special = DFA15_special; + this.transition = DFA15_transition; } public String getDescription() { - return "1:1: Tokens : ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_VALUE_SPECIFICATION_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | RULE_VALUE_SPECIFICATION_ID | RULE_VALUE_SPECIFICATION_NEGATIVE_INT | RULE_VALUE_SPECIFICATION_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; int _s = s; switch ( s ) { case 0 : - int LA26_16 = input.LA(1); + int LA15_14 = input.LA(1); s = -1; - if ( (LA26_16=='\\') ) {s = 39;} + if ( ((LA15_14>='\u0000' && LA15_14<='\uFFFF')) ) {s = 35;} - else if ( ((LA26_16>='\u0000' && LA26_16<='&')||(LA26_16>='(' && LA26_16<='[')||(LA26_16>=']' && LA26_16<='\uFFFF')) ) {s = 40;} - - else if ( (LA26_16=='\'') ) {s = 41;} - - else s = 19; + else s = 18; if ( s>=0 ) return s; break; case 1 : - int LA26_36 = input.LA(1); - - s = -1; - if ( ((LA26_36>='\u0000' && LA26_36<='\uFFFF')) ) {s = 48;} - - if ( s>=0 ) return s; - break; - case 2 : - int LA26_48 = input.LA(1); - - s = -1; - if ( (LA26_48=='\"') ) {s = 38;} - - else if ( (LA26_48=='\\') ) {s = 36;} - - else if ( ((LA26_48>='\u0000' && LA26_48<='!')||(LA26_48>='#' && LA26_48<='[')||(LA26_48>=']' && LA26_48<='\uFFFF')) ) {s = 37;} - - if ( s>=0 ) return s; - break; - case 3 : - int LA26_39 = input.LA(1); - - s = -1; - if ( ((LA26_39>='\u0000' && LA26_39<='\uFFFF')) ) {s = 50;} - - if ( s>=0 ) return s; - break; - case 4 : - int LA26_37 = input.LA(1); - - s = -1; - if ( (LA26_37=='\"') ) {s = 38;} - - else if ( (LA26_37=='\\') ) {s = 36;} - - else if ( ((LA26_37>='\u0000' && LA26_37<='!')||(LA26_37>='#' && LA26_37<='[')||(LA26_37>=']' && LA26_37<='\uFFFF')) ) {s = 37;} - - if ( s>=0 ) return s; - break; - case 5 : - int LA26_15 = input.LA(1); - - s = -1; - if ( (LA26_15=='\\') ) {s = 36;} - - else if ( ((LA26_15>='\u0000' && LA26_15<='!')||(LA26_15>='#' && LA26_15<='[')||(LA26_15>=']' && LA26_15<='\uFFFF')) ) {s = 37;} - - else if ( (LA26_15=='\"') ) {s = 38;} - - else s = 19; - - if ( s>=0 ) return s; - break; - case 6 : - int LA26_0 = input.LA(1); + int LA15_0 = input.LA(1); s = -1; - if ( (LA26_0=='=') ) {s = 1;} - - else if ( (LA26_0=='t') ) {s = 2;} - - else if ( (LA26_0=='f') ) {s = 3;} - - else if ( (LA26_0=='n') ) {s = 4;} - - else if ( (LA26_0=='<') ) {s = 5;} + if ( (LA15_0=='t') ) {s = 1;} - else if ( (LA26_0=='+') ) {s = 6;} + else if ( (LA15_0=='f') ) {s = 2;} - else if ( (LA26_0=='-') ) {s = 7;} + else if ( (LA15_0=='*') ) {s = 3;} - else if ( (LA26_0=='#') ) {s = 8;} + else if ( (LA15_0=='n') ) {s = 4;} - else if ( (LA26_0=='~') ) {s = 9;} + else if ( (LA15_0=='<') ) {s = 5;} - else if ( (LA26_0=='^') ) {s = 10;} + else if ( (LA15_0=='+') ) {s = 6;} - else if ( ((LA26_0>='A' && LA26_0<='Z')||LA26_0=='_'||(LA26_0>='a' && LA26_0<='e')||(LA26_0>='g' && LA26_0<='m')||(LA26_0>='o' && LA26_0<='s')||(LA26_0>='u' && LA26_0<='z')) ) {s = 11;} + else if ( (LA15_0=='-') ) {s = 7;} - else if ( ((LA26_0>='0' && LA26_0<='9')) ) {s = 12;} + else if ( (LA15_0=='#') ) {s = 8;} - else if ( (LA26_0=='*') ) {s = 13;} + else if ( (LA15_0=='~') ) {s = 9;} - else if ( (LA26_0==','||LA26_0=='.') ) {s = 14;} + else if ( ((LA15_0>='A' && LA15_0<='Z')||LA15_0=='_'||(LA15_0>='a' && LA15_0<='e')||(LA15_0>='g' && LA15_0<='m')||(LA15_0>='o' && LA15_0<='s')||(LA15_0>='u' && LA15_0<='z')) ) {s = 10;} - else if ( (LA26_0=='\"') ) {s = 15;} + else if ( ((LA15_0>='0' && LA15_0<='9')) ) {s = 11;} - else if ( (LA26_0=='\'') ) {s = 16;} + else if ( (LA15_0==','||LA15_0=='.') ) {s = 12;} - else if ( (LA26_0=='/') ) {s = 17;} + else if ( (LA15_0=='^') ) {s = 13;} - else if ( ((LA26_0>='\t' && LA26_0<='\n')||LA26_0=='\r'||LA26_0==' ') ) {s = 18;} + else if ( (LA15_0=='\"') ) {s = 14;} - else if ( ((LA26_0>='\u0000' && LA26_0<='\b')||(LA26_0>='\u000B' && LA26_0<='\f')||(LA26_0>='\u000E' && LA26_0<='\u001F')||LA26_0=='!'||(LA26_0>='$' && LA26_0<='&')||(LA26_0>='(' && LA26_0<=')')||(LA26_0>=':' && LA26_0<=';')||(LA26_0>='>' && LA26_0<='@')||(LA26_0>='[' && LA26_0<=']')||LA26_0=='`'||(LA26_0>='{' && LA26_0<='}')||(LA26_0>='\u007F' && LA26_0<='\uFFFF')) ) {s = 19;} + else if ( (LA15_0=='\'') ) {s = 15;} - if ( s>=0 ) return s; - break; - case 7 : - int LA26_50 = input.LA(1); - - s = -1; - if ( (LA26_50=='\'') ) {s = 41;} + else if ( (LA15_0=='/') ) {s = 16;} - else if ( (LA26_50=='\\') ) {s = 39;} + else if ( ((LA15_0>='\t' && LA15_0<='\n')||LA15_0=='\r'||LA15_0==' ') ) {s = 17;} - else if ( ((LA26_50>='\u0000' && LA26_50<='&')||(LA26_50>='(' && LA26_50<='[')||(LA26_50>=']' && LA26_50<='\uFFFF')) ) {s = 40;} + else if ( ((LA15_0>='\u0000' && LA15_0<='\b')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\u001F')||LA15_0=='!'||(LA15_0>='$' && LA15_0<='&')||(LA15_0>='(' && LA15_0<=')')||(LA15_0>=':' && LA15_0<=';')||(LA15_0>='=' && LA15_0<='@')||(LA15_0>='[' && LA15_0<=']')||LA15_0=='`'||(LA15_0>='{' && LA15_0<='}')||(LA15_0>='\u007F' && LA15_0<='\uFFFF')) ) {s = 18;} if ( s>=0 ) return s; break; - case 8 : - int LA26_40 = input.LA(1); + case 2 : + int LA15_15 = input.LA(1); s = -1; - if ( (LA26_40=='\'') ) {s = 41;} - - else if ( (LA26_40=='\\') ) {s = 39;} + if ( ((LA15_15>='\u0000' && LA15_15<='\uFFFF')) ) {s = 35;} - else if ( ((LA26_40>='\u0000' && LA26_40<='&')||(LA26_40>='(' && LA26_40<='[')||(LA26_40>=']' && LA26_40<='\uFFFF')) ) {s = 40;} + else s = 18; if ( s>=0 ) return s; break; } NoViableAltException nvae = - new NoViableAltException(getDescription(), 26, _s, input); + new NoViableAltException(getDescription(), 15, _s, input); error(nvae); throw nvae; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationParser.java index 88911bf9517..4de95719b27 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationParser.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecificationParser.java @@ -21,29 +21,28 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_VALUE_SPECIFICATION_ID", "RULE_ID", "RULE_VALUE_SPECIFICATION_INT", "RULE_VALUE_SPECIFICATION_DOUBLE", "RULE_VALUE_SPECIFICATION_STRING", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'true'", "'false'", "'null'", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_VALUE_SPECIFICATION_ID", "RULE_ID", "RULE_INT", "RULE_VALUE_SPECIFICATION_NEGATIVE_INT", "RULE_VALUE_SPECIFICATION_DOUBLE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'true'", "'false'", "'*'", "'null'", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'" }; public static final int RULE_ID=5; - public static final int RULE_VALUE_SPECIFICATION_DOUBLE=7; - public static final int T__23=23; + public static final int RULE_VALUE_SPECIFICATION_DOUBLE=8; public static final int T__22=22; - public static final int RULE_ANY_OTHER=14; + public static final int RULE_ANY_OTHER=13; public static final int T__21=21; public static final int T__20=20; - public static final int RULE_VALUE_SPECIFICATION_INT=6; - public static final int RULE_SL_COMMENT=12; + public static final int RULE_SL_COMMENT=11; public static final int EOF=-1; - public static final int RULE_ML_COMMENT=11; + public static final int RULE_ML_COMMENT=10; public static final int T__19=19; - public static final int RULE_STRING=10; + public static final int RULE_STRING=9; public static final int T__16=16; public static final int T__15=15; public static final int T__18=18; public static final int T__17=17; - public static final int RULE_VALUE_SPECIFICATION_STRING=8; - public static final int RULE_INT=9; + public static final int T__14=14; + public static final int RULE_INT=6; public static final int RULE_VALUE_SPECIFICATION_ID=4; - public static final int RULE_WS=13; + public static final int RULE_WS=12; + public static final int RULE_VALUE_SPECIFICATION_NEGATIVE_INT=7; // delegates // delegators @@ -120,13 +119,12 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleAbstractRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:76:1: ruleAbstractRule returns [EObject current=null] : ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) ) | ( (lv_undefined_5_0= ruleUndefinedRule ) ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:76:1: ruleAbstractRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) )? ( ( (otherlv_2= RULE_ID ) ) | ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (lv_undefined_4_0= ruleUndefinedRule ) ) ) ) ; public final EObject ruleAbstractRule() throws RecognitionException { EObject current = null; Token lv_name_1_0=null; Token otherlv_2=null; - Token otherlv_4=null; EObject lv_visibility_0_0 = null; EObject lv_value_3_1 = null; @@ -139,351 +137,327 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa EObject lv_value_3_5 = null; - EObject lv_undefined_5_0 = null; + EObject lv_undefined_4_0 = null; enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:79:28: ( ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) ) | ( (lv_undefined_5_0= ruleUndefinedRule ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:1: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) ) | ( (lv_undefined_5_0= ruleUndefinedRule ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:79:28: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) )? ( ( (otherlv_2= RULE_ID ) ) | ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (lv_undefined_4_0= ruleUndefinedRule ) ) ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) )? ( ( (otherlv_2= RULE_ID ) ) | ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (lv_undefined_4_0= ruleUndefinedRule ) ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:1: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) ) | ( (lv_undefined_5_0= ruleUndefinedRule ) ) ) - int alt5=2; - int LA5_0 = input.LA(1); - - if ( ((LA5_0>=RULE_VALUE_SPECIFICATION_ID && LA5_0<=RULE_VALUE_SPECIFICATION_STRING)||(LA5_0>=16 && LA5_0<=18)||(LA5_0>=20 && LA5_0<=23)) ) { - alt5=1; - } - else if ( (LA5_0==19) ) { - alt5=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 5, 0, input); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) )? ( ( (otherlv_2= RULE_ID ) ) | ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (lv_undefined_4_0= ruleUndefinedRule ) ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) )? ( ( (otherlv_2= RULE_ID ) ) | ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (lv_undefined_4_0= ruleUndefinedRule ) ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )? + int alt1=2; + int LA1_0 = input.LA(1); - throw nvae; + if ( ((LA1_0>=19 && LA1_0<=22)) ) { + alt1=1; } - switch (alt5) { + switch (alt1) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:2: ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:81:1: (lv_visibility_0_0= ruleVisibilityKind ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:2: ( ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:3: ( (lv_visibility_0_0= ruleVisibilityKind ) )? ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:81:1: (lv_visibility_0_0= ruleVisibilityKind ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:82:3: lv_visibility_0_0= ruleVisibilityKind { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:80:3: ( (lv_visibility_0_0= ruleVisibilityKind ) )? - int alt1=2; - int LA1_0 = input.LA(1); + + newCompositeNode(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0()); + + pushFollow(FOLLOW_ruleVisibilityKind_in_ruleAbstractRule131); + lv_visibility_0_0=ruleVisibilityKind(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); + } + set( + current, + "visibility", + lv_visibility_0_0, + "VisibilityKind"); + afterParserOrEnumRuleCall(); + - if ( ((LA1_0>=20 && LA1_0<=23)) ) { - alt1=1; } - switch (alt1) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:81:1: (lv_visibility_0_0= ruleVisibilityKind ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:81:1: (lv_visibility_0_0= ruleVisibilityKind ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:82:3: lv_visibility_0_0= ruleVisibilityKind - { - - newCompositeNode(grammarAccess.getAbstractRuleAccess().getVisibilityVisibilityKindParserRuleCall_0_0_0()); - - pushFollow(FOLLOW_ruleVisibilityKind_in_ruleAbstractRule132); - lv_visibility_0_0=ruleVisibilityKind(); - state._fsp--; + } + break; - if (current==null) { - current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); - } - set( - current, - "visibility", - lv_visibility_0_0, - "VisibilityKind"); - afterParserOrEnumRuleCall(); - + } - } + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:98:3: ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) )? + int alt2=2; + int LA2_0 = input.LA(1); + + if ( (LA2_0==RULE_VALUE_SPECIFICATION_ID) ) { + alt2=1; + } + switch (alt2) { + case 1 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:99:1: (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:99:1: (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:100:3: lv_name_1_0= RULE_VALUE_SPECIFICATION_ID + { + lv_name_1_0=(Token)match(input,RULE_VALUE_SPECIFICATION_ID,FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_ruleAbstractRule149); + newLeafNode(lv_name_1_0, grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0()); + - } - break; + if (current==null) { + current = createModelElement(grammarAccess.getAbstractRuleRule()); + } + setWithLastConsumed( + current, + "name", + lv_name_1_0, + "VALUE_SPECIFICATION_ID"); + } - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:98:3: ( ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' )? - int alt2=2; - int LA2_0 = input.LA(1); - if ( (LA2_0==RULE_VALUE_SPECIFICATION_ID) ) { - alt2=1; } - switch (alt2) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:98:4: ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) otherlv_2= '=' - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:98:4: ( (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:99:1: (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:99:1: (lv_name_1_0= RULE_VALUE_SPECIFICATION_ID ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:100:3: lv_name_1_0= RULE_VALUE_SPECIFICATION_ID - { - lv_name_1_0=(Token)match(input,RULE_VALUE_SPECIFICATION_ID,FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_ruleAbstractRule151); + break; - newLeafNode(lv_name_1_0, grammarAccess.getAbstractRuleAccess().getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0()); - + } - if (current==null) { - current = createModelElement(grammarAccess.getAbstractRuleRule()); - } - setWithLastConsumed( - current, - "name", - lv_name_1_0, - "VALUE_SPECIFICATION_ID"); - + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:116:3: ( ( (otherlv_2= RULE_ID ) ) | ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (lv_undefined_4_0= ruleUndefinedRule ) ) ) + int alt4=3; + switch ( input.LA(1) ) { + case RULE_ID: + { + alt4=1; + } + break; + case RULE_INT: + case RULE_VALUE_SPECIFICATION_NEGATIVE_INT: + case RULE_VALUE_SPECIFICATION_DOUBLE: + case RULE_STRING: + case 14: + case 15: + case 16: + case 17: + { + alt4=2; + } + break; + case 18: + { + alt4=3; + } + break; + default: + NoViableAltException nvae = + new NoViableAltException("", 4, 0, input); - } + throw nvae; + } + switch (alt4) { + case 1 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:116:4: ( (otherlv_2= RULE_ID ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:116:4: ( (otherlv_2= RULE_ID ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:117:1: (otherlv_2= RULE_ID ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:117:1: (otherlv_2= RULE_ID ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:118:3: otherlv_2= RULE_ID + { - } + if (current==null) { + current = createModelElement(grammarAccess.getAbstractRuleRule()); + } + + otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAbstractRule176); - otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleAbstractRule168); + newLeafNode(otherlv_2, grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0()); + - newLeafNode(otherlv_2, grammarAccess.getAbstractRuleAccess().getEqualsSignKeyword_0_1_1()); - + } - } - break; } - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:120:3: ( ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) | ( (otherlv_4= RULE_ID ) ) ) - int alt4=2; - int LA4_0 = input.LA(1); - if ( ((LA4_0>=RULE_VALUE_SPECIFICATION_INT && LA4_0<=RULE_VALUE_SPECIFICATION_STRING)||(LA4_0>=16 && LA4_0<=18)) ) { - alt4=1; - } - else if ( (LA4_0==RULE_ID) ) { - alt4=2; } - else { + break; + case 2 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:130:6: ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:130:6: ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:131:1: ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:131:1: ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:132:1: (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:132:1: (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) + int alt3=5; + switch ( input.LA(1) ) { + case 14: + case 15: + { + alt3=1; + } + break; + case RULE_INT: + case RULE_VALUE_SPECIFICATION_NEGATIVE_INT: + case 16: + { + alt3=2; + } + break; + case RULE_VALUE_SPECIFICATION_DOUBLE: + { + alt3=3; + } + break; + case 17: + { + alt3=4; + } + break; + case RULE_STRING: + { + alt3=5; + } + break; + default: NoViableAltException nvae = - new NoViableAltException("", 4, 0, input); + new NoViableAltException("", 3, 0, input); throw nvae; } - switch (alt4) { + + switch (alt3) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:120:4: ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:133:3: lv_value_3_1= ruleLiteralBooleanRule { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:120:4: ( ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:121:1: ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:121:1: ( (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:122:1: (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:122:1: (lv_value_3_1= ruleLiteralBooleanRule | lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule | lv_value_3_3= ruleLiteralRealRule | lv_value_3_4= ruleLiteralNullRule | lv_value_3_5= ruleLiteralStringRule ) - int alt3=5; - switch ( input.LA(1) ) { - case 16: - case 17: - { - alt3=1; - } - break; - case RULE_VALUE_SPECIFICATION_INT: - { - alt3=2; - } - break; - case RULE_VALUE_SPECIFICATION_DOUBLE: - { - alt3=3; - } - break; - case 18: - { - alt3=4; - } - break; - case RULE_VALUE_SPECIFICATION_STRING: - { - alt3=5; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 3, 0, input); - - throw nvae; - } + + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_2_1_0_0()); + + pushFollow(FOLLOW_ruleLiteralBooleanRule_in_ruleAbstractRule205); + lv_value_3_1=ruleLiteralBooleanRule(); - switch (alt3) { - case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:123:3: lv_value_3_1= ruleLiteralBooleanRule - { - - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0()); - - pushFollow(FOLLOW_ruleLiteralBooleanRule_in_ruleAbstractRule194); - lv_value_3_1=ruleLiteralBooleanRule(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); - } - set( - current, - "value", - lv_value_3_1, - "LiteralBooleanRule"); - afterParserOrEnumRuleCall(); - - - } - break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:138:8: lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule - { - - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1()); - - pushFollow(FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_ruleAbstractRule213); - lv_value_3_2=ruleLiteralIntegerOrUnlimitedNaturalRule(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); - } - set( - current, - "value", - lv_value_3_2, - "LiteralIntegerOrUnlimitedNaturalRule"); - afterParserOrEnumRuleCall(); - - - } - break; - case 3 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:153:8: lv_value_3_3= ruleLiteralRealRule - { - - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_0_2_0_0_2()); - - pushFollow(FOLLOW_ruleLiteralRealRule_in_ruleAbstractRule232); - lv_value_3_3=ruleLiteralRealRule(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); - } - set( - current, - "value", - lv_value_3_3, - "LiteralRealRule"); - afterParserOrEnumRuleCall(); - - - } - break; - case 4 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:168:8: lv_value_3_4= ruleLiteralNullRule - { - - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_0_2_0_0_3()); - - pushFollow(FOLLOW_ruleLiteralNullRule_in_ruleAbstractRule251); - lv_value_3_4=ruleLiteralNullRule(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); - } - set( - current, - "value", - lv_value_3_4, - "LiteralNullRule"); - afterParserOrEnumRuleCall(); - - - } - break; - case 5 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:183:8: lv_value_3_5= ruleLiteralStringRule - { - - newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_0_2_0_0_4()); - - pushFollow(FOLLOW_ruleLiteralStringRule_in_ruleAbstractRule270); - lv_value_3_5=ruleLiteralStringRule(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); - } - set( - current, - "value", - lv_value_3_5, - "LiteralStringRule"); - afterParserOrEnumRuleCall(); - - - } - break; + state._fsp--; - } + if (current==null) { + current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); + } + set( + current, + "value", + lv_value_3_1, + "LiteralBooleanRule"); + afterParserOrEnumRuleCall(); + } + break; + case 2 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:148:8: lv_value_3_2= ruleLiteralIntegerOrUnlimitedNaturalRule + { + + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1()); + + pushFollow(FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_ruleAbstractRule224); + lv_value_3_2=ruleLiteralIntegerOrUnlimitedNaturalRule(); + state._fsp--; - } + if (current==null) { + current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); + } + set( + current, + "value", + lv_value_3_2, + "LiteralIntegerOrUnlimitedNaturalRule"); + afterParserOrEnumRuleCall(); + } break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:202:6: ( (otherlv_4= RULE_ID ) ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:202:6: ( (otherlv_4= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:203:1: (otherlv_4= RULE_ID ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:203:1: (otherlv_4= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:204:3: otherlv_4= RULE_ID + case 3 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:163:8: lv_value_3_3= ruleLiteralRealRule { + + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralRealRuleParserRuleCall_2_1_0_2()); + + pushFollow(FOLLOW_ruleLiteralRealRule_in_ruleAbstractRule243); + lv_value_3_3=ruleLiteralRealRule(); - if (current==null) { - current = createModelElement(grammarAccess.getAbstractRuleRule()); - } - - otherlv_4=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAbstractRule299); + state._fsp--; - newLeafNode(otherlv_4, grammarAccess.getAbstractRuleAccess().getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0()); - + + if (current==null) { + current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); + } + set( + current, + "value", + lv_value_3_3, + "LiteralRealRule"); + afterParserOrEnumRuleCall(); + } + break; + case 4 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:178:8: lv_value_3_4= ruleLiteralNullRule + { + + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralNullRuleParserRuleCall_2_1_0_3()); + + pushFollow(FOLLOW_ruleLiteralNullRule_in_ruleAbstractRule262); + lv_value_3_4=ruleLiteralNullRule(); + + state._fsp--; + if (current==null) { + current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); + } + set( + current, + "value", + lv_value_3_4, + "LiteralNullRule"); + afterParserOrEnumRuleCall(); + + } + break; + case 5 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:193:8: lv_value_3_5= ruleLiteralStringRule + { + + newCompositeNode(grammarAccess.getAbstractRuleAccess().getValueLiteralStringRuleParserRuleCall_2_1_0_4()); + + pushFollow(FOLLOW_ruleLiteralStringRule_in_ruleAbstractRule281); + lv_value_3_5=ruleLiteralStringRule(); + + state._fsp--; + + if (current==null) { + current = createModelElementForParent(grammarAccess.getAbstractRuleRule()); + } + set( + current, + "value", + lv_value_3_5, + "LiteralStringRule"); + afterParserOrEnumRuleCall(); + } break; @@ -495,21 +469,24 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa } + + + } break; - case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:216:6: ( (lv_undefined_5_0= ruleUndefinedRule ) ) + case 3 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:212:6: ( (lv_undefined_4_0= ruleUndefinedRule ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:216:6: ( (lv_undefined_5_0= ruleUndefinedRule ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:217:1: (lv_undefined_5_0= ruleUndefinedRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:212:6: ( (lv_undefined_4_0= ruleUndefinedRule ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:213:1: (lv_undefined_4_0= ruleUndefinedRule ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:217:1: (lv_undefined_5_0= ruleUndefinedRule ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:218:3: lv_undefined_5_0= ruleUndefinedRule + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:213:1: (lv_undefined_4_0= ruleUndefinedRule ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:214:3: lv_undefined_4_0= ruleUndefinedRule { - newCompositeNode(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_1_0()); + newCompositeNode(grammarAccess.getAbstractRuleAccess().getUndefinedUndefinedRuleParserRuleCall_2_2_0()); - pushFollow(FOLLOW_ruleUndefinedRule_in_ruleAbstractRule328); - lv_undefined_5_0=ruleUndefinedRule(); + pushFollow(FOLLOW_ruleUndefinedRule_in_ruleAbstractRule311); + lv_undefined_4_0=ruleUndefinedRule(); state._fsp--; @@ -520,7 +497,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa set( current, "undefined", - lv_undefined_5_0, + lv_undefined_4_0, "UndefinedRule"); afterParserOrEnumRuleCall(); @@ -539,6 +516,9 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa } + + } + leaveRule(); } @@ -554,7 +534,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleLiteralBooleanRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:242:1: entryRuleLiteralBooleanRule returns [EObject current=null] : iv_ruleLiteralBooleanRule= ruleLiteralBooleanRule EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:238:1: entryRuleLiteralBooleanRule returns [EObject current=null] : iv_ruleLiteralBooleanRule= ruleLiteralBooleanRule EOF ; public final EObject entryRuleLiteralBooleanRule() throws RecognitionException { EObject current = null; @@ -562,17 +542,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:243:2: (iv_ruleLiteralBooleanRule= ruleLiteralBooleanRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:244:2: iv_ruleLiteralBooleanRule= ruleLiteralBooleanRule EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:239:2: (iv_ruleLiteralBooleanRule= ruleLiteralBooleanRule EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:240:2: iv_ruleLiteralBooleanRule= ruleLiteralBooleanRule EOF { newCompositeNode(grammarAccess.getLiteralBooleanRuleRule()); - pushFollow(FOLLOW_ruleLiteralBooleanRule_in_entryRuleLiteralBooleanRule364); + pushFollow(FOLLOW_ruleLiteralBooleanRule_in_entryRuleLiteralBooleanRule348); iv_ruleLiteralBooleanRule=ruleLiteralBooleanRule(); state._fsp--; current =iv_ruleLiteralBooleanRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralBooleanRule374); + match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralBooleanRule358); } @@ -590,7 +570,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleLiteralBooleanRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:251:1: ruleLiteralBooleanRule returns [EObject current=null] : ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:247:1: ruleLiteralBooleanRule returns [EObject current=null] : ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) ; public final EObject ruleLiteralBooleanRule() throws RecognitionException { EObject current = null; @@ -600,36 +580,36 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:254:28: ( ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:255:1: ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:250:28: ( ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:251:1: ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:255:1: ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:256:1: ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:251:1: ( ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:252:1: ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:256:1: ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:257:1: (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:252:1: ( (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:253:1: (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:257:1: (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) - int alt6=2; - int LA6_0 = input.LA(1); + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:253:1: (lv_value_0_1= 'true' | lv_value_0_2= 'false' ) + int alt5=2; + int LA5_0 = input.LA(1); - if ( (LA6_0==16) ) { - alt6=1; + if ( (LA5_0==14) ) { + alt5=1; } - else if ( (LA6_0==17) ) { - alt6=2; + else if ( (LA5_0==15) ) { + alt5=2; } else { NoViableAltException nvae = - new NoViableAltException("", 6, 0, input); + new NoViableAltException("", 5, 0, input); throw nvae; } - switch (alt6) { + switch (alt5) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:258:3: lv_value_0_1= 'true' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:254:3: lv_value_0_1= 'true' { - lv_value_0_1=(Token)match(input,16,FOLLOW_16_in_ruleLiteralBooleanRule418); + lv_value_0_1=(Token)match(input,14,FOLLOW_14_in_ruleLiteralBooleanRule402); newLeafNode(lv_value_0_1, grammarAccess.getLiteralBooleanRuleAccess().getValueTrueKeyword_0_0()); @@ -643,9 +623,9 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:270:8: lv_value_0_2= 'false' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:266:8: lv_value_0_2= 'false' { - lv_value_0_2=(Token)match(input,17,FOLLOW_17_in_ruleLiteralBooleanRule447); + lv_value_0_2=(Token)match(input,15,FOLLOW_15_in_ruleLiteralBooleanRule431); newLeafNode(lv_value_0_2, grammarAccess.getLiteralBooleanRuleAccess().getValueFalseKeyword_0_1()); @@ -685,7 +665,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleLiteralIntegerOrUnlimitedNaturalRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:293:1: entryRuleLiteralIntegerOrUnlimitedNaturalRule returns [EObject current=null] : iv_ruleLiteralIntegerOrUnlimitedNaturalRule= ruleLiteralIntegerOrUnlimitedNaturalRule EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:289:1: entryRuleLiteralIntegerOrUnlimitedNaturalRule returns [EObject current=null] : iv_ruleLiteralIntegerOrUnlimitedNaturalRule= ruleLiteralIntegerOrUnlimitedNaturalRule EOF ; public final EObject entryRuleLiteralIntegerOrUnlimitedNaturalRule() throws RecognitionException { EObject current = null; @@ -693,17 +673,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:294:2: (iv_ruleLiteralIntegerOrUnlimitedNaturalRule= ruleLiteralIntegerOrUnlimitedNaturalRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:295:2: iv_ruleLiteralIntegerOrUnlimitedNaturalRule= ruleLiteralIntegerOrUnlimitedNaturalRule EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:290:2: (iv_ruleLiteralIntegerOrUnlimitedNaturalRule= ruleLiteralIntegerOrUnlimitedNaturalRule EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:291:2: iv_ruleLiteralIntegerOrUnlimitedNaturalRule= ruleLiteralIntegerOrUnlimitedNaturalRule EOF { newCompositeNode(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); - pushFollow(FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule498); + pushFollow(FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule482); iv_ruleLiteralIntegerOrUnlimitedNaturalRule=ruleLiteralIntegerOrUnlimitedNaturalRule(); state._fsp--; current =iv_ruleLiteralIntegerOrUnlimitedNaturalRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule508); + match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule492); } @@ -721,42 +701,144 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleLiteralIntegerOrUnlimitedNaturalRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:302:1: ruleLiteralIntegerOrUnlimitedNaturalRule returns [EObject current=null] : ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_INT ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:298:1: ruleLiteralIntegerOrUnlimitedNaturalRule returns [EObject current=null] : ( ( ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) ) | ( (lv_unlimited_1_0= '*' ) ) ) ; public final EObject ruleLiteralIntegerOrUnlimitedNaturalRule() throws RecognitionException { EObject current = null; - Token lv_value_0_0=null; + Token lv_value_0_1=null; + Token lv_value_0_2=null; + Token lv_unlimited_1_0=null; enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:305:28: ( ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_INT ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:306:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_INT ) ) - { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:306:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_INT ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:307:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_INT ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:301:28: ( ( ( ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) ) | ( (lv_unlimited_1_0= '*' ) ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:302:1: ( ( ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) ) | ( (lv_unlimited_1_0= '*' ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:307:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_INT ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:308:3: lv_value_0_0= RULE_VALUE_SPECIFICATION_INT - { - lv_value_0_0=(Token)match(input,RULE_VALUE_SPECIFICATION_INT,FOLLOW_RULE_VALUE_SPECIFICATION_INT_in_ruleLiteralIntegerOrUnlimitedNaturalRule549); - - newLeafNode(lv_value_0_0, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0()); - + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:302:1: ( ( ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) ) | ( (lv_unlimited_1_0= '*' ) ) ) + int alt7=2; + int LA7_0 = input.LA(1); - if (current==null) { - current = createModelElement(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); - } - setWithLastConsumed( - current, - "value", - lv_value_0_0, - "VALUE_SPECIFICATION_INT"); - + if ( ((LA7_0>=RULE_INT && LA7_0<=RULE_VALUE_SPECIFICATION_NEGATIVE_INT)) ) { + alt7=1; + } + else if ( (LA7_0==16) ) { + alt7=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 7, 0, input); + throw nvae; } + switch (alt7) { + case 1 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:302:2: ( ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:302:2: ( ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:303:1: ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:303:1: ( (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:304:1: (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:304:1: (lv_value_0_1= RULE_INT | lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT ) + int alt6=2; + int LA6_0 = input.LA(1); + + if ( (LA6_0==RULE_INT) ) { + alt6=1; + } + else if ( (LA6_0==RULE_VALUE_SPECIFICATION_NEGATIVE_INT) ) { + alt6=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 6, 0, input); + + throw nvae; + } + switch (alt6) { + case 1 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:305:3: lv_value_0_1= RULE_INT + { + lv_value_0_1=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleLiteralIntegerOrUnlimitedNaturalRule536); + + newLeafNode(lv_value_0_1, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueINTTerminalRuleCall_0_0_0()); + + + if (current==null) { + current = createModelElement(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); + } + setWithLastConsumed( + current, + "value", + lv_value_0_1, + "INT"); + + + } + break; + case 2 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:320:8: lv_value_0_2= RULE_VALUE_SPECIFICATION_NEGATIVE_INT + { + lv_value_0_2=(Token)match(input,RULE_VALUE_SPECIFICATION_NEGATIVE_INT,FOLLOW_RULE_VALUE_SPECIFICATION_NEGATIVE_INT_in_ruleLiteralIntegerOrUnlimitedNaturalRule556); + + newLeafNode(lv_value_0_2, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1()); + + + if (current==null) { + current = createModelElement(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); + } + setWithLastConsumed( + current, + "value", + lv_value_0_2, + "VALUE_SPECIFICATION_NEGATIVE_INT"); + + + } + break; + + } + + + } + } + + + } + break; + case 2 : + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:339:6: ( (lv_unlimited_1_0= '*' ) ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:339:6: ( (lv_unlimited_1_0= '*' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:340:1: (lv_unlimited_1_0= '*' ) + { + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:340:1: (lv_unlimited_1_0= '*' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:341:3: lv_unlimited_1_0= '*' + { + lv_unlimited_1_0=(Token)match(input,16,FOLLOW_16_in_ruleLiteralIntegerOrUnlimitedNaturalRule588); + + newLeafNode(lv_unlimited_1_0, grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getUnlimitedAsteriskKeyword_1_0()); + + + if (current==null) { + current = createModelElement(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleRule()); + } + setWithLastConsumed(current, "unlimited", lv_unlimited_1_0, "*"); + + + } + + + } + + + } + break; + } @@ -777,7 +859,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleLiteralRealRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:332:1: entryRuleLiteralRealRule returns [EObject current=null] : iv_ruleLiteralRealRule= ruleLiteralRealRule EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:362:1: entryRuleLiteralRealRule returns [EObject current=null] : iv_ruleLiteralRealRule= ruleLiteralRealRule EOF ; public final EObject entryRuleLiteralRealRule() throws RecognitionException { EObject current = null; @@ -785,17 +867,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:333:2: (iv_ruleLiteralRealRule= ruleLiteralRealRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:334:2: iv_ruleLiteralRealRule= ruleLiteralRealRule EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:363:2: (iv_ruleLiteralRealRule= ruleLiteralRealRule EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:364:2: iv_ruleLiteralRealRule= ruleLiteralRealRule EOF { newCompositeNode(grammarAccess.getLiteralRealRuleRule()); - pushFollow(FOLLOW_ruleLiteralRealRule_in_entryRuleLiteralRealRule589); + pushFollow(FOLLOW_ruleLiteralRealRule_in_entryRuleLiteralRealRule637); iv_ruleLiteralRealRule=ruleLiteralRealRule(); state._fsp--; current =iv_ruleLiteralRealRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralRealRule599); + match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralRealRule647); } @@ -813,7 +895,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleLiteralRealRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:341:1: ruleLiteralRealRule returns [EObject current=null] : ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:371:1: ruleLiteralRealRule returns [EObject current=null] : ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) ; public final EObject ruleLiteralRealRule() throws RecognitionException { EObject current = null; @@ -822,16 +904,16 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:344:28: ( ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:345:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:374:28: ( ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:375:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:345:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:346:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:375:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:376:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:346:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:347:3: lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:376:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:377:3: lv_value_0_0= RULE_VALUE_SPECIFICATION_DOUBLE { - lv_value_0_0=(Token)match(input,RULE_VALUE_SPECIFICATION_DOUBLE,FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_ruleLiteralRealRule640); + lv_value_0_0=(Token)match(input,RULE_VALUE_SPECIFICATION_DOUBLE,FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_ruleLiteralRealRule688); newLeafNode(lv_value_0_0, grammarAccess.getLiteralRealRuleAccess().getValueVALUE_SPECIFICATION_DOUBLETerminalRuleCall_0()); @@ -869,7 +951,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleLiteralNullRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:371:1: entryRuleLiteralNullRule returns [EObject current=null] : iv_ruleLiteralNullRule= ruleLiteralNullRule EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:401:1: entryRuleLiteralNullRule returns [EObject current=null] : iv_ruleLiteralNullRule= ruleLiteralNullRule EOF ; public final EObject entryRuleLiteralNullRule() throws RecognitionException { EObject current = null; @@ -877,17 +959,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:372:2: (iv_ruleLiteralNullRule= ruleLiteralNullRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:373:2: iv_ruleLiteralNullRule= ruleLiteralNullRule EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:402:2: (iv_ruleLiteralNullRule= ruleLiteralNullRule EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:403:2: iv_ruleLiteralNullRule= ruleLiteralNullRule EOF { newCompositeNode(grammarAccess.getLiteralNullRuleRule()); - pushFollow(FOLLOW_ruleLiteralNullRule_in_entryRuleLiteralNullRule680); + pushFollow(FOLLOW_ruleLiteralNullRule_in_entryRuleLiteralNullRule728); iv_ruleLiteralNullRule=ruleLiteralNullRule(); state._fsp--; current =iv_ruleLiteralNullRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralNullRule690); + match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralNullRule738); } @@ -905,7 +987,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleLiteralNullRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:380:1: ruleLiteralNullRule returns [EObject current=null] : ( (lv_value_0_0= 'null' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:410:1: ruleLiteralNullRule returns [EObject current=null] : ( (lv_value_0_0= 'null' ) ) ; public final EObject ruleLiteralNullRule() throws RecognitionException { EObject current = null; @@ -914,16 +996,16 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:383:28: ( ( (lv_value_0_0= 'null' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:384:1: ( (lv_value_0_0= 'null' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:413:28: ( ( (lv_value_0_0= 'null' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:414:1: ( (lv_value_0_0= 'null' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:384:1: ( (lv_value_0_0= 'null' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:385:1: (lv_value_0_0= 'null' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:414:1: ( (lv_value_0_0= 'null' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:415:1: (lv_value_0_0= 'null' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:385:1: (lv_value_0_0= 'null' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:386:3: lv_value_0_0= 'null' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:415:1: (lv_value_0_0= 'null' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:416:3: lv_value_0_0= 'null' { - lv_value_0_0=(Token)match(input,18,FOLLOW_18_in_ruleLiteralNullRule732); + lv_value_0_0=(Token)match(input,17,FOLLOW_17_in_ruleLiteralNullRule780); newLeafNode(lv_value_0_0, grammarAccess.getLiteralNullRuleAccess().getValueNullKeyword_0()); @@ -957,7 +1039,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleLiteralStringRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:407:1: entryRuleLiteralStringRule returns [EObject current=null] : iv_ruleLiteralStringRule= ruleLiteralStringRule EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:437:1: entryRuleLiteralStringRule returns [EObject current=null] : iv_ruleLiteralStringRule= ruleLiteralStringRule EOF ; public final EObject entryRuleLiteralStringRule() throws RecognitionException { EObject current = null; @@ -965,17 +1047,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:408:2: (iv_ruleLiteralStringRule= ruleLiteralStringRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:409:2: iv_ruleLiteralStringRule= ruleLiteralStringRule EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:438:2: (iv_ruleLiteralStringRule= ruleLiteralStringRule EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:439:2: iv_ruleLiteralStringRule= ruleLiteralStringRule EOF { newCompositeNode(grammarAccess.getLiteralStringRuleRule()); - pushFollow(FOLLOW_ruleLiteralStringRule_in_entryRuleLiteralStringRule780); + pushFollow(FOLLOW_ruleLiteralStringRule_in_entryRuleLiteralStringRule828); iv_ruleLiteralStringRule=ruleLiteralStringRule(); state._fsp--; current =iv_ruleLiteralStringRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralStringRule790); + match(input,EOF,FOLLOW_EOF_in_entryRuleLiteralStringRule838); } @@ -993,7 +1075,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleLiteralStringRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:416:1: ruleLiteralStringRule returns [EObject current=null] : ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:446:1: ruleLiteralStringRule returns [EObject current=null] : ( (lv_value_0_0= RULE_STRING ) ) ; public final EObject ruleLiteralStringRule() throws RecognitionException { EObject current = null; @@ -1002,18 +1084,18 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:419:28: ( ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:420:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:449:28: ( ( (lv_value_0_0= RULE_STRING ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:450:1: ( (lv_value_0_0= RULE_STRING ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:420:1: ( (lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:421:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:450:1: ( (lv_value_0_0= RULE_STRING ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:451:1: (lv_value_0_0= RULE_STRING ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:421:1: (lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:422:3: lv_value_0_0= RULE_VALUE_SPECIFICATION_STRING + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:451:1: (lv_value_0_0= RULE_STRING ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:452:3: lv_value_0_0= RULE_STRING { - lv_value_0_0=(Token)match(input,RULE_VALUE_SPECIFICATION_STRING,FOLLOW_RULE_VALUE_SPECIFICATION_STRING_in_ruleLiteralStringRule831); + lv_value_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleLiteralStringRule879); - newLeafNode(lv_value_0_0, grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0()); + newLeafNode(lv_value_0_0, grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0()); if (current==null) { @@ -1023,7 +1105,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa current, "value", lv_value_0_0, - "VALUE_SPECIFICATION_STRING"); + "STRING"); } @@ -1049,7 +1131,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleUndefinedRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:446:1: entryRuleUndefinedRule returns [EObject current=null] : iv_ruleUndefinedRule= ruleUndefinedRule EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:476:1: entryRuleUndefinedRule returns [EObject current=null] : iv_ruleUndefinedRule= ruleUndefinedRule EOF ; public final EObject entryRuleUndefinedRule() throws RecognitionException { EObject current = null; @@ -1057,17 +1139,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:447:2: (iv_ruleUndefinedRule= ruleUndefinedRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:448:2: iv_ruleUndefinedRule= ruleUndefinedRule EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:477:2: (iv_ruleUndefinedRule= ruleUndefinedRule EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:478:2: iv_ruleUndefinedRule= ruleUndefinedRule EOF { newCompositeNode(grammarAccess.getUndefinedRuleRule()); - pushFollow(FOLLOW_ruleUndefinedRule_in_entryRuleUndefinedRule871); + pushFollow(FOLLOW_ruleUndefinedRule_in_entryRuleUndefinedRule919); iv_ruleUndefinedRule=ruleUndefinedRule(); state._fsp--; current =iv_ruleUndefinedRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleUndefinedRule881); + match(input,EOF,FOLLOW_EOF_in_entryRuleUndefinedRule929); } @@ -1085,7 +1167,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleUndefinedRule" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:455:1: ruleUndefinedRule returns [EObject current=null] : ( (lv_value_0_0= '<Undefined>' ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:485:1: ruleUndefinedRule returns [EObject current=null] : ( (lv_value_0_0= '<Undefined>' ) ) ; public final EObject ruleUndefinedRule() throws RecognitionException { EObject current = null; @@ -1094,16 +1176,16 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:458:28: ( ( (lv_value_0_0= '<Undefined>' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:459:1: ( (lv_value_0_0= '<Undefined>' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:488:28: ( ( (lv_value_0_0= '<Undefined>' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:489:1: ( (lv_value_0_0= '<Undefined>' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:459:1: ( (lv_value_0_0= '<Undefined>' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:460:1: (lv_value_0_0= '<Undefined>' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:489:1: ( (lv_value_0_0= '<Undefined>' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:490:1: (lv_value_0_0= '<Undefined>' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:460:1: (lv_value_0_0= '<Undefined>' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:461:3: lv_value_0_0= '<Undefined>' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:490:1: (lv_value_0_0= '<Undefined>' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:491:3: lv_value_0_0= '<Undefined>' { - lv_value_0_0=(Token)match(input,19,FOLLOW_19_in_ruleUndefinedRule923); + lv_value_0_0=(Token)match(input,18,FOLLOW_18_in_ruleUndefinedRule971); newLeafNode(lv_value_0_0, grammarAccess.getUndefinedRuleAccess().getValueUndefinedKeyword_0()); @@ -1137,7 +1219,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "entryRuleVisibilityKind" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:482:1: entryRuleVisibilityKind returns [EObject current=null] : iv_ruleVisibilityKind= ruleVisibilityKind EOF ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:512:1: entryRuleVisibilityKind returns [EObject current=null] : iv_ruleVisibilityKind= ruleVisibilityKind EOF ; public final EObject entryRuleVisibilityKind() throws RecognitionException { EObject current = null; @@ -1145,17 +1227,17 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:483:2: (iv_ruleVisibilityKind= ruleVisibilityKind EOF ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:484:2: iv_ruleVisibilityKind= ruleVisibilityKind EOF + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:513:2: (iv_ruleVisibilityKind= ruleVisibilityKind EOF ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:514:2: iv_ruleVisibilityKind= ruleVisibilityKind EOF { newCompositeNode(grammarAccess.getVisibilityKindRule()); - pushFollow(FOLLOW_ruleVisibilityKind_in_entryRuleVisibilityKind971); + pushFollow(FOLLOW_ruleVisibilityKind_in_entryRuleVisibilityKind1019); iv_ruleVisibilityKind=ruleVisibilityKind(); state._fsp--; current =iv_ruleVisibilityKind; - match(input,EOF,FOLLOW_EOF_in_entryRuleVisibilityKind981); + match(input,EOF,FOLLOW_EOF_in_entryRuleVisibilityKind1029); } @@ -1173,7 +1255,7 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa // $ANTLR start "ruleVisibilityKind" - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:491:1: ruleVisibilityKind returns [EObject current=null] : ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) ; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:521:1: ruleVisibilityKind returns [EObject current=null] : ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) ; public final EObject ruleVisibilityKind() throws RecognitionException { EObject current = null; @@ -1185,50 +1267,50 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:494:28: ( ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:495:1: ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:524:28: ( ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:525:1: ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:495:1: ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) - int alt7=4; + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:525:1: ( ( (lv_public_0_0= '+' ) ) | ( (lv_private_1_0= '-' ) ) | ( (lv_protected_2_0= '#' ) ) | ( (lv_package_3_0= '~' ) ) ) + int alt8=4; switch ( input.LA(1) ) { - case 20: + case 19: { - alt7=1; + alt8=1; } break; - case 21: + case 20: { - alt7=2; + alt8=2; } break; - case 22: + case 21: { - alt7=3; + alt8=3; } break; - case 23: + case 22: { - alt7=4; + alt8=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 7, 0, input); + new NoViableAltException("", 8, 0, input); throw nvae; } - switch (alt7) { + switch (alt8) { case 1 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:495:2: ( (lv_public_0_0= '+' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:525:2: ( (lv_public_0_0= '+' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:495:2: ( (lv_public_0_0= '+' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:496:1: (lv_public_0_0= '+' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:525:2: ( (lv_public_0_0= '+' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:526:1: (lv_public_0_0= '+' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:496:1: (lv_public_0_0= '+' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:497:3: lv_public_0_0= '+' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:526:1: (lv_public_0_0= '+' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:527:3: lv_public_0_0= '+' { - lv_public_0_0=(Token)match(input,20,FOLLOW_20_in_ruleVisibilityKind1024); + lv_public_0_0=(Token)match(input,19,FOLLOW_19_in_ruleVisibilityKind1072); newLeafNode(lv_public_0_0, grammarAccess.getVisibilityKindAccess().getPublicPlusSignKeyword_0_0()); @@ -1248,15 +1330,15 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa } break; case 2 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:511:6: ( (lv_private_1_0= '-' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:541:6: ( (lv_private_1_0= '-' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:511:6: ( (lv_private_1_0= '-' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:512:1: (lv_private_1_0= '-' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:541:6: ( (lv_private_1_0= '-' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:542:1: (lv_private_1_0= '-' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:512:1: (lv_private_1_0= '-' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:513:3: lv_private_1_0= '-' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:542:1: (lv_private_1_0= '-' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:543:3: lv_private_1_0= '-' { - lv_private_1_0=(Token)match(input,21,FOLLOW_21_in_ruleVisibilityKind1061); + lv_private_1_0=(Token)match(input,20,FOLLOW_20_in_ruleVisibilityKind1109); newLeafNode(lv_private_1_0, grammarAccess.getVisibilityKindAccess().getPrivateHyphenMinusKeyword_1_0()); @@ -1276,15 +1358,15 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa } break; case 3 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:527:6: ( (lv_protected_2_0= '#' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:557:6: ( (lv_protected_2_0= '#' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:527:6: ( (lv_protected_2_0= '#' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:528:1: (lv_protected_2_0= '#' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:557:6: ( (lv_protected_2_0= '#' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:558:1: (lv_protected_2_0= '#' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:528:1: (lv_protected_2_0= '#' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:529:3: lv_protected_2_0= '#' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:558:1: (lv_protected_2_0= '#' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:559:3: lv_protected_2_0= '#' { - lv_protected_2_0=(Token)match(input,22,FOLLOW_22_in_ruleVisibilityKind1098); + lv_protected_2_0=(Token)match(input,21,FOLLOW_21_in_ruleVisibilityKind1146); newLeafNode(lv_protected_2_0, grammarAccess.getVisibilityKindAccess().getProtectedNumberSignKeyword_2_0()); @@ -1304,15 +1386,15 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa } break; case 4 : - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:543:6: ( (lv_package_3_0= '~' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:6: ( (lv_package_3_0= '~' ) ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:543:6: ( (lv_package_3_0= '~' ) ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:544:1: (lv_package_3_0= '~' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:573:6: ( (lv_package_3_0= '~' ) ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:574:1: (lv_package_3_0= '~' ) { - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:544:1: (lv_package_3_0= '~' ) - // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:545:3: lv_package_3_0= '~' + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:574:1: (lv_package_3_0= '~' ) + // ../org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/parser/antlr/internal/InternalUmlValueSpecification.g:575:3: lv_package_3_0= '~' { - lv_package_3_0=(Token)match(input,23,FOLLOW_23_in_ruleVisibilityKind1135); + lv_package_3_0=(Token)match(input,22,FOLLOW_22_in_ruleVisibilityKind1183); newLeafNode(lv_package_3_0, grammarAccess.getVisibilityKindAccess().getPackageTildeKeyword_3_0()); @@ -1357,40 +1439,41 @@ public class InternalUmlValueSpecificationParser extends AbstractInternalAntlrPa public static final BitSet FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule75 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleAbstractRule85 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleVisibilityKind_in_ruleAbstractRule132 = new BitSet(new long[]{0x00000000000701F0L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_ruleAbstractRule151 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleAbstractRule168 = new BitSet(new long[]{0x00000000000701E0L}); - public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_ruleAbstractRule194 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_ruleAbstractRule213 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralRealRule_in_ruleAbstractRule232 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralNullRule_in_ruleAbstractRule251 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralStringRule_in_ruleAbstractRule270 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleAbstractRule299 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUndefinedRule_in_ruleAbstractRule328 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_entryRuleLiteralBooleanRule364 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLiteralBooleanRule374 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_16_in_ruleLiteralBooleanRule418 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_ruleLiteralBooleanRule447 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule498 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule508 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_INT_in_ruleLiteralIntegerOrUnlimitedNaturalRule549 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralRealRule_in_entryRuleLiteralRealRule589 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLiteralRealRule599 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_ruleLiteralRealRule640 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralNullRule_in_entryRuleLiteralNullRule680 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLiteralNullRule690 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_ruleLiteralNullRule732 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLiteralStringRule_in_entryRuleLiteralStringRule780 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLiteralStringRule790 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_STRING_in_ruleLiteralStringRule831 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUndefinedRule_in_entryRuleUndefinedRule871 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUndefinedRule881 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_19_in_ruleUndefinedRule923 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleVisibilityKind_in_entryRuleVisibilityKind971 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleVisibilityKind981 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_20_in_ruleVisibilityKind1024 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_21_in_ruleVisibilityKind1061 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_ruleVisibilityKind1098 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_23_in_ruleVisibilityKind1135 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleVisibilityKind_in_ruleAbstractRule131 = new BitSet(new long[]{0x000000000007C3F0L}); + public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_ID_in_ruleAbstractRule149 = new BitSet(new long[]{0x000000000007C3F0L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleAbstractRule176 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_ruleAbstractRule205 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_ruleAbstractRule224 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralRealRule_in_ruleAbstractRule243 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralNullRule_in_ruleAbstractRule262 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralStringRule_in_ruleAbstractRule281 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUndefinedRule_in_ruleAbstractRule311 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralBooleanRule_in_entryRuleLiteralBooleanRule348 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLiteralBooleanRule358 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_ruleLiteralBooleanRule402 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleLiteralBooleanRule431 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralIntegerOrUnlimitedNaturalRule_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule482 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLiteralIntegerOrUnlimitedNaturalRule492 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleLiteralIntegerOrUnlimitedNaturalRule536 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_NEGATIVE_INT_in_ruleLiteralIntegerOrUnlimitedNaturalRule556 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_16_in_ruleLiteralIntegerOrUnlimitedNaturalRule588 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralRealRule_in_entryRuleLiteralRealRule637 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLiteralRealRule647 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_VALUE_SPECIFICATION_DOUBLE_in_ruleLiteralRealRule688 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralNullRule_in_entryRuleLiteralNullRule728 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLiteralNullRule738 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleLiteralNullRule780 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLiteralStringRule_in_entryRuleLiteralStringRule828 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLiteralStringRule838 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleLiteralStringRule879 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUndefinedRule_in_entryRuleUndefinedRule919 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUndefinedRule929 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleUndefinedRule971 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleVisibilityKind_in_entryRuleVisibilityKind1019 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleVisibilityKind1029 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_ruleVisibilityKind1072 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_20_in_ruleVisibilityKind1109 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_21_in_ruleVisibilityKind1146 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_ruleVisibilityKind1183 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/serializer/UmlValueSpecificationSemanticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/serializer/UmlValueSpecificationSemanticSequencer.java index c0859635cfa..2da3f06c12c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/serializer/UmlValueSpecificationSemanticSequencer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/serializer/UmlValueSpecificationSemanticSequencer.java @@ -67,19 +67,17 @@ public class UmlValueSpecificationSemanticSequencer extends AbstractDelegatingSe /** * Constraint: * ( + * visibility=VisibilityKind? + * name=VALUE_SPECIFICATION_ID? * ( - * visibility=VisibilityKind? - * name=VALUE_SPECIFICATION_ID? - * ( - * value=LiteralBooleanRule | - * value=LiteralIntegerOrUnlimitedNaturalRule | - * value=LiteralRealRule | - * value=LiteralNullRule | - * value=LiteralStringRule | - * instanceSpecification=[InstanceSpecification|ID] - * ) - * ) | - * undefined=UndefinedRule + * instanceSpecification=[InstanceSpecification|ID] | + * value=LiteralBooleanRule | + * value=LiteralIntegerOrUnlimitedNaturalRule | + * value=LiteralRealRule | + * value=LiteralNullRule | + * value=LiteralStringRule | + * undefined=UndefinedRule + * ) * ) */ protected void sequence_AbstractRule(EObject context, AbstractRule semanticObject) { @@ -98,17 +96,10 @@ public class UmlValueSpecificationSemanticSequencer extends AbstractDelegatingSe /** * Constraint: - * value=VALUE_SPECIFICATION_INT + * (value=INT | value=VALUE_SPECIFICATION_NEGATIVE_INT | unlimited='*') */ protected void sequence_LiteralIntegerOrUnlimitedNaturalRule(EObject context, LiteralIntegerOrUnlimitedNaturalRule semanticObject) { - if(errorAcceptor != null) { - if(transientValues.isValueTransient(semanticObject, UmlValueSpecificationPackage.Literals.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE) == ValueTransient.YES) - errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlValueSpecificationPackage.Literals.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE)); - } - INodesForEObjectProvider nodes = createNodeProvider(semanticObject); - SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes); - feeder.accept(grammarAccess.getLiteralIntegerOrUnlimitedNaturalRuleAccess().getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0(), semanticObject.getValue()); - feeder.finish(); + genericSequencer.createSequence(context, semanticObject); } @@ -146,7 +137,7 @@ public class UmlValueSpecificationSemanticSequencer extends AbstractDelegatingSe /** * Constraint: - * value=VALUE_SPECIFICATION_STRING + * value=STRING */ protected void sequence_LiteralStringRule(EObject context, LiteralStringRule semanticObject) { if(errorAcceptor != null) { @@ -155,7 +146,7 @@ public class UmlValueSpecificationSemanticSequencer extends AbstractDelegatingSe } INodesForEObjectProvider nodes = createNodeProvider(semanticObject); SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes); - feeder.accept(grammarAccess.getLiteralStringRuleAccess().getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0(), semanticObject.getValue()); + feeder.accept(grammarAccess.getLiteralStringRuleAccess().getValueSTRINGTerminalRuleCall_0(), semanticObject.getValue()); feeder.finish(); } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/services/UmlValueSpecificationGrammarAccess.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/services/UmlValueSpecificationGrammarAccess.java index 1ef1c2e4696..47324b90f3a 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/services/UmlValueSpecificationGrammarAccess.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/services/UmlValueSpecificationGrammarAccess.java @@ -20,102 +20,88 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi public class AbstractRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AbstractRule"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0); - private final Assignment cVisibilityAssignment_0_0 = (Assignment)cGroup_0.eContents().get(0); - private final RuleCall cVisibilityVisibilityKindParserRuleCall_0_0_0 = (RuleCall)cVisibilityAssignment_0_0.eContents().get(0); - private final Group cGroup_0_1 = (Group)cGroup_0.eContents().get(1); - private final Assignment cNameAssignment_0_1_0 = (Assignment)cGroup_0_1.eContents().get(0); - private final RuleCall cNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0 = (RuleCall)cNameAssignment_0_1_0.eContents().get(0); - private final Keyword cEqualsSignKeyword_0_1_1 = (Keyword)cGroup_0_1.eContents().get(1); - private final Alternatives cAlternatives_0_2 = (Alternatives)cGroup_0.eContents().get(2); - private final Assignment cValueAssignment_0_2_0 = (Assignment)cAlternatives_0_2.eContents().get(0); - private final Alternatives cValueAlternatives_0_2_0_0 = (Alternatives)cValueAssignment_0_2_0.eContents().get(0); - private final RuleCall cValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0 = (RuleCall)cValueAlternatives_0_2_0_0.eContents().get(0); - private final RuleCall cValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1 = (RuleCall)cValueAlternatives_0_2_0_0.eContents().get(1); - private final RuleCall cValueLiteralRealRuleParserRuleCall_0_2_0_0_2 = (RuleCall)cValueAlternatives_0_2_0_0.eContents().get(2); - private final RuleCall cValueLiteralNullRuleParserRuleCall_0_2_0_0_3 = (RuleCall)cValueAlternatives_0_2_0_0.eContents().get(3); - private final RuleCall cValueLiteralStringRuleParserRuleCall_0_2_0_0_4 = (RuleCall)cValueAlternatives_0_2_0_0.eContents().get(4); - private final Assignment cInstanceSpecificationAssignment_0_2_1 = (Assignment)cAlternatives_0_2.eContents().get(1); - private final CrossReference cInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0 = (CrossReference)cInstanceSpecificationAssignment_0_2_1.eContents().get(0); - private final RuleCall cInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1 = (RuleCall)cInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0.eContents().get(1); - private final Assignment cUndefinedAssignment_1 = (Assignment)cAlternatives.eContents().get(1); - private final RuleCall cUndefinedUndefinedRuleParserRuleCall_1_0 = (RuleCall)cUndefinedAssignment_1.eContents().get(0); + private final Group cGroup = (Group)rule.eContents().get(1); + private final Assignment cVisibilityAssignment_0 = (Assignment)cGroup.eContents().get(0); + private final RuleCall cVisibilityVisibilityKindParserRuleCall_0_0 = (RuleCall)cVisibilityAssignment_0.eContents().get(0); + private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1); + private final RuleCall cNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0); + private final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2); + private final Assignment cInstanceSpecificationAssignment_2_0 = (Assignment)cAlternatives_2.eContents().get(0); + private final CrossReference cInstanceSpecificationInstanceSpecificationCrossReference_2_0_0 = (CrossReference)cInstanceSpecificationAssignment_2_0.eContents().get(0); + private final RuleCall cInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1 = (RuleCall)cInstanceSpecificationInstanceSpecificationCrossReference_2_0_0.eContents().get(1); + private final Assignment cValueAssignment_2_1 = (Assignment)cAlternatives_2.eContents().get(1); + private final Alternatives cValueAlternatives_2_1_0 = (Alternatives)cValueAssignment_2_1.eContents().get(0); + private final RuleCall cValueLiteralBooleanRuleParserRuleCall_2_1_0_0 = (RuleCall)cValueAlternatives_2_1_0.eContents().get(0); + private final RuleCall cValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1 = (RuleCall)cValueAlternatives_2_1_0.eContents().get(1); + private final RuleCall cValueLiteralRealRuleParserRuleCall_2_1_0_2 = (RuleCall)cValueAlternatives_2_1_0.eContents().get(2); + private final RuleCall cValueLiteralNullRuleParserRuleCall_2_1_0_3 = (RuleCall)cValueAlternatives_2_1_0.eContents().get(3); + private final RuleCall cValueLiteralStringRuleParserRuleCall_2_1_0_4 = (RuleCall)cValueAlternatives_2_1_0.eContents().get(4); + private final Assignment cUndefinedAssignment_2_2 = (Assignment)cAlternatives_2.eContents().get(2); + private final RuleCall cUndefinedUndefinedRuleParserRuleCall_2_2_0 = (RuleCall)cUndefinedAssignment_2_2.eContents().get(0); //AbstractRule: - // visibility=VisibilityKind? (name=VALUE_SPECIFICATION_ID "=")? (value=(LiteralBooleanRule | - // LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | LiteralStringRule) | - // instanceSpecification=[uml::InstanceSpecification]) | undefined=UndefinedRule; + // visibility=VisibilityKind? name=VALUE_SPECIFICATION_ID? (instanceSpecification=[uml::InstanceSpecification] | + // value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | + // LiteralStringRule) | undefined=UndefinedRule); @Override public ParserRule getRule() { return rule; } - //visibility=VisibilityKind? (name=VALUE_SPECIFICATION_ID "=")? (value=(LiteralBooleanRule | - //LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | LiteralStringRule) | - //instanceSpecification=[uml::InstanceSpecification]) | undefined=UndefinedRule - public Alternatives getAlternatives() { return cAlternatives; } - - //visibility=VisibilityKind? (name=VALUE_SPECIFICATION_ID "=")? (value=(LiteralBooleanRule | - //LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | LiteralStringRule) | - //instanceSpecification=[uml::InstanceSpecification]) - public Group getGroup_0() { return cGroup_0; } + //visibility=VisibilityKind? name=VALUE_SPECIFICATION_ID? (instanceSpecification=[uml::InstanceSpecification] | + //value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | + //LiteralStringRule) | undefined=UndefinedRule) + public Group getGroup() { return cGroup; } //visibility=VisibilityKind? - public Assignment getVisibilityAssignment_0_0() { return cVisibilityAssignment_0_0; } + public Assignment getVisibilityAssignment_0() { return cVisibilityAssignment_0; } //VisibilityKind - public RuleCall getVisibilityVisibilityKindParserRuleCall_0_0_0() { return cVisibilityVisibilityKindParserRuleCall_0_0_0; } + public RuleCall getVisibilityVisibilityKindParserRuleCall_0_0() { return cVisibilityVisibilityKindParserRuleCall_0_0; } - //(name=VALUE_SPECIFICATION_ID "=")? - public Group getGroup_0_1() { return cGroup_0_1; } - - //name=VALUE_SPECIFICATION_ID - public Assignment getNameAssignment_0_1_0() { return cNameAssignment_0_1_0; } + //name=VALUE_SPECIFICATION_ID? + public Assignment getNameAssignment_1() { return cNameAssignment_1; } //VALUE_SPECIFICATION_ID - public RuleCall getNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0() { return cNameVALUE_SPECIFICATION_IDTerminalRuleCall_0_1_0_0; } + public RuleCall getNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0() { return cNameVALUE_SPECIFICATION_IDTerminalRuleCall_1_0; } - //"=" - public Keyword getEqualsSignKeyword_0_1_1() { return cEqualsSignKeyword_0_1_1; } + //instanceSpecification=[uml::InstanceSpecification] | value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | + //LiteralRealRule | LiteralNullRule | LiteralStringRule) | undefined=UndefinedRule + public Alternatives getAlternatives_2() { return cAlternatives_2; } - //value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | - //LiteralStringRule) | instanceSpecification=[uml::InstanceSpecification] - public Alternatives getAlternatives_0_2() { return cAlternatives_0_2; } + //instanceSpecification=[uml::InstanceSpecification] + public Assignment getInstanceSpecificationAssignment_2_0() { return cInstanceSpecificationAssignment_2_0; } + + //[uml::InstanceSpecification] + public CrossReference getInstanceSpecificationInstanceSpecificationCrossReference_2_0_0() { return cInstanceSpecificationInstanceSpecificationCrossReference_2_0_0; } + + //ID + public RuleCall getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1() { return cInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_2_0_0_1; } //value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | //LiteralStringRule) - public Assignment getValueAssignment_0_2_0() { return cValueAssignment_0_2_0; } + public Assignment getValueAssignment_2_1() { return cValueAssignment_2_1; } //LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | LiteralStringRule - public Alternatives getValueAlternatives_0_2_0_0() { return cValueAlternatives_0_2_0_0; } + public Alternatives getValueAlternatives_2_1_0() { return cValueAlternatives_2_1_0; } //LiteralBooleanRule - public RuleCall getValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0() { return cValueLiteralBooleanRuleParserRuleCall_0_2_0_0_0; } + public RuleCall getValueLiteralBooleanRuleParserRuleCall_2_1_0_0() { return cValueLiteralBooleanRuleParserRuleCall_2_1_0_0; } //LiteralIntegerOrUnlimitedNaturalRule - public RuleCall getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1() { return cValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_0_2_0_0_1; } + public RuleCall getValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1() { return cValueLiteralIntegerOrUnlimitedNaturalRuleParserRuleCall_2_1_0_1; } //LiteralRealRule - public RuleCall getValueLiteralRealRuleParserRuleCall_0_2_0_0_2() { return cValueLiteralRealRuleParserRuleCall_0_2_0_0_2; } + public RuleCall getValueLiteralRealRuleParserRuleCall_2_1_0_2() { return cValueLiteralRealRuleParserRuleCall_2_1_0_2; } //LiteralNullRule - public RuleCall getValueLiteralNullRuleParserRuleCall_0_2_0_0_3() { return cValueLiteralNullRuleParserRuleCall_0_2_0_0_3; } + public RuleCall getValueLiteralNullRuleParserRuleCall_2_1_0_3() { return cValueLiteralNullRuleParserRuleCall_2_1_0_3; } //LiteralStringRule - public RuleCall getValueLiteralStringRuleParserRuleCall_0_2_0_0_4() { return cValueLiteralStringRuleParserRuleCall_0_2_0_0_4; } - - //instanceSpecification=[uml::InstanceSpecification] - public Assignment getInstanceSpecificationAssignment_0_2_1() { return cInstanceSpecificationAssignment_0_2_1; } - - //[uml::InstanceSpecification] - public CrossReference getInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0() { return cInstanceSpecificationInstanceSpecificationCrossReference_0_2_1_0; } - - //ID - public RuleCall getInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1() { return cInstanceSpecificationInstanceSpecificationIDTerminalRuleCall_0_2_1_0_1; } + public RuleCall getValueLiteralStringRuleParserRuleCall_2_1_0_4() { return cValueLiteralStringRuleParserRuleCall_2_1_0_4; } //undefined=UndefinedRule - public Assignment getUndefinedAssignment_1() { return cUndefinedAssignment_1; } + public Assignment getUndefinedAssignment_2_2() { return cUndefinedAssignment_2_2; } //UndefinedRule - public RuleCall getUndefinedUndefinedRuleParserRuleCall_1_0() { return cUndefinedUndefinedRuleParserRuleCall_1_0; } + public RuleCall getUndefinedUndefinedRuleParserRuleCall_2_2_0() { return cUndefinedUndefinedRuleParserRuleCall_2_2_0; } } public class LiteralBooleanRuleElements extends AbstractParserRuleElementFinder { @@ -144,18 +130,38 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi public class LiteralIntegerOrUnlimitedNaturalRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralIntegerOrUnlimitedNaturalRule"); - private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1); - private final RuleCall cValueVALUE_SPECIFICATION_INTTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0); + private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); + private final Assignment cValueAssignment_0 = (Assignment)cAlternatives.eContents().get(0); + private final Alternatives cValueAlternatives_0_0 = (Alternatives)cValueAssignment_0.eContents().get(0); + private final RuleCall cValueINTTerminalRuleCall_0_0_0 = (RuleCall)cValueAlternatives_0_0.eContents().get(0); + private final RuleCall cValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1 = (RuleCall)cValueAlternatives_0_0.eContents().get(1); + private final Assignment cUnlimitedAssignment_1 = (Assignment)cAlternatives.eContents().get(1); + private final Keyword cUnlimitedAsteriskKeyword_1_0 = (Keyword)cUnlimitedAssignment_1.eContents().get(0); //LiteralIntegerOrUnlimitedNaturalRule: - // value=VALUE_SPECIFICATION_INT; + // value=(INT | VALUE_SPECIFICATION_NEGATIVE_INT) | unlimited="*"; @Override public ParserRule getRule() { return rule; } - //value=VALUE_SPECIFICATION_INT - public Assignment getValueAssignment() { return cValueAssignment; } + //value=(INT | VALUE_SPECIFICATION_NEGATIVE_INT) | unlimited="*" + public Alternatives getAlternatives() { return cAlternatives; } + + //value=(INT | VALUE_SPECIFICATION_NEGATIVE_INT) + public Assignment getValueAssignment_0() { return cValueAssignment_0; } + + //INT | VALUE_SPECIFICATION_NEGATIVE_INT + public Alternatives getValueAlternatives_0_0() { return cValueAlternatives_0_0; } + + //INT + public RuleCall getValueINTTerminalRuleCall_0_0_0() { return cValueINTTerminalRuleCall_0_0_0; } - //VALUE_SPECIFICATION_INT - public RuleCall getValueVALUE_SPECIFICATION_INTTerminalRuleCall_0() { return cValueVALUE_SPECIFICATION_INTTerminalRuleCall_0; } + //VALUE_SPECIFICATION_NEGATIVE_INT + public RuleCall getValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1() { return cValueVALUE_SPECIFICATION_NEGATIVE_INTTerminalRuleCall_0_0_1; } + + //unlimited="*" + public Assignment getUnlimitedAssignment_1() { return cUnlimitedAssignment_1; } + + //"*" + public Keyword getUnlimitedAsteriskKeyword_1_0() { return cUnlimitedAsteriskKeyword_1_0; } } public class LiteralRealRuleElements extends AbstractParserRuleElementFinder { @@ -193,17 +199,17 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi public class LiteralStringRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralStringRule"); private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1); - private final RuleCall cValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0); + private final RuleCall cValueSTRINGTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0); //LiteralStringRule: - // value=VALUE_SPECIFICATION_STRING; + // value=STRING; @Override public ParserRule getRule() { return rule; } - //value=VALUE_SPECIFICATION_STRING + //value=STRING public Assignment getValueAssignment() { return cValueAssignment; } - //VALUE_SPECIFICATION_STRING - public RuleCall getValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0() { return cValueVALUE_SPECIFICATION_STRINGTerminalRuleCall_0; } + //STRING + public RuleCall getValueSTRINGTerminalRuleCall_0() { return cValueSTRINGTerminalRuleCall_0; } } public class UndefinedRuleElements extends AbstractParserRuleElementFinder { @@ -276,9 +282,8 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi private final UndefinedRuleElements pUndefinedRule; private final VisibilityKindElements pVisibilityKind; private final TerminalRule tVALUE_SPECIFICATION_ID; - private final TerminalRule tVALUE_SPECIFICATION_INT; + private final TerminalRule tVALUE_SPECIFICATION_NEGATIVE_INT; private final TerminalRule tVALUE_SPECIFICATION_DOUBLE; - private final TerminalRule tVALUE_SPECIFICATION_STRING; private final Grammar grammar; @@ -298,9 +303,8 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi this.pUndefinedRule = new UndefinedRuleElements(); this.pVisibilityKind = new VisibilityKindElements(); this.tVALUE_SPECIFICATION_ID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "VALUE_SPECIFICATION_ID"); - this.tVALUE_SPECIFICATION_INT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "VALUE_SPECIFICATION_INT"); + this.tVALUE_SPECIFICATION_NEGATIVE_INT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "VALUE_SPECIFICATION_NEGATIVE_INT"); this.tVALUE_SPECIFICATION_DOUBLE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "VALUE_SPECIFICATION_DOUBLE"); - this.tVALUE_SPECIFICATION_STRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "VALUE_SPECIFICATION_STRING"); } protected Grammar internalFindGrammar(GrammarProvider grammarProvider) { @@ -331,9 +335,9 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi //AbstractRule: - // visibility=VisibilityKind? (name=VALUE_SPECIFICATION_ID "=")? (value=(LiteralBooleanRule | - // LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | LiteralStringRule) | - // instanceSpecification=[uml::InstanceSpecification]) | undefined=UndefinedRule; + // visibility=VisibilityKind? name=VALUE_SPECIFICATION_ID? (instanceSpecification=[uml::InstanceSpecification] | + // value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | + // LiteralStringRule) | undefined=UndefinedRule); public AbstractRuleElements getAbstractRuleAccess() { return pAbstractRule; } @@ -353,7 +357,7 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi } //LiteralIntegerOrUnlimitedNaturalRule: - // value=VALUE_SPECIFICATION_INT; + // value=(INT | VALUE_SPECIFICATION_NEGATIVE_INT) | unlimited="*"; public LiteralIntegerOrUnlimitedNaturalRuleElements getLiteralIntegerOrUnlimitedNaturalRuleAccess() { return pLiteralIntegerOrUnlimitedNaturalRule; } @@ -383,7 +387,7 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi } //LiteralStringRule: - // value=VALUE_SPECIFICATION_STRING; + // value=STRING; public LiteralStringRuleElements getLiteralStringRuleAccess() { return pLiteralStringRule; } @@ -412,32 +416,25 @@ public class UmlValueSpecificationGrammarAccess extends AbstractGrammarElementFi return getVisibilityKindAccess().getRule(); } - //// Manage the basic terminals to avoid XText completion problem + //// Manage the basic terminals //terminal VALUE_SPECIFICATION_ID: - // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*; + // ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "-" | "0".."9")* "="; public TerminalRule getVALUE_SPECIFICATION_IDRule() { return tVALUE_SPECIFICATION_ID; } - //terminal VALUE_SPECIFICATION_INT: - // "-"? "0".."9"+ | "*"; - public TerminalRule getVALUE_SPECIFICATION_INTRule() { - return tVALUE_SPECIFICATION_INT; + //terminal VALUE_SPECIFICATION_NEGATIVE_INT returns ecore::EInt: + // "-" INT; + public TerminalRule getVALUE_SPECIFICATION_NEGATIVE_INTRule() { + return tVALUE_SPECIFICATION_NEGATIVE_INT; } //terminal VALUE_SPECIFICATION_DOUBLE returns ecore::EDouble: - // "-"? ("0".."9"+ ("." | ",") "0".."9"* | "0".."9"* ("." | ",") "0".."9"+); + // "-"? (INT ("." | ",") INT | INT ("." | ",") | ("." | ",") INT); public TerminalRule getVALUE_SPECIFICATION_DOUBLERule() { return tVALUE_SPECIFICATION_DOUBLE; } - //terminal VALUE_SPECIFICATION_STRING: - // "\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" . - // / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'"; - public TerminalRule getVALUE_SPECIFICATION_STRINGRule() { - return tVALUE_SPECIFICATION_STRING; - } - //terminal ID: // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*; public TerminalRule getIDRule() { diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/AbstractRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/AbstractRule.java index 837de58fe77..53cff96eba5 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/AbstractRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/AbstractRule.java @@ -17,8 +17,8 @@ import org.eclipse.uml2.uml.InstanceSpecification; * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getVisibility <em>Visibility</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue <em>Value</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification <em>Instance Specification</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue <em>Value</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getUndefined <em>Undefined</em>}</li> * </ul> * @@ -81,56 +81,56 @@ public interface AbstractRule extends EObject void setName(String value); /** - * Returns the value of the '<em><b>Value</b></em>' containment reference. + * Returns the value of the '<em><b>Instance Specification</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Value</em>' containment reference isn't clear, + * If the meaning of the '<em>Instance Specification</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Value</em>' containment reference. - * @see #setValue(EObject) - * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getAbstractRule_Value() - * @model containment="true" + * @return the value of the '<em>Instance Specification</em>' reference. + * @see #setInstanceSpecification(InstanceSpecification) + * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getAbstractRule_InstanceSpecification() + * @model * @generated */ - EObject getValue(); + InstanceSpecification getInstanceSpecification(); /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue <em>Value</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification <em>Instance Specification</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Value</em>' containment reference. - * @see #getValue() + * @param value the new value of the '<em>Instance Specification</em>' reference. + * @see #getInstanceSpecification() * @generated */ - void setValue(EObject value); + void setInstanceSpecification(InstanceSpecification value); /** - * Returns the value of the '<em><b>Instance Specification</b></em>' reference. + * Returns the value of the '<em><b>Value</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Instance Specification</em>' reference isn't clear, + * If the meaning of the '<em>Value</em>' containment reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Instance Specification</em>' reference. - * @see #setInstanceSpecification(InstanceSpecification) - * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getAbstractRule_InstanceSpecification() - * @model + * @return the value of the '<em>Value</em>' containment reference. + * @see #setValue(EObject) + * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getAbstractRule_Value() + * @model containment="true" * @generated */ - InstanceSpecification getInstanceSpecification(); + EObject getValue(); /** - * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification <em>Instance Specification</em>}' reference. + * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue <em>Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Instance Specification</em>' reference. - * @see #getInstanceSpecification() + * @param value the new value of the '<em>Value</em>' containment reference. + * @see #getValue() * @generated */ - void setInstanceSpecification(InstanceSpecification value); + void setValue(EObject value); /** * Returns the value of the '<em><b>Undefined</b></em>' containment reference. diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/LiteralIntegerOrUnlimitedNaturalRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/LiteralIntegerOrUnlimitedNaturalRule.java index ecb5da94272..114a104d7a4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/LiteralIntegerOrUnlimitedNaturalRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/LiteralIntegerOrUnlimitedNaturalRule.java @@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule#getUnlimited <em>Unlimited</em>}</li> * </ul> * * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getLiteralIntegerOrUnlimitedNaturalRule() @@ -31,12 +32,12 @@ public interface LiteralIntegerOrUnlimitedNaturalRule extends EObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Value</em>' attribute. - * @see #setValue(String) + * @see #setValue(int) * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getLiteralIntegerOrUnlimitedNaturalRule_Value() * @model * @generated */ - String getValue(); + int getValue(); /** * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule#getValue <em>Value</em>}' attribute. @@ -46,6 +47,32 @@ public interface LiteralIntegerOrUnlimitedNaturalRule extends EObject * @see #getValue() * @generated */ - void setValue(String value); + void setValue(int value); + + /** + * Returns the value of the '<em><b>Unlimited</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Unlimited</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Unlimited</em>' attribute. + * @see #setUnlimited(String) + * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.UmlValueSpecificationPackage#getLiteralIntegerOrUnlimitedNaturalRule_Unlimited() + * @model + * @generated + */ + String getUnlimited(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule#getUnlimited <em>Unlimited</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Unlimited</em>' attribute. + * @see #getUnlimited() + * @generated + */ + void setUnlimited(String value); } // LiteralIntegerOrUnlimitedNaturalRule diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/UmlValueSpecificationPackage.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/UmlValueSpecificationPackage.java index a18dccee499..8f728ac9ed4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/UmlValueSpecificationPackage.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/UmlValueSpecificationPackage.java @@ -85,22 +85,22 @@ public interface UmlValueSpecificationPackage extends EPackage int ABSTRACT_RULE__NAME = 1; /** - * The feature id for the '<em><b>Value</b></em>' containment reference. + * The feature id for the '<em><b>Instance Specification</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_RULE__VALUE = 2; + int ABSTRACT_RULE__INSTANCE_SPECIFICATION = 2; /** - * The feature id for the '<em><b>Instance Specification</b></em>' reference. + * The feature id for the '<em><b>Value</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_RULE__INSTANCE_SPECIFICATION = 3; + int ABSTRACT_RULE__VALUE = 3; /** * The feature id for the '<em><b>Undefined</b></em>' containment reference. @@ -168,13 +168,22 @@ public interface UmlValueSpecificationPackage extends EPackage int LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE = 0; /** + * The feature id for the '<em><b>Unlimited</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED = 1; + + /** * The number of structural features of the '<em>Literal Integer Or Unlimited Natural Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE_FEATURE_COUNT = 1; + int LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE_FEATURE_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.LiteralRealRuleImpl <em>Literal Real Rule</em>}' class. @@ -377,26 +386,26 @@ public interface UmlValueSpecificationPackage extends EPackage EAttribute getAbstractRule_Name(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue <em>Value</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification <em>Instance Specification</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference '<em>Value</em>'. - * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue() + * @return the meta object for the reference '<em>Instance Specification</em>'. + * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification() * @see #getAbstractRule() * @generated */ - EReference getAbstractRule_Value(); + EReference getAbstractRule_InstanceSpecification(); /** - * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification <em>Instance Specification</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Instance Specification</em>'. - * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getInstanceSpecification() + * @return the meta object for the containment reference '<em>Value</em>'. + * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getValue() * @see #getAbstractRule() * @generated */ - EReference getAbstractRule_InstanceSpecification(); + EReference getAbstractRule_Value(); /** * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.AbstractRule#getUndefined <em>Undefined</em>}'. @@ -452,6 +461,17 @@ public interface UmlValueSpecificationPackage extends EPackage EAttribute getLiteralIntegerOrUnlimitedNaturalRule_Value(); /** + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule#getUnlimited <em>Unlimited</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Unlimited</em>'. + * @see org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralIntegerOrUnlimitedNaturalRule#getUnlimited() + * @see #getLiteralIntegerOrUnlimitedNaturalRule() + * @generated + */ + EAttribute getLiteralIntegerOrUnlimitedNaturalRule_Unlimited(); + + /** * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.LiteralRealRule <em>Literal Real Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -639,20 +659,20 @@ public interface UmlValueSpecificationPackage extends EPackage EAttribute ABSTRACT_RULE__NAME = eINSTANCE.getAbstractRule_Name(); /** - * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. + * The meta object literal for the '<em><b>Instance Specification</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ABSTRACT_RULE__VALUE = eINSTANCE.getAbstractRule_Value(); + EReference ABSTRACT_RULE__INSTANCE_SPECIFICATION = eINSTANCE.getAbstractRule_InstanceSpecification(); /** - * The meta object literal for the '<em><b>Instance Specification</b></em>' reference feature. + * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference ABSTRACT_RULE__INSTANCE_SPECIFICATION = eINSTANCE.getAbstractRule_InstanceSpecification(); + EReference ABSTRACT_RULE__VALUE = eINSTANCE.getAbstractRule_Value(); /** * The meta object literal for the '<em><b>Undefined</b></em>' containment reference feature. @@ -699,6 +719,14 @@ public interface UmlValueSpecificationPackage extends EPackage EAttribute LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE = eINSTANCE.getLiteralIntegerOrUnlimitedNaturalRule_Value(); /** + * The meta object literal for the '<em><b>Unlimited</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED = eINSTANCE.getLiteralIntegerOrUnlimitedNaturalRule_Unlimited(); + + /** * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.LiteralRealRuleImpl <em>Literal Real Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/AbstractRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/AbstractRuleImpl.java index b04acc19b9a..78fe14f097e 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/AbstractRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/AbstractRuleImpl.java @@ -29,8 +29,8 @@ import org.eclipse.uml2.uml.InstanceSpecification; * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.AbstractRuleImpl#getVisibility <em>Visibility</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.AbstractRuleImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.AbstractRuleImpl#getValue <em>Value</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.AbstractRuleImpl#getInstanceSpecification <em>Instance Specification</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.AbstractRuleImpl#getValue <em>Value</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.AbstractRuleImpl#getUndefined <em>Undefined</em>}</li> * </ul> * @@ -69,24 +69,24 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab protected String name = NAME_EDEFAULT; /** - * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference. + * The cached value of the '{@link #getInstanceSpecification() <em>Instance Specification</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getValue() + * @see #getInstanceSpecification() * @generated * @ordered */ - protected EObject value; + protected InstanceSpecification instanceSpecification; /** - * The cached value of the '{@link #getInstanceSpecification() <em>Instance Specification</em>}' reference. + * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getInstanceSpecification() + * @see #getValue() * @generated * @ordered */ - protected InstanceSpecification instanceSpecification; + protected EObject value; /** * The cached value of the '{@link #getUndefined() <em>Undefined</em>}' containment reference. @@ -195,9 +195,19 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * <!-- end-user-doc --> * @generated */ - public EObject getValue() + public InstanceSpecification getInstanceSpecification() { - return value; + if (instanceSpecification != null && instanceSpecification.eIsProxy()) + { + InternalEObject oldInstanceSpecification = (InternalEObject)instanceSpecification; + instanceSpecification = (InstanceSpecification)eResolveProxy(oldInstanceSpecification); + if (instanceSpecification != oldInstanceSpecification) + { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION, oldInstanceSpecification, instanceSpecification)); + } + } + return instanceSpecification; } /** @@ -205,16 +215,9 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) + public InstanceSpecification basicGetInstanceSpecification() { - EObject oldValue = value; - value = newValue; - if (eNotificationRequired()) - { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, oldValue, newValue); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; + return instanceSpecification; } /** @@ -222,20 +225,12 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * <!-- end-user-doc --> * @generated */ - public void setValue(EObject newValue) + public void setInstanceSpecification(InstanceSpecification newInstanceSpecification) { - if (newValue != value) - { - NotificationChain msgs = null; - if (value != null) - msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, null, msgs); - if (newValue != null) - msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, null, msgs); - msgs = basicSetValue(newValue, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, newValue, newValue)); + InstanceSpecification oldInstanceSpecification = instanceSpecification; + instanceSpecification = newInstanceSpecification; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION, oldInstanceSpecification, instanceSpecification)); } /** @@ -243,19 +238,9 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * <!-- end-user-doc --> * @generated */ - public InstanceSpecification getInstanceSpecification() + public EObject getValue() { - if (instanceSpecification != null && instanceSpecification.eIsProxy()) - { - InternalEObject oldInstanceSpecification = (InternalEObject)instanceSpecification; - instanceSpecification = (InstanceSpecification)eResolveProxy(oldInstanceSpecification); - if (instanceSpecification != oldInstanceSpecification) - { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION, oldInstanceSpecification, instanceSpecification)); - } - } - return instanceSpecification; + return value; } /** @@ -263,9 +248,16 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * <!-- end-user-doc --> * @generated */ - public InstanceSpecification basicGetInstanceSpecification() + public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) { - return instanceSpecification; + EObject oldValue = value; + value = newValue; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, oldValue, newValue); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; } /** @@ -273,12 +265,20 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * <!-- end-user-doc --> * @generated */ - public void setInstanceSpecification(InstanceSpecification newInstanceSpecification) + public void setValue(EObject newValue) { - InstanceSpecification oldInstanceSpecification = instanceSpecification; - instanceSpecification = newInstanceSpecification; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION, oldInstanceSpecification, instanceSpecification)); + if (newValue != value) + { + NotificationChain msgs = null; + if (value != null) + msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, null, msgs); + if (newValue != null) + msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, null, msgs); + msgs = basicSetValue(newValue, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE, newValue, newValue)); } /** @@ -363,11 +363,11 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab return getVisibility(); case UmlValueSpecificationPackage.ABSTRACT_RULE__NAME: return getName(); - case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: - return getValue(); case UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION: if (resolve) return getInstanceSpecification(); return basicGetInstanceSpecification(); + case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: + return getValue(); case UmlValueSpecificationPackage.ABSTRACT_RULE__UNDEFINED: return getUndefined(); } @@ -390,12 +390,12 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab case UmlValueSpecificationPackage.ABSTRACT_RULE__NAME: setName((String)newValue); return; - case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: - setValue((EObject)newValue); - return; case UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION: setInstanceSpecification((InstanceSpecification)newValue); return; + case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: + setValue((EObject)newValue); + return; case UmlValueSpecificationPackage.ABSTRACT_RULE__UNDEFINED: setUndefined((UndefinedRule)newValue); return; @@ -419,12 +419,12 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab case UmlValueSpecificationPackage.ABSTRACT_RULE__NAME: setName(NAME_EDEFAULT); return; - case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: - setValue((EObject)null); - return; case UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION: setInstanceSpecification((InstanceSpecification)null); return; + case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: + setValue((EObject)null); + return; case UmlValueSpecificationPackage.ABSTRACT_RULE__UNDEFINED: setUndefined((UndefinedRule)null); return; @@ -446,10 +446,10 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab return visibility != null; case UmlValueSpecificationPackage.ABSTRACT_RULE__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: - return value != null; case UmlValueSpecificationPackage.ABSTRACT_RULE__INSTANCE_SPECIFICATION: return instanceSpecification != null; + case UmlValueSpecificationPackage.ABSTRACT_RULE__VALUE: + return value != null; case UmlValueSpecificationPackage.ABSTRACT_RULE__UNDEFINED: return undefined != null; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/LiteralIntegerOrUnlimitedNaturalRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/LiteralIntegerOrUnlimitedNaturalRuleImpl.java index f3dd4b59bec..a4374547f67 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/LiteralIntegerOrUnlimitedNaturalRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/LiteralIntegerOrUnlimitedNaturalRuleImpl.java @@ -21,6 +21,7 @@ import org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecifi * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.LiteralIntegerOrUnlimitedNaturalRuleImpl#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl.LiteralIntegerOrUnlimitedNaturalRuleImpl#getUnlimited <em>Unlimited</em>}</li> * </ul> * * @generated @@ -35,7 +36,7 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl * @generated * @ordered */ - protected static final String VALUE_EDEFAULT = null; + protected static final int VALUE_EDEFAULT = 0; /** * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. @@ -45,7 +46,27 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl * @generated * @ordered */ - protected String value = VALUE_EDEFAULT; + protected int value = VALUE_EDEFAULT; + + /** + * The default value of the '{@link #getUnlimited() <em>Unlimited</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getUnlimited() + * @generated + * @ordered + */ + protected static final String UNLIMITED_EDEFAULT = null; + + /** + * The cached value of the '{@link #getUnlimited() <em>Unlimited</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getUnlimited() + * @generated + * @ordered + */ + protected String unlimited = UNLIMITED_EDEFAULT; /** * <!-- begin-user-doc --> @@ -73,7 +94,7 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl * <!-- end-user-doc --> * @generated */ - public String getValue() + public int getValue() { return value; } @@ -83,9 +104,9 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl * <!-- end-user-doc --> * @generated */ - public void setValue(String newValue) + public void setValue(int newValue) { - String oldValue = value; + int oldValue = value; value = newValue; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE, oldValue, value)); @@ -96,6 +117,29 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl * <!-- end-user-doc --> * @generated */ + public String getUnlimited() + { + return unlimited; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setUnlimited(String newUnlimited) + { + String oldUnlimited = unlimited; + unlimited = newUnlimited; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED, oldUnlimited, unlimited)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { @@ -103,6 +147,8 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl { case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE: return getValue(); + case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED: + return getUnlimited(); } return super.eGet(featureID, resolve, coreType); } @@ -118,7 +164,10 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl switch (featureID) { case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE: - setValue((String)newValue); + setValue((Integer)newValue); + return; + case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED: + setUnlimited((String)newValue); return; } super.eSet(featureID, newValue); @@ -137,6 +186,9 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE: setValue(VALUE_EDEFAULT); return; + case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED: + setUnlimited(UNLIMITED_EDEFAULT); + return; } super.eUnset(featureID); } @@ -152,7 +204,9 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl switch (featureID) { case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE: - return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + return value != VALUE_EDEFAULT; + case UmlValueSpecificationPackage.LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED: + return UNLIMITED_EDEFAULT == null ? unlimited != null : !UNLIMITED_EDEFAULT.equals(unlimited); } return super.eIsSet(featureID); } @@ -170,6 +224,8 @@ public class LiteralIntegerOrUnlimitedNaturalRuleImpl extends MinimalEObjectImpl StringBuffer result = new StringBuffer(super.toString()); result.append(" (value: "); result.append(value); + result.append(", unlimited: "); + result.append(unlimited); result.append(')'); return result.toString(); } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/UmlValueSpecificationPackageImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/UmlValueSpecificationPackageImpl.java index e52d01631a9..d28af1bbdad 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/UmlValueSpecificationPackageImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src-gen/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/umlValueSpecification/impl/UmlValueSpecificationPackageImpl.java @@ -188,7 +188,7 @@ public class UmlValueSpecificationPackageImpl extends EPackageImpl implements Um * <!-- end-user-doc --> * @generated */ - public EReference getAbstractRule_Value() + public EReference getAbstractRule_InstanceSpecification() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(2); } @@ -198,7 +198,7 @@ public class UmlValueSpecificationPackageImpl extends EPackageImpl implements Um * <!-- end-user-doc --> * @generated */ - public EReference getAbstractRule_InstanceSpecification() + public EReference getAbstractRule_Value() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(3); } @@ -258,6 +258,16 @@ public class UmlValueSpecificationPackageImpl extends EPackageImpl implements Um * <!-- end-user-doc --> * @generated */ + public EAttribute getLiteralIntegerOrUnlimitedNaturalRule_Unlimited() + { + return (EAttribute)literalIntegerOrUnlimitedNaturalRuleEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getLiteralRealRule() { return literalRealRuleEClass; @@ -416,8 +426,8 @@ public class UmlValueSpecificationPackageImpl extends EPackageImpl implements Um abstractRuleEClass = createEClass(ABSTRACT_RULE); createEReference(abstractRuleEClass, ABSTRACT_RULE__VISIBILITY); createEAttribute(abstractRuleEClass, ABSTRACT_RULE__NAME); - createEReference(abstractRuleEClass, ABSTRACT_RULE__VALUE); createEReference(abstractRuleEClass, ABSTRACT_RULE__INSTANCE_SPECIFICATION); + createEReference(abstractRuleEClass, ABSTRACT_RULE__VALUE); createEReference(abstractRuleEClass, ABSTRACT_RULE__UNDEFINED); literalBooleanRuleEClass = createEClass(LITERAL_BOOLEAN_RULE); @@ -425,6 +435,7 @@ public class UmlValueSpecificationPackageImpl extends EPackageImpl implements Um literalIntegerOrUnlimitedNaturalRuleEClass = createEClass(LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE); createEAttribute(literalIntegerOrUnlimitedNaturalRuleEClass, LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__VALUE); + createEAttribute(literalIntegerOrUnlimitedNaturalRuleEClass, LITERAL_INTEGER_OR_UNLIMITED_NATURAL_RULE__UNLIMITED); literalRealRuleEClass = createEClass(LITERAL_REAL_RULE); createEAttribute(literalRealRuleEClass, LITERAL_REAL_RULE__VALUE); @@ -483,15 +494,16 @@ public class UmlValueSpecificationPackageImpl extends EPackageImpl implements Um initEClass(abstractRuleEClass, AbstractRule.class, "AbstractRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getAbstractRule_Visibility(), this.getVisibilityKind(), null, "visibility", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getAbstractRule_Name(), theEcorePackage.getEString(), "name", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getAbstractRule_Value(), theEcorePackage.getEObject(), null, "value", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAbstractRule_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "instanceSpecification", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getAbstractRule_Value(), theEcorePackage.getEObject(), null, "value", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAbstractRule_Undefined(), this.getUndefinedRule(), null, "undefined", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(literalBooleanRuleEClass, LiteralBooleanRule.class, "LiteralBooleanRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getLiteralBooleanRule_Value(), theEcorePackage.getEString(), "value", null, 0, 1, LiteralBooleanRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(literalIntegerOrUnlimitedNaturalRuleEClass, LiteralIntegerOrUnlimitedNaturalRule.class, "LiteralIntegerOrUnlimitedNaturalRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getLiteralIntegerOrUnlimitedNaturalRule_Value(), theEcorePackage.getEString(), "value", null, 0, 1, LiteralIntegerOrUnlimitedNaturalRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLiteralIntegerOrUnlimitedNaturalRule_Value(), theEcorePackage.getEInt(), "value", null, 0, 1, LiteralIntegerOrUnlimitedNaturalRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLiteralIntegerOrUnlimitedNaturalRule_Unlimited(), theEcorePackage.getEString(), "unlimited", null, 0, 1, LiteralIntegerOrUnlimitedNaturalRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(literalRealRuleEClass, LiteralRealRule.class, "LiteralRealRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getLiteralRealRule_Value(), theEcorePackage.getEDouble(), "value", null, 0, 1, LiteralRealRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtext index 92a3f0bf0ce..28efa4f1a16 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtext +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/src/org/eclipse/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification.xtext @@ -19,14 +19,14 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore generate umlValueSpecification "http://www.eclipse.org/papyrus/uml/textedit/valuespecification/xtext/UmlValueSpecification" AbstractRule: - ((visibility = VisibilityKind)? - (name=VALUE_SPECIFICATION_ID '=')? - (value=(LiteralBooleanRule | + (visibility=VisibilityKind)? + (name=VALUE_SPECIFICATION_ID)? + ((instanceSpecification=[uml::InstanceSpecification]) | + value=(LiteralBooleanRule | LiteralIntegerOrUnlimitedNaturalRule | LiteralRealRule | LiteralNullRule | LiteralStringRule) | - instanceSpecification=[uml::InstanceSpecification]) | undefined=UndefinedRule) ; @@ -35,7 +35,8 @@ LiteralBooleanRule: ; LiteralIntegerOrUnlimitedNaturalRule: - value=VALUE_SPECIFICATION_INT + (value=(INT|VALUE_SPECIFICATION_NEGATIVE_INT) | + unlimited='*') ; LiteralRealRule: @@ -48,7 +49,7 @@ LiteralNullRule: ; LiteralStringRule: - value=VALUE_SPECIFICATION_STRING + value=STRING ; UndefinedRule: @@ -61,11 +62,7 @@ VisibilityKind: | protected = '#' | package = '~' ; -// Manage the basic terminals to avoid XText completion problem -terminal VALUE_SPECIFICATION_ID returns ecore::EString: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -terminal VALUE_SPECIFICATION_INT returns ecore::EString: (('-')?('0'..'9')+|'*'); -terminal VALUE_SPECIFICATION_DOUBLE returns ecore::EDouble: ('-')?(('0'..'9')+("."|",")('0'..'9')*|('0'..'9')*("."|",")('0'..'9')+); -terminal VALUE_SPECIFICATION_STRING : - '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"' | - "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'" - ;
\ No newline at end of file +// Manage the basic terminals +terminal VALUE_SPECIFICATION_ID returns ecore::EString: ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9')*'='; +terminal VALUE_SPECIFICATION_NEGATIVE_INT returns ecore::EInt: '-'INT; +terminal VALUE_SPECIFICATION_DOUBLE returns ecore::EDouble: ('-')?((INT('.'|',')INT)|(INT('.'|','))|(('.'|',')INT)); |