diff options
| author | Camille Letavernier | 2018-04-17 14:05:18 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2018-04-18 07:15:35 +0000 |
| commit | fa271e93a8163957385075241d42c3bad5c77e96 (patch) | |
| tree | 26824b4753a1d6a6ad52313e76753e281e63a50c /plugins/uml/diagram | |
| parent | dfe67eff3d5c9ac7ca15de13a9901edb45a2e916 (diff) | |
| download | org.eclipse.papyrus-fa271e93a8163957385075241d42c3bad5c77e96.tar.gz org.eclipse.papyrus-fa271e93a8163957385075241d42c3bad5c77e96.tar.xz org.eclipse.papyrus-fa271e93a8163957385075241d42c3bad5c77e96.zip | |
[SequenceD] Run the clean-up profile on the Sequence Diagram plug-in
Change-Id: I393ae94b596cfd4a08ffc3fadb8580d8887edc0a
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
Diffstat (limited to 'plugins/uml/diagram')
230 files changed, 1074 insertions, 1170 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/ElkRectangle.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/ElkRectangle.java index f57f8d38516..021d84161db 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/ElkRectangle.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/ElkRectangle.java @@ -40,7 +40,7 @@ public class ElkRectangle { /** * Constructs and initializes a <code>Rectangle</code> from the specified <code>double</code> * coordinates. - * + * * @param x * the x coordinate of the upper-left corner of the newly constructed * <code>Rectangle</code> @@ -61,7 +61,7 @@ public class ElkRectangle { /** * Constructs and initializes a <code>Rectangle</code> from the specified instance. - * + * * @param rect * the existing rectangle whose values to copy. */ @@ -75,7 +75,7 @@ public class ElkRectangle { /** * Sets the location and size of this <code>Rectangle</code> to the specified * <code>double</code> values. - * + * * @param nx * the X coordinate of the upper-left corner of this <code>Rectangle</code> * @param ny @@ -98,7 +98,7 @@ public class ElkRectangle { public KVector getPosition() { return new KVector(x, y); } - + /** * @return the top left coordinate (x,y). */ @@ -126,18 +126,18 @@ public class ElkRectangle { public KVector getBottomRight() { return new KVector(x + width, y + height); } - + /** * @return the center point of a rectangle. */ public KVector getCenter() { return new KVector(x + width / 2, y + height / 2); } - + /** * Unions the receiver and the given <code>Rectangle</code> objects and puts the result into the * receiver. - * + * * @param other * the <code>Rectangle</code> to be combined with this instance */ @@ -158,10 +158,10 @@ public class ElkRectangle { } setRect(x1, y1, x2 - x1, y2 - y1); } - + /** * Moves the rectangle by the given offset. - * + * * @param offset * the offset to move the rectangle by. */ @@ -169,7 +169,7 @@ public class ElkRectangle { x += offset.x; y += offset.y; } - + /** * {@inheritDoc} */ @@ -190,7 +190,7 @@ public class ElkRectangle { return Objects.equals(x, other.x) && Objects.equals(y, other.y) && Objects.equals(width, other.width) && Objects.equals(height, other.height); } - + /** * {@inheritDoc} */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/IDataObject.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/IDataObject.java index a68867c698d..fa54ef6fb84 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/IDataObject.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/IDataObject.java @@ -22,10 +22,10 @@ import java.io.Serializable; * @author msp */ public interface IDataObject extends Serializable { - + /** * Parse the given string and set the content of this data object. - * + * * @param string a string * @throws IllegalArgumentException if the string does not have the expected format */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/KVector.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/KVector.java index 4fd1696eeac..60c615b5c66 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/KVector.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/KVector.java @@ -389,7 +389,7 @@ public final class KVector implements IDataObject, Cloneable { public double dotProduct(final KVector v2) { return ((this.x * v2.x) + (this.y * v2.y)); } - + /** * Calculates the cross product of two vectors v and w. * @param v @@ -455,7 +455,8 @@ public final class KVector implements IDataObject, Cloneable { /** * {@inheritDoc} */ - public void parse(final String string) { + @Override + public void parse(final String string) { int start = 0; while (start < string.length() && isdelim(string.charAt(start), "([{\"' \t\r\n")) { start++; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Point.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Point.java index 406f2f2aa10..9730c5ffe0e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Point.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Point.java @@ -30,7 +30,7 @@ public class Point { /** * Constructs a new point. - * + * * @param x * coordinate * @param y @@ -43,7 +43,7 @@ public class Point { /** * Constructs a new point with is associated with a quadrant. - * + * * @param x * coordinate * @param y @@ -99,10 +99,10 @@ public class Point { /** * Represents a quadrant of a plane split into four parts. - * + * * <pre> - * Q1 | Q2 - * --------- + * Q1 | Q2 + * --------- * Q4 | Q3 * </pre> */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/RectilinearConvexHull.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/RectilinearConvexHull.java index 92d07f03871..1fbbfcbb8e4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/RectilinearConvexHull.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/RectilinearConvexHull.java @@ -22,7 +22,7 @@ import com.google.common.collect.Lists; /** * The rectilinear convex hull is represented by four staircases. - * + * * q1 | q2 * --------- * q4 | q3 @@ -39,7 +39,7 @@ public final class RectilinearConvexHull { private Point yMax1 = null, yMax2 = null; @SuppressWarnings("unused") private Point yMin1 = null, yMin2 = null; - + private static final boolean DEBUG = false; private RectilinearConvexHull() { } @@ -50,7 +50,7 @@ public final class RectilinearConvexHull { * @return The {@link RectilinearConvexHull} for the passed points. */ public static RectilinearConvexHull of(final Iterable<Point> points) { - + RectilinearConvexHull rch = new RectilinearConvexHull(); for (Point p : points) { @@ -92,7 +92,7 @@ public final class RectilinearConvexHull { // Q3 MaximalElementsEventHandler q3 = new MaximalElementsEventHandler(Quadrant.Q3); Scanline.execute(points, LEFT_HIGH_FIRST, q3); - + if (DEBUG) { // print clockwise System.out.println("The four stairs (no concaves):"); @@ -101,8 +101,8 @@ public final class RectilinearConvexHull { System.out.println(q3.points); System.out.println(Lists.reverse(q4.points)); } - - // the scanline algorithm detected all convex corners, + + // the scanline algorithm detected all convex corners, // now we add the concave corners to the lists addConcaveCorners(q1.points, Quadrant.Q1); addConcaveCorners(q2.points, Quadrant.Q2); @@ -117,7 +117,7 @@ public final class RectilinearConvexHull { System.out.println(q3.points); System.out.println(Lists.reverse(q4.points)); } - + // ... and add everything to the hull list // (in clockwise order, q1..q4) rch.getHull().clear(); @@ -128,7 +128,7 @@ public final class RectilinearConvexHull { return rch; } - + /** * @return the points uniquely specifying the rectilinear convex hull. The points are ordered * clock-wise starting with the Q1 staircase (Q1, Q2, Q3, Q4). @@ -155,7 +155,7 @@ public final class RectilinearConvexHull { return handler.rects; } - + /** * @param pts * a list of points representing convex points of one staircase of the rectilinear @@ -176,7 +176,7 @@ public final class RectilinearConvexHull { last = next; } } - + private static final Comparator<Point> RIGHT_HIGH_FIRST = (p1, p2) -> { if (p1.x == p2.x) { return Double.compare(p2.y, p1.y); @@ -210,7 +210,7 @@ public final class RectilinearConvexHull { }; /** - * An {@link EventHandler} that can be passed to the {@link Scanline} algorithm to + * An {@link EventHandler} that can be passed to the {@link Scanline} algorithm to * determine the rectilinear convex hull. */ private static class MaximalElementsEventHandler implements EventHandler<Point> { @@ -229,18 +229,18 @@ public final class RectilinearConvexHull { * the specified quadrant. Note however that for this handler to work properly the * {@link Scanline} must run left-to-right for quadrants Q1 and Q4 and right-to-left for * quadrants Q2 and Q3. - * See the for specially defined comparators + * See the for specially defined comparators * (such as {@link RectilinearConvexHull#LEFT_HIGH_FIRST) for more details. - * + * * @param quadrant * the {@link Quadrant} for which this handler finds points on the hull. */ MaximalElementsEventHandler(final Quadrant quadrant) { this.quadrant = quadrant; - + switch (quadrant) { - case Q1: - case Q2: + case Q1: + case Q2: compare = Collections.reverseOrder(DBL_CMP); maximalY = Double.POSITIVE_INFINITY; break; @@ -266,7 +266,7 @@ public final class RectilinearConvexHull { *-----------------------------------------------------------------------------------------*/ /** - * If the x coordinates are the same, Q1,Q4 < Q2,Q3, for Q1,Q2 convex smaller than concave. + * If the x coordinates are the same, Q1,Q4 < Q2,Q3, for Q1,Q2 convex smaller than concave. */ private static final Comparator<Point> RIGHT_SPECIAL_ORDER = (p1, p2) -> { @@ -313,7 +313,7 @@ public final class RectilinearConvexHull { public void handle(final Point p) { if (queued != null - && (p.x != queuedPnt.x + && (p.x != queuedPnt.x || Quadrant.isOneLeftOneRight(queuedPnt.quadrant, p.quadrant))) { rects.add(queued); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Scanline.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Scanline.java index b6e83a4bbd5..dfdb3d1b5bd 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Scanline.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/internal/uml/diagram/sequence/elk/Scanline.java @@ -19,7 +19,7 @@ import com.google.common.collect.Lists; /** * Simple scaffold for a scanline algorithm. - * + * * @param <T> * The type of the points the scanline works on. */ @@ -54,7 +54,7 @@ public final class Scanline<T> { final Iterable<EventHandler<T>> eventHandlers) { // copy the points! we will resort them! List<T> copy = Lists.newArrayList(points); - new Scanline<T>(copy, comparator, eventHandlers).go(); + new Scanline<>(copy, comparator, eventHandlers).go(); } /** @@ -89,7 +89,7 @@ public final class Scanline<T> { /** * An event handler, gets passed a point of type T and does with it whatever it likes. - * + * * @param <T> * The type of the point. */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CustomMessages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CustomMessages.java index ed184ee87fc..2328563bac2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CustomMessages.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CustomMessages.java @@ -43,7 +43,7 @@ public class CustomMessages extends NLS { public static String SelectOrCreateDialog_TypeLabel; public static String CommandHelper_CreateMessage; - + /** * Error message for when an error occurs in FragmentOrderingKeeper evaluation. */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java index 522aa9be5e9..7f711ff96a5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 531596 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence; @@ -30,7 +30,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.BoundForEdit /** * This figure is used in order to allow a link to follow the shape of the lifeLine * see getPolygonPoints() - * + * * @since 3.0 * */ @@ -60,6 +60,7 @@ public class LifelineNodePlate extends LinkLFSVGNodePlateFigure { return ((NodeFigure) this.getChildren().get(0)).getPolygonPoints(); } + @Override protected ConnectionAnchor createAnchor(PrecisionPoint p) { p.setPreciseX(0.5);// a changer return super.createAnchor(p); @@ -75,11 +76,11 @@ public class LifelineNodePlate extends LinkLFSVGNodePlateFigure { } else { Point temp = p.getCopy(); translateToRelative(temp); - + // This allows to calculate the bounds corresponding to the node instead of the figure bounds final Bounds bounds = BoundForEditPart.getBounds((Node)getGraphicalEditPart().getModel()); final Rectangle rectangle = new Rectangle(new Point(bounds.getX(), bounds.getY()), new Dimension(bounds.getWidth(), bounds.getHeight())); - + PrecisionPoint pt = BaseSlidableAnchor.getAnchorRelativeLocation(temp, rectangle); return createAnchor(pt); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceViewDependentsAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceViewDependentsAdvice.java index d414f8d6c2a..e6dfac54e68 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceViewDependentsAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceViewDependentsAdvice.java @@ -42,7 +42,7 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @author Jin Liu (jin.liu@soyatec.com) - * + * * TODO : refactore me, see Bugs 493512, and 492522 */ public class SequenceViewDependentsAdvice extends AbstractEditHelperAdvice { @@ -59,8 +59,8 @@ public class SequenceViewDependentsAdvice extends AbstractEditHelperAdvice { if (!(value instanceof List<?>)) { return null; } - List<Edge> destroyEdges = new ArrayList<Edge>(); - List<Element> targetObjects = new ArrayList<Element>(); + List<Edge> destroyEdges = new ArrayList<>(); + List<Element> targetObjects = new ArrayList<>(); if (element instanceof Comment && UMLPackage.Literals.COMMENT__ANNOTATED_ELEMENT == feature) { targetObjects.addAll(((Comment) element).getAnnotatedElements()); } else if (element instanceof DurationObservation && UMLPackage.Literals.DURATION_OBSERVATION__EVENT == feature) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/canonical/LifelineSemanticChildrenStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/canonical/LifelineSemanticChildrenStrategy.java index f88df008301..44973523097 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/canonical/LifelineSemanticChildrenStrategy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/canonical/LifelineSemanticChildrenStrategy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015, 2016 Christian W. Damus 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 @@ -8,7 +8,7 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.canonical; @@ -121,7 +121,7 @@ public class LifelineSemanticChildrenStrategy extends DefaultUMLSemanticChildren * Collects execution specifications implicitly covering a lifeline. They typically don't actually cover * a lifeline: their start/end occurrence specifications do in the semantics, but the diagram has views * only for the executions, not for the occurrences. - * + * * @param lifeline * a lifeline visualized in the sequence diagram * @param result @@ -144,7 +144,7 @@ public class LifelineSemanticChildrenStrategy extends DefaultUMLSemanticChildren /** * Gets/finds the execution(s) started or finished by an {@code occurrence}, which * may just be a message-end and so not have a reference to the execution(s). - * + * * @param occurrence * an occurrence that may or may not start or finish an execution * @return the execution(s) started or finished by the {@code occurrence}, or @@ -222,10 +222,10 @@ public class LifelineSemanticChildrenStrategy extends DefaultUMLSemanticChildren * Obtains the execution-specification or lifeline to which a message {@code end} * connects a message, if the {@code end} is not explicitly visualized in the * sequence diagram as a gate or destruction is. - * + * * @param end * a message end - * + * * @return the element that is actually visualized in the diagram at that {@code end} */ private Object resolveMessageEnd(MessageEnd end) { @@ -254,7 +254,7 @@ public class LifelineSemanticChildrenStrategy extends DefaultUMLSemanticChildren /** * If a message end is a message occurrence specification (not a gate), get the lifeline * that it covers. - * + * * @param messageEnd * a message end * @return its covered lifeline 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 1d42d26b3da..829b30e43f0 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,6 @@ 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; @@ -116,7 +115,7 @@ public class ChangeEdgeTargetCommand extends AbstractTransactionalCommand { if (bendpoints instanceof RelativeBendpoints) { List points = ((RelativeBendpoints) bendpoints).getPoints(); if (!points.isEmpty()) { - List<RelativeBendpoint> newPoints = new ArrayList<RelativeBendpoint>(); + List<RelativeBendpoint> newPoints = new ArrayList<>(); 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()); @@ -144,7 +143,7 @@ public class ChangeEdgeTargetCommand extends AbstractTransactionalCommand { } } } - + OccurrenceSpecificationHelper.resetExecutionStart((ExecutionSpecification) targetElement, receiveEvent); } if (edgeElement instanceof Message && MessageSort.DELETE_MESSAGE_LITERAL == ((Message) edgeElement).getMessageSort() && targetElement instanceof DestructionOccurrenceSpecification) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateAppliedStereotypeCommentViewCommandEx.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateAppliedStereotypeCommentViewCommandEx.java index c5932ab3f0b..c07f13a0ad1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateAppliedStereotypeCommentViewCommandEx.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateAppliedStereotypeCommentViewCommandEx.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 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 @@ -8,7 +8,7 @@ * * Contributors: * Celine janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -82,7 +82,7 @@ public class CreateAppliedStereotypeCommentViewCommandEx extends CreateAppliedSt Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + ArrayList<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateCoordinateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateCoordinateCommand.java index e7f8f4be79d..d6bcaecfa9e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateCoordinateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateCoordinateCommand.java @@ -1,33 +1,17 @@ package org.eclipse.papyrus.uml.diagram.sequence.command; -import java.util.ArrayList; - -import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EcoreFactory; -import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.notation.BasicCompartment; -import org.eclipse.gmf.runtime.notation.Compartment; import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationFactory; -import org.eclipse.gmf.runtime.notation.StringValueStyle; -import org.eclipse.gmf.runtime.notation.TitleStyle; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant; -import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil; -import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GrillingEditpart; -import org.eclipse.papyrus.uml.diagram.sequence.util.LogOptions; -import org.eclipse.papyrus.uml.diagram.sequence.messages.Messages; import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GridManagementEditPolicy; +import org.eclipse.papyrus.uml.diagram.sequence.util.LogOptions; import org.eclipse.uml2.uml.Element; -import org.eclipse.uml2.uml.Stereotype; /** * the goal of this command is to create a basic compartment in the notation that represent a compartment of stereotypes 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 fb19cbb0e52..b97113d7669 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 @@ -56,7 +56,7 @@ public class CreateElementAndNodeCommand extends AbstractTransactionalCommand { protected Command nodeCreationCommand; - protected Map<String, Object> createElementRequestParameters = new HashMap<String, Object>(); + protected Map<String, Object> createElementRequestParameters = new HashMap<>(); protected IHintedType elementType; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateExecutionSpecificationWithMessage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateExecutionSpecificationWithMessage.java index 9d7c9468fd0..084e74e96b5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateExecutionSpecificationWithMessage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateExecutionSpecificationWithMessage.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -235,7 +235,7 @@ public class CreateExecutionSpecificationWithMessage extends AbstractTransaction /** * Get the list of all commands contained into {@link CompoundCommand}, {@link CompositeCommand} or {@link ICommandProxy}. - * + * * @param parent * the command to looking for * @return the list of all commands @@ -251,10 +251,10 @@ public class CreateExecutionSpecificationWithMessage extends AbstractTransaction } if (command instanceof CompoundCommand) { - return (Stream<Object>) ((CompoundCommand) command).getCommands().stream() + return ((CompoundCommand) command).getCommands().stream() .flatMap(childNode -> getAllCommands(childNode)); } else if (command instanceof CompositeCommand) { - return (Stream<Object>) StreamSupport.stream(Spliterators.spliteratorUnknownSize(((CompositeCommand) command).iterator(), Spliterator.ORDERED), false) + return StreamSupport.stream(Spliterators.spliteratorUnknownSize(((CompositeCommand) command).iterator(), Spliterator.ORDERED), false) .flatMap(childNode -> getAllCommands(childNode)); } else { return Stream.of(command); @@ -263,7 +263,7 @@ public class CreateExecutionSpecificationWithMessage extends AbstractTransaction /** * Get the created semantic element. - * + * * @param <T> * the type of expected element * @param command diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGrillingStructureCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGrillingStructureCommand.java index f0e3df13471..f68c80ad242 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGrillingStructureCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGrillingStructureCommand.java @@ -4,18 +4,10 @@ import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; import org.eclipse.gmf.runtime.notation.BasicCompartment; -import org.eclipse.gmf.runtime.notation.Compartment; -import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationFactory; -import org.eclipse.gmf.runtime.notation.StringValueStyle; -import org.eclipse.gmf.runtime.notation.TitleStyle; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant; -import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GrillingEditpart; -import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GridManagementEditPolicy; -import org.eclipse.uml2.uml.Stereotype; /** * the goal of this command is to create a basic compartment in the notation that represent a compartment of stereotypes @@ -25,7 +17,7 @@ public class CreateGrillingStructureCommand extends RecordingCommand { /** - * + * */ private static final int Y_SPACE = 30; @@ -39,7 +31,7 @@ public class CreateGrillingStructureCommand extends RecordingCommand { * * Constructor. * - * @param domain + * @param domain * @param node * The EditPart view of the Compartment */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateLocatedConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateLocatedConnectionViewCommand.java index 7efad82bdae..c79881d3a72 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateLocatedConnectionViewCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateLocatedConnectionViewCommand.java @@ -174,7 +174,7 @@ public class CreateLocatedConnectionViewCommand extends CommonDeferredCreateConn * @return true if message hint */ private boolean isMessageHint(String hint) { - List<String> messageHints = new ArrayList<String>(7); + List<String> messageHints = new ArrayList<>(7); String messageHint = ((IHintedType) UMLElementTypes.Message_SynchEdge).getSemanticHint(); messageHints.add(messageHint); messageHint = ((IHintedType) UMLElementTypes.Message_AsynchEdge).getSemanticHint(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomSetConnectionAnchorsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomSetConnectionAnchorsCommand.java index b82ac0cdba6..e877b337818 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomSetConnectionAnchorsCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomSetConnectionAnchorsCommand.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2018 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -66,7 +66,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Constructor. - * + * * @param editingDomain * The editing domain through which model changes are made. * @param label @@ -78,20 +78,21 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles() */ @Override public List<?> getAffectedFiles() { - View view = (View) edgeAdaptor.getAdapter(View.class); - if (view != null) + View view = edgeAdaptor.getAdapter(View.class); + if (view != null) { return getWorkspaceFiles(view); + } return super.getAffectedFiles(); } /** * Gets the edge adaptor. - * + * * @return IAdaptable The edge adapter. */ public IAdaptable getEdgeAdaptor() { @@ -100,7 +101,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Sets the edge adaptor. - * + * * @param edgeAdaptor * The edgeAdaptor to set. */ @@ -110,7 +111,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Gets the node. - * + * * @return The node. */ public INodeEditPart getNode() { @@ -119,7 +120,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Sets the node. - * + * * @param node * The node to set. */ @@ -129,7 +130,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Gets the source ReconnectRequest. - * + * * @return The source ReconnectRequest. */ public ReconnectRequest getSourceReconnectRequest() { @@ -138,7 +139,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Sets the source ReconnectRequest. - * + * * @param sourceReconnectRequest * The source ReconnectRequest to set. */ @@ -148,7 +149,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Gets the target ReconnectRequest. - * + * * @return The target ReconnectRequest. */ public ReconnectRequest getTargetReconnectRequest() { @@ -157,7 +158,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Sets the target ReconnectRequest. - * + * * @param targetReconnectRequest * The target ReconnectRequest to set. */ @@ -167,7 +168,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Sets the isSourceSet. - * + * * @return the isSourceSet */ public boolean isSourceSet() { @@ -176,7 +177,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Gets the isSourceSet. - * + * * @param isSourceSet * The isSourceSet to set. */ @@ -186,7 +187,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Sets the isTargetSet. - * + * * @return the isTargetSet */ public boolean isTargetSet() { @@ -195,7 +196,7 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * Gets the isTargetSet. - * + * * @param isSourceSet * The isSourceSet to set. */ @@ -205,14 +206,14 @@ public class CustomSetConnectionAnchorsCommand extends AbstractTransactionalComm /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ @Override protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException { assert null != edgeAdaptor : "Null child in CustomSetConnectionAnchorsCommand"; //$NON-NLS-1$ - final Edge edge = (Edge) getEdgeAdaptor().getAdapter(Edge.class); + final Edge edge = getEdgeAdaptor().getAdapter(Edge.class); assert null != edge : "Null edge in CustomSetConnectionAnchorsCommand"; //$NON-NLS-1$ if (isSourceSet()) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/DropDestructionOccurenceSpecification.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/DropDestructionOccurenceSpecification.java index 2478c49f633..c0ef736d771 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/DropDestructionOccurenceSpecification.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/DropDestructionOccurenceSpecification.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -115,7 +115,7 @@ public class DropDestructionOccurenceSpecification extends AbstractTransactional destructionEventFigure = new DestructionEventFigure(); point.y = point.y - destructionEventFigure.getDefaultSize().height / 2; dropDestructionOccurrenceRequest.setLocation(point); - ArrayList<EObject> destructionOccurrenceListToDrop = new ArrayList<EObject>(); + ArrayList<EObject> destructionOccurrenceListToDrop = new ArrayList<>(); destructionOccurrenceListToDrop.add(destructionOccurrenceSpecification); dropDestructionOccurrenceRequest.setObjects(destructionOccurrenceListToDrop); // give the position from the layer it is not relative @@ -126,7 +126,7 @@ public class DropDestructionOccurenceSpecification extends AbstractTransactional /** * get the DestructionOccurenceSpecification from a given message - * + * * @param deleteMessage * the message to look for must be never null * @return DestructionOccurenceSpecification or null diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/OLDCreateGateViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/OLDCreateGateViewCommand.java index bcbfd96895f..f52c4e6e2d1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/OLDCreateGateViewCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/OLDCreateGateViewCommand.java @@ -95,7 +95,7 @@ public class OLDCreateGateViewCommand extends AbstractTransactionalCommand { protected View getContainerView() { if (containerViewAdapter != null) { - return (View) containerViewAdapter.getAdapter(View.class); + return containerViewAdapter.getAdapter(View.class); } return null; } @@ -183,7 +183,7 @@ public class OLDCreateGateViewCommand extends AbstractTransactionalCommand { private Gate getGate() { IAdaptable gateAdapter = getGateAdapter(); if (gateAdapter != null) { - return (Gate) gateAdapter.getAdapter(Gate.class); + return gateAdapter.getAdapter(Gate.class); } return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/PromptCreateElementAndNodeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/PromptCreateElementAndNodeCommand.java index 8ae395eac28..8c04df30290 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/PromptCreateElementAndNodeCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/PromptCreateElementAndNodeCommand.java @@ -22,10 +22,6 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.C import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.IHintedType; import org.eclipse.jface.viewers.ILabelProvider; -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.part.Messages; -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.SequenceRequestConstant; import org.eclipse.swt.widgets.Control; @@ -35,7 +31,7 @@ import org.eclipse.uml2.uml.InteractionFragment; public class PromptCreateElementAndNodeCommand extends CreateOrSelectElementCommand { - private static final List<IElementType> executionTypes = new ArrayList<IElementType>(); + private static final List<IElementType> executionTypes = new ArrayList<>(); static { executionTypes.add(UMLElementTypes.ActionExecutionSpecification_Shape); executionTypes.add(UMLElementTypes.BehaviorExecutionSpecification_Shape); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ReconnectToGateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ReconnectToGateCommand.java index 416c6633af1..0551bd07f89 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ReconnectToGateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ReconnectToGateCommand.java @@ -76,7 +76,7 @@ public class ReconnectToGateCommand extends AbstractTransactionalCommand { @SuppressWarnings({ "rawtypes", "unchecked" }) public List getAffectedFiles() { if (newEndAdapter != null) { - View view = (View) newEndAdapter.getAdapter(View.class); + View view = newEndAdapter.getAdapter(View.class); if (view != null) { List result = new ArrayList(); IFile file = WorkspaceSynchronizer.getFile(view.eResource()); @@ -99,7 +99,7 @@ public class ReconnectToGateCommand extends AbstractTransactionalCommand { */ @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - View view = (View) newEndAdapter.getAdapter(View.class); + View view = newEndAdapter.getAdapter(View.class); EditPart target = (EditPart) editPartViewer.getEditPartRegistry().get(view); boolean redirected = false; EditPart oldTarget = reconnectRequest.getTarget(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/RestoreDurationConstraintLinkCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/RestoreDurationConstraintLinkCommand.java index 2fb0c28c109..dda8d44e2e9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/RestoreDurationConstraintLinkCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/RestoreDurationConstraintLinkCommand.java @@ -94,7 +94,7 @@ public class RestoreDurationConstraintLinkCommand extends AbstractTransactionalC if (!canExecute()) { return CommandResult.newCancelledCommandResult(); } - View view = (View) dcViewAdapter.getAdapter(View.class); + View view = dcViewAdapter.getAdapter(View.class); if (view == null) { return CommandResult.newErrorCommandResult("No view found"); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetLocationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetLocationCommand.java index 5745b53b20e..3026cecc548 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetLocationCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetLocationCommand.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2018 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -44,7 +44,7 @@ public class SetLocationCommand extends AbstractTransactionalCommand { /** * Creates a <code>CustomSetBoundsCommand</code> for the given view adapter with a given location. - * + * * @param editingDomain * the editing domain through which model changes are made. * @param label @@ -64,7 +64,7 @@ public class SetLocationCommand extends AbstractTransactionalCommand { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ @Override @@ -75,7 +75,7 @@ public class SetLocationCommand extends AbstractTransactionalCommand { return CommandResult.newErrorCommandResult("SetLocationCommand: viewAdapter does not adapt to IView.class"); //$NON-NLS-1$ } - final View view = (View) adapter.getAdapter(View.class); + final View view = adapter.getAdapter(View.class); if (location != null) { ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLocation_X(), Integer.valueOf(location.x)); @@ -86,13 +86,13 @@ public class SetLocationCommand extends AbstractTransactionalCommand { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles() */ @Override public List<?> getAffectedFiles() { if (adapter != null) { - View view = (View) adapter.getAdapter(View.class); + View view = adapter.getAdapter(View.class); if (view != null) { return getWorkspaceFiles(view); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetMoveAllLineAtSamePositionCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetMoveAllLineAtSamePositionCommand.java index 048d95940a8..61dec5618a4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetMoveAllLineAtSamePositionCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetMoveAllLineAtSamePositionCommand.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,20 +8,13 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; -import java.util.List; - import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gef.commands.Command; -import org.eclipse.gmf.runtime.common.core.command.CommandResult; -import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GridManagementEditPolicy; /** @@ -66,6 +59,6 @@ public class SetMoveAllLineAtSamePositionCommand extends Command { public void undo() { grid.setMoveAllLinesAtSamePosition(!setMoveAllLineAtSamePosition); } - + } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeAndLocationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeAndLocationCommand.java index c5c938f5ad3..2a691b72e90 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeAndLocationCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeAndLocationCommand.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2018 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -46,7 +46,7 @@ public class SetResizeAndLocationCommand extends AbstractTransactionalCommand { /** * Creates a <code>CustomSetBoundsCommand</code> for the given view adapter with a given bounds. - * + * * @param editingDomain * the editing domain through which model changes are made. * @param label @@ -66,7 +66,7 @@ public class SetResizeAndLocationCommand extends AbstractTransactionalCommand { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ @Override @@ -77,7 +77,7 @@ public class SetResizeAndLocationCommand extends AbstractTransactionalCommand { return CommandResult.newErrorCommandResult("SetResizeAndLocationCommand: viewAdapter does not adapt to IView.class"); //$NON-NLS-1$ } - final View view = (View) adapter.getAdapter(View.class); + final View view = adapter.getAdapter(View.class); if (bounds != null) { final Point location = bounds.getLocation(); @@ -92,13 +92,13 @@ public class SetResizeAndLocationCommand extends AbstractTransactionalCommand { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles() */ @Override public List<?> getAffectedFiles() { if (adapter != null) { - View view = (View) adapter.getAdapter(View.class); + View view = adapter.getAdapter(View.class); if (view != null) { return getWorkspaceFiles(view); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeCommand.java index ea126267adf..675dcc1a23a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/SetResizeCommand.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2018 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.command; @@ -44,7 +44,7 @@ public class SetResizeCommand extends AbstractTransactionalCommand { /** * Creates a <code>CustomSetBoundsCommand</code> for the given view adapter with a given size. - * + * * @param editingDomain * the editing domain through which model changes are made. * @param label @@ -64,7 +64,7 @@ public class SetResizeCommand extends AbstractTransactionalCommand { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ @Override @@ -75,7 +75,7 @@ public class SetResizeCommand extends AbstractTransactionalCommand { return CommandResult.newErrorCommandResult("SetResizeCommand: viewAdapter does not adapt to IView.class"); //$NON-NLS-1$ } - final View view = (View) adapter.getAdapter(View.class); + final View view = adapter.getAdapter(View.class); if (size != null) { ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getSize_Width(), Integer.valueOf(size.width)); @@ -86,13 +86,13 @@ public class SetResizeCommand extends AbstractTransactionalCommand { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles() */ @Override public List<?> getAffectedFiles() { if (adapter != null) { - View view = (View) adapter.getAdapter(View.class); + View view = adapter.getAdapter(View.class); if (view != null) { return getWorkspaceFiles(view); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/draw2d/routers/MessageRouter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/draw2d/routers/MessageRouter.java index 91326285635..50c3e4c574e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/draw2d/routers/MessageRouter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/draw2d/routers/MessageRouter.java @@ -67,7 +67,7 @@ public class MessageRouter extends ObliqueRouter { /** * isHorizontalConnection tests whether an asynchronous message is horizontal - * + * * @param conn * controller representing the link * @param newLine 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 1126b224795..fd1ecd7f4ff 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 @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java index 252f9a25c84..54d638bb0fa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageLabelHelper.java @@ -48,7 +48,7 @@ public class MessageLabelHelper extends StereotypedElementLabelHelper { private static MessageLabelHelper labelHelper; /** Map for masks */ - protected final Map<String, String> masks = new HashMap<String, String>(); + protected final Map<String, String> masks = new HashMap<>(); protected MessageLabelHelper() { // initialize the map diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/advice/ConstraintHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/advice/ConstraintHelperAdvice.java index c9f7de3fb3b..e6bef03384e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/advice/ConstraintHelperAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/advice/ConstraintHelperAdvice.java @@ -57,7 +57,7 @@ public class ConstraintHelperAdvice extends AbstractEditHelperAdvice { if (element instanceof Constraint) { EStructuralFeature feature = request.getFeature(); final Object value = request.getValue(); - Vector<Edge> edgesToDestroy = new Vector<Edge>(); + Vector<Edge> edgesToDestroy = new Vector<>(); Element targetContextElement = null; if (UMLPackage.eINSTANCE.getConstraint_Context().equals(feature)) { Namespace constraintContext = ((Constraint) element).getContext(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java index 6b961784c23..549d4a25728 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -486,7 +486,7 @@ public abstract class AbstractExecutionSpecificationEditPart extends RoundedComp figure.setLayoutManager(new DelegatingLayout() { /** * Override it to verify type of constraint. - * + * * @see org.eclipse.draw2d.DelegatingLayout#layout(org.eclipse.draw2d.IFigure) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java index e8a83b38931..f12b3109e11 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractMessageEditPart.java @@ -30,6 +30,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure; import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectMessageToGridEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectPointToGridEditPolicy; +import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectRectangleToGridEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.LifeLineGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.util.SelectMessagesEditPartTracker; import org.eclipse.papyrus.uml.diagram.sequence.util.SelfMessageHelper; @@ -73,13 +74,13 @@ public abstract class AbstractMessageEditPart extends UMLConnectionNodeEditPart /** * This method has been added in order to satisfy the requirement Diagram.UML.Sequence.REQ_004: * <I>"It should be possible to select and move several messages at the same time."</I> - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#getDragTracker(org.eclipse.gef.Request) * * * @param req * @return the drag tracker - * + * */ @Override public DragTracker getDragTracker(Request req) { @@ -200,7 +201,7 @@ public abstract class AbstractMessageEditPart extends UMLConnectionNodeEditPart super.createDefaultEditPolicies(); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MessageLabelEditPolicy()); // Ordering Message Occurrence Specification. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=403233 - installEditPolicy(ConnectPointToGridEditPolicy.CONNECT_TO_GRILLING_MANAGEMENT, new ConnectMessageToGridEditPolicy()); + installEditPolicy(ConnectRectangleToGridEditPolicy.CONNECT_TO_GRILLING_MANAGEMENT, new ConnectMessageToGridEditPolicy()); installEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE, new SequenceReferenceEditPolicy()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AnnotatedLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AnnotatedLinkEditPart.java index 051bb39bc98..b1981a883d1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AnnotatedLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AnnotatedLinkEditPart.java @@ -15,7 +15,6 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import org.eclipse.draw2d.Connection; import org.eclipse.draw2d.Graphics; @@ -24,7 +23,6 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.requests.ReconnectRequest; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart; import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx; import org.eclipse.gmf.runtime.notation.NotationPackage; @@ -52,6 +50,7 @@ public abstract class AnnotatedLinkEditPart extends org.eclipse.papyrus.infra.gm return new AnnotatedLinkDescriptor(); } + @Override public AnnotatedLinkDescriptor getPrimaryShape() { return (AnnotatedLinkDescriptor) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationBehaviorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationBehaviorEditPart.java index 6d4d5e9bb15..73c6bd9e3c9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationBehaviorEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationBehaviorEditPart.java @@ -97,7 +97,7 @@ public class BehaviorExecutionSpecificationBehaviorEditPart extends @Override public String getPrintString(IAdaptable adapter, int flags) { String printString = super.getPrintString(adapter, flags); - EObject obj = (EObject) adapter.getAdapter(EObject.class); + EObject obj = adapter.getAdapter(EObject.class); if (obj instanceof OpaqueBehavior) { OpaqueBehavior opaque = (OpaqueBehavior) obj; if (opaque.isSetLanguages()) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedCompartmentEditPart.java index e2a185c3f5b..68ae35ecab5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedCompartmentEditPart.java @@ -32,8 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNode import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; -import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy; -import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy; import org.eclipse.swt.graphics.Color; /** @@ -66,6 +64,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -126,9 +125,10 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart.ExecutionSpecificationRectangleFigure - * + * * @generated */ + @Override public RoundedCompartmentFigure getPrimaryShape() { return (RoundedCompartmentFigure) primaryShape; } @@ -136,6 +136,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(200, 100); return result; @@ -144,6 +145,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPolicy getPrimaryDragEditPolicy() { EditPolicy result = super.getPrimaryDragEditPolicy(); if (result instanceof ResizableEditPolicy) { @@ -170,11 +172,12 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * + * * @param nodeShape * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { return nodeShape; // use nodeShape itself as contentPane } @@ -182,6 +185,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -192,6 +196,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -201,6 +206,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -217,6 +223,7 @@ public class CCombinedCompartmentEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java index a76d93ec751..da61138845c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; @@ -30,7 +30,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.LogOptions; * This class has been modified for 2 reasons: * - refresh in order to ensure the refresh about size of children * - compute the ratio for each children. - * + * * @since 3.0 * */ @@ -48,6 +48,7 @@ public class CCombinedFragmentCombinedFragmentCompartmentEditPart extends Combin /** * this method has been overloaded in order to ensure the refresh about children size */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -70,9 +71,10 @@ public class CCombinedFragmentCombinedFragmentCompartmentEditPart extends Combin /** * This code is specific an use to constraint the size of sub compartments. * the ratio has to be recompute in order to have a good display - * + * * @see GraphicalEditPart#setLayoutConstraint(EditPart, IFigure, Object) */ + @Override public void setLayoutConstraint(EditPart child, IFigure childFigure, Object childConstraint) { EditPart parentEditPart = this.getParent(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java index f5d488419d8..064e67e396b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * C�line Janssens (celine.janssens@all4tec.net) - Add Coregion functionnality - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; @@ -60,7 +60,7 @@ public class CCombinedFragmentEditPart extends CombinedFragmentEditPart { /** * Get the Notation Value of the CoRegion boolean - * + * * @return true if the Combined Fragment should be displayed as a CoRegion with Brackets. * This is the case if the Operator is Parallel and if the combinedFragment covers only 1 lifeline */ @@ -91,7 +91,7 @@ public class CCombinedFragmentEditPart extends CombinedFragmentEditPart { @Override public void refresh() { - ((CombinedFragmentFigure) getPrimaryShape()).setCoregion(isCoregion()); + getPrimaryShape().setCoregion(isCoregion()); super.refresh(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionEditPart.java index d60a84c4aed..2bce3db9b45 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016-2017 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 @@ -38,7 +38,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes; * @author Patrick Tessier * @since 3.0 * this class has been customized to prevent the strange feedback of lifeline during the move - * + * */ public class CInteractionEditPart extends InteractionEditPart { @@ -173,11 +173,11 @@ public class CInteractionEditPart extends InteractionEditPart { /** * {@inheritDoc} - * + * * <pre> * Interaction is not selectable. * </pre> - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#isSelectable() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java index ec6b749f82a..aff410d01c0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; @@ -54,7 +54,7 @@ public class CInteractionInteractionCompartmentEditPart extends InteractionInter if (request instanceof CreateViewAndElementRequest && request.getType().equals(REQ_CREATE)) { CreateViewAndElementRequest createrequest = (CreateViewAndElementRequest) request; ViewAndElementDescriptor descriptor = createrequest.getViewAndElementDescriptor(); - IElementType elementType = (IElementType) descriptor.getElementAdapter().getAdapter(IElementType.class); + IElementType elementType = descriptor.getElementAdapter().getAdapter(IElementType.class); if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.DURATION_CONSTRAINT_SHAPE)) { return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionOperandEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionOperandEditPart.java index 5266b2bb909..397632f44a7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionOperandEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionOperandEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; @@ -17,7 +17,6 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartListener; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; @@ -28,7 +27,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.BoundForEditPart; /** - * This class has been modified + * This class has been modified * because the container is used to manipulate as a list * the refresh has been modified to take the size of the operand. * @@ -91,6 +90,7 @@ public class CInteractionOperandEditPart extends InteractionOperandEditPart { * @param editPart * @return */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof IBorderItemEditPart) { return getBorderedFigure().getBorderItemContainer(); @@ -103,6 +103,7 @@ public class CInteractionOperandEditPart extends InteractionOperandEditPart { * because the container is used to manipulate as a list * the refresh has been modified to take the size of the operand. */ + @Override protected void refreshBounds() { int width = BoundForEditPart.getWidthFromView((Node)getNotationView()); int height = BoundForEditPart.getHeightFromView((Node)getNotationView()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CLifeLineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CLifeLineEditPart.java index 2e66499fa11..23238d8f6ff 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CLifeLineEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CLifeLineEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017, 2018 CEA LIST, ALL4TEC 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 @@ -51,7 +51,7 @@ public class CLifeLineEditPart extends LifelineEditPart { /** * The minimum height of the figure. - * + * * @since 4.0 */ public static int MIN_HEIGHT = 100; @@ -68,7 +68,7 @@ public class CLifeLineEditPart extends LifelineEditPart { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart#createSVGNodePlate() */ @Override @@ -89,14 +89,14 @@ public class CLifeLineEditPart extends LifelineEditPart { if (getPrimaryShape() instanceof LifelineFigure) { //Bug 531520: we redefine the border of the lifeline, in order to include the children //the message are connected to the middle line of the Lifeline, but they must be drawn as connected on the ExecutionSpeficiation - final List<NodeFigure> childrenFigure = new ArrayList<NodeFigure>(); + final List<NodeFigure> childrenFigure = new ArrayList<>(); for (final Object current : getChildren()) { if (current instanceof AbstractExecutionSpecificationEditPart) { NodeFigure figure = ((AbstractExecutionSpecificationEditPart) current).getPrimaryShape(); childrenFigure.add(figure); } } - ((LifelineFigure) getPrimaryShape()).setChildrenFigure(childrenFigure); + getPrimaryShape().setChildrenFigure(childrenFigure); } super.refresh(); @@ -104,7 +104,7 @@ public class CLifeLineEditPart extends LifelineEditPart { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart#createDefaultEditPolicies() */ @Override @@ -119,7 +119,7 @@ public class CLifeLineEditPart extends LifelineEditPart { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart#setLayoutConstraint(org.eclipse.gef.EditPart, org.eclipse.draw2d.IFigure, java.lang.Object) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomActionExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomActionExecutionSpecificationEditPart.java index b1bb98c402d..e79dd388245 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomActionExecutionSpecificationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomActionExecutionSpecificationEditPart.java @@ -13,15 +13,10 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; -import org.eclipse.draw2d.IFigure; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompartmentFigure; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionGraphicalNodeEditPolicy; -import org.eclipse.papyrus.uml.diagram.sequence.figures.ILifelineInternalFigure; /** * @author Jin Liu (jin.liu@soyatec.com) @@ -48,16 +43,16 @@ public class CustomActionExecutionSpecificationEditPart extends CCombinedCompart removeEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ExecutionGraphicalNodeEditPolicy()); } - - - + + + /** * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#refreshBounds() * */ @Override protected void refreshBounds() { - + super.refreshBounds(); } /** @@ -66,7 +61,7 @@ public class CustomActionExecutionSpecificationEditPart extends CCombinedCompart */ @Override protected void refreshVisuals() { - + super.refreshVisuals(); } /** @@ -76,7 +71,7 @@ public class CustomActionExecutionSpecificationEditPart extends CCombinedCompart */ @Override protected void handleNotificationEvent(Notification event) { - + super.handleNotificationEvent(event); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName6EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName6EditPart.java index 14ab0ec5226..802350adee1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName6EditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName6EditPart.java @@ -42,7 +42,7 @@ public class CustomMessageName6EditPart extends MessageLostNameEditPart implemen public int getDirectEditionType() { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } - + @Override protected void refreshLabel() { EditPolicy maskLabelPolicy = getParent().getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName7EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName7EditPart.java index 12a675aeb5a..c010db16d82 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName7EditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageName7EditPart.java @@ -37,7 +37,7 @@ public class CustomMessageName7EditPart extends MessageFoundNameEditPart impleme public CustomMessageName7EditPart(View view) { super(view); } - + @Override public int getDirectEditionType() { return IDirectEdition.DEFAULT_DIRECT_EDITOR; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageNameEditPart.java index 208e2f9eaa7..9f8f55b7be1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageNameEditPart.java @@ -38,7 +38,7 @@ public class CustomMessageNameEditPart extends MessageSyncNameEditPart implement public CustomMessageNameEditPart(View view) { super(view); } - + @Override public int getDirectEditionType() { return IDirectEdition.DEFAULT_DIRECT_EDITOR; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java index d30d03223a2..38ab43b193a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java @@ -179,7 +179,7 @@ public class CustomStateInvariantEditPart extends StateInvariantEditPart impleme final View view = getNotationView(); final DecorationNode guardNode = NotationFactory.eINSTANCE.createDecorationNode(); guardNode.setType(UMLVisualIDRegistry.getType(StateInvariantLabelEditPart.VISUAL_ID)); - + modelChildren.add(guardNode); } return modelChildren; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ExecutionSpecificationRectangleFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ExecutionSpecificationRectangleFigure.java index b19fa4da5ad..337ec4aa75f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ExecutionSpecificationRectangleFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ExecutionSpecificationRectangleFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,23 +8,22 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.TreeSearch; -import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; import org.eclipse.papyrus.uml.diagram.sequence.figures.ILifelineInternalFigure; -public class ExecutionSpecificationRectangleFigure extends RoundedCompartmentFigure implements ILifelineInternalFigure { +public class ExecutionSpecificationRectangleFigure extends RoundedCompartmentFigure implements ILifelineInternalFigure { /** */ public ExecutionSpecificationRectangleFigure() { - + } @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java index 4aea2602a33..f93395a4263 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java @@ -133,8 +133,8 @@ public abstract class InteractionFragmentEditPart extends RoundedCompartmentEdit Rectangle newBound = new Rectangle(newBounds.getX(), newBounds.getY(), newBounds.getWidth(), newBounds.getHeight()); InteractionFragment combinedFragment = (InteractionFragment) resolveSemanticElement(); EList<Lifeline> coveredLifelines = combinedFragment.getCovereds(); - List<Lifeline> coveredLifelinesToAdd = new ArrayList<Lifeline>(); - List<Lifeline> coveredLifelinesToRemove = new ArrayList<Lifeline>(); + List<Lifeline> coveredLifelinesToAdd = new ArrayList<>(); + List<Lifeline> coveredLifelinesToRemove = new ArrayList<>(); EditPart interactionCompartment = getInteractionCompartment(); if (interactionCompartment != null) { this.getFigure().translateToAbsolute(newBound); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java index 8e18a02f49c..ab0363c45f7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandGuardEditPart.java @@ -314,7 +314,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT /** * return the interactionoperand - * + * * @return */ protected EObject getParserElement() { @@ -542,7 +542,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT */ @Override public void notifyChanged(Notification notification) { - + super.notifyChanged(notification); } @Override @@ -830,7 +830,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT @Override public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof InteractionConstraint) { InteractionConstraint op = (InteractionConstraint) element; semanticElementsBeingParsed.add(op); @@ -852,7 +852,7 @@ public class InteractionOperandGuardEditPart extends ShapeEditPart implements IT @Override public String getPrintString(IAdaptable element, int flags) { - EObject operand = (EObject) element.getAdapter(EObject.class); + EObject operand = element.getAdapter(EObject.class); // InteractionOperand operand = getInteractionOperand(adapter); if (operand instanceof InteractionOperand) { return getGuardLabelText((InteractionOperand) operand, false); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomBehaviorExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomBehaviorExecutionSpecificationEditPart.java index 749e52df5df..cb6447d89e0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomBehaviorExecutionSpecificationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomBehaviorExecutionSpecificationEditPart.java @@ -76,7 +76,7 @@ public class OLDCustomBehaviorExecutionSpecificationEditPart extends BehaviorExe */ public OLDCustomBehaviorExecutionSpecificationEditPart(View view) { super(view); - + } private NotificationHelper helper = new NotificationHelper(new UIAdapterImpl() { @@ -326,7 +326,7 @@ public class OLDCustomBehaviorExecutionSpecificationEditPart extends BehaviorExe location.setY(16); behaviorLabel.setLayoutConstraint(location); behaviorLabel.setType(BehaviorExecutionSpecificationBehaviorEditPart.BEHAVIOR_TYPE); - + modelChildren.add(behaviorLabel); } return modelChildren; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomCombinedFragmentEditPart.java index 0c1306509bf..0152fa89af0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomCombinedFragmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomCombinedFragmentEditPart.java @@ -290,7 +290,7 @@ public class OLDCustomCombinedFragmentEditPart extends CombinedFragmentEditPart } public List<OLDCustomInteractionOperandEditPart> getOperandChildrenEditParts() { - List<OLDCustomInteractionOperandEditPart> children = new LinkedList<OLDCustomInteractionOperandEditPart>(); + List<OLDCustomInteractionOperandEditPart> children = new LinkedList<>(); IGraphicalEditPart compartment = getChildBySemanticHint(String.valueOf(CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID)); if (compartment instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) { for (Object ep : compartment.getChildren()) { @@ -372,13 +372,13 @@ public class OLDCustomCombinedFragmentEditPart extends CombinedFragmentEditPart EList<Lifeline> operandCoveredLifelines = operand.getCovereds(); if (!operandCoveredLifelines.equals(combinedFragmentCoveredLifelines)) { // Add new covered lifelines (not already covered) - List<Lifeline> coveredLifelinesToAdd = new ArrayList<Lifeline>(combinedFragmentCoveredLifelines); + List<Lifeline> coveredLifelinesToAdd = new ArrayList<>(combinedFragmentCoveredLifelines); coveredLifelinesToAdd.removeAll(operandCoveredLifelines); if (!coveredLifelinesToAdd.isEmpty()) { CommandHelper.executeCommandWithoutHistory(getEditingDomain(), AddCommand.create(getEditingDomain(), operand, UMLPackage.eINSTANCE.getInteractionFragment_Covered(), coveredLifelinesToAdd), true); } // Delete old covered lifelines (not covered anymore) - List<Lifeline> coveredLifelinesToRemove = new ArrayList<Lifeline>(operandCoveredLifelines); + List<Lifeline> coveredLifelinesToRemove = new ArrayList<>(operandCoveredLifelines); coveredLifelinesToRemove.removeAll(combinedFragmentCoveredLifelines); if (!coveredLifelinesToRemove.isEmpty()) { CommandHelper.executeCommandWithoutHistory(getEditingDomain(), RemoveCommand.create(getEditingDomain(), operand, UMLPackage.eINSTANCE.getInteractionFragment_Covered(), coveredLifelinesToRemove), true); @@ -745,7 +745,7 @@ public class OLDCustomCombinedFragmentEditPart extends CombinedFragmentEditPart @Override public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof CombinedFragment) { CombinedFragment cf = (CombinedFragment) element; semanticElementsBeingParsed.add(cf); @@ -782,12 +782,12 @@ public class OLDCustomCombinedFragmentEditPart extends CombinedFragmentEditPart @Override public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) { - EObject element = (EObject) adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element); if (editingDomain == null || !(element instanceof CombinedFragment)) { return UnexecutableCommand.INSTANCE; } - + ICommand command = null; if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) { final ModelSet modelSet = (ModelSet) element.eResource().getResourceSet(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionOperandEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionOperandEditPart.java index 4922ad02214..70910b0df08 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionOperandEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionOperandEditPart.java @@ -111,6 +111,7 @@ import org.eclipse.uml2.uml.ValueSpecification; * @author Jin Liu (jin.liu@soyatec.com) * @deprecated */ +@Deprecated public class OLDCustomInteractionOperandEditPart extends InteractionOperandEditPart implements ITextAwareEditPart { /** @@ -371,13 +372,13 @@ public class OLDCustomInteractionOperandEditPart extends InteractionOperandEditP EList<Lifeline> continuationCoveredLifelines = interactionFragment.getCovereds(); if (!continuationCoveredLifelines.equals(currentlyCoveredLifeline)) { // Add new covered lifelines (not already covered) - List<Lifeline> coveredLifelinesToAdd = new ArrayList<Lifeline>(currentlyCoveredLifeline); + List<Lifeline> coveredLifelinesToAdd = new ArrayList<>(currentlyCoveredLifeline); coveredLifelinesToAdd.removeAll(continuationCoveredLifelines); if (!coveredLifelinesToAdd.isEmpty()) { CommandHelper.executeCommandWithoutHistory(getEditingDomain(), AddCommand.create(getEditingDomain(), interactionFragment, UMLPackage.eINSTANCE.getInteractionFragment_Covered(), coveredLifelinesToAdd), true); } // Delete old covered lifelines (not covered anymore) - List<Lifeline> coveredLifelinesToRemove = new ArrayList<Lifeline>(continuationCoveredLifelines); + List<Lifeline> coveredLifelinesToRemove = new ArrayList<>(continuationCoveredLifelines); coveredLifelinesToRemove.removeAll(currentlyCoveredLifeline); if (!coveredLifelinesToRemove.isEmpty()) { CommandHelper.executeCommandWithoutHistory(getEditingDomain(), RemoveCommand.create(getEditingDomain(), interactionFragment, UMLPackage.eINSTANCE.getInteractionFragment_Covered(), coveredLifelinesToRemove), true); @@ -439,7 +440,7 @@ public class OLDCustomInteractionOperandEditPart extends InteractionOperandEditP if (view.getElement() instanceof InteractionOperand) { guardNode.setElement(((InteractionOperand) view.getElement()).getGuard()); } - + modelChildren.add(guardNode); } } @@ -970,7 +971,7 @@ public class OLDCustomInteractionOperandEditPart extends InteractionOperandEditP @Override public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof InteractionOperand) { InteractionOperand op = (InteractionOperand) element; semanticElementsBeingParsed.add(op); @@ -1008,7 +1009,7 @@ public class OLDCustomInteractionOperandEditPart extends InteractionOperandEditP @Override public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) { - EObject element = (EObject) adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element); if (editingDomain == null || !(element instanceof InteractionOperand)) { return UnexecutableCommand.INSTANCE; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionUseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionUseEditPart.java index 0136d247f8a..6feb564acca 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionUseEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionUseEditPart.java @@ -45,7 +45,6 @@ import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDGateCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDGatesHolderGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionUseRectangleFigure; -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; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateEditPart.java index 64ded36d638..58158023209 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateEditPart.java @@ -387,9 +387,10 @@ public class OLDGateEditPart extends AbstractBorderEditPart implements IBorderIt /** * this method will return the primary child EditPart inside this edit part - * + * * @return the primary child view inside this edit part */ + @Override public EditPart getPrimaryChildEditPart() { if (getChildren().size() > 0) { return (EditPart) getChildren().get(0); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java index 231989aec0d..c149e371db3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java @@ -140,6 +140,7 @@ import org.eclipse.uml2.uml.UMLPackage; * @author Jin Liu (jin.liu@soyatec.com) * @deprecated will be remove in Oxygen */ +@Deprecated public class OLDLifelineEditPart extends LifelineEditPart { public class CustomLifelineFigure extends LifelineFigure { @@ -288,7 +289,7 @@ public class OLDLifelineEditPart extends LifelineEditPart { if (type instanceof StructuredClassifier) { StructuredClassifier structuredClassifier = (StructuredClassifier) type; if (!structuredClassifier.getAllAttributes().isEmpty()) { - return new ArrayList<Property>(((StructuredClassifier) type).getAllAttributes()); + return new ArrayList<>(((StructuredClassifier) type).getAllAttributes()); } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkEndEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkEndEditPolicy.java index a10fc867029..5df9141b108 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkEndEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkEndEditPolicy.java @@ -39,10 +39,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.command.AnnotatedLinkEditCommand; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AnnotatedLinkEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart.CustomLifelineFigure; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart.CustomLifelineFigure; import org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration; import org.eclipse.swt.SWT; import org.eclipse.uml2.uml.NamedElement; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkStartEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkStartEditPolicy.java index 85a69342460..a8ae4e9dd30 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkStartEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AnnotatedLinkStartEditPolicy.java @@ -68,7 +68,7 @@ public class AnnotatedLinkStartEditPolicy extends GraphicalNodeEditPolicy { if (host instanceof INodeEditPart) { return (INodeEditPart) host; } else { - IGraphicalEditPart hostGraphical = (IGraphicalEditPart) host.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart hostGraphical = host.getAdapter(IGraphicalEditPart.class); if (hostGraphical == null) { return null; } @@ -80,7 +80,7 @@ public class AnnotatedLinkStartEditPolicy extends GraphicalNodeEditPolicy { if (!(parent instanceof INodeEditPart)) { return null; } - IGraphicalEditPart parentGraphical = (IGraphicalEditPart) parent.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart parentGraphical = parent.getAdapter(IGraphicalEditPart.class); if (parentGraphical != null && element == parentGraphical.resolveSemanticElement()) { return (INodeEditPart) parent; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeExternalNodeLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeExternalNodeLabelEditPolicy.java index 2152a1a0c0e..27d2bb6fb2a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeExternalNodeLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeExternalNodeLabelEditPolicy.java @@ -109,7 +109,7 @@ public class AppliedStereotypeExternalNodeLabelEditPolicy extends AppliedStereot } /** - * + * */ private void refreshStereotypeLabel() { if (getHost() instanceof IPapyrusEditPart) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedCreationEditPolicy.java index a4b45ea5a75..250a58d0d49 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedCreationEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -31,7 +31,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.command.SetResizeAndLocationComm * */ public class CombinedCreationEditPolicy extends DefaultCreationEditPolicy { - + /** * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy#getSetBoundsCommand(org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest, org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor) * @@ -48,7 +48,7 @@ public class CombinedCreationEditPolicy extends DefaultCreationEditPolicy { int y=0; int height=((Bounds)combinedFragmentNode.getLayoutConstraint()).getHeight()-labelHeight; for(int i=0; i<getHost().getChildren().size();i++) { - + Node currentNode=(Node)(((GraphicalEditPart)getHost().getChildren().get(i))).getNotationView(); int previousheight=((Bounds)currentNode.getLayoutConstraint()).getHeight(); y=y+previousheight; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java index 833a0b43bf3..93b6165b78c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java @@ -93,7 +93,7 @@ public class CombinedFragmentHeadImpactLayoutEditPolicy extends AbstractHeadImpa EditPart part = (EditPart) object; EditPart current = part.getParent(); while (current != null) { - ExposeHelper helper = (ExposeHelper) current + ExposeHelper helper = current .getAdapter(ExposeHelper.class); if (helper != null) { helper.exposeDescendant(part); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java index 613f5d62fcc..e0ff8534717 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java @@ -44,7 +44,6 @@ import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdap 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; import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; @@ -165,7 +164,7 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo */ @Override protected Set<String> getDroppableElementVisualId() { - Set<String> elementsVisualId = new HashSet<String>(); + Set<String> elementsVisualId = new HashSet<>(); elementsVisualId.add(LifelineEditPart.VISUAL_ID); elementsVisualId.add(CCombinedCompartmentEditPart.VISUAL_ID); elementsVisualId.add(ActionExecutionSpecificationEditPart.VISUAL_ID); @@ -1064,7 +1063,7 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo * @return the list of lifeline. */ private List<Lifeline> getLifelines(List<View> existingViews) { - List<Lifeline> lifelines = new ArrayList<Lifeline>(); + List<Lifeline> lifelines = new ArrayList<>(); for (View view : existingViews) { EObject eObject = ViewUtil.resolveSemanticElement((View) view.eContainer()); if (eObject instanceof Lifeline) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomGraphicalNodeEditPolicy.java index 9fbe3c93921..ad6ce691b37 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomGraphicalNodeEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2018 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -44,7 +44,7 @@ public class CustomGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest) */ @Override @@ -72,14 +72,15 @@ public class CustomGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest) */ @Override protected Command getReconnectTargetCommand(ReconnectRequest request) { final INodeEditPart node = getConnectableEditPart(); - if (node == null) + if (node == null) { return null; + } final TransactionalEditingDomain editingDomain = getEditingDomain(); @@ -124,16 +125,16 @@ public class CustomGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { /** * This allows to get the editing domain. - * + * * @return The editing domain. */ private TransactionalEditingDomain getEditingDomain() { return ((IGraphicalEditPart) getHost()).getEditingDomain(); } - + /** * Add a command of reconnection of the given connection editpart at the location. - * + * * @param hostEditpart * the current editpart that is the origin of this impact * @param connectionEditPart diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomSetConnectionBendpointsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomSetConnectionBendpointsCommand.java index 54608aca49f..5fce75fa3ff 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomSetConnectionBendpointsCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomSetConnectionBendpointsCommand.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2018 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -68,20 +68,21 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles() */ @Override public List<?> getAffectedFiles() { - View view = (View) edgeAdaptor.getAdapter(View.class); - if (view != null) + View view = edgeAdaptor.getAdapter(View.class); + if (view != null) { return getWorkspaceFiles(view); + } return super.getAffectedFiles(); } /** * Gets the edge adaptor. - * + * * @return The edgeAdapter. */ public IAdaptable getEdgeAdaptor() { @@ -90,7 +91,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * Sets the edge adaptor. - * + * * @param edgeAdapter * The edgeAdapter to set. */ @@ -100,7 +101,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * Gets the request. - * + * * @return The request. */ public ReconnectRequest getRequest() { @@ -109,7 +110,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * Sets the request. - * + * * @param request * The request to set. */ @@ -119,7 +120,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * Gets the node. - * + * * @return The node. */ public INodeEditPart getNode() { @@ -128,7 +129,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * Sets the node. - * + * * @param node * The node to set. */ @@ -138,7 +139,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ @Override @@ -147,7 +148,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC Assert.isNotNull(request); - final Edge edge = (Edge) getEdgeAdaptor().getAdapter(Edge.class); + final Edge edge = getEdgeAdaptor().getAdapter(Edge.class); Assert.isNotNull(edge); final ConnectionAnchor sourceAnchor = node.getSourceConnectionAnchor(request); @@ -160,7 +161,7 @@ public class CustomSetConnectionBendpointsCommand extends AbstractTransactionalC pointList.addPoint(sourceAnchor.getLocation(targetRefPoint)); pointList.addPoint(targetAnchor.getLocation(sourceRefPoint)); - final List<RelativeBendpoint> newBendpoints = new ArrayList<RelativeBendpoint>(); + final List<RelativeBendpoint> newBendpoints = new ArrayList<>(); for (short i = 0; i < pointList.size(); i++) { final Dimension s = pointList.getPoint(i).getDifference(sourceRefPoint); final Dimension t = pointList.getPoint(i).getDifference(targetRefPoint); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java index d02cc7ee5fa..0724a6473c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java @@ -76,7 +76,7 @@ public class DeleteTimeElementWithoutEventPolicy extends AbstractEditPolicy impl public static final String KEY = "DeleteTimeElementWithoutEvent"; /** list of element to listen */ - protected HashMap<EObject, List<View>> additionalParentToListen = new HashMap<EObject, List<View>>(); + protected HashMap<EObject, List<View>> additionalParentToListen = new HashMap<>(); /** stores the host associated semantic element */ protected EObject hostSemanticElement; @@ -259,7 +259,7 @@ public class DeleteTimeElementWithoutEventPolicy extends AbstractEditPolicy impl if (occs.size() >= 2 && occs.get(0) instanceof OccurrenceSpecification && occs.get(1) instanceof OccurrenceSpecification) { EditPart part1 = SequenceUtil.getLinkedEditPart(lifeline, (OccurrenceSpecification) occs.get(0)); EditPart part2 = SequenceUtil.getLinkedEditPart(lifeline, (OccurrenceSpecification) occs.get(1)); - List<View> list = new ArrayList<View>(2); + List<View> list = new ArrayList<>(2); if (part1 != null) { list.add((View) part1.getModel()); } @@ -383,13 +383,13 @@ public class DeleteTimeElementWithoutEventPolicy extends AbstractEditPolicy impl */ protected void removeListenerForView(View oldView) { // create a temp list of elements to delete (iterator concurrent modification..) - Map<EObject, List<View>> parentsToDelete = new HashMap<EObject, List<View>>(); + Map<EObject, List<View>> parentsToDelete = new HashMap<>(); for (EObject parent : additionalParentToListen.keySet()) { List<View> parentViews = additionalParentToListen.get(parent); if (parentViews.contains(oldView)) { List<View> views = parentsToDelete.get(parent); if (views == null) { - views = new ArrayList<View>(); + views = new ArrayList<>(); } views.add(oldView); parentsToDelete.put(parent, views); @@ -402,7 +402,7 @@ public class DeleteTimeElementWithoutEventPolicy extends AbstractEditPolicy impl */ protected void removeListeners(List<View> impactedViews) { // create a temp list of elements to delete (iterator concurrent modification..) - Map<EObject, List<View>> parentsToDelete = new HashMap<EObject, List<View>>(); + Map<EObject, List<View>> parentsToDelete = new HashMap<>(); // collect the elements to delete for (View view : impactedViews) { for (EObject parent : additionalParentToListen.keySet()) { @@ -410,7 +410,7 @@ public class DeleteTimeElementWithoutEventPolicy extends AbstractEditPolicy impl if (parentViews.contains(view)) { List<View> views = parentsToDelete.get(parent); if (views == null) { - views = new ArrayList<View>(); + views = new ArrayList<>(); } views.add(view); parentsToDelete.put(parent, views); 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 fb98aa533d3..37345c3398c 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 @@ -37,19 +37,15 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElemen import org.eclipse.gmf.runtime.emf.type.core.IHintedType; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper; -import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper; -import org.eclipse.papyrus.uml.diagram.sequence.command.DropDestructionOccurenceSpecification; import org.eclipse.papyrus.uml.diagram.sequence.command.PromptCreateElementAndNodeCommand; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart.CustomLifelineFigure; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateEditPart; 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; @@ -94,7 +90,7 @@ public class ElementCreationWithMessageEditPolicy extends LifelineChildGraphical } } } - + //if the message is DELETE KIND, we must drop the view of the DestructionOccurrenceSpecification if (getDeleteMessageHint().equals(viewRequest.getConnectionViewDescriptor().getSemanticHint())) { // DropDestructionOccurenceSpecification dropDestructionOccurenceSpecification= new DropDestructionOccurenceSpecification(getEditingDomain(), viewRequest, targetEP); 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 00e57bec883..6a50ee7d016 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 @@ -131,7 +131,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy for (Object o : request.getEditParts()) { GraphicalEditPart child = (GraphicalEditPart) o; boolean hasCreateLink = LifelineMessageCreateHelper.hasIncomingMessageCreate(child); - // Adjust excessive vertical resizing + // Adjust excessive vertical resizing if (child instanceof LifelineEditPart && hasCreateLink && request.getMoveDelta().y > 0) { int oldHeight = child.getFigure().getBounds().height; int oldMinimumHeight = ((OLDLifelineEditPart)child).getMinimumHeight(-1); @@ -460,10 +460,10 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy if (combinedFragmentEditPart.getChildren().size() > 0 && combinedFragmentEditPart.getChildren().get(0) instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) { CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) combinedFragmentEditPart.getChildren().get(0); List<EditPart> combinedFragmentChildrenEditParts = compartment.getChildren(); - List<InteractionOperandEditPart> interactionOperandEditParts = new ArrayList<InteractionOperandEditPart>(); + List<InteractionOperandEditPart> interactionOperandEditParts = new ArrayList<>(); InteractionOperand firstOperand = cf.getOperands().get(0); // interaction fragments which will not be covered by the operands - Set<InteractionFragment> notCoveredAnymoreInteractionFragments = new HashSet<InteractionFragment>(); + Set<InteractionFragment> notCoveredAnymoreInteractionFragments = new HashSet<>(); int headerHeight = 0; for (EditPart ep : combinedFragmentChildrenEditParts) { if (ep instanceof InteractionOperandEditPart) { @@ -486,7 +486,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy for (InteractionOperandEditPart ioEP : interactionOperandEditParts) { InteractionOperand io = (InteractionOperand) ioEP.resolveSemanticElement(); Rectangle newBoundsIO = SequenceUtil.getAbsoluteBounds(ioEP); - Rectangle oldBoundsIO = newBoundsIO.getCopy(); + Rectangle oldBoundsIO = newBoundsIO.getCopy(); // apply the move delta which will impact all operands newBoundsIO.translate(moveDelta); // calculate the new bounds of the interaction operand @@ -501,7 +501,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy oldBoundsIO.height += headerHeight; } // ignore current CF and enclosed IO - Set<InteractionFragment> ignoreSet = new HashSet<InteractionFragment>(); + Set<InteractionFragment> ignoreSet = new HashSet<>(); ignoreSet.add(cf); ignoreSet.addAll(cf.getOperands()); Set<InteractionFragment> coveredInteractionFragments = SequenceUtil.getCoveredInteractionFragments(newBoundsIO, combinedFragmentEditPart, ignoreSet); @@ -521,7 +521,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy } Interaction interactionOwner = ift.getEnclosingInteraction(); InteractionOperand ioOwner = ift.getEnclosingOperand(); - if ((ioOwner != null && (ioOwner.equals(cf.getEnclosingOperand()) || cf.equals(ioOwner.getOwner()))) + if ((ioOwner != null && (ioOwner.equals(cf.getEnclosingOperand()) || cf.equals(ioOwner.getOwner()))) || (interactionOwner != null && (interactionOwner.equals(cf.getEnclosingInteraction()) || cf.equals(interactionOwner.getOwner())))) { compoundCmd.add(new ICommandProxy(SequenceUtil.getSetEnclosingInteractionCommand(ioEP.getEditingDomain(), ift, io))); } @@ -531,7 +531,7 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy if (firstOperand.equals(io)) { offsetInnerCFs.y = oldBoundsIO.y - newBoundsIO.y; // no need to adjust other IOs } - Command adjustInnerCFsCommand = CombinedFragmentMoveHelper.getShiftEnclosedCFsCommand(ioEP, offsetInnerCFs); + Command adjustInnerCFsCommand = CombinedFragmentMoveHelper.getShiftEnclosedCFsCommand(ioEP, offsetInnerCFs); if (adjustInnerCFsCommand != null) { compoundCmd.add(adjustInnerCFsCommand); } @@ -696,13 +696,13 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy List<?> editParts = ((ChangeBoundsRequest)request).getEditParts(); if(editParts.size() == 1) { if (editParts.get(0) instanceof AppliedStereotypeCommentEditPart) { - // Allow to move-in AppliedStereotypeCommentEditPart + // Allow to move-in AppliedStereotypeCommentEditPart return super.getAddCommand(request); } if(editParts.get(0) instanceof CombinedFragmentEditPart) { // Prevent UnexecutableCommand.INSTANCE to be added to a valid CombinedFragmentEditPart move command chain return null; - } + } } return UnexecutableCommand.INSTANCE; } @@ -860,5 +860,5 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy super.eraseSizeOnDropFeedback(request); } - private List<LifelineEditPart> coveredLifelines = new ArrayList<LifelineEditPart>(1); + private List<LifelineEditPart> coveredLifelines = new ArrayList<>(1); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionGraphicalNodeEditPolicy.java index 038a02500ae..16b95f14036 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionGraphicalNodeEditPolicy.java @@ -128,7 +128,7 @@ public class InteractionGraphicalNodeEditPolicy extends OLDGatesHolderGraphicalN // ignore CoRegion if ((source instanceof CombinedFragment || source instanceof Interaction || source instanceof InteractionUse)) { Point location = null; - IGraphicalEditPart adapter = (IGraphicalEditPart) sourceEditPart.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart adapter = sourceEditPart.getAdapter(IGraphicalEditPart.class); TransactionalEditingDomain editingDomain = null; if (adapter != null) { location = GateHelper.computeGateLocation(request.getLocation(), adapter.getFigure(), null); @@ -156,7 +156,7 @@ public class InteractionGraphicalNodeEditPolicy extends OLDGatesHolderGraphicalN @Override public Object getAdapter(Class adapter) { if (Gate.class == adapter) { - Message message = (Message) elementAdapter.getAdapter(Message.class); + Message message = elementAdapter.getAdapter(Message.class); MessageEnd sendEvent = message.getSendEvent(); if (sendEvent instanceof Gate) { return sendEvent; @@ -285,7 +285,7 @@ public class InteractionGraphicalNodeEditPolicy extends OLDGatesHolderGraphicalN if (typeInfoAdapter == null) { return false; } - final IElementType typeInfo = (IElementType) typeInfoAdapter.getAdapter(IElementType.class); + final IElementType typeInfo = typeInfoAdapter.getAdapter(IElementType.class); if (typeInfo != null) { if (((CreateUnspecifiedTypeConnectionRequest) request).getRequestForType(typeInfo) == null) { return false; @@ -307,7 +307,7 @@ public class InteractionGraphicalNodeEditPolicy extends OLDGatesHolderGraphicalN return CommandResult.newErrorCommandResult(getLabel()); } if (typeInfoAdapter != null) { - IElementType typeInfo = (IElementType) typeInfoAdapter.getAdapter(IElementType.class); + IElementType typeInfo = typeInfoAdapter.getAdapter(IElementType.class); if (typeInfo == null) { return CommandResult.newErrorCommandResult(getLabel()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java index aebb2dc05e8..539b100e941 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java @@ -73,7 +73,7 @@ public class InteractionHeadImpactLayoutEditPolicy extends AbstractHeadImpactLay // 1. move gate { List children = getHost().getChildren(); - List<OLDGateEditPart> gates = new ArrayList<OLDGateEditPart>(); + List<OLDGateEditPart> gates = new ArrayList<>(); for (Object object : children) { if (object instanceof OLDGateEditPart) { gates.add((OLDGateEditPart) object); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandAppliedStereotypeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandAppliedStereotypeLabelDisplayEditPolicy.java index 25e435c23ef..d6f285bc9ca 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandAppliedStereotypeLabelDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandAppliedStereotypeLabelDisplayEditPolicy.java @@ -20,9 +20,8 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeNamedElementFigure; import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomInteractionOperandEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandGuardEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandGuardEditPart.GuardFigure; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomInteractionOperandEditPart; import org.eclipse.swt.graphics.Image; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java index d46d431e59e..38d32b78fcb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java @@ -13,14 +13,9 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.gef.EditPart; import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.ResizableEditPolicy; import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.util.OperandBoundsComputeHelper; /** * The customn DragDropEditPolicy for InteractionOperandEditPart. @@ -52,7 +47,7 @@ public class InteractionOperandDragDropEditPolicy extends ResizableEditPolicy { // if (this.getHost() instanceof InteractionOperandEditPart && this.getHost().getParent() instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) { // InteractionOperandEditPart currentIOEP = (InteractionOperandEditPart) this.getHost(); // CombinedFragmentCombinedFragmentCompartmentEditPart compartEP = (CombinedFragmentCombinedFragmentCompartmentEditPart) this.getHost().getParent(); -// // if the OP's border same as/linked to the CF's border +// // if the OP's border same as/linked to the CF's border // if (this.getHost() == OperandBoundsComputeHelper.findFirstIOEP(compartEP) && isNorthResize // || this.getHost() == OperandBoundsComputeHelper.findLastIOEP(compartEP) && isSouthResize) { // return getHost().getParent().getParent().getCommand(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineAffixedNodesCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineAffixedNodesCreationEditPolicy.java index 0f6df2eeba4..7e0a96eb340 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineAffixedNodesCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineAffixedNodesCreationEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java index ac88030ba35..6f5c9399071 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineRestorePositionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineRestorePositionEditPolicy.java index f27b6daa326..7765696010d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineRestorePositionEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineRestorePositionEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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 @@ -43,7 +43,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineEditPartUtil; /** * Edit policy to restore target lifeline line position after a deletion of a {@link MessageCreate}. - * + * * @author Mickaël ADAM */ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implements NodeListener { @@ -53,9 +53,10 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate() */ + @Override public void activate() { // add listener on life line edit part EditPart host = getHost(); @@ -66,7 +67,7 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#deactivate() */ @Override @@ -80,11 +81,11 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * {@inheritDoc} - * + * * <p> * Overridden to add the request parameters to inform if the event of the target is the first on the lifeline. * </p> - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy#getSemanticCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest) */ @Override @@ -95,9 +96,9 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * If the removed connection is a MessageCreate, then we restore life line position. - * + * * {@inheritDoc} - * + * * @see org.eclipse.gef.NodeListener#removingTargetConnection(org.eclipse.gef.ConnectionEditPart, int) */ @Override @@ -156,7 +157,7 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * {@inheritDoc} - * + * * @see org.eclipse.gef.NodeListener#removingSourceConnection(org.eclipse.gef.ConnectionEditPart, int) */ @Override @@ -166,7 +167,7 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * {@inheritDoc} - * + * * @see org.eclipse.gef.NodeListener#sourceConnectionAdded(org.eclipse.gef.ConnectionEditPart, int) */ @Override @@ -176,7 +177,7 @@ public class LifeLineRestorePositionEditPolicy extends SemanticEditPolicy implem /** * {@inheritDoc} - * + * * @see org.eclipse.gef.NodeListener#targetConnectionAdded(org.eclipse.gef.ConnectionEditPart, int) */ @Override 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 5087cc0ad12..e703a3be602 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 @@ -126,7 +126,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo * 2. we are in other cases: * 2.1: it is a comment link or a constraint link or a context link -> seems works fine removing this code * 2.2: it is a General Ordering, probably not supported - * + * * TODO : this code and more in this class should probably be deleted */ if (org.eclipse.gef.RequestConstants.REQ_CONNECTION_START.equals(request.getType())) { @@ -206,12 +206,12 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo */ @Override protected Command getReconnectSourceCommand(ReconnectRequest request) { - ReconnectRequest reconnectRequest = (ReconnectRequest) request; + ReconnectRequest reconnectRequest = request; ConnectionEditPart linkEditPart = reconnectRequest.getConnectionEditPart(); if (linkEditPart.getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE) != null) { SequenceReferenceEditPolicy references = (SequenceReferenceEditPolicy) linkEditPart.getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE); for (Iterator<EditPart> iterator = references.getStrongReferences().keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (editPart.equals(getHost())) { reconnectRequest.setTargetEditPart(getHost().getParent()); return getHost().getParent().getCommand(reconnectRequest); @@ -241,12 +241,12 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo */ @Override protected Command getReconnectTargetCommand(ReconnectRequest request) { - ReconnectRequest reconnectRequest = (ReconnectRequest) request; + ReconnectRequest reconnectRequest = request; ConnectionEditPart linkEditPart = reconnectRequest.getConnectionEditPart(); if (linkEditPart.getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE) != null) { SequenceReferenceEditPolicy references = (SequenceReferenceEditPolicy) linkEditPart.getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE); for (Iterator<EditPart> iterator = references.getStrongReferences().keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (editPart.equals(getHost())) { reconnectRequest.setTargetEditPart(getHost().getParent()); return getHost().getParent().getCommand(reconnectRequest); @@ -355,7 +355,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo if (source instanceof CombinedFragment || source instanceof Interaction || source instanceof InteractionUse) { CompoundCommand cc = new CompoundCommand("Redirect to Gate"); Point location = null; - IGraphicalEditPart adapter = (IGraphicalEditPart) sourceEP.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart adapter = sourceEP.getAdapter(IGraphicalEditPart.class); if (adapter != null) { Point sourceLocation = request.getLocation(); Object object = request.getExtendedData().get(SequenceRequestConstant.SOURCE_LOCATION_DATA); @@ -372,7 +372,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends OLDSequenceGraphicalNo @Override public Object getAdapter(Class adapter) { if (Gate.class == adapter) { - Message message = (Message) elementAdapter.getAdapter(Message.class); + Message message = elementAdapter.getAdapter(Message.class); MessageEnd sendEvent = message.getSendEvent(); if (sendEvent instanceof Gate) { return sendEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineHeadImpactLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineHeadImpactLayoutEditPolicy.java index b21bc5a1cbf..0b5cdd7b0b2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineHeadImpactLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineHeadImpactLayoutEditPolicy.java @@ -16,9 +16,9 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; import org.eclipse.draw2d.RectangleFigure; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart.CustomLifelineFigure; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineHeadUtil; 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 01680762c8d..4b86f0a4797 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 @@ -56,7 +56,7 @@ public class LifelineSelectionEditPolicy extends PapyrusResizableShapeEditPolicy final LifelineEditPart host = (LifelineEditPart) getHost(); final LifelineFigure primaryShape = host.getPrimaryShape(); // resizable in at least one direction - List<Handle> list = new ArrayList<Handle>(); + List<Handle> list = new ArrayList<>(); // createMoveHandle(list); final RectangleFigure figure = primaryShape.getFigureLifelineNameContainerFigure(); final Locator locator = new MoveHandleLocator(figure); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java index c8e943c82ff..6da18c66b65 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java @@ -11,7 +11,7 @@ * Atos Origin - Initial API and implementation * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 519408, 525372, 526628 * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 531596 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -159,7 +159,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP /** * Get the command to update weak references of the message for a deletion. - * + * * @param request * the delete command wrapped into a {@link EditCommandRequestWrapper}. * @return the command @@ -180,7 +180,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP CompoundCommand compoundCommand = new CompoundCommand(); // Gets weak references - List<EditPart> weakReferences = new ArrayList<EditPart>(); + List<EditPart> weakReferences = new ArrayList<>(); HashMap<EditPart, String> allWeakReferences = references.getWeakReferences(); allWeakReferences.forEach((editPart, value) -> { @@ -191,7 +191,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP // for each weak reference move it for (Iterator<EditPart> iterator = weakReferences.iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (!SenderRequestUtils.isASender(request, editPart)) {// avoid loop UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+--> try to Move " + editPart);//$NON-NLS-1$ ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request); @@ -389,7 +389,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP } else // Found message case && Lost message case if ((srcLifelinePart == null) && (targetLifelinePart != null) || (srcLifelinePart != null && targetLifelinePart == null)) { - return getMoveMessageCommand((BendpointRequest) request); + return getMoveMessageCommand(request); } } } @@ -398,7 +398,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP /** * This allows to updates lifelines height if necessary. - * + * * @param request * The initial request. * @param hostConnectionEditPart @@ -419,7 +419,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP if (!SenderRequestUtils.isASender(request, getHost())) { // Gets weak references - final List<EditPart> weakAndStrongReferences = new ArrayList<EditPart>(); + final List<EditPart> weakAndStrongReferences = new ArrayList<>(); weakAndStrongReferences.addAll(references.getWeakReferences().keySet()); weakAndStrongReferences.addAll(references.getStrongReferences().keySet()); @@ -431,7 +431,7 @@ public class MessageConnectionLineSegEditPolicy extends ConnectionBendpointEditP final Point initialSourcePosition = polyline.getSourceAnchor().getReferencePoint(); final Point initialTargetPosition = polyline.getTargetAnchor().getReferencePoint(); - final Set<LifelineEditPart> lifelineEditParts = new HashSet<LifelineEditPart>(); + final Set<LifelineEditPart> lifelineEditParts = new HashSet<>(); if (hostConnectionEditPart.getSource() instanceof LifelineEditPart) { lifelineEditParts.add((LifelineEditPart) hostConnectionEditPart.getSource()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java index 3368628624d..ad3fcd8262b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper; /** * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part. - * + * * @since 3.0 */ public class OLDDestructionEventComponentEditPolicy extends ComponentEditPolicy { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java index 25cdaaeec4c..b88f973372d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java @@ -85,7 +85,7 @@ public class OLDGateGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { if (source instanceof CombinedFragment || source instanceof Interaction || source instanceof InteractionUse) { CompoundCommand cc = new CompoundCommand("Redirect to Gate"); Point location = null; - IGraphicalEditPart adapter = (IGraphicalEditPart) sourceEP.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart adapter = sourceEP.getAdapter(IGraphicalEditPart.class); if (adapter != null) { Point sourceLocation = request.getLocation(); Object object = request.getExtendedData().get(SequenceRequestConstant.SOURCE_LOCATION_DATA); @@ -102,7 +102,7 @@ public class OLDGateGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { @Override public Object getAdapter(Class adapter) { if (Gate.class == adapter) { - Message message = (Message) elementAdapter.getAdapter(Message.class); + Message message = elementAdapter.getAdapter(Message.class); MessageEnd sendEvent = message.getSendEvent(); if (sendEvent instanceof Gate) { return sendEvent; @@ -231,7 +231,7 @@ public class OLDGateGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { @Override protected Command getReconnectTargetCommand(ReconnectRequest request) { ConnectionEditPart connectionEditPart = request.getConnectionEditPart(); - IGraphicalEditPart adapter = (IGraphicalEditPart) connectionEditPart.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart adapter = connectionEditPart.getAdapter(IGraphicalEditPart.class); if (adapter != null && adapter.resolveSemanticElement() instanceof Message) { Message oldMessage = (Message) adapter.resolveSemanticElement(); Gate gate = resolveSemanticElement(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java index 5035346c0fa..e6830af5eb3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java @@ -154,7 +154,7 @@ public class OLDGatesHolderGraphicalNodeEditPolicy extends OLDSequenceGraphicalN private boolean isReconnectMessage(ReconnectRequest request) { ConnectionEditPart conn = request.getConnectionEditPart(); - IGraphicalEditPart adapter = (IGraphicalEditPart) conn.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart adapter = conn.getAdapter(IGraphicalEditPart.class); return adapter != null && adapter.resolveSemanticElement() instanceof Message; } @@ -341,7 +341,7 @@ public class OLDGatesHolderGraphicalNodeEditPolicy extends OLDSequenceGraphicalN if (typeInfoAdapter == null) { return false; } - final IElementType typeInfo = (IElementType) typeInfoAdapter.getAdapter(IElementType.class); + final IElementType typeInfo = typeInfoAdapter.getAdapter(IElementType.class); if (typeInfo != null) { if (((CreateUnspecifiedTypeConnectionRequest) request).getRequestForType(typeInfo) == null) { return false; @@ -363,7 +363,7 @@ public class OLDGatesHolderGraphicalNodeEditPolicy extends OLDSequenceGraphicalN return CommandResult.newErrorCommandResult(getLabel()); } if (typeInfoAdapter != null) { - IElementType typeInfo = (IElementType) typeInfoAdapter.getAdapter(IElementType.class); + IElementType typeInfo = typeInfoAdapter.getAdapter(IElementType.class); if (typeInfo == null) { return CommandResult.newErrorCommandResult(getLabel()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifeLineLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifeLineLayoutEditPolicy.java index 49f4accdcee..93eb500fb02 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifeLineLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifeLineLayoutEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ @@ -40,7 +40,7 @@ import org.eclipse.papyrus.uml.service.types.element.UMLDIElementTypes; import org.eclipse.papyrus.uml.service.types.utils.SequenceRequestConstant; /** - * + * * This class is manage border item and element inside Lifeline * @since 3.0 * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java index bae648ebf91..4abda94b151 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java @@ -49,8 +49,8 @@ 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.sequence.command.SetResizeAndLocationCommand; import org.eclipse.papyrus.uml.diagram.sequence.command.CustomZOrderCommand; +import org.eclipse.papyrus.uml.diagram.sequence.command.SetResizeAndLocationCommand; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomDurationConstraintEditPart; @@ -68,9 +68,10 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil; /** * The custom LayoutEditPolicy for LifelineEditPart. - * + * * @deprecated will be removed in Oxygen */ +@Deprecated public class OLDLifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { /** Initialization width of Execution Specification. */ @@ -671,7 +672,7 @@ public class OLDLifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { newBounds.height += unZoomedSizeDelta.height; } // Not to check list - List<ShapeNodeEditPart> notToCheckExecutionSpecificationList = new BasicEList<ShapeNodeEditPart>(); + List<ShapeNodeEditPart> notToCheckExecutionSpecificationList = new BasicEList<>(); // Affixed ExecutionSpecification List notToCheckExecutionSpecificationList.addAll(getAffixedExecutionSpecificationEditParts(executionSpecificationEP)); // Add also current ExecutionSpecification EditPart @@ -918,7 +919,7 @@ public class OLDLifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { * ExecutionSpecification, then an empty list will be returned */ public final static List<ShapeNodeEditPart> getAffixedExecutionSpecificationEditParts(ShapeNodeEditPart executionSpecificationEP) { - List<ShapeNodeEditPart> notToCheckExecutionSpecificationList = new ArrayList<ShapeNodeEditPart>(); + List<ShapeNodeEditPart> notToCheckExecutionSpecificationList = new ArrayList<>(); return getAffixedExecutionSpecificationEditParts(executionSpecificationEP, notToCheckExecutionSpecificationList); } @@ -937,7 +938,7 @@ public class OLDLifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { */ protected final static List<ShapeNodeEditPart> getAffixedExecutionSpecificationEditParts(ShapeNodeEditPart executionSpecificationEP, List<ShapeNodeEditPart> notToCheckExecutionSpecificationList) { // Add itself to the notToCheck list - List<ShapeNodeEditPart> newNotToCheckExecutionSpecificationList = new ArrayList<ShapeNodeEditPart>(notToCheckExecutionSpecificationList); + List<ShapeNodeEditPart> newNotToCheckExecutionSpecificationList = new ArrayList<>(notToCheckExecutionSpecificationList); newNotToCheckExecutionSpecificationList.add(executionSpecificationEP); // LifelineEditPart where the ExecutionSpecification EditPart is contained LifelineEditPart lifelineEP = (LifelineEditPart) executionSpecificationEP.getParent(); @@ -945,7 +946,7 @@ public class OLDLifelineXYLayoutEditPolicy extends XYLayoutEditPolicy { List<ShapeNodeEditPart> executionSpecificationList = LifelineEditPartUtil.getChildShapeNodeEditPart(lifelineEP); executionSpecificationList.removeAll(newNotToCheckExecutionSpecificationList); // List to store the Affixed ExecutionSpecification - List<ShapeNodeEditPart> affixedExecutionSpecificationList = new ArrayList<ShapeNodeEditPart>(); + List<ShapeNodeEditPart> affixedExecutionSpecificationList = new ArrayList<>(); // Loop ExecutionSpecificationough the ExecutionSpecification list for (ShapeNodeEditPart childExecutionSpecificationEP : executionSpecificationList) { if (isAffixedToRight(executionSpecificationEP.getFigure().getBounds(), childExecutionSpecificationEP.getFigure().getBounds())) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java index bcdbee0b0bc..54bee045557 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java @@ -24,7 +24,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper; /** * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part. - * + * * @since 3.0 */ @Deprecated diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java index 9e206681e65..16b17c25efd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDSequenceGraphicalNodeEditPolicy.java @@ -196,7 +196,7 @@ public class OLDSequenceGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy * @return true if creation of a message */ protected boolean isMessageHint(String requestHint) { - List<String> messageHints = new ArrayList<String>(7); + List<String> messageHints = new ArrayList<>(7); String messageHint = ((IHintedType) UMLElementTypes.Message_SynchEdge).getSemanticHint(); messageHints.add(messageHint); messageHint = ((IHintedType) UMLElementTypes.Message_AsynchEdge).getSemanticHint(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java index 30ce446bdf3..d366332aa79 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java @@ -23,10 +23,11 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart; * this policy is used to suppress orphan node view in GMF view the policy to remove orphan * connection is more complex. It is dependent of the diagram. see remove OrphanConnectionView * policy. - * + * * @deprecated since 5.0. Useless. Helper Advices remove views. * */ +@Deprecated public class RemoveOrphanViewPolicy extends OrphanViewPolicy { public String[] notOrphanNode = { LifelineNameEditPart.VISUAL_ID }; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SenderRequestUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SenderRequestUtils.java index a2e07a564e8..0634d0cb3fb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SenderRequestUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SenderRequestUtils.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -21,7 +21,7 @@ import org.eclipse.gef.Request; /** * this class is used to add senders of request in the request - * + * * @since 4.0 * */ @@ -30,7 +30,7 @@ public class SenderRequestUtils { /** * from a request add the editpart as sender of the request - * + * * @param request * a given request, never null * @param editPart @@ -44,7 +44,7 @@ public class SenderRequestUtils { senderList = ((ArrayList<EditPart>) extendedData.get(REQUEST_SENDER)); } else { - senderList = new ArrayList<EditPart>(); + senderList = new ArrayList<>(); } senderList.add(editPart); extendedData.put(REQUEST_SENDER, senderList); @@ -53,7 +53,7 @@ public class SenderRequestUtils { /** * test if the given editpart is a sender of the request - * + * * @param request * a given request, never null * @param editPart @@ -74,7 +74,7 @@ public class SenderRequestUtils { /** * get all senders from a given request - * + * * @param request * a a given request, never null * @return always a list maybe empty @@ -86,14 +86,14 @@ public class SenderRequestUtils { senderList = ((ArrayList<EditPart>) extendedData.get(REQUEST_SENDER)); } else { - senderList = new ArrayList<EditPart>(); + senderList = new ArrayList<>(); } return senderList; } /** * add a list of editpart as sender of the request - * + * * @param request * a given request, never null * @param senderList diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceConnectionHandleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceConnectionHandleEditPolicy.java index af21d2cef6f..fbfafcadd77 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceConnectionHandleEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceConnectionHandleEditPolicy.java @@ -88,7 +88,7 @@ public class SequenceConnectionHandleEditPolicy extends ConnectionHandleEditPoli if (activePart instanceof IDiagramWorkbenchPart) { editorPart = (IDiagramWorkbenchPart) activePart; } else if (activePart instanceof IAdaptable) { - editorPart = (IDiagramWorkbenchPart) ((IAdaptable) activePart).getAdapter(IDiagramWorkbenchPart.class); + editorPart = ((IAdaptable) activePart).getAdapter(IDiagramWorkbenchPart.class); } if (editorPart == null) { return false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceDiagramLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceDiagramLayoutEditPolicy.java index 9a1d0e0cbdc..504b36b33bc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceDiagramLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceDiagramLayoutEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -43,7 +43,7 @@ public class SequenceDiagramLayoutEditPolicy extends XYLayoutWithConstrainedResi return super.createAddCommand(request, child, constraint); } - + /** * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#showTargetFeedback(org.eclipse.gef.Request) * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceReferenceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceReferenceEditPolicy.java index 028698be3f9..dd6ec72425d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceReferenceEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceReferenceEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017, 2018 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 @@ -9,7 +9,7 @@ * Contributors: * Patrick Tessier (CEA LIST) - Initial API and implementation * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312, 526079, 526191 - * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 531520 + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 531520 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -48,7 +48,7 @@ import org.eclipse.uml2.uml.OccurrenceSpecification; * for example: a message connected to an executionSpecification means that a strong reference exists between editpart of the message * and the editpart of the execution specification. * Two consecutive execution specifications on the same life-line means that a weak reference exists from the top exec to the bottom lifeline. - * + * * @since 4.0 */ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements NotificationListener { @@ -60,8 +60,8 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements public static final String ROLE_SOURCE = "SOURCE"; //$NON-NLS-1$ public static final String ROLE_TARGET = "TARGET"; //$NON-NLS-1$ - protected HashMap<EditPart, String> weakReferences = new HashMap<EditPart, String>(); - protected HashMap<EditPart, String> strongReferences = new HashMap<EditPart, String>(); + protected HashMap<EditPart, String> weakReferences = new HashMap<>(); + protected HashMap<EditPart, String> strongReferences = new HashMap<>(); protected RedirectionContentAdapter redirectionContentAdapter; protected RedirectionCommandStackListener redirectionCommandStackListener; protected RedirectionOperationListener redirectionOperationListener; @@ -110,7 +110,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements * compute strong a weak reference */ public void updateStrongAndWeakReferences() { - UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+ Update Strong and weak ref " + getHost().getClass().getName());//$NON-NLS-1$ //$NON-NLS-2$ + UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+ Update Strong and weak ref " + getHost().getClass().getName());//$NON-NLS-1$ strongReferences.clear(); weakReferences.clear(); @@ -132,7 +132,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements // the weak reference is the next element associated to next event after the finish event. if (exec.getCovereds().size() == 1) { Lifeline currentLifeline = exec.getCovereds().get(0); - fillWeakReference((OccurrenceSpecification) exec.getFinish(), currentLifeline); + fillWeakReference(exec.getFinish(), currentLifeline); } } // management of messages @@ -169,7 +169,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * this method is used to add a weak reference from the next event after the given event - * + * * @param sourceEvent * the given event the next is maybe an element to add in the weakreference * @param currentLifeline, @@ -188,7 +188,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * this method is used to get the execution specification associated to the message End - * + * * @param event * the given event where we look for a executionSpecification, must be never null * @return the associated execution specification or null if there is no association @@ -216,7 +216,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * this method returns the next events after the given event - * + * * @param event * we look for the next event after this one. * @param currentLifeline @@ -243,7 +243,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements public boolean isCoveredByStrinReference(Element event) { for (Iterator<EditPart> iterator = getStrongReferences().keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (editPart instanceof AbstractMessageEditPart) { Message message = (Message) (((AbstractMessageEditPart) editPart)).resolveSemanticElement(); if (message.getSendEvent().equals(event)) { @@ -268,7 +268,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * given a messageEnd, the corresponding editPart to a message is adding to the references list - * + * * @param messageEnd * a messageEnd * @param referenceList @@ -290,7 +290,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * test if this event is only use of a message not also for an executionSpecification - * + * * @param messageEnd * @return true if the message End is only used by a message */ @@ -313,7 +313,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * given a messageEnd, the corresponding editPart to a ExecutionSpec is added to the references list - * + * * @param messageEnd * a messageEnd * @param referenceList @@ -347,7 +347,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * this method return the controller attached to the semantic element * the complexity of this algorithm is N (N the number of controller in the opened sequence diagram) - * + * * @param semanticElement * must be different from null * @return the reference to the controller or null. @@ -389,7 +389,7 @@ public class SequenceReferenceEditPolicy extends GraphicalEditPolicy implements /** * get the current Interaction from the editpart - * + * * @return null or the interaction */ protected Interaction getInteraction() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java index 80c30ab1b6b..c1091ad703d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantResizableEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -35,7 +35,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; * */ public class StateInvariantResizableEditPolicy extends BorderItemResizableEditPolicy { - + @Override protected Command getResizeCommand(ChangeBoundsRequest request) { IBorderItemEditPart borderItemEP = (IBorderItemEditPart) getHost(); @@ -84,6 +84,6 @@ public class StateInvariantResizableEditPolicy extends BorderItemResizableEditPo return true; } - - + + } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java index 96aa3e214ee..3ac841a03e2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java @@ -73,7 +73,7 @@ public class TimeRelatedSelectionEditPolicy extends BorderItemSelectionEditPolic DurationConstraintEditPart editPart = (DurationConstraintEditPart) getHost(); DurationConstraint durationConstraint = (DurationConstraint) editPart.resolveSemanticElement(); EList<Element> constrainedElements = durationConstraint.getConstrainedElements(); - List<ExecutionSpecification> executions = new ArrayList<ExecutionSpecification>(); + List<ExecutionSpecification> executions = new ArrayList<>(); for (Element element : constrainedElements) { if (!(element instanceof ExecutionOccurrenceSpecification)) { continue; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateConnectionReferenceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateConnectionReferenceEditPolicy.java index c1fc1dddd1c..572d4bc2714 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateConnectionReferenceEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateConnectionReferenceEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright s(c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil; /** * this editpolicy is to manage the movement of Execution specification and update move of messages * It is like a graphical node - * + * * @since 4.0 * */ @@ -49,8 +49,8 @@ public class UpdateConnectionReferenceEditPolicy extends GraphicalEditPolicy { * * @param request * @return - * - * + * + * * <img src="../../../../../../../../../icons/sequenceScheme.png" width="250" /> * <UL> * <LI>when move E --> move B on the coordinate Y of E and move A on the coordinate Y of E @@ -75,7 +75,7 @@ public class UpdateConnectionReferenceEditPolicy extends GraphicalEditPolicy { if (!SenderRequestUtils.isASender(request, getHost())) { CompoundCommand compoundCommand = new CompoundCommand(); for (Iterator<EditPart> iterator = references.getStrongReferences().keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (!SenderRequestUtils.isASender(request, editPart)) { UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+--> try to Move " + editPart.getClass().getName());//$NON-NLS-1$ if (editPart instanceof ConnectionEditPart) { @@ -105,7 +105,7 @@ public class UpdateConnectionReferenceEditPolicy extends GraphicalEditPolicy { /** * Create a reconnection request - * + * * @param connectionEditPart * the link controller to reconnect * @param locationAndSize diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateNodeReferenceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateNodeReferenceEditPolicy.java index dd2066c72e0..568e64bea58 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateNodeReferenceEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateNodeReferenceEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright s(c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -40,7 +40,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil; /** * this editpolicy is to manage the movement of message on node as lifeline * It is like a graphical node - * + * * @since 4.0 * */ @@ -49,12 +49,12 @@ public class UpdateNodeReferenceEditPolicy extends GraphicalEditPolicy { /** * To extract in other EditPolicy - * + * * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#getCommand(org.eclipse.gef.Request) * * @param request * @return - * + * * <img src="../../../../../../../../../icons/sequenceScheme.png" width="250" /> * <UL> * <LI>when move B (anchor of the message)--> @@ -76,7 +76,7 @@ public class UpdateNodeReferenceEditPolicy extends GraphicalEditPolicy { SequenceReferenceEditPolicy references = (SequenceReferenceEditPolicy) linkEditPart.getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE); CompoundCommand compoundCommand = new CompoundCommand(); for (Iterator<EditPart> iterator = references.getStrongReferences().keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (!SenderRequestUtils.isASender(request, editPart) && getHost().getChildren().contains(editPart)) { GraphicalEditPart gEditPart = (GraphicalEditPart) editPart; Point GEPlocationOnDiagram = CoordinateReferentialUtils.getFigurePositionRelativeToDiagramReferential(gEditPart.getFigure(), getDiagramEditPart(getHost())); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java index 61ed4635677..6501668e8bf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -43,7 +43,7 @@ import org.eclipse.ui.PlatformUI; /** * the goal of this editpat is to propose a set of method and action by SHIFT key button to move messages and execution spec under the current editpart - * + * * @since 4.0 * */ @@ -98,7 +98,7 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy /** * Add a command of reconnection of the given connection editpart at the location. - * + * * @param hostEditpart * the current editpart that is the origin of this impact * @param connectionEditPart @@ -130,7 +130,7 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener.IKeyPressState#setKeyPressState(java.lang.Boolean) */ @Override @@ -140,7 +140,7 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy /** * Move the editPart to move at this location withe the move delta - * + * * @param moveDelta * the move delta (very important) * @param compoundCommand @@ -174,7 +174,7 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy /** * move the target anchor of the connection editpartPart - * + * * @param hostEditPart * the editpart that impacts the connection editpart * @param moveDelta diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java index c7757a51f85..0c81667679f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright s(c) 2017 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 @@ -34,8 +34,6 @@ import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper; import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx; -import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart; @@ -53,7 +51,7 @@ import org.eclipse.uml2.uml.OccurrenceSpecification; /** * this editpolicy is to manage the movement of Execution specification and update move of messages * It is like a graphical node - * + * * @since 4.0 * */ @@ -65,8 +63,8 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc * * @param request * @return - * - * + * + * * <img src="../../../../../../../../../icons/sequenceScheme.png" width="250" /> * <UL> * <LI>when move E --> move B on the coordinate Y of E and move A on the coordinate Y of E @@ -85,7 +83,7 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc // For change bounds request command = getUpdateWeakRefForExecSpecResize((ChangeBoundsRequest) request); } - + /* * Bug 532071 - [SequenceDiagram] Creation and Deletion of an element on a Lifeline should not move necessarily the other elements * This code is comment due to instability (Oxygen version is not work very well). @@ -109,15 +107,15 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc /** * Get the command to update weak references at execution specification creation. - * + * * @param request * the {@link CreateViewAndElementRequest} request * @return the command to update weak references */ private Command getUpdateWeakRefForExecSpecCreate(final CreateViewAndElementRequest request) { Command command = null; - CreateViewAndElementRequest createRequest = (CreateViewAndElementRequest) request; - UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "Execution Specification creation request at:" + ((View) ((IAdaptable) getHost()).getAdapter(View.class)).getElement()); + CreateViewAndElementRequest createRequest = request; + UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "Execution Specification creation request at:" + ((IAdaptable) getHost()).getAdapter(View.class).getElement()); // Snap to grid Location createRequest.setLocation(SequenceUtil.getSnappedLocation(getHost(), createRequest.getLocation())); @@ -126,8 +124,8 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc getHostFigure().translateToRelative(reqlocationOnScreen); UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "=> Request Location on screen: " + reqlocationOnScreen); - List<OccurrenceSpecification> nextEventsFromPosition = new ArrayList<OccurrenceSpecification>(); - List<OccurrenceSpecification> previousEventsFromPosition = new ArrayList<OccurrenceSpecification>(); + List<OccurrenceSpecification> nextEventsFromPosition = new ArrayList<>(); + List<OccurrenceSpecification> previousEventsFromPosition = new ArrayList<>(); // Get next and previous event from the lifeline source EditPart host = getHost(); @@ -210,39 +208,39 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc /** * Get the command to update weak references at execution specification resize. - * + * * @param request * the {@link ChangeBoundsRequest} request * @return the command to update weak references */ private Command getUpdateWeakRefForExecSpecResize(final ChangeBoundsRequest request) { CompoundCommand compoundCommand = new CompoundCommand(); - Point nextLocation = ((ChangeBoundsRequest) request).getLocation(); + Point nextLocation = request.getLocation(); UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+ MOVE at " + nextLocation + " of " + getHost());//$NON-NLS-1$ //$NON-NLS-2$ Rectangle locationAndSize = new PrecisionRectangle(getHostFigure().getBounds()); Point moveDelta = new Point(0, 0); if (RequestConstants.REQ_MOVE.equals(request.getType())) { - moveDelta = ((ChangeBoundsRequest) request).getMoveDelta(); + moveDelta = request.getMoveDelta(); } else if (RequestConstants.REQ_RESIZE.equals(request.getType())) { - moveDelta = new Point(0, ((ChangeBoundsRequest) request).getSizeDelta().height + ((ChangeBoundsRequest) request).getMoveDelta().y); + moveDelta = new Point(0, request.getSizeDelta().height + request.getMoveDelta().y); } if (moveDelta.y != 0 && mustMove) { if (getHost() instanceof AbstractExecutionSpecificationEditPart) { getHostFigure().translateToAbsolute(locationAndSize); - locationAndSize = ((ChangeBoundsRequest) request).getTransformedRectangle(locationAndSize); + locationAndSize = request.getTransformedRectangle(locationAndSize); } if (getHost().getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE) != null) { SequenceReferenceEditPolicy references = (SequenceReferenceEditPolicy) getHost().getEditPolicy(SequenceReferenceEditPolicy.SEQUENCE_REFERENCE); if (!SenderRequestUtils.isASender(request, getHost())) { // Gets weak references - HashMap<EditPart, String> weakReferences = new HashMap<EditPart, String>(); + HashMap<EditPart, String> weakReferences = new HashMap<>(); if (moveDelta.y > 0 && mustMoveBelowAtMovingDown) { weakReferences.putAll(references.getWeakReferences()); } for (Iterator<EditPart> iterator = weakReferences.keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (!SenderRequestUtils.isASender(request, editPart)) { UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+--> try to Move of " + moveDelta.y + " " + editPart);//$NON-NLS-1$ ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request); @@ -267,7 +265,7 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc /** * Get the command to update weak references of the execution specification for a deletion. - * + * * @param request * the delete command wrapped into a {@link EditCommandRequestWrapper}. * @return the command @@ -288,12 +286,12 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc CompoundCommand compoundCommand = new CompoundCommand(); // Gets weak references - HashMap<EditPart, String> weakReferences = new HashMap<EditPart, String>(); + HashMap<EditPart, String> weakReferences = new HashMap<>(); weakReferences.putAll(references.getWeakReferences()); // for each weak reference move it for (Iterator<EditPart> iterator = weakReferences.keySet().iterator(); iterator.hasNext();) { - EditPart editPart = (EditPart) iterator.next(); + EditPart editPart = iterator.next(); if (!SenderRequestUtils.isASender(request, editPart)) {// avoid loop UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG, "+--> try to Move " + editPart);//$NON-NLS-1$ ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java index 2899652b89d..8fe0d172fb6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright s(c) 2017 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 @@ -49,7 +49,7 @@ import org.eclipse.uml2.uml.OccurrenceSpecification; /** * this editpolicy is to manage the movement of Execution specification and update move of messages * It is like a graphical node - * + * * @since 4.0 * */ @@ -61,7 +61,7 @@ public class UpdateWeakReferenceForMessageSpecEditPolicy extends UpdateWeakRefer * * @param request * @return - * + * * <img src="../../../../../../../../../icons/sequenceScheme.png" width="250" /> * <UL> * <LI>when move E --> move B on the coordinate Y of E and move A on the coordinate Y of E @@ -85,7 +85,7 @@ public class UpdateWeakReferenceForMessageSpecEditPolicy extends UpdateWeakRefer /** * Get the command to update weak references of the message for a creation. - * + * * @param request * the create connection view and element request * @return the command @@ -197,7 +197,7 @@ public class UpdateWeakReferenceForMessageSpecEditPolicy extends UpdateWeakRefer /** * Get the command to update weak references of the message for a reconnect. - * + * * @param request * the reconnect request * @return the command diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java index 5280537da72..235ca99823a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; @@ -165,7 +165,7 @@ public class CustomGeneralOrderingDescriptor extends GeneralOrderingDescriptor i /** * Create the arrow locator to draw the arrow to the proper location - * + * * @return Arrow Locator using the middle point as reference */ private ArrowLocator getArrowLocator() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DestructionEventFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DestructionEventFigure.java index a2ec64e64f6..1db49c0d1f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DestructionEventFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DestructionEventFigure.java @@ -31,7 +31,7 @@ public class DestructionEventFigure extends org.eclipse.draw2d.Figure { super(); } /** - * @return a <code>Dimension</code> that represents the minimum or default size of + * @return a <code>Dimension</code> that represents the minimum or default size of * this figure. * @since 3.0 */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationConstraintFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationConstraintFigure.java index ef0adc3a57b..a8dd6ed9118 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationConstraintFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationConstraintFigure.java @@ -33,7 +33,7 @@ public class DurationConstraintFigure extends RectangleFigure { private static final int ARROW_SIZE = 10; /** - * + * * Constructor. * */ @@ -45,7 +45,7 @@ public class DurationConstraintFigure extends RectangleFigure { /** * Create and display the top and bottom line of the figure. - * + * * @return the created Border */ private Border createBorder() { @@ -105,11 +105,12 @@ public class DurationConstraintFigure extends RectangleFigure { /** * Not used anymore (present for compilation purpose of CustomDurationConstraintFigure that is no more called ) - * + * * @return null * @deprecated Use paint instead. - * + * */ + @Deprecated protected PolylineShape getDurationArrow() { return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java index 90faabb9d6a..48d512dc7b6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ILifelineInternalFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ILifelineInternalFigure.java index 7ae1dce14da..ebe6fdbba7b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ILifelineInternalFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ILifelineInternalFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java index c18c6b19629..469a4c8b850 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java @@ -13,16 +13,12 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; -import javax.swing.text.StyleConstants.ColorConstants; - import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.XYLayout; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; -import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode; -import org.eclipse.gmf.runtime.notation.Bounds; import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure; public class InteractionOperandFigure extends RoundedCompartmentFigure { @@ -84,7 +80,7 @@ public class InteractionOperandFigure extends RoundedCompartmentFigure { */ @Override public Dimension getMinimumSize(int wHint, int hHint) { - + Dimension dim= super.getMinimumSize(wHint, hHint); //look for combinedFragmentFigure IFigure cfFigure=getParent(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionUseRectangleFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionUseRectangleFigure.java index 4d321ee7f1f..22f4a827661 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionUseRectangleFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionUseRectangleFigure.java @@ -88,7 +88,7 @@ public class InteractionUseRectangleFigure extends RoundedCompartmentFigure { /** * Getter of the centerLabel - * + * * @return centerLabel (creates it if null) */ public PapyrusWrappingLabel getCenterLabel() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifeLineLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifeLineLayoutManager.java index 15a15bc4de8..5ca41fcb84f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifeLineLayoutManager.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifeLineLayoutManager.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 - 2017 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 @@ -31,7 +31,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure.LifelineH public class LifeLineLayoutManager extends AutomaticCompartmentLayoutManager { private int bottomHeaderY = 0; /** The layout contraints */ - protected Map<IFigure, Rectangle> constraints = new HashMap<IFigure, Rectangle>(); + protected Map<IFigure, Rectangle> constraints = new HashMap<>(); public int getBottomHeader() { return bottomHeaderY; @@ -53,13 +53,14 @@ public class LifeLineLayoutManager extends AutomaticCompartmentLayoutManager { * * @param container * The container to layout - * + * * @param bound * The bound to fill - * + * * @param previous * The previously filled bound */ + @Override protected void fillBoundsForOther(IFigure container, Rectangle bound, Rectangle previous) { bound.x = container.getBounds().x + 1; // +1, see bug 490318, restore +1 to fix shift from Papyrus Luna to Papyrus Mars bound.width = container.getBounds().width; @@ -195,7 +196,7 @@ public class LifeLineLayoutManager extends AutomaticCompartmentLayoutManager { /** * all {@link ILifelineInternalFigure} must be managed as XY layout by respecting their position and size - * + * * @param container */ protected void layoutXYFigure(IFigure container) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifelineFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifelineFigure.java index 129a9b70d99..20d27d59114 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifelineFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifelineFigure.java @@ -49,13 +49,13 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** * Utility figure to get header. Used for selection bounds. - * + * * @author Mickael ADAM * */ public final class LifelineHeaderFigure extends RectangleFigure { /** - * + * * @see org.eclipse.draw2d.RectangleFigure#fillShape(org.eclipse.draw2d.Graphics) */ @Override @@ -81,11 +81,11 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** * This field contains the figure of the children to include into the PolygonPoint list. - * + * * @see bug 531520 : all messages are connected to the Lifeline, but they must be drawn as attached to the ExecutionSpecification when required. * @since 5.0 */ - private List<NodeFigure> childrenFigure = new ArrayList<NodeFigure>(); + private List<NodeFigure> childrenFigure = new ArrayList<>(); /** * Constructor. @@ -100,7 +100,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** * This method has been used in order to display combinedFragment - * + * * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#setTransparency(int) */ @Override @@ -143,7 +143,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @return * the LifelineFigure including its children (ExecutionSpecification) */ @@ -164,7 +164,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { final List<Set<Rectangle>> groups = getGroupedRectangles(getChildrenRectangle()); // 3. we get the set of points composition the global shape of each group of rectangle - final List<List<Point>> groupPointsLists = new ArrayList<List<Point>>(); + final List<List<Point>> groupPointsLists = new ArrayList<>(); for (final Set<Rectangle> currentGroup : groups) { groupPointsLists.add(PapyrusRectilinearConvexHull.getExternalShapeForRectangle(currentGroup)); } @@ -174,8 +174,8 @@ public class LifelineFigure extends RoundedCompartmentFigure { groupPointsLists.sort(new OrdinatePointListComparator()); // 5. we divide each list in 2 parts: 1 one for the top to bottom way, and the second one, for the bottom to the top way - final List<List<Point>> descendingList = new ArrayList<List<Point>>(); - final List<List<Point>> ascendingList = new ArrayList<List<Point>>(); + final List<List<Point>> descendingList = new ArrayList<>(); + final List<List<Point>> ascendingList = new ArrayList<>(); for (final List<Point> groupList : groupPointsLists) { final List<Point> topToBottom = new ArrayList<>(); final List<Point> bottomToTop = new ArrayList<>(); @@ -227,7 +227,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @return * the list of {@link Rectangle} representing each child figure */ @@ -240,7 +240,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param ptList * the initial list of points * @param topToBottomList @@ -280,7 +280,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** * This class allows to compare list of points. The term used for the comparison is the point with the smallest y value - * + * * @since 5.0 */ private static final class OrdinatePointListComparator implements Comparator<Collection<Point>> { @@ -299,7 +299,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param points * a points' collection * @return @@ -317,7 +317,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param points * a points' collection * @return @@ -335,17 +335,17 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param rectangles * a collections of rectangle * @return * a list of set of rectangles. Each Set in the List contains the rectangles which have intersections between them - * + * * @since 5.0 */ private List<Set<Rectangle>> getGroupedRectangles(final Collection<Rectangle> rectangles) { - List<Set<Rectangle>> groups = new ArrayList<Set<Rectangle>>(); - final List<Rectangle> localRectangles = new ArrayList<Rectangle>(rectangles); + List<Set<Rectangle>> groups = new ArrayList<>(); + final List<Rectangle> localRectangles = new ArrayList<>(rectangles); Iterator<Rectangle> iter = localRectangles.iterator(); while (iter.hasNext()) { Set<Rectangle> result = getIntersectingRectangles(iter.next(), localRectangles); @@ -357,7 +357,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param aRectangle * a rectangle * @param allAvailableRectangle @@ -369,7 +369,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { private Set<Rectangle> getIntersectingRectangles(final Rectangle aRectangle, Collection<Rectangle> allAvailableRectangle) { allAvailableRectangle = new ArrayList<>(allAvailableRectangle); allAvailableRectangle.remove(aRectangle); - final Set<Rectangle> intersectingRectangles = new HashSet<Rectangle>(); + final Set<Rectangle> intersectingRectangles = new HashSet<>(); for (Rectangle current : allAvailableRectangle) { if (current.intersects(aRectangle)) { intersectingRectangles.add(current); @@ -383,6 +383,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** * {@inheritDoc} */ + @Override public void paint(Graphics graphics) { Rectangle rect = this.getBounds(); graphics.pushState(); @@ -411,7 +412,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** * [{@inheritDoc} - * + * * @see org.eclipse.draw2d.Figure#getLayoutManager() */ @Override @@ -508,18 +509,18 @@ public class LifelineFigure extends RoundedCompartmentFigure { /** - * + * * @author Vincent LORENZO * Papyrus integration of the ELK class RectilinearConvexHull. * This class allow to get the list of points describing the polygon represented by a set of overlaping rectangles - * + * * N.B.: In some specific cases, the result is not the better * @since 5.0 */ private static final class PapyrusRectilinearConvexHull { /** - * + * * @param rectangles * overlaping rectangles * @return @@ -530,7 +531,7 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param inputPoints * a collection of points * @return @@ -548,14 +549,14 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param rectangles * the input rectangles * @return * a set of points composed by all the corners of the input rectangles AND the intersection's points of the rectangles between them */ private static final Set<Point> getAllPoints(final Collection<Rectangle> rectangles) { - final Set<Point> points = new HashSet<Point>(); + final Set<Point> points = new HashSet<>(); for (final Rectangle current : rectangles) { for (final Rectangle internalCurrent : rectangles) { if (internalCurrent.intersects(current)) { @@ -575,14 +576,14 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param draw2DPoints * drawd2D points * @return * a list of ELK Points */ private static final List<org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point> convertToELKPoints(final Collection<Point> draw2DPoints) { - final List<org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point> elkPoints = new ArrayList<org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point>(); + final List<org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point> elkPoints = new ArrayList<>(); for (final Point current : draw2DPoints) { elkPoints.add(new org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point(current.preciseX(), current.preciseY())); } @@ -590,14 +591,14 @@ public class LifelineFigure extends RoundedCompartmentFigure { } /** - * + * * @param elkPoints * ELK points * @return * a list of draw2D points */ private static final List<Point> convertToPoints(final Collection<org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point> elkPoints) { - final List<Point> draw2DPoints = new ArrayList<Point>(); + final List<Point> draw2DPoints = new ArrayList<>(); for (final org.eclipse.papyrus.internal.uml.diagram.sequence.elk.Point current : elkPoints) { draw2DPoints.add(new Point((int) current.x, (int) current.y)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java index d9dcec5b2d1..d438fee7258 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2010 - 2017 CEA LIST, ALL4TEC 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 @@ -25,7 +25,7 @@ public class MessageAsync extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() */ @Override @@ -35,7 +35,7 @@ public class MessageAsync extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java index 4f1c43f160a..d8f2e11bd5a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2010 - 2017 CEA LIST, ALL4TEC 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 @@ -28,7 +28,7 @@ public class MessageCreate extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() */ @Override @@ -38,7 +38,7 @@ public class MessageCreate extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java index 193774bad74..b979eaed326 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2010 - 2017 CEA LIST, ALL4TEC 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 @@ -28,7 +28,7 @@ public class MessageDelete extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() */ @Override @@ -38,7 +38,7 @@ public class MessageDelete extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java index 64ab70a9b7b..0d6692066da 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java @@ -29,9 +29,10 @@ public class MessageFound extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() */ + @Override protected RotatableDecoration createSourceDecoration() { EllipseDecoration df = new EllipseDecoration(); df.setPreferredSize(new Dimension(10, 10)); @@ -41,7 +42,7 @@ public class MessageFound extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() * * @return diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java index 30ae7508772..bce24efb1f9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2010, 2017 CEA LIST, ALL4TEC 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 @@ -29,7 +29,7 @@ public class MessageReply extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() */ @Override @@ -39,7 +39,7 @@ public class MessageReply extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java index 083d9159f51..a242ab95347 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2010, 2017 CEA LIST, ALL4TEC 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 @@ -28,7 +28,7 @@ public class MessageSync extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration() */ @Override @@ -38,7 +38,7 @@ public class MessageSync extends MessageFigure { /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ReferencialGrid.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ReferencialGrid.java index a73d206f9d5..67ae0aedb99 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ReferencialGrid.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ReferencialGrid.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; @@ -18,9 +18,6 @@ import java.util.ArrayList; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Point; -import org.eclipse.papyrus.uml.diagram.sequence.CustomMessages; -import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; /** * use to display a grid @@ -28,8 +25,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; * */ public class ReferencialGrid extends RectangleFigure { - - ArrayList<Integer> lines= new ArrayList<Integer>(); + + ArrayList<Integer> lines= new ArrayList<>(); /** * Constructor. * @@ -59,7 +56,7 @@ public class ReferencialGrid extends RectangleFigure { */ public void displayLine(int y) { lines.add(new Integer(y)); - + } public void cleanAllLines() { lines.clear(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/SquareFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/SquareFigure.java index 5b0fd817c08..2342167089d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/SquareFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/SquareFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java index b36f4c667b9..82384e700a5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * C�line Jansens - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; @@ -35,7 +35,7 @@ import org.eclipse.swt.graphics.Image; /** * Class extracted from the Custom State Invariant edit part - * + * * @since 3.0 * */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StereotypeInteractionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StereotypeInteractionFigure.java index 4daefd0fdfe..10d31060f75 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StereotypeInteractionFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StereotypeInteractionFigure.java @@ -13,24 +13,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; -import org.eclipse.draw2d.BorderLayout; -import org.eclipse.draw2d.Figure; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.ToolbarLayout; -import org.eclipse.draw2d.geometry.Point; -import org.eclipse.draw2d.geometry.PointList; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure; -import org.eclipse.papyrus.uml.diagram.common.draw2d.LeftToolbarLayout; import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure; -import org.eclipse.swt.graphics.Font; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/TimeMarkElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/TimeMarkElementFigure.java index d486476e322..3c682ef9cc2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/TimeMarkElementFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/TimeMarkElementFigure.java @@ -69,7 +69,7 @@ public class TimeMarkElementFigure extends SequencePolylineShape { TransactionalEditingDomain dom = ((IGraphicalEditPart) host).getEditingDomain(); org.eclipse.emf.common.command.Command setCmd = SetCommand.create(dom, constraint, NotationPackage.eINSTANCE.getLocation_X(), mirroredLocation); TransactionalCommandStack stack = (TransactionalCommandStack) dom.getCommandStack(); - Map<String, Boolean> options = new HashMap<String, Boolean>(); + Map<String, Boolean> options = new HashMap<>(); options.put(Transaction.OPTION_NO_NOTIFICATIONS, true); options.put(Transaction.OPTION_NO_UNDO, true); options.put(Transaction.OPTION_UNPROTECTED, true); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/handlers/CustomSizeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/handlers/CustomSizeHandler.java index f4722297d1f..27a855b3385 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/handlers/CustomSizeHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/handlers/CustomSizeHandler.java @@ -13,21 +13,13 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.handlers; -import java.util.Iterator; import java.util.List; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.commands.Command; -import org.eclipse.gef.commands.CompoundCommand; -import org.eclipse.gef.commands.UnexecutableCommand; -import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.menu.actions.SizeAction; import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; @@ -58,7 +50,7 @@ public class CustomSizeHandler extends SizeHandler { } return constraint; } - + protected boolean isLifelines(List<IGraphicalEditPart> selectedElements) { if (selectedElements.isEmpty()) { return true; @@ -69,13 +61,13 @@ public class CustomSizeHandler extends SizeHandler { } return isLifelines; } - + private static Dimension correctDelta(IGraphicalEditPart toResize, Dimension delta, Rectangle constraint) { // Align all Lifelines at bottom. Rectangle previousRect = SequenceUtil.getAbsoluteBounds(toResize); return new Dimension(delta.width, constraint.bottom() - previousRect.bottom()); } - + public class CustomSizeAction extends SizeAction { /** @@ -95,7 +87,7 @@ public class CustomSizeHandler extends SizeHandler { } return super.getBothCommand(); } - + @Override protected Command getHeightCommand() { if (isLifelines(selectedElements)) { @@ -103,11 +95,11 @@ public class CustomSizeHandler extends SizeHandler { } return super.getHeightCommand(); } - + protected class LifeLinedSameBothSizeAction extends SameBothSizeAction { - + private final Rectangle lifelinesContext; - + public LifeLinedSameBothSizeAction(List<IGraphicalEditPart> selectedElements) { super(selectedElements); lifelinesContext = getLifelineConstraint(selectedElements); @@ -120,11 +112,11 @@ public class CustomSizeHandler extends SizeHandler { return correctDelta(toResize, delta, lifelinesContext); } } - + protected class LifeLinedSameHeightAction extends SameHeightSizeAction { - + private final Rectangle lifelinesContext; - + public LifeLinedSameHeightAction(List<IGraphicalEditPart> selectedElements) { super(selectedElements); lifelinesContext = getLifelineConstraint(selectedElements); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/IKeyPressState.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/IKeyPressState.java index f22e00f34be..e153eb5c13b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/IKeyPressState.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/IKeyPressState.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener; @@ -20,7 +20,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener; public interface IKeyPressState { /** - * + * * @param isPressed * true if the key has bee pressed */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyToSetMoveLinesListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyToSetMoveLinesListener.java index 16b17624ee5..2deb1121824 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyToSetMoveLinesListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyToSetMoveLinesListener.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,16 +8,14 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener; import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.command.SetMoveAllLineAtSamePositionCommand; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GridManagementEditPolicy; -import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyboardListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyboardListener.java index 8b3a0c64652..f7b723b0ca5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyboardListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/keyboardlistener/KeyboardListener.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/CenterLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/CenterLocator.java index 40715e913d7..68faddeea45 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/CenterLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/CenterLocator.java @@ -97,7 +97,7 @@ public class CenterLocator extends AdvancedBorderItemLocator { /** * Overridden : * - the destructionEventFigure is always drawn at the end of the figure - * + * * @see org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator#getValidLocation(org.eclipse.draw2d.geometry.Rectangle, org.eclipse.draw2d.IFigure) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java index 57c662354be..04bc529730c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/DurationConstraintLocator.java @@ -1,14 +1,14 @@ /***************************************************************************** * Copyright (c) 2017 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: - * Céline Janssens (celine.janssens@all4tec.net) - Initial API and implementation - * + * C�line Janssens (celine.janssens@all4tec.net) - Initial API and implementation + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.locator; @@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; /** - * @author Céline JANSSENS + * @author C�line JANSSENS * This class is used for Duration Constraint (@see {@link LifelineEditPart}) in order to locate it just next to the middle of it's parent (the Lifeline) on the X axe. * The Y Axe is free except if the top is upper than its Parent. */ @@ -84,9 +84,9 @@ public class DurationConstraintLocator extends AdvancedBorderItemLocator { } /** - * + * * The Valid location for a Duration Constraint is just next to the center of its parent (the lifeline). - * + * * @see org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator#getValidLocation(org.eclipse.draw2d.geometry.Rectangle, org.eclipse.draw2d.IFigure) * * @param proposedLocation diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/MessageCreateLifelineAnchor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/MessageCreateLifelineAnchor.java index bab619fc6b5..dd9f48e3038 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/MessageCreateLifelineAnchor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/MessageCreateLifelineAnchor.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java index 55f481ec082..18c044a697d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/StateInvariantLocator.java @@ -1,14 +1,14 @@ /***************************************************************************** * Copyright (c) 2017 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: - * Céline JANSSENS (All4tec.net) - Initial API and implementation - * + * C�line JANSSENS (All4tec.net) - Initial API and implementation + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.locator; @@ -19,7 +19,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; /** - * @author Céline JANSSENS + * @author C�line JANSSENS * */ public class StateInvariantLocator extends CenterLocator { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java index 6624cf4b35f..7fbd29d4eb7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.messages; @@ -78,7 +78,7 @@ public class Messages extends NLS { public static String Commands_CreateExecutionSpecification_Label; public static String Commands_DropDestructionOccurenceSpecification_Label; - + /** * @since 5.0 */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconciler_1_4_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconciler_1_4_0.java index 78a23811353..9bcd03f418b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconciler_1_4_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconciler_1_4_0.java @@ -8,7 +8,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 531520 - Initial API and implementation + * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 531520 - Initial API and implementation * *****************************************************************************/ @@ -50,14 +50,14 @@ import org.eclipse.uml2.uml.NamedElement; * <li>recalculate the anchors location of retargeted message</li> * <li>bendpoints are really ignored</li> * </ul> - * + * * @author Vincent LORENZO * @since 5.0 */ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconciler_1_4_0 extends DiagramReconciler { /** - * + * * Constructor. * */ @@ -107,7 +107,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc // 3. the y of the anchor in the currentParent (an ExecutionSpecification) - final double yOnOldEndShape = currentPercentageOnOldEndShape.preciseY() * (double) oldEnd_Size.getHeight(); + final double yOnOldEndShape = currentPercentageOnOldEndShape.preciseY() * oldEnd_Size.getHeight(); // 4. we calculate the Y location of the ExecutionSpec final double yOnLifeline = yOnOldEndShape + oldEnd_Size.getY(); @@ -134,7 +134,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param view * a view * @return @@ -145,7 +145,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param object * an object * @return @@ -156,7 +156,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param messageConnector * a message connector * @return @@ -167,7 +167,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param messageConnector * a message connector * @return @@ -178,7 +178,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param messageConnector * a message connector * @return @@ -196,7 +196,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param messageConnector * a message connector * @return @@ -214,7 +214,7 @@ public class RetargetMessageEndFromExecutionSpecificationToLifelineDiagramReconc } /** - * + * * @param view * a view * @return diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceDiagramLunaToMarsReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceDiagramLunaToMarsReconciler.java index 729951ca7f0..9f64cc74d8b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceDiagramLunaToMarsReconciler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceDiagramLunaToMarsReconciler.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -35,7 +35,7 @@ import org.eclipse.uml2.uml.Lifeline; /** * This class has been created to fix the bugs 490251 and 493874. - * + * * The size of the lifeline was saved in Luna, but ignored in Eclipse Mars, so the following problem appears: * <ul> * <li>the width of the lifeline name edit part changed, so:</li> @@ -49,7 +49,7 @@ import org.eclipse.uml2.uml.Lifeline; * just under the name of the lifeline. + recalculate the anchors location with this new size. * </li> * </ul> - * + * * The solutions: * <ul> * <li>bad solution: To fix the bug we tried to determine the futur height of the lifeline, to reset them to the good location in order to keep alignment between Lifeline and {@link ActionExecutionSpecification} and {@link BehaviorExecutionSpecification}, @@ -105,7 +105,7 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { /** * Eclipse Mars forces changes on the Lifeline width (ignoring saved values), excepted adding a specific EAnnoation to the Lifeline shapes - * + * * @param diagram * the diagram to update */ @@ -136,9 +136,9 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { } } } - + //the first version of the reconcilier -> not the good result, but I prefer save it before to be fully sure of the current version is the good one - + // /** // * the default width for the lifeline in Mars, always used excepted when it was bigger in Luna // */ @@ -155,8 +155,8 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { // */ // protected static final int DEFAULT_HEIGHT = -1; // -// -// +// +// // /** // * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram) // */ @@ -232,7 +232,7 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { // } // // /** -// * +// * // * @param diagram // * the sequence diagram // * @param newLifelineHeight @@ -257,7 +257,7 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { // // /** // * Set the new percentage to the anchors -// * +// * // * @param edge // * an edge // * @param lifelineHeigthInMars @@ -276,7 +276,7 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { // } // // /** -// * +// * // * @param anchor // * the anchor to update // * @param lifelineView @@ -302,7 +302,7 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { // /** // * Eclipse Mars forces changes on the Lifeline width (ignoring saved values), so, we need to change the Lifeline position in order to keep alignment of Action Execution Specification // * and Behavior Exceution Specification aligned with it -// * +// * // * @param diagram // * the diagram to update // */ @@ -361,7 +361,7 @@ public class SequenceDiagramLunaToMarsReconciler extends DiagramReconciler { // // /** // * Get The new corrected position. -// * +// * // * @param lifelineHeightInMars // */ // private String getNewAnchorPosition(IdentityAnchor anchor, int lunaHeight, int lifelineHeightInMars) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment_1_2_0.java index 043417932f5..be3feade1f0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment_1_2_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment_1_2_0.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.migration; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconciler_1_3_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconciler_1_3_0.java index baec07e48d6..9b296dc3eb0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconciler_1_3_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconciler_1_3_0.java @@ -70,7 +70,7 @@ public class SequenceReconciler_1_3_0 extends DiagramReconciler { } } if(interactionCompartmentShape!=null) { - ArrayList<View> combinedViews= new ArrayList<View>(); + ArrayList<View> combinedViews= new ArrayList<>(); for (int i = 0; i < interactionCompartmentShape.getChildren().size(); i++) { View child=(View)interactionCompartmentShape.getChildren().get(i); if( "CombinedFragment_Shape".equals(child.getType())) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/DurationObservationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/DurationObservationParser.java index 98e2745cb15..ebce53b3178 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/DurationObservationParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/DurationObservationParser.java @@ -101,7 +101,7 @@ public class DurationObservationParser extends MessageFormatParser implements IS @Override @SuppressWarnings("unchecked") public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof DurationObservation) { DurationObservation observation = (DurationObservation) element; semanticElementsBeingParsed.add(observation); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/InteractionUseCustomParsers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/InteractionUseCustomParsers.java index 05f9a572c59..cc7385d461a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/InteractionUseCustomParsers.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/InteractionUseCustomParsers.java @@ -118,7 +118,7 @@ public class InteractionUseCustomParsers extends MessageFormatParser implements */ @Override public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof InteractionUse) { InteractionUse interactionUse = (InteractionUse) element; semanticElementsBeingParsed.add(interactionUse); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/LifelineCustomParsers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/LifelineCustomParsers.java index 3a7b7fac12b..fb1f343a922 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/LifelineCustomParsers.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/LifelineCustomParsers.java @@ -150,7 +150,7 @@ public class LifelineCustomParsers extends MessageFormatParser implements ISeman */ @Override public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof Lifeline) { Lifeline lifeline = (Lifeline) element; // Add the lifeline diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java index b47af51b3cf..193d1f484dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java @@ -87,7 +87,7 @@ public class MessageCustomParser extends MessageFormatParser implements ISemanti @Override public List<Element> getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof Message) { Message message = (Message) element; semanticElementsBeingParsed.add(message); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeConstraintParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeConstraintParser.java index 0f208e634df..9e8407f5fc0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeConstraintParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeConstraintParser.java @@ -144,7 +144,7 @@ public class TimeConstraintParser extends MessageFormatParser implements ISemant @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public List getSemanticElementsBeingParsed(EObject element) { - HashSet<Element> semanticElementsBeingParsed = new HashSet<Element>(); + HashSet<Element> semanticElementsBeingParsed = new HashSet<>(); if (element instanceof Constraint) { Constraint constraint = (Constraint) element; ValueSpecificationUtil.addEnclosedValueSpecificationToCollection(constraint.getSpecification(), semanticElementsBeingParsed); @@ -178,7 +178,7 @@ public class TimeConstraintParser extends MessageFormatParser implements ISemant @Override public String getEditString(IAdaptable adapter, int flags) { - EObject element = (EObject) adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); if (element instanceof DurationConstraint) { return getDurationConstraint((DurationConstraint) element, false); } @@ -201,7 +201,7 @@ public class TimeConstraintParser extends MessageFormatParser implements ISemant @Override public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) { - EObject element = (EObject) adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); if (element instanceof DurationConstraint) { TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element); if (editingDomain == null) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeObservationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeObservationParser.java index 2af1fcda473..2d1ba9ff039 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeObservationParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeObservationParser.java @@ -107,7 +107,7 @@ public class TimeObservationParser extends MessageFormatParser implements ISeman @Override @SuppressWarnings("unchecked") public List getSemanticElementsBeingParsed(EObject element) { - List<Element> semanticElementsBeingParsed = new ArrayList<Element>(); + List<Element> semanticElementsBeingParsed = new ArrayList<>(); if (element instanceof TimeObservation) { semanticElementsBeingParsed.add((TimeObservation) element); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java index 63f4a3ddeb6..84ff9bd18f2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java @@ -70,7 +70,7 @@ public class CustomCombinedFragmentPreferencePage extends AbstractPapyrusNodePre @Override protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() { - TreeMap<String, Boolean> map = new TreeMap<String, Boolean>(); + TreeMap<String, Boolean> map = new TreeMap<>(); for (String name : compartments) { map.put(name, Boolean.FALSE); } @@ -86,7 +86,7 @@ public class CustomCombinedFragmentPreferencePage extends AbstractPapyrusNodePre @Override protected TreeMap<String, String> getLabelRole() { - return new TreeMap<String, String>(); + return new TreeMap<>(); } @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java index 43a6278193b..28646ff5817 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java @@ -59,7 +59,7 @@ public class CustomConsiderIgnoreFragmentPreferencePage extends AbstractPapyrusN @Override protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() { - TreeMap<String, Boolean> map = new TreeMap<String, Boolean>(); + TreeMap<String, Boolean> map = new TreeMap<>(); for (String name : compartments) { map.put(name, Boolean.FALSE); } @@ -75,7 +75,7 @@ public class CustomConsiderIgnoreFragmentPreferencePage extends AbstractPapyrusN @Override protected TreeMap<String, String> getLabelRole() { - return new TreeMap<String, String>(); + return new TreeMap<>(); } @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java index 5b2db8df8b8..4762396a4be 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java @@ -51,21 +51,21 @@ public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage { /** * preference key to move down messages in the same time that message down. - * + * * @since 5.0 */ public static final String PREF_MOVE_BELOW_ELEMENTS_AT_MESSAGE_DOWN = "PREF_MOVE_BELOW_ELEMENTS_AT_MESSAGE_DOWN"; //$NON-NLS-1$ /** * preference key to move down messages in the same time that message is created. - * + * * @since 5.0 */ public static final String PREF_MOVE_BELOW_ELEMENTS_AT_MESSAGE_CREATION = "PREF_MOVE_BELOW_ELEMENTS_AT_MESSAGE_CREATION"; //$NON-NLS-1$ /** * Value to move down messages in the same time that message down. - * + * * @since 5.0 */ public static final int PREF_MOVE_BELOW_ELEMENTS_AT_MESSAGE_CREATION_VALUE = 40; @@ -118,7 +118,7 @@ public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage { } /** - * + * * @param composite */ protected void createFieldEditors(Composite composite) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java index 97c360b79df..211693dc471 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomCombinedFragmentEditPolicyProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.providers; @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreat import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; /** - * @author Céline JANSSENS + * @author C�line JANSSENS * */ public class CustomCombinedFragmentEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomExecutionSpecificationEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomExecutionSpecificationEditPolicyProvider.java index 554ac07b328..314d4289d37 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomExecutionSpecificationEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomExecutionSpecificationEditPolicyProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.providers; @@ -21,8 +21,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation; import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.CustomExecutionSpecificationXYLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.CustomExecutionSpecificationCreationEditPolicy; +import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.CustomExecutionSpecificationXYLayoutEditPolicy; /** * The edit policy provider for the execution specifications. @@ -31,7 +31,7 @@ public class CustomExecutionSpecificationEditPolicyProvider extends AbstractProv /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation) */ @Override @@ -49,7 +49,7 @@ public class CustomExecutionSpecificationEditPolicyProvider extends AbstractProv /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider#createEditPolicies(org.eclipse.gef.EditPart) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java index 743b246ec9d..a2898a61f3f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionEditPolicyProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.providers; @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreat import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart; /** - * @author Céline JANSSENS + * @author C�line JANSSENS * */ public class CustomInteractionEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionOperandEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionOperandEditPolicyProvider.java index 877fee5f18f..f380052a56f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionOperandEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionOperandEditPolicyProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.providers; @@ -29,7 +29,7 @@ public class CustomInteractionOperandEditPolicyProvider extends AbstractProvider /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation) */ @Override @@ -47,7 +47,7 @@ public class CustomInteractionOperandEditPolicyProvider extends AbstractProvider /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider#createEditPolicies(org.eclipse.gef.EditPart) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java index c6f0ed042fb..1c82ab71707 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomInteractionUseEditPolicyProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.providers; @@ -23,7 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.SideAffixedNodesCreat import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart; /** - * @author Céline JANSSENS + * @author C�line JANSSENS * */ public class CustomInteractionUseEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomNamespaceEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomNamespaceEditPolicyProvider.java index fe8ee7aa45a..20be40e748b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomNamespaceEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomNamespaceEditPolicyProvider.java @@ -35,6 +35,7 @@ public class CustomNamespaceEditPolicyProvider extends AbstractProvider implemen /** * {@inheritDoc} */ + @Override public boolean provides(IOperation operation) { CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation; EditPart editPart = epOperation.getEditPart(); @@ -61,6 +62,7 @@ public class CustomNamespaceEditPolicyProvider extends AbstractProvider implemen /** * {@inheritDoc} */ + @Override public void createEditPolicies(EditPart editPart) { } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java index 8649f74310c..14e8d4f8e80 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java @@ -208,7 +208,7 @@ public class CustomViewProvider extends UMLViewProvider { /** * This class has bee overloaded in order to set the combined fragment under the lifelines - * + * * @see org.eclipse.papyrus.uml.diagram.sequence.providers.UMLViewProvider#createCombinedFragment_Shape(org.eclipse.emf.ecore.EObject, org.eclipse.gmf.runtime.notation.View, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint) */ @Override @@ -242,7 +242,7 @@ public class CustomViewProvider extends UMLViewProvider { * the view that can contains lifeline representation * @return the position of the first lifeline in the notation * @since 3.0 - * + * */ protected int LifelinePosition(View containerView) { @SuppressWarnings("unchecked") @@ -380,7 +380,7 @@ public class CustomViewProvider extends UMLViewProvider { edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE .createRelativeBendpoints(); - ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>( + ArrayList<RelativeBendpoint> points = new ArrayList<>( 2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DisplayBehaviorContributionItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DisplayBehaviorContributionItem.java index 023ed605cc9..4e5db4afba1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DisplayBehaviorContributionItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DisplayBehaviorContributionItem.java @@ -57,7 +57,7 @@ public class DisplayBehaviorContributionItem extends ContributionItem implements if (serviceLocator == null) { return null; } - ISelectionService selectionService = (ISelectionService) serviceLocator.getService(ISelectionService.class); + ISelectionService selectionService = serviceLocator.getService(ISelectionService.class); if (selectionService != null) { return selectionService.getSelection(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java index dadd8e3697b..a7a44e3a929 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java @@ -156,7 +156,7 @@ public class DurationConstraintContributionItem extends ContributionItem impleme * service was found. */ protected ISelectionService getSelectionService() { - ISelectionService selectionService = (ISelectionService) serviceLocator.getService(ISelectionService.class); + ISelectionService selectionService = serviceLocator.getService(ISelectionService.class); return selectionService; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/PostEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/PostEditPolicyProvider.java index 773d9f2783a..5b0fc80846b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/PostEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/PostEditPolicyProvider.java @@ -26,12 +26,12 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPa import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomContinuationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomDestructionOccurrenceSpecificationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomDurationConstraintEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomInteractionOperandEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomStateInvariantEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomTimeConstraintLabelEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomTimeObservationLabelEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomInteractionOperandEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.SequenceDiagramEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.AppliedStereotypeCommentCreationEditPolicyEx; import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies.AppliedStereotypeCommentEditPolicy; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/BoundForEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/BoundForEditPart.java index 895ee834b83..32af52d2f75 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/BoundForEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/BoundForEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2017 CEA LIST and others. - * + * Copyright (c) 2017 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 @@ -9,7 +9,7 @@ * Contributors: * Patrick TESSIER (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 531596 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -30,7 +30,7 @@ public class BoundForEditPart { /** * This allows to get bounds for a node in parameter. - * + * * @param node * The node which one to get bounds. * @return The bounds. @@ -50,7 +50,7 @@ public class BoundForEditPart { /** * This allows to get height from view node. - * + * * @param node * The node which one to get height. * @return The height. @@ -66,7 +66,7 @@ public class BoundForEditPart { /** * This allows to get the default height of a view node. - * + * * @param node * The node which one to get the default height. * @return The default height. @@ -86,7 +86,7 @@ public class BoundForEditPart { /** * This allows to get width from view node. - * + * * @param node * The node which one to get width. * @return The width. @@ -102,7 +102,7 @@ public class BoundForEditPart { /** * This allows to get the default width of a view node. - * + * * @param node * The node which one to get the default width. * @return The default width. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CommandExecutionNotification.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CommandExecutionNotification.java index ee8d0d08736..26e3b0e7d02 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CommandExecutionNotification.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CommandExecutionNotification.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,12 +8,11 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.NotificationImpl; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ComputeOwnerHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ComputeOwnerHelper.java index 0928bcc0984..3614b761a51 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ComputeOwnerHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ComputeOwnerHelper.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.gmf.runtime.notation.DecorationNode; @@ -35,13 +34,13 @@ import org.eclipse.uml2.uml.UMLPackage; /** * This class is a basic class to compute owners. - * + * * @since 3.0 */ public class ComputeOwnerHelper implements IComputeOwnerHelper { protected static void fillHorizontalMatch(ArrayList<DecorationNode> columns, HashMap<Lifeline, ArrayList<InteractionOperand>> HorizontalLifeLinetoOperand) { - ArrayList<InteractionOperand> interactionOperandStack = new ArrayList<InteractionOperand>(); + ArrayList<InteractionOperand> interactionOperandStack = new ArrayList<>(); for (DecorationNode column : columns) { if (column.getElement() instanceof InteractionOperand) { if (interactionOperandStack.contains(column.getElement())) { @@ -61,7 +60,7 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { protected static void fillVerticalMatch(ArrayList<DecorationNode> rows, HashMap<Element, ArrayList<InteractionOperand>> verticalElementToOperand) { - ArrayList<InteractionOperand> interactionOperandStack = new ArrayList<InteractionOperand>(); + ArrayList<InteractionOperand> interactionOperandStack = new ArrayList<>(); for (DecorationNode row : rows) { if (row.getElement() instanceof InteractionOperand) { if (interactionOperandStack.contains(row.getElement())) { @@ -81,8 +80,8 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { public void updateOwnedByInteractionOperand(EditingDomain domain, ArrayList<DecorationNode> rows, ArrayList<DecorationNode> columns, Interaction interaction, GridManagementEditPolicy grid) { // update owner of interaction operand - HashMap<Lifeline, ArrayList<InteractionOperand>> horizontalLifeLinetoOperand = new HashMap<Lifeline, ArrayList<InteractionOperand>>(); - HashMap<Element, ArrayList<InteractionOperand>> verticalElementToOperand = new HashMap<Element, ArrayList<InteractionOperand>>(); + HashMap<Lifeline, ArrayList<InteractionOperand>> horizontalLifeLinetoOperand = new HashMap<>(); + HashMap<Element, ArrayList<InteractionOperand>> verticalElementToOperand = new HashMap<>(); fillHorizontalMatch(columns, horizontalLifeLinetoOperand); UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG_REFERENCEGRID, "horizontal parsing done " + horizontalLifeLinetoOperand);//$NON-NLS-1$ fillVerticalMatch(rows, verticalElementToOperand); @@ -91,9 +90,9 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { // list of element for the interaction - ArrayList<InteractionFragment> elementForInteraction = new ArrayList<InteractionFragment>(); + ArrayList<InteractionFragment> elementForInteraction = new ArrayList<>(); // list of element for the interactionOperand - HashMap<InteractionOperand, ArrayList<InteractionFragment>> elementForIneractionOp = new HashMap<InteractionOperand, ArrayList<InteractionFragment>>(); + HashMap<InteractionOperand, ArrayList<InteractionFragment>> elementForIneractionOp = new HashMap<>(); Iterator elementInteraction = interaction.eAllContents(); while (elementInteraction.hasNext()) { Element element = (Element) elementInteraction.next(); @@ -136,11 +135,11 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { // update fragments of interaction operrands Iterator<InteractionOperand> iterator = elementForIneractionOp.keySet().iterator(); while (iterator.hasNext()) { - InteractionOperand interactionOperand = (InteractionOperand) iterator.next(); + InteractionOperand interactionOperand = iterator.next(); ArrayList<InteractionFragment> elements = elementForIneractionOp.get(interactionOperand); if (elements.size() != 0) { // sort list bu taking - ArrayList<InteractionFragment> existedFragments = new ArrayList<InteractionFragment>(); + ArrayList<InteractionFragment> existedFragments = new ArrayList<>(); ArrayList<InteractionFragment> sorted = sortSemanticFromRows(elements, rows); existedFragments.addAll(sorted); existedFragments.addAll(interactionOperand.getFragments()); @@ -150,7 +149,7 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { // Update fragments of the interaction if (elementForInteraction.size() != 0) { - ArrayList<InteractionFragment> existedFragments = new ArrayList<InteractionFragment>(); + ArrayList<InteractionFragment> existedFragments = new ArrayList<>(); ArrayList<InteractionFragment> sorted = sortSemanticFromRows(elementForInteraction, rows); existedFragments.addAll(sorted); // Add not sorted element existing into fragment @@ -176,7 +175,7 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { /** * The goal is to create a new list of ordered fragment form a list of fragments by taking general order from rows - * + * * @param fragments * a list of fragments * @param rows @@ -184,11 +183,11 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { * @return an ordered list */ protected ArrayList<InteractionFragment> sortSemanticFromRows(ArrayList<InteractionFragment> fragments, ArrayList<DecorationNode> rows) { - ArrayList<InteractionFragment> sortedList = new ArrayList<InteractionFragment>(); + ArrayList<InteractionFragment> sortedList = new ArrayList<>(); for (Iterator<DecorationNode> iteratorRow = rows.iterator(); iteratorRow.hasNext();) { DecorationNode row = iteratorRow.next(); if (fragments.contains(row.getElement())) { - if (!sortedList.contains((InteractionFragment) row.getElement())) { + if (!sortedList.contains(row.getElement())) { sortedList.add((InteractionFragment) row.getElement()); } } @@ -200,13 +199,13 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { /** * simplify the list of interaction operand to find only one. * all interaction operand in this list must have a relation owner-owned. - * + * * @param operandList */ protected static void simplifyOwnerInteractionOperand(ArrayList<InteractionOperand> operandList) { -/* +/* while (operandList.size() > 1) { - + InteractionOperand last = operandList.get(operandList.size() - 1); EObject parent = last.eContainer(); while (parent != null) { @@ -219,13 +218,13 @@ public class ComputeOwnerHelper implements IComputeOwnerHelper { /** * make the intersection of 2 lists - * + * * @param list1 * @param list2 * @return */ protected static <T> ArrayList<T> intersection(List<T> list1, List<T> list2) { - ArrayList<T> list = new ArrayList<T>(); + ArrayList<T> list = new ArrayList<>(); for (T t : list1) { if (list2.contains(t)) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectExecutionToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectExecutionToGridEditPolicy.java index ee726c37720..f5452fb59d5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectExecutionToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectExecutionToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -24,7 +24,7 @@ import org.eclipse.uml2.uml.ExecutionSpecification; */ public class ConnectExecutionToGridEditPolicy extends ConnectYCoordinateToGrillingEditPolicy { - + /** * @see org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectRectangleToGridEditPolicy#initListeningRowStart(org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GridManagementEditPolicy, org.eclipse.uml2.uml.Element, org.eclipse.draw2d.geometry.PrecisionRectangle) * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java index 724f3bdabd3..47877208ea9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,13 +8,11 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; -import java.io.ObjectInputStream.GetField; - import org.eclipse.draw2d.geometry.PrecisionRectangle; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EObject; @@ -53,7 +51,7 @@ public class ConnectInteractionOperandToGridEditPolicy extends ConnectRectangle if( getHost().getParent() instanceof CombinedFragmentCombinedFragmentCompartmentEditPart){ if(getHost().getParent().getParent() instanceof CombinedFragmentEditPart){ combinedFragmentEditPart = (CombinedFragmentEditPart)getHost().getParent().getParent(); - getDiagramEventBroker().addNotificationListener(combinedFragmentEditPart.getNotationView(), this); + getDiagramEventBroker().addNotificationListener(combinedFragmentEditPart.getNotationView(), this); } } super.activate(); @@ -88,8 +86,8 @@ public class ConnectInteractionOperandToGridEditPolicy extends ConnectRectangle } } - - + + /** * @see org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectNodeToGridEditPolicy#updateColumFinishFromWitdhNotification(org.eclipse.draw2d.geometry.PrecisionRectangle) * @@ -118,5 +116,5 @@ public class ConnectInteractionOperandToGridEditPolicy extends ConnectRectangle } } } - + } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectMessageToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectMessageToGridEditPolicy.java index f9cd5809e62..2e838be61bc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectMessageToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectMessageToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016, 2017 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 @@ -68,7 +68,7 @@ public class ConnectMessageToGridEditPolicy extends GraphicalEditPolicyEx implem /** * update an axis of the grid from coordinate X or Y - * + * * @param axis * the axis to update * @param x @@ -191,7 +191,7 @@ public class ConnectMessageToGridEditPolicy extends GraphicalEditPolicyEx implem DiagramEditPart diagramEditPart = getDiagramEditPart(getHost()); if (diagramEditPart != null) { // CREATION - if (notification.getNotifier().equals(((EObject) getHost().getModel())) && NotationPackage.eINSTANCE.getEdge_SourceAnchor().equals(notification.getFeature()) && notification.getNewValue() != null) { + if (notification.getNotifier().equals((getHost().getModel())) && NotationPackage.eINSTANCE.getEdge_SourceAnchor().equals(notification.getFeature()) && notification.getNewValue() != null) { UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG_REFERENCEGRID, "+ EVENT :CREATION add SourceAnchor " + notification.getNotifier());//$NON-NLS-1$ IdentityAnchor sourceAnchor = (IdentityAnchor) notification.getNewValue(); if (sourceAnchor.getId() != null && !(sourceAnchor.getId().equals(""))) { @@ -233,7 +233,7 @@ public class ConnectMessageToGridEditPolicy extends GraphicalEditPolicyEx implem } // CREATION - if (notification.getNotifier().equals(((EObject) getHost().getModel())) && NotationPackage.eINSTANCE.getEdge_TargetAnchor().equals(notification.getFeature()) && notification.getNewValue() != null) { + if (notification.getNotifier().equals((getHost().getModel())) && NotationPackage.eINSTANCE.getEdge_TargetAnchor().equals(notification.getFeature()) && notification.getNewValue() != null) { UMLDiagramEditorPlugin.log.trace(LogOptions.SEQUENCE_DEBUG_REFERENCEGRID, "+ EVENT: CREATION add targetAnchor " + notification.getNotifier());//$NON-NLS-1$ IdentityAnchor targetAnchor = (IdentityAnchor) notification.getNewValue(); if (targetAnchor.getId() != null && !(targetAnchor.getId().equals(""))) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectPointToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectPointToGridEditPolicy.java index 3db5a5d1286..149924f4fdb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectPointToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectPointToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,13 +8,12 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; import org.eclipse.draw2d.geometry.PrecisionRectangle; -import org.eclipse.gmf.runtime.notation.Bounds; import org.eclipse.gmf.runtime.notation.DecorationNode; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.uml2.uml.Element; @@ -53,7 +52,7 @@ public class ConnectPointToGridEditPolicy extends ConnectRectangleToGridEditPoli protected void initListeningColumnFinish(Node node, GridManagementEditPolicy grilling, Element element, PrecisionRectangle p) throws NoGrillElementFound { //the ColumnFinish is not listen } - + /** * @see org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectNodeToGridEditPolicy#initListeningRowFinish(org.eclipse.gmf.runtime.notation.Node, org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GrillingManagementEditPolicy, org.eclipse.draw2d.geometry.PrecisionRectangle, org.eclipse.uml2.uml.Element, org.eclipse.draw2d.geometry.PrecisionRectangle) * @@ -71,7 +70,7 @@ public class ConnectPointToGridEditPolicy extends ConnectRectangleToGridEditPoli - + /** * @see org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectNodeToGridEditPolicy#updateColumFinishFromWitdhNotification(org.eclipse.draw2d.geometry.PrecisionRectangle) * @@ -90,5 +89,5 @@ public class ConnectPointToGridEditPolicy extends ConnectRectangleToGridEditPoli protected void updateRowFinishFromHeightNotification(PrecisionRectangle p) { //the RowFinish is not listen } - + } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectRectangleToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectRectangleToGridEditPolicy.java index cbe3fa88167..1b5f4154fb1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectRectangleToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectRectangleToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 533004 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -68,7 +68,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * avoid to modify it directly, try to modify call of sub-methods: initListeningXXX - * + * * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate() * */ @@ -98,7 +98,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * this method is called during the activate * It initialize a columnFinish and listen it - * + * * @param grilling * the grid manager that allow creating rows * @param element @@ -115,7 +115,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * this method is called during the activate * It initialize a rowFinish and listen it - * + * * @param grilling * the grid manager that allow creating rows * @param element @@ -132,7 +132,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * this method is called during the activate * It initialize a ColumnStart and listen it - * + * * @param grilling * the grid manager that allow creating rows * @param element @@ -149,7 +149,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * this method is called during the activate * It initialize a rowStart and listen it - * + * * @param grilling * the grid manager that allow creating rows * @param element @@ -201,7 +201,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * avoid to modify it directly, try to modify call of sub-methods: updateXXX - * + * * @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener#notifyChanged(org.eclipse.emf.common.notify.Notification) * * @param notification @@ -228,7 +228,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im updateRowFinishFromHeightNotification(bounds); // update anchors - if ((((EObject) notification.getNotifier()).eContainer().equals(((EObject) getHost().getModel())))) { + if ((((EObject) notification.getNotifier()).eContainer().equals((getHost().getModel())))) { Node node = (Node) this.getHost().getModel(); java.util.List<Edge> sourceEdge = node.getSourceEdges(); for (Edge edge : sourceEdge) { @@ -253,7 +253,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im // compute next position for RowStart updateRowStartFromYNotification(bounds); // updateAnchors - if (((EObject) notification.getNotifier()).eContainer().equals(((EObject) getHost().getModel()))) { + if (((EObject) notification.getNotifier()).eContainer().equals((getHost().getModel()))) { Node node = (Node) this.getHost().getModel(); // children case @@ -294,7 +294,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * This update the position of {@link ExecutionSpecification} {@link Node} after the Y move of lifeline parent. - * + * * @param execSpecNode * the {@link ExecutionSpecification} {@link Node} * @param newYValue @@ -314,7 +314,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * When the bounds of the notation has change the axis must change * In this case this is the height that has change so rowFinish must change - * + * * @param originPosition * the position of the node is the relative position ( relative to the container) */ @@ -326,7 +326,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * When the bounds of the notation has change the axis must change * In this case this is the width that has changed so ColumnFinish must change - * + * * @param notationBound * the position of the node is the absolute position ( the origin to the referential is the diagram) */ @@ -340,7 +340,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * When the bounds of the notation has change the axis must change * In this case this is the position Y that has change so RowStart must change - * + * * @param bounds * the position of the node is the absolute position ( the origin to the referential is the diagram) */ @@ -358,7 +358,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * When the bounds of the notation has change the axis must change * In this case this is the position X that has change so ColumnStart must change - * + * * @param bounds * the position of the node is the absolute position ( the origin to the referential is the diagram) */ @@ -375,7 +375,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * this class update the position of anchor after the resize - * + * * @param edge * the edge anchor to update * @param node @@ -401,7 +401,7 @@ public class ConnectRectangleToGridEditPolicy extends ConnectToGridEditPolicy im /** * This allows to update the position of anchor after the move. - * + * * @param anchor The anchor to recalculate. * @param node The moved node. * @param oldY The old Y position. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectToGridEditPolicy.java index f86a1ba6bac..501cbe2697b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectYCoordinateToGrillingEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectYCoordinateToGrillingEditPolicy.java index 5005ef4113b..48de091ef61 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectYCoordinateToGrillingEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectYCoordinateToGrillingEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,42 +8,15 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; -import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PrecisionRectangle; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.edit.command.SetCommand; -import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker; -import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener; -import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand; -import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; -import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx; -import org.eclipse.gmf.runtime.notation.Bounds; -import org.eclipse.gmf.runtime.notation.DecorationNode; -import org.eclipse.gmf.runtime.notation.Edge; -import org.eclipse.gmf.runtime.notation.IdentityAnchor; -import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; -import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AutomaticNotationEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.helper.IdentityAnchorHelper; -import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CLifeLineEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomActionExecutionSpecificationEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; import org.eclipse.uml2.uml.Element; -import org.eclipse.uml2.uml.ExecutionSpecification; /** * This editPolicy is specific to register the Y Top and the T bottom of the node @@ -90,7 +63,7 @@ public class ConnectYCoordinateToGrillingEditPolicy extends ConnectRectangleToGr protected void initListeningColumnStart(GridManagementEditPolicy grilling, Element element, PrecisionRectangle bounds) throws NoGrillElementFound { //do nothing } - + /** * @see org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectRectangleToGridEditPolicy#updateColumFinishFromWitdhNotification(org.eclipse.draw2d.geometry.PrecisionRectangle) * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ContentDiagramListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ContentDiagramListener.java index 0614d4885af..710f48a98cf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ContentDiagramListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ContentDiagramListener.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationCreationEditPolicy.java index f9da3f2d3ce..a9347fe4490 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationCreationEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -50,7 +50,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy#getCommand(org.eclipse.gef.Request) */ @Override @@ -66,7 +66,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat /** * When this is a {@link CreateUnspecifiedTypeRequest}, we need to check if the position needed by the user is on an ExecutionSpecification because this is not allowed by the UML Norm * but this will be possible graphically. - * + * * @param request * The unspecified type request. * @return The command. @@ -75,11 +75,11 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat private Command getUnspecifiedTypeCreateCommand( final CreateUnspecifiedTypeRequest request) { - final Map<IElementType, Command> createCmds = new HashMap<IElementType, Command>(); - List<IElementType> validTypes = new ArrayList<IElementType>(); + final Map<IElementType, Command> createCmds = new HashMap<>(); + List<IElementType> validTypes = new ArrayList<>(); for (Iterator<IElementType> iter = request.getElementTypes().iterator(); iter .hasNext();) { - IElementType elementType = (IElementType) iter.next(); + IElementType elementType = iter.next(); Request createRequest = request.getRequestForType(elementType); if (createRequest != null) { EditPart target = SequenceUtil.getParentLifelinePart(getHost().getTargetEditPart(createRequest)); @@ -112,6 +112,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat * menu, then executes the command prepared for the element * type that the user selected. */ + @Override protected CommandResult doExecuteWithResult( IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { @@ -124,7 +125,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat IElementType type = (IElementType) cmdResult .getReturnValue(); - _createCmd = (Command) createCmds.get(type); + _createCmd = createCmds.get(type); Assert.isTrue(_createCmd != null && _createCmd.canExecute()); // validate the affected files @@ -146,6 +147,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat return CommandResult.newOKCommandResult(newObject); } + @Override protected CommandResult doUndoWithResult( IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { @@ -161,6 +163,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat return super.doUndoWithResult(progressMonitor, info); } + @Override protected CommandResult doRedoWithResult( IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { @@ -182,7 +185,7 @@ public class CustomExecutionSpecificationCreationEditPolicy extends DefaultCreat int fileCount = affectedFiles.size(); if (fileCount > 0) { return FileModificationValidator - .approveFileModification((IFile[]) affectedFiles + .approveFileModification(affectedFiles .toArray(new IFile[fileCount])); } return Status.OK_STATUS; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationXYLayoutEditPolicy.java index 8bc04803c3f..5668ea3d800 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomExecutionSpecificationXYLayoutEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -40,7 +40,7 @@ public class CustomExecutionSpecificationXYLayoutEditPolicy extends LayoutEditPo /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCommand(org.eclipse.gef.Request) */ @Override @@ -94,7 +94,7 @@ public class CustomExecutionSpecificationXYLayoutEditPolicy extends LayoutEditPo /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#createChildEditPolicy(org.eclipse.gef.EditPart) */ @Override @@ -108,7 +108,7 @@ public class CustomExecutionSpecificationXYLayoutEditPolicy extends LayoutEditPo /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getMoveChildrenCommand(org.eclipse.gef.Request) */ @Override @@ -118,7 +118,7 @@ public class CustomExecutionSpecificationXYLayoutEditPolicy extends LayoutEditPo /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomInteractionOperandCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomInteractionOperandCreationEditPolicy.java index 2b616d30cad..952dfaa9d54 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomInteractionOperandCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/CustomInteractionOperandCreationEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -50,7 +50,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy#getCommand(org.eclipse.gef.Request) */ @Override @@ -66,7 +66,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE /** * When this is a {@link CreateUnspecifiedTypeRequest}, we need to check if the position needed by the user is on an ExecutionSpecification because this is not allowed by the UML Norm * but this will be possible graphically. - * + * * @param request * The unspecified type request. * @return The command. @@ -75,11 +75,11 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE private Command getUnspecifiedTypeCreateCommand( final CreateUnspecifiedTypeRequest request) { - final Map<IElementType, Command> createCmds = new HashMap<IElementType, Command>(); - List<IElementType> validTypes = new ArrayList<IElementType>(); + final Map<IElementType, Command> createCmds = new HashMap<>(); + List<IElementType> validTypes = new ArrayList<>(); for (Iterator<IElementType> iter = request.getElementTypes().iterator(); iter .hasNext();) { - IElementType elementType = (IElementType) iter.next(); + IElementType elementType = iter.next(); Request createRequest = request.getRequestForType(elementType); if (createRequest != null) { EditPart target = SequenceUtil.getParentCombinedFragmentPart(getHost().getTargetEditPart(createRequest)); @@ -112,6 +112,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE * menu, then executes the command prepared for the element * type that the user selected. */ + @Override protected CommandResult doExecuteWithResult( IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { @@ -124,7 +125,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE IElementType type = (IElementType) cmdResult .getReturnValue(); - _createCmd = (Command) createCmds.get(type); + _createCmd = createCmds.get(type); Assert.isTrue(_createCmd != null && _createCmd.canExecute()); // validate the affected files @@ -146,6 +147,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE return CommandResult.newOKCommandResult(newObject); } + @Override protected CommandResult doUndoWithResult( IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { @@ -161,6 +163,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE return super.doUndoWithResult(progressMonitor, info); } + @Override protected CommandResult doRedoWithResult( IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException { @@ -182,7 +185,7 @@ public class CustomInteractionOperandCreationEditPolicy extends DefaultCreationE int fileCount = affectedFiles.size(); if (fileCount > 0) { return FileModificationValidator - .approveFileModification((IFile[]) affectedFiles + .approveFileModification(affectedFiles .toArray(new IFile[fileCount])); } return Status.OK_STATUS; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/DisplayEvent.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/DisplayEvent.java index 3c285f81eef..7e6be1de7a2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/DisplayEvent.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/DisplayEvent.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -69,7 +69,7 @@ public class DisplayEvent { /** * if the position is the same a an event it return the event. - * + * * @param container * the figure container * @param locationOntheScreen @@ -110,7 +110,7 @@ public class DisplayEvent { /** * if the position is the same a an event it return the event. - * + * * @param container * the figure container * @param locationOntheScreen @@ -144,10 +144,10 @@ public class DisplayEvent { /** * Get the Exact location of an Event around the location (from Execution Specification or Message ) - * + * * @param location * absolute value on the screen - * + * * @return the location if no event found around, or the event precise location if existing */ public Point getRealEventLocation(final Point location) { @@ -161,7 +161,7 @@ public class DisplayEvent { /** * Get the Exact location of an Event from execution Specification - * + * * @param location * absolute value on the screen * @return the location if no event belonging to executionSpecification found around, or the event precise location if existing. @@ -202,14 +202,14 @@ public class DisplayEvent { /** * Get the new position of an event located at the reference Y if the mouse location is around (delta is 8px ) the reference value of Y - * + * * @param relativeMouseLocation * Location of Mouse relatively to the Lifeline * @param editPartFigure * Lifeline Figure to compute the Absolute Coordinate from the Interaction * @param referenceY * The reference Y coordinate where the event is located - * + * * @return a new Point in the absolute coordinate with the Y updated to the Event exact position or the initial position if not in the interval */ private Point getNewEventLocationY(Point relativeMouseLocation, int referenceY, IFigure editPartFigure) { @@ -226,7 +226,7 @@ public class DisplayEvent { /** * Get the Exact location of an Event from Messages - * + * * @param location * absolute value on the screen * @return the location if no event belonging to Messages found around, or the event precise location if existing. @@ -275,7 +275,7 @@ public class DisplayEvent { /** * Get the y value of an anchor from the height ratio of a node - * + * * @param node * where the Anchor is on * @param anchor @@ -316,7 +316,7 @@ public class DisplayEvent { } /** - * + * * @param container * the container edipart * @param node @@ -354,7 +354,7 @@ public class DisplayEvent { } /** - * + * * @param container * the figure container where we want display event * @param location @@ -407,7 +407,7 @@ public class DisplayEvent { } /** - * + * * @param container * the container editpart * @param node @@ -465,12 +465,12 @@ public class DisplayEvent { /** * use to remove all event from the figures - * + * * @param container * the container figure */ public void removeFigureEvent(IFigure container) { - ArrayList<IFigure> eventFigureList = new ArrayList<IFigure>(); + ArrayList<IFigure> eventFigureList = new ArrayList<>(); for (Object iFigure : container.getChildren()) { if (iFigure instanceof IEventFig) { eventFigureList.add((IFigure) iFigure); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java index 6f4df144d41..c15ef91bec1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridBasedXYLayoutEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 - 2017 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 @@ -8,8 +8,8 @@ * * Contributors: * CEA LIST - Initial API and implementation - * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 - * + * C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -41,7 +41,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; /** * This class is over load the creation of element and to avoid to move element directly at creation * this class has been customized to prevent the strange feedback of lifeline during the move - * + * */ public class GridBasedXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEditPolicy implements IGrillingEditpolicy { /** @@ -77,9 +77,10 @@ public class GridBasedXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedE /** * Override to use to deal with causes where the point is UNDERFINED * we will ask the layout helper to find a location for us - * + * * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getConstraintFor(org.eclipse.gef.requests.CreateRequest) */ + @Override protected Object getConstraintFor(CreateRequest request) { // Used during the creation from the palette Object constraint = super.getConstraintFor(request); @@ -107,10 +108,10 @@ public class GridBasedXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedE /** - * + * * In the case of Sequence Diagram, the Edge are managed by other mechanisms. * The Command then should do nothing. - * + * * @see org.eclipse.papyrus.infra.gmfdiag.common.helper.FixAnchorHelper#getFixAnchorCommand(org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart, org.eclipse.draw2d.geometry.PrecisionRectangle, org.eclipse.draw2d.geometry.PrecisionRectangle, * org.eclipse.gef.editparts.AbstractConnectionEditPart, org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Dimension, boolean) */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridCommandStackListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridCommandStackListener.java index 10d2353d00e..e996062b360 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridCommandStackListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridCommandStackListener.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -17,8 +17,6 @@ import java.util.EventObject; import org.eclipse.emf.common.command.CommandStackListener; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.impl.NotificationImpl; -import org.eclipse.papyrus.uml.diagram.common.helper.NotificationHelper; /** * @author Patrick Tessier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java index 26f2e29c8fc..557f6a429a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016, 2017 CEA LIST, ALL4TEC 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 @@ -83,15 +83,15 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A * the threshold to set */ public void setThreshold(int threshold) { - this.threshold = threshold; + GridManagementEditPolicy.threshold = threshold; } public int margin = 50; public boolean respectMargin = true; public boolean moveAllLinesAtSamePosition = false; - public ArrayList<DecorationNode> rows = new ArrayList<DecorationNode>(); - public ArrayList<DecorationNode> columns = new ArrayList<DecorationNode>(); + public ArrayList<DecorationNode> rows = new ArrayList<>(); + public ArrayList<DecorationNode> columns = new ArrayList<>(); // ok if the creation a X is free public boolean CREATION_X_FREE = true; @@ -146,7 +146,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A LayoutConstraint layoutConstrainto1 = ((Node) o1).getLayoutConstraint(); LayoutConstraint layoutConstrainto2 = ((Node) o2).getLayoutConstraint(); if (layoutConstrainto1 != null && layoutConstrainto2 != null) { - return ((Integer) ((Location) layoutConstrainto1).getY()).compareTo(((Integer) ((Location) layoutConstrainto2).getY())); + return ((Integer) ((Location) layoutConstrainto1).getY()).compareTo((((Location) layoutConstrainto2).getY())); } return 0; } @@ -159,7 +159,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A LayoutConstraint layoutConstrainto1 = ((Node) o1).getLayoutConstraint(); LayoutConstraint layoutConstrainto2 = ((Node) o2).getLayoutConstraint(); if (layoutConstrainto1 != null && layoutConstrainto2 != null) { - return ((Integer) ((Location) layoutConstrainto1).getX()).compareTo(((Integer) ((Location) layoutConstrainto2).getX())); + return ((Integer) ((Location) layoutConstrainto1).getX()).compareTo((((Location) layoutConstrainto2).getX())); } return 0; } @@ -199,7 +199,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A } /** - * + * */ private void refreshGrillingStructure() { EditPart host = getHost(); @@ -265,7 +265,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A } protected void updateCoveredBy() { - HashSet<Lifeline> lifelineList = new HashSet<Lifeline>(); + HashSet<Lifeline> lifelineList = new HashSet<>(); for (DecorationNode column : columns) { if ((column.getElement()) instanceof Lifeline) { lifelineList.add((Lifeline) (column.getElement())); @@ -276,7 +276,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A // for each lifeline recreat the list of covered element for (Lifeline lifeline : lifelineList) { - ArrayList<InteractionFragment> covered = new ArrayList<InteractionFragment>(); + ArrayList<InteractionFragment> covered = new ArrayList<>(); for (DecorationNode row : rows) { if (row.getElement() instanceof InteractionFragment && (!(row.getElement() instanceof InteractionOperand))) { InteractionFragment interactionFragment = (InteractionFragment) (row.getElement()); @@ -307,14 +307,14 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A // 3. management of InteractionOperand // There are columns. - ArrayList<InteractionOperand> coveredbyInteractionOperand = new ArrayList<InteractionOperand>(); - covered = new ArrayList<InteractionFragment>(); + ArrayList<InteractionOperand> coveredbyInteractionOperand = new ArrayList<>(); + covered = new ArrayList<>(); for (DecorationNode column : columns) { if (column.getElement() instanceof InteractionOperand) { if (!(coveredbyInteractionOperand.contains(column.getElement()))) { coveredbyInteractionOperand.add((InteractionOperand) column.getElement()); } else { - coveredbyInteractionOperand.remove((InteractionOperand) column.getElement()); + coveredbyInteractionOperand.remove(column.getElement()); } } if (column.getElement().equals(lifeline)) { @@ -348,7 +348,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A /** * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#deactivate() - * + * */ @Override public void deactivate() { @@ -374,7 +374,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A /** * get the decoration node that represents a column from a position (absolute) - * + * * @param x * the position x for the column * @return the decoration node @@ -387,7 +387,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A /** * get the decoration node that represents a line from a position (absolute) - * + * * @param y * the position y for the line * @return the decoration node @@ -415,13 +415,13 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A /** - * + * * @param y * the position y where we look for a row * @return the rows that exists at the position [y- threshold, y+threshold]s */ public ArrayList<DecorationNode> getRowAtPosition(int y) { - ArrayList<DecorationNode> sameLines = new ArrayList<DecorationNode>(); + ArrayList<DecorationNode> sameLines = new ArrayList<>(); for (Iterator<DecorationNode> iterator = rows.iterator(); iterator.hasNext();) { DecorationNode currentRow = iterator.next(); int Yposition = getPositionY(currentRow); @@ -456,7 +456,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A int nextDistance = ((Location) nextConstraint).getY() - ((Location) newconstraint).getY(); int margin = getGridSpacing(); if (nextDistance < margin) { - ArrayList<DecorationNode> rowsCopy = new ArrayList<DecorationNode>(); + ArrayList<DecorationNode> rowsCopy = new ArrayList<>(); rowsCopy.addAll(rows); for (int i = rowsCopy.indexOf(nextRow); i < rowsCopy.size(); i++) { if (!(rowsCopy.get(i).equals(movedRow))) { @@ -474,7 +474,7 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A } /** - * + * * @param currentRow * @param currentRowPosition * @return get the next row that has not the same position diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingBasedResizableShapeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingBasedResizableShapeEditPolicy.java index 5d21af3d62e..ae99cc4b361 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingBasedResizableShapeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingBasedResizableShapeEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,24 +8,13 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Point; -import org.eclipse.draw2d.geometry.PrecisionRectangle; -import org.eclipse.gef.EditPart; import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.notation.Location; -import org.eclipse.gmf.runtime.notation.Node; -import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusResizableShapeEditPolicy; -import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; /** * @author Patrick Tessier @@ -33,6 +22,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; */ public class GrillingBasedResizableShapeEditPolicy extends PapyrusResizableShapeEditPolicy implements IGrillingEditpolicy{ + @Override protected void showChangeBoundsFeedback(ChangeBoundsRequest request) { super.showChangeBoundsFeedback(request); // IFigure feedback = getDragSourceFeedbackFigure(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingEditpart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingEditpart.java index 8061b797a64..0398a494d69 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingEditpart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GrillingEditpart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,23 +8,18 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; -import javax.swing.text.StyleConstants.ColorConstants; - import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.RectangleFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; import org.eclipse.gmf.runtime.notation.Location; -import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.papyrus.uml.diagram.sequence.figures.ReferencialGrid; /** @@ -43,7 +38,7 @@ public class GrillingEditpart extends GraphicalEditPart { super(model); } - public static final String VISUAL_ID="GRILLING"; + public static final String VISUAL_ID="GRILLING"; /** * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setVisibility(boolean) * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IComputeOwnerHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IComputeOwnerHelper.java index 693daa525ce..6d1b9b05064 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IComputeOwnerHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IComputeOwnerHelper.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -20,13 +20,13 @@ import org.eclipse.gmf.runtime.notation.DecorationNode; import org.eclipse.uml2.uml.Interaction; /** - * the goal of theses classes is to compute elements owned by Interaction operands or by interaction + * the goal of theses classes is to compute elements owned by Interaction operands or by interaction * @since 3.0 */ public interface IComputeOwnerHelper { /** - * + * * @param domain the domain to execute commands * @param rows the list of rows from the grid * @param columns the list of columns from the grid diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IEventFig.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IEventFig.java index 53aae1691fb..06b529c0390 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IEventFig.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IEventFig.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IGrillingEditpolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IGrillingEditpolicy.java index 42dc43ce87b..5a27fa891c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IGrillingEditpolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/IGrillingEditpolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -17,7 +17,6 @@ import org.eclipse.gef.EditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.render.editparts.RenderedDiagramRootEditPart; /** * @author Patrick Tessier @@ -34,7 +33,7 @@ public interface IGrillingEditpolicy { if (editPart instanceof DiagramEditPart){ return (DiagramEditPart) editPart; } - + editPart = editPart.getParent(); } if(editPart instanceof DiagramRootEditPart){ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionGraphicalNodeEditPolicy.java index 4a0177826fd..5220bcd53a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionGraphicalNodeEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -17,16 +17,13 @@ import java.util.Map; import org.eclipse.draw2d.Connection; import org.eclipse.draw2d.ConnectionAnchor; -import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PrecisionPoint; import org.eclipse.draw2d.geometry.PrecisionRectangle; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.FeedbackHelper; import org.eclipse.gef.requests.CreateConnectionRequest; -import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest; @@ -68,7 +65,7 @@ public class InteractionGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy /** * This method update the request in order to make the point at the correctposition on the grill. - * @param request the request + * @param request the request * @param wanted the position has we want in the serialization */ protected void computeSourcePosition(CreateConnectionRequest request, PrecisionPoint wanted){ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionOperandToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionOperandToGridEditPolicy.java index d365a61a210..6603e612d17 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionOperandToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/InteractionOperandToGridEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java index 47144a6e09b..5bfc11a71e3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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 @@ -10,7 +10,7 @@ * CEA LIST - Initial API and implementation * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 519621, 519756, 526191 * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 531596 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -195,7 +195,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getSourceConnectionAnchor(org.eclipse.gef.requests.CreateConnectionRequest) */ @Override @@ -269,7 +269,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * Force the Horizontal position of the feedback - * + * * @see org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor#getIntersectionPoints(org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Point) */ @Override @@ -324,7 +324,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy#getConnectionAndRelationshipCompleteCommand(org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest) */ @Override @@ -375,7 +375,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol * This method update the Extended Data of the the Creation Request * 1) Adding the Previous Event of the Target * 2) Adding the OccurenceSpecification which needs to be replaced by the Message ReceiveEvent - * + * * @param request * initial Request to be updated */ @@ -477,7 +477,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * Get the Command for a Message Sync and Async creation * Adding the command to create the AES or BES and update Grid position accordingly - * + * * @param request * the initial request * @param cmd @@ -487,13 +487,13 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol protected Command getSyncAsyncEdgeCommand(CreateConnectionViewAndElementRequest request, Command cmd) { // in the case of messages of sort: synchCall, asynchCall or asynchSignal // an execution specification may be created at target - OccurrenceSpecification messageEvent = displayEvent.getActionExecutionSpecificationEvent(getHostFigure(), ((CreateConnectionViewAndElementRequest) request).getLocation()); + OccurrenceSpecification messageEvent = displayEvent.getActionExecutionSpecificationEvent(getHostFigure(), request.getLocation()); CompoundCommand compoundCommand = new CompoundCommand(); compoundCommand.add(cmd); // If we are not into an existing event we create Execution specification in the same time if (null == messageEvent) { - CreateExecutionSpecificationWithMessage createExecutionSpecificationwithMsg = new CreateExecutionSpecificationWithMessage(getDiagramEditPart(getHost()).getEditingDomain(), request, (NodeEditPart) request.getTargetEditPart()); + CreateExecutionSpecificationWithMessage createExecutionSpecificationwithMsg = new CreateExecutionSpecificationWithMessage(getDiagramEditPart(getHost()).getEditingDomain(), request, request.getTargetEditPart()); compoundCommand.add(new GMFtoGEFCommandWrapper(createExecutionSpecificationwithMsg)); } return compoundCommand; @@ -502,7 +502,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * Get the Command for a Message delete creation * Adding the Delete Occurrence Specification command - * + * * @param request * the initial request * @param cmd @@ -541,7 +541,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * Get the Command for a Message Create creation * Adding the command to update the grid accordingly - * + * * @param request * the initial request * @param cmd @@ -562,7 +562,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * Get the command to set lifeline position in case of MessageCreate reorient or creation. - * + * * @param originalCommand * the original command which needs to be completed * @param targetEditPart @@ -603,7 +603,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * Check if the request is allowed - * + * * @param request * The Connection END creation Request * @return true if all the validation are passed @@ -631,10 +631,10 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol * Validation1: * Check if the Target point is Lower than the Source. * The target should be lower than the source to be valid. - * + * * @param request * The Connection END creation Request - * + * * @return true if target location point is lower than source location point */ private Boolean isTargetLowerThanSource(Point sourceLocation, Point targetLocation) { @@ -652,7 +652,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest) */ @Override @@ -684,7 +684,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * {@inheritDoc} - * + * * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest) */ @Override @@ -720,7 +720,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol if (nodeEP instanceof CLifeLineEditPart) { Point requestLocationCopy = request.getLocation().getCopy(); if (request.getConnectionEditPart() instanceof MessageCreateEditPart) { - if (!LifelineEditPartUtil.hasPreviousEvent((Point) requestLocationCopy, (LifelineEditPart) getHost())) { + if (!LifelineEditPartUtil.hasPreviousEvent(requestLocationCopy, (LifelineEditPart) getHost())) { command = new CompoundCommand(); if (!LifelineMessageCreateHelper.hasIncomingMessageCreate(nodeEP)) { @@ -731,17 +731,17 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol } // move up old target if the target is different of the source if (!request.getConnectionEditPart().getTarget().equals(request.getTarget())) { - ((CompoundCommand) command).add(LifelineEditPartUtil.getRestoreLifelinePositionOnMessageCreateRemovedCommand((ConnectionEditPart) request.getConnectionEditPart())); + ((CompoundCommand) command).add(LifelineEditPartUtil.getRestoreLifelinePositionOnMessageCreateRemovedCommand(request.getConnectionEditPart())); } } else { command = reconnectTargetCommand; } } else if (request.getConnectionEditPart() instanceof MessageDeleteEditPart) { - if (!LifelineEditPartUtil.hasNextEvent((Point) requestLocationCopy, (LifelineEditPart) getHost())) { + if (!LifelineEditPartUtil.hasNextEvent(requestLocationCopy, (LifelineEditPart) getHost())) { command = new CompoundCommand(); if (!LifelineMessageDeleteHelper.hasIncomingMessageDelete(nodeEP)) { - NodeEditPart targetEditPart = (NodeEditPart) (LifelineEditPart) getHost(); + NodeEditPart targetEditPart = (LifelineEditPart) getHost(); DropDestructionOccurenceSpecification dropDestructionOccurenceSpecification = new DropDestructionOccurenceSpecification(getDiagramEditPart(getHost()).getEditingDomain(), request, targetEditPart, requestLocationCopy); CompoundCommand compoundCommand = new CompoundCommand(); compoundCommand.add(reconnectTargetCommand); @@ -759,7 +759,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol // restore position of the old target if (!request.getConnectionEditPart().getTarget().equals(request.getTarget())) { - ((CompoundCommand) command).add(LifelineEditPartUtil.getRestoreLifelinePositionOnMessageCreateRemovedCommand((ConnectionEditPart) request.getConnectionEditPart())); + ((CompoundCommand) command).add(LifelineEditPartUtil.getRestoreLifelinePositionOnMessageCreateRemovedCommand(request.getConnectionEditPart())); } } else { command = reconnectTargetCommand; @@ -776,7 +776,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * This method must look for event that are upper than the given position - * + * * @param point * the position on the lifeline */ @@ -787,7 +787,7 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** * This method update the request in order to make the point at the correct position on the grill. - * + * * @param request * the request * @param wanted @@ -822,10 +822,11 @@ public class LifeLineGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPol /** - * + * * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getFeedbackHelper(org.eclipse.gef.requests.CreateConnectionRequest) * This method is used in order to manage the snap to grid of LOST Message */ + @Override protected FeedbackHelper getFeedbackHelper(CreateConnectionRequest request) { if (request.getTargetEditPart() instanceof NodeEditPart) { ConnectionAnchor targetAnchor = ((NodeEditPart) request.getTargetEditPart()).getTargetConnectionAnchor(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java index 4e4fdd4c1a5..42acfaa2695 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -47,8 +47,8 @@ import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; -import org.eclipse.papyrus.uml.diagram.sequence.command.SetResizeAndLocationCommand; import org.eclipse.papyrus.uml.diagram.sequence.command.SetMoveAllLineAtSamePositionCommand; +import org.eclipse.papyrus.uml.diagram.sequence.command.SetResizeAndLocationCommand; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CLifeLineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; @@ -63,7 +63,7 @@ import org.eclipse.papyrus.uml.service.types.utils.ElementUtil; /** * This class is used to manage node element in the compartment by using grill system. * this class has been customized to prevent the strange feedback of lifeline during the move - * + * */ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEditPolicy implements IGrillingEditpolicy { @@ -98,7 +98,7 @@ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEd /* * Override to use to deal with causes where the point is UNDERFINED * we will ask the layout helper to find a location for us - * + * * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getConstraintFor(org.eclipse.gef.requests.CreateRequest) */ @Override @@ -161,7 +161,7 @@ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEd /** * {@inheritDoc} - * + * * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#showLayoutTargetFeedback(org.eclipse.gef.Request) */ @Override @@ -188,7 +188,7 @@ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEd * Recalculation of feedback location of combined fragment creation after update in: * LifelineCreationEditPolicy.getCreateElementAndViewCommand() */ - else if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.COMBINED_FRAGMENT_SHAPE) + else if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.COMBINED_FRAGMENT_SHAPE) || ElementUtil.isTypeOf(elementType, UMLDIElementTypes.INTERACTION_USE_SHAPE)) { Rectangle boundsLifeline = getHostFigure().getBounds(); @@ -236,10 +236,10 @@ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEd /** * Called in response to a <tt>REQ_RESIZE_CHILDREN</tt> request. - * + * * This implementation creates a <tt>SetPropertyCommand</i> and sets * the <tt>ID_BOUNDS</tt> property value to the supplied constraints. - * + * * @param child * the element being resized. * @param constraint @@ -349,7 +349,7 @@ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEd /** * In the specific case of Execution Specification, the resize of the Lifeline should trigger the move of the ES to remain centered on it. - * + * * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy#getCommand(org.eclipse.gef.Request) * * @param request diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifelineCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifelineCreationEditPolicy.java index c3536552671..9faeb64b938 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifelineCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifelineCreationEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -53,12 +53,12 @@ public class LifelineCreationEditPolicy extends DefaultCreationEditPolicy implem protected Command getCreateElementAndViewCommand(CreateViewAndElementRequest request) { // Used during the drop from the model explorer if (request instanceof CreateViewAndElementRequest) { - CreateViewAndElementRequest req = (CreateViewAndElementRequest) request; + CreateViewAndElementRequest req = request; ViewAndElementDescriptor descriptor = (req).getViewAndElementDescriptor(); - IElementType elementType = (IElementType) descriptor.getElementAdapter().getAdapter(IElementType.class); - - - + IElementType elementType = descriptor.getElementAdapter().getAdapter(IElementType.class); + + + if (isControlledByLifeline(elementType)) { // get the element descriptor CreateElementRequestAdapter requestAdapter = req.getViewAndElementDescriptor().getCreateElementRequestAdapter(); @@ -74,25 +74,25 @@ public class LifelineCreationEditPolicy extends DefaultCreationEditPolicy implem if (mos != null) { createElementRequest.setParameter(org.eclipse.papyrus.uml.service.types.utils.SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_START, mos); } - } + } /* * Fix of Bug 531471 - [SequenceDiagram] Combined Fragment / Interaction Use should be create over a Lifeline. * Recalculation of location of combined fragment for according to interaction compartment position */ - else if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.COMBINED_FRAGMENT_SHAPE) + else if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.COMBINED_FRAGMENT_SHAPE) || ElementUtil.isTypeOf(elementType, UMLDIElementTypes.INTERACTION_USE_SHAPE)) { Rectangle boundsLifeline = getHostFigure().getBounds(); Point pointCombinedFragment = req.getLocation(); - + pointCombinedFragment.x = pointCombinedFragment.x + boundsLifeline.x; pointCombinedFragment.y = pointCombinedFragment.y + boundsLifeline.y; - + req.setLocation(pointCombinedFragment); - + return getHost().getParent().getCommand(req); } } - + DiagramEditPart diagramEditPart=getDiagramEditPart(getHost()); GridManagementEditPolicy grid=(GridManagementEditPolicy)diagramEditPart.getEditPolicy(GridManagementEditPolicy.GRID_MANAGEMENT); if (grid!=null){ @@ -101,7 +101,7 @@ public class LifelineCreationEditPolicy extends DefaultCreationEditPolicy implem cmd.add(setMoveAllLineAtSamePositionCommand); cmd.add(super.getCreateElementAndViewCommand(request)); setMoveAllLineAtSamePositionCommand= new SetMoveAllLineAtSamePositionCommand( grid, true); - cmd.add(setMoveAllLineAtSamePositionCommand); + cmd.add(setMoveAllLineAtSamePositionCommand); return cmd; } return super.getCreateElementAndViewCommand(request); @@ -110,9 +110,9 @@ public class LifelineCreationEditPolicy extends DefaultCreationEditPolicy implem /** * test if the element Type that is normally not a child of the Lifeline should be controlled by the lifeline. * Then The lifeline will be set as the parent editpart, but not as the semantic parent. - * + * * This is the case of most of the affixed node. - * + * * @param elementType * the tested element type * @return true if the Lifeline should be the diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/NoGrillElementFound.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/NoGrillElementFound.java index 9d7cfeba8f1..04d67506af2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/NoGrillElementFound.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/NoGrillElementFound.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ResizeOperandEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ResizeOperandEditPolicy.java index 003f1b4772a..3d4ed01d70f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ResizeOperandEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ResizeOperandEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -94,14 +94,15 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto /** * Factors incoming requests into various specific methods. - * + * * @see org.eclipse.gef.EditPolicy#getCommand(Request) */ + @Override public Command getCommand(Request request) { if (request instanceof CreateViewAndElementRequest) { CreateViewAndElementRequest req = (CreateViewAndElementRequest) request; ViewAndElementDescriptor descriptor = (req).getViewAndElementDescriptor(); - IElementType elementType = (IElementType) descriptor.getElementAdapter().getAdapter(IElementType.class); + IElementType elementType = descriptor.getElementAdapter().getAdapter(IElementType.class); if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.INTERACTION_OPERAND_SHAPE)) { Node combinedFragmentNode = (Node) ((GraphicalEditPart) (getHost().getParent())).getNotationView(); // we add a new Operand so we add the default height @@ -109,7 +110,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto if (getHost().getChildren().size() > 0) { int newHeight = height + CInteractionOperandEditPart.DEFAULT_HEIGHT; - return new ICommandProxy(new SetResizeCommand(getEditingDomain(), "set dimension", new EObjectAdapter(combinedFragmentNode), new Dimension(BoundForEditPart.getWidthFromView(combinedFragmentNode), (int) newHeight))); + return new ICommandProxy(new SetResizeCommand(getEditingDomain(), "set dimension", new EObjectAdapter(combinedFragmentNode), new Dimension(BoundForEditPart.getWidthFromView(combinedFragmentNode), newHeight))); } } } @@ -157,7 +158,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto for (int i = 1; i < getHost().getChildren().size(); i++) { GraphicalEditPart graphicalEditPart = (GraphicalEditPart) getHost().getChildren().get(i); int y = ((Bounds) ((Node) graphicalEditPart.getNotationView()).getLayoutConstraint()).getY() - changeBoundsRequest.getMoveDelta().y; - compositeCommand.add(new SetLocationCommand(editingDomain, "Resize Operands", new EObjectAdapter(((Node) graphicalEditPart.getNotationView())), new Point(0, y))); + compositeCommand.add(new SetLocationCommand(editingDomain, "Resize Operands", new EObjectAdapter((graphicalEditPart.getNotationView())), new Point(0, y))); } } else { @@ -190,7 +191,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto } /** - * + * * @param operandEditPart * @return true if this the last children of the compartment. */ @@ -202,7 +203,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto } /** - * + * * @param operandEditPart * @return true if this the first children of the compartment. */ @@ -214,7 +215,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto /** * get the next view at the same level at the current editPart - * + * * @param operandEditPart * @return can return null if this the last; */ @@ -230,7 +231,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto /** * get the previous view at the same level at the current editPart - * + * * @param operandEditPart * @return can return null if this the last; */ @@ -245,7 +246,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto /** * the border effect is to resize the combined fragment - * + * * @param changeBoundsRequest * @return a command to to resize the combinedfragment */ @@ -255,14 +256,14 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto int combinedFragmentHeight = BoundForEditPart.getHeightFromView(combinedFragmentNode); int newHeight = getComputedCombinedFragmentHeight() + changeBoundsRequest.getSizeDelta().height; if (newHeight != combinedFragmentHeight) { - return new SetResizeCommand(editingDomain, "Resize Operands", new EObjectAdapter(combinedFragmentNode), new Dimension(BoundForEditPart.getWidthFromView(combinedFragmentNode), (int) newHeight)); + return new SetResizeCommand(editingDomain, "Resize Operands", new EObjectAdapter(combinedFragmentNode), new Dimension(BoundForEditPart.getWidthFromView(combinedFragmentNode), newHeight)); } return IdentityCommand.INSTANCE; } /** * the border effect is to move the combined fragment - * + * * @param changeBoundsRequest * @return a command to to resize the combinedfragment */ @@ -277,7 +278,7 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto int newY = combinedFragmentBound.getY() + changeBoundsRequest.getMoveDelta().y; if (newHeight != combinedFragmentHeight) { - return new SetResizeAndLocationCommand(editingDomain, "Resize Operands", new EObjectAdapter(combinedFragmentNode), new Rectangle(combinedFragmentBound.getX(), newY, BoundForEditPart.getWidthFromView(combinedFragmentNode), (int) newHeight)); + return new SetResizeAndLocationCommand(editingDomain, "Resize Operands", new EObjectAdapter(combinedFragmentNode), new Rectangle(combinedFragmentBound.getX(), newY, BoundForEditPart.getWidthFromView(combinedFragmentNode), newHeight)); } return IdentityCommand.INSTANCE; } @@ -295,13 +296,13 @@ public class ResizeOperandEditPolicy extends GraphicalEditPolicy implements Auto int newHeight = getComputedCombinedFragmentHeight(); int combinedFragmentHeight = BoundForEditPart.getHeightFromView(combinedFragmentNode); if (newHeight != combinedFragmentHeight) { - execute(new SetResizeCommand(getEditingDomain(), "Resize Operands", new EObjectAdapter(combinedFragmentNode), new Dimension(BoundForEditPart.getWidthFromView(combinedFragmentNode), (int) newHeight))); + execute(new SetResizeCommand(getEditingDomain(), "Resize Operands", new EObjectAdapter(combinedFragmentNode), new Dimension(BoundForEditPart.getWidthFromView(combinedFragmentNode), newHeight))); } } } /** - * + * * @return the height of the combined fragment by computing the size of interaction operand */ protected int getComputedCombinedFragmentHeight() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/SimpleSnapHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/SimpleSnapHelper.java index ddb0a6688fd..f0ba4946908 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/SimpleSnapHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/SimpleSnapHelper.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/InteractionChildCreationTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/InteractionChildCreationTool.java index 987f22aa721..56c2f5e066b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/InteractionChildCreationTool.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/InteractionChildCreationTool.java @@ -1,13 +1,13 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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: - * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 510587 + * Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 510587 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.tools; @@ -36,7 +36,7 @@ public class InteractionChildCreationTool extends AspectUnspecifiedTypeCreationT /** * {@inheritDoc} - * + * * @see org.eclipse.gef.tools.TargetingTool#updateTargetUnderMouse() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/MessageLostFoundConnectionTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/MessageLostFoundConnectionTool.java index f17f1d88d80..81e54ca7dbf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/MessageLostFoundConnectionTool.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/MessageLostFoundConnectionTool.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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 @@ -50,7 +50,7 @@ public class MessageLostFoundConnectionTool extends SequenceSpecificConnectionTo * 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 @@ -69,43 +69,49 @@ public class MessageLostFoundConnectionTool extends SequenceSpecificConnectionTo * changes. The target is updated by using the target conditional and the * target request. If the target has been locked, this method does nothing * and returns <code>false</code>. - * + * * @return <code>true</code> if the target was changed */ + @Override protected boolean updateTargetUnderMouse() { if (!isTargetLocked()) { EditPart editPart = null; - if (getCurrentViewer() != null) + if (getCurrentViewer() != null) { editPart = getCurrentViewer().findObjectAtExcluding( getLocation(), getExclusionSet(), getTargetingConditional()); + } if( editPart instanceof InteractionInteractionCompartmentEditPart){ editPart = getCurrentViewer().findObjectAtExcluding( getLocation(), getExclusionSet(), getTargetingConditional()); editPart= editPart.getParent(); } - if (editPart != null) + if (editPart != null) { editPart = editPart.getTargetEditPart(getTargetRequest()); + } boolean changed = getTargetEditPart() != editPart; setTargetEditPart(editPart); return changed; - } else + } else { return false; + } } /** * Queries the target editpart for a command. - * + * * @see org.eclipse.gef.tools.AbstractTool#getCommand() */ + @Override protected Command getCommand() { - if (getTargetEditPart() == null) + if (getTargetEditPart() == null) { return null; + } return getTargetEditPart().getCommand(getTargetRequest()); } /** * {@inheritDoc} - * + * * @see org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool#selectAddedObject(org.eclipse.gef.EditPartViewer, java.util.Collection) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/SequenceSpecificConnectionTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/SequenceSpecificConnectionTool.java index 62b8805519c..19e8214def5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/SequenceSpecificConnectionTool.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/tools/SequenceSpecificConnectionTool.java @@ -1,13 +1,13 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST, ALL4TEC 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: - * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation + * Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.tools; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentDeleteHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentDeleteHelper.java index a67bf967757..391dc092bfc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentDeleteHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentDeleteHelper.java @@ -152,7 +152,7 @@ public class CombinedFragmentDeleteHelper { } private List<CombinedFragmentEditPart> collectCombinedFragmentParts() { - List<CombinedFragmentEditPart> parts = new ArrayList<CombinedFragmentEditPart>(); + List<CombinedFragmentEditPart> parts = new ArrayList<>(); for (InteractionFragment f : fragmentsToMove) { if (f instanceof CombinedFragment) { EditPart p = findEditPartByModel(host, f); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java index 6caaad856bb..340ebff3603 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java @@ -31,12 +31,12 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand; import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; import org.eclipse.gmf.runtime.notation.Bounds; -import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper; import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomCombinedFragmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomInteractionOperandEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionCompartmentXYLayoutEditPolicy; public class CombinedFragmentMoveHelper { @@ -102,7 +102,7 @@ public class CombinedFragmentMoveHelper { * */ public static void adjustNewParentOperands(CompoundCommand cc, Rectangle newParentNewRect, Rectangle newParentOldRect, EditPart hostEP) { - Set<Object> alreadyMovedBlocks = new HashSet<Object>(); + Set<Object> alreadyMovedBlocks = new HashSet<>(); OLDCustomCombinedFragmentEditPart hostCFEP = (OLDCustomCombinedFragmentEditPart) hostEP.getParent(); List<OLDCustomInteractionOperandEditPart> operands = hostCFEP.getOperandChildrenEditParts(); int moveUpperYOffset = newParentNewRect.y - newParentOldRect.y; @@ -179,7 +179,7 @@ public class CombinedFragmentMoveHelper { // CFs children moveDelta need special processing (no need to translate coords) Point childrenMoveDelta = moveDelta.getCopy(); - HashMap<String, Object> extData = new HashMap<String, Object>(); + HashMap<String, Object> extData = new HashMap<>(); forceLocationRequest.setExtendedData(extData); extData.put(InteractionCompartmentXYLayoutEditPolicy.CHILDREN_MOVEDELTA, childrenMoveDelta); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java index 26f49e60e1c..bd836a62bfe 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java @@ -269,7 +269,7 @@ public class CommandHelper { parentsOwner = source; useSignals = false; } - LinkedHashMap<EClass, List<EObject>> mapTypesPossibleParents = new LinkedHashMap<EClass, List<EObject>>(); + LinkedHashMap<EClass, List<EObject>> mapTypesPossibleParents = new LinkedHashMap<>(); if (useSignals) { mapTypesPossibleParents.put(UMLPackage.eINSTANCE.getSignal(), new LinkedList<EObject>()); } @@ -278,7 +278,7 @@ public class CommandHelper { } // add the parents we can find boolean existingParent = false; - List<Type> types = new ArrayList<Type>(); + List<Type> types = new ArrayList<>(); if (parentsOwner instanceof InteractionFragment) { EList<Lifeline> lifelines = ((InteractionFragment) parentsOwner).getCovereds(); for (Lifeline l : lifelines) { @@ -305,7 +305,7 @@ public class CommandHelper { } // if no parent available => no signature if (!existingParent) { - return new ArrayList<NamedElement>(); + return new ArrayList<>(); } Set<EObject> existingElements = getExistingElementsFromParents(mapTypesPossibleParents); // fix bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=383420, remove connection feedbacks before opening dialog @@ -323,7 +323,7 @@ public class CommandHelper { // Get the selected result if (dialog.open() == Window.OK) { // list to return - List<NamedElement> returnElements = new ArrayList<NamedElement>(); + List<NamedElement> returnElements = new ArrayList<>(); EObject element = dialog.getSelected(); if (element instanceof NamedElement) { returnElements.add((NamedElement) element); @@ -356,7 +356,7 @@ public class CommandHelper { */ private static Set<EObject> getExistingElementsFromParents(Map<EClass, List<EObject>> mapTypesPossibleParents) { // find the existing elements using the parents we just found - Set<EObject> existingElements = new HashSet<EObject>(); + Set<EObject> existingElements = new HashSet<>(); for (EClass eClass : mapTypesPossibleParents.keySet()) { List<EObject> parents = mapTypesPossibleParents.get(eClass); for (EObject parent : parents) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CoordinateReferentialUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CoordinateReferentialUtils.java index 26197ed552e..a2f7be7cf09 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CoordinateReferentialUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CoordinateReferentialUtils.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -23,14 +23,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; /** * The purpose of this class is to provide method to transform local coordinates to screen coordinate or absolute coordinate - * + * * @since 4.0 */ public class CoordinateReferentialUtils { /** * this method transform a position seen on the screen referential to the position with the referential of the diagram - * + * * @param locationOnScreen * the position on the screen * @param graphicalViewer @@ -50,7 +50,7 @@ public class CoordinateReferentialUtils { /** * this method transform a position on the diagram to the position on the screen - * + * * @param locationOnDiagram * shall be never null * @param graphicalViewer @@ -71,7 +71,7 @@ public class CoordinateReferentialUtils { /** * return the relative position of the figure according the diagram - * + * * @param figure * the figure from which we want the position * never null diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DestructionOccurrenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DestructionOccurrenceUtil.java index 133da4a13cc..229ca2a406a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DestructionOccurrenceUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DestructionOccurrenceUtil.java @@ -28,7 +28,7 @@ public class DestructionOccurrenceUtil { public static void reorderDestructionOccurrence(List<InteractionFragment> reorderedFragments) { int size = reorderedFragments.size(); - List<InteractionFragment> destructionOccurrenceList = new ArrayList<InteractionFragment>(size); + List<InteractionFragment> destructionOccurrenceList = new ArrayList<>(size); for (int i = 0; i < size; i++) { InteractionFragment o = reorderedFragments.get(i); if (o instanceof DestructionOccurrenceSpecification) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java index 483845f8327..3e7fc30d8b0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ExecutionSpecificationUtil.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -47,7 +47,7 @@ public class ExecutionSpecificationUtil { /** * This allows to calculate the correct location of the execution specification. - * + * * @param lifeLineEditPart * The current life line edit part. * @param initialRectangle @@ -63,7 +63,7 @@ public class ExecutionSpecificationUtil { /** * This allows to calculate the correct location of the execution specification with the list of rectangles of the execution specification for the current life line. - * + * * @param lifeLineEditPart * The current life line edit part. * @param executionSpecificationRectangles @@ -101,7 +101,7 @@ public class ExecutionSpecificationUtil { /** * This allows to get a command to move needed execution specification when an execution specification is moved or deleted. - * + * * @param lifeLineEditPart * The current life line edit part. * @param initialRectangle @@ -119,7 +119,7 @@ public class ExecutionSpecificationUtil { /** * This allows to get a command to move needed execution specification with the list of rectangles of the execution specification for the current life line when an execution specification is moved or deleted. - * + * * @param lifeLineEditPart * The current life line edit part. * @param executionSpecificationRectangles @@ -208,13 +208,13 @@ public class ExecutionSpecificationUtil { /** * This allows to get initial rectangles by execution specification available in the current life line. - * + * * @param lifeLineEditPart * The current life line edit part. * @return The map with the rectangle by execution specification edit part. */ public static Map<AbstractExecutionSpecificationEditPart, Rectangle> getRectangles(final LifelineEditPart lifeLineEditPart) { - final Map<AbstractExecutionSpecificationEditPart, Rectangle> executionSpecificationRectangles = new HashMap<AbstractExecutionSpecificationEditPart, Rectangle>(); + final Map<AbstractExecutionSpecificationEditPart, Rectangle> executionSpecificationRectangles = new HashMap<>(); final Iterator<?> editPartChildren = lifeLineEditPart.getChildren().iterator(); while (editPartChildren.hasNext()) { @@ -233,13 +233,13 @@ public class ExecutionSpecificationUtil { /** * This allows to copy the map of the rectangle with creation (to avoid rectangle modification by instance). - * + * * @param rectangles * The initial map of rectangle by edit part. * @return The copy of the initial map of rectangle by edit part with new rectangles. */ private static Map<AbstractExecutionSpecificationEditPart, Rectangle> copyRectangles(final Map<AbstractExecutionSpecificationEditPart, Rectangle> rectangles) { - final Map<AbstractExecutionSpecificationEditPart, Rectangle> copiedRectangles = new HashMap<AbstractExecutionSpecificationEditPart, Rectangle>(); + final Map<AbstractExecutionSpecificationEditPart, Rectangle> copiedRectangles = new HashMap<>(); for (final Entry<AbstractExecutionSpecificationEditPart, Rectangle> entry : rectangles.entrySet()) { copiedRectangles.put(entry.getKey(), new Rectangle(entry.getValue())); @@ -250,7 +250,7 @@ public class ExecutionSpecificationUtil { /** * This allows to calculate the initial x of the execution specification for a life line. - * + * * @param lifeLineEditPart * The life line edit part. * @param executionSpecificationRectangle diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrderer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrderer.java index 61376ab4ae7..bf09e8c0517 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrderer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrderer.java @@ -81,7 +81,7 @@ public class FragmentsOrderer { public void addCachePosition(View view, Float[] position) { if (cachePositions == null) { - cachePositions = new HashMap<View, Float[]>(1); + cachePositions = new HashMap<>(1); } cachePositions.put(view, position); } @@ -97,9 +97,9 @@ public class FragmentsOrderer { return false; } // compute fragment position; - fragmentPositions = new HashMap<InteractionFragment, Float>(); + fragmentPositions = new HashMap<>(); // compute new indexes. - fragmentIndexes = new HashMap<InteractionFragment, Integer>(); + fragmentIndexes = new HashMap<>(); EList<InteractionFragment> orderingFragments = getOrderingFragments(); return orderingFragments != null && !orderingFragments.isEmpty(); } @@ -110,7 +110,7 @@ public class FragmentsOrderer { private void computeNewIndexes() { fragmentIndexes.clear(); computePositions(); - List<Entry<InteractionFragment, Float>> positionalEntries = new ArrayList<Map.Entry<InteractionFragment, Float>>(fragmentPositions.entrySet()); + List<Entry<InteractionFragment, Float>> positionalEntries = new ArrayList<>(fragmentPositions.entrySet()); Collections.sort(positionalEntries, new Comparator<Map.Entry<InteractionFragment, Float>>() { @Override @@ -297,7 +297,7 @@ public class FragmentsOrderer { EList<InteractionFragment> orderingFragments = getOrderingFragments(); synchronized (orderingFragments) { computeNewIndexes(); - for (InteractionFragment fragment : new ArrayList<InteractionFragment>(orderingFragments)) { + for (InteractionFragment fragment : new ArrayList<>(orderingFragments)) { int oldPos = orderingFragments.indexOf(fragment); if (oldPos == -1) { continue; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrdererHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrdererHelper.java index c942f2e2df5..f11cf5a008d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrdererHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FragmentsOrdererHelper.java @@ -63,7 +63,7 @@ import org.eclipse.uml2.uml.OccurrenceSpecification; */ public class FragmentsOrdererHelper { - private static final List<String> INTERACTION_FRAGMENT_HINTS = new ArrayList<String>(); + private static final List<String> INTERACTION_FRAGMENT_HINTS = new ArrayList<>(); static { INTERACTION_FRAGMENT_HINTS.add(((IHintedType) UMLElementTypes.ActionExecutionSpecification_Shape).getSemanticHint()); INTERACTION_FRAGMENT_HINTS.add(((IHintedType) UMLElementTypes.BehaviorExecutionSpecification_Shape).getSemanticHint()); @@ -105,7 +105,7 @@ public class FragmentsOrdererHelper { if (editPart == null) { return null; } - IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) editPart.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart graphicalEditPart = editPart.getAdapter(IGraphicalEditPart.class); if (graphicalEditPart != null) { return graphicalEditPart.getEditingDomain(); } @@ -120,7 +120,7 @@ public class FragmentsOrdererHelper { @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - final Map<View, Float[]> viewPositions = new HashMap<View, Float[]>(); + final Map<View, Float[]> viewPositions = new HashMap<>(); ConnectionEditPart conn = request.getConnectionEditPart(); if (conn != null) { // View view = (View)conn.getAdapter(View.class); @@ -150,7 +150,7 @@ public class FragmentsOrdererHelper { @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - final Map<View, Float[]> viewPositions = new HashMap<View, Float[]>(); + final Map<View, Float[]> viewPositions = new HashMap<>(); ConnectionViewAndElementDescriptor desc = request.getConnectionViewAndElementDescriptor(); if (desc != null) { View view = (View) desc.getAdapter(View.class); @@ -179,7 +179,7 @@ public class FragmentsOrdererHelper { @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - final Map<View, Float[]> viewPositions = new HashMap<View, Float[]>(); + final Map<View, Float[]> viewPositions = new HashMap<>(); ViewAndElementDescriptor desc = request.getViewAndElementDescriptor(); if (desc != null) { View view = (View) desc.getAdapter(View.class); @@ -202,15 +202,15 @@ public class FragmentsOrdererHelper { if (editPart == null) { return null; } - IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) editPart.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart graphicalEditPart = editPart.getAdapter(IGraphicalEditPart.class); if (graphicalEditPart instanceof InteractionEditPart || graphicalEditPart instanceof InteractionOperandEditPart) { - Set<IGraphicalEditPart> rootEditParts = new HashSet<IGraphicalEditPart>(); + Set<IGraphicalEditPart> rootEditParts = new HashSet<>(); rootEditParts.add(graphicalEditPart); return rootEditParts; } else if (graphicalEditPart instanceof AbstractMessageEditPart) { - Set<IGraphicalEditPart> rootEditParts = new HashSet<IGraphicalEditPart>(); + Set<IGraphicalEditPart> rootEditParts = new HashSet<>(); EObject element = graphicalEditPart.resolveSemanticElement(); - Set<EObject> enclosingParents = new HashSet<EObject>(); + Set<EObject> enclosingParents = new HashSet<>(); if (element instanceof Message) { MessageEnd receiveEvent = ((Message) element).getReceiveEvent(); if (receiveEvent instanceof OccurrenceSpecification) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java index 2377d940d40..a88f111b043 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java @@ -254,7 +254,7 @@ public class GateHelper { if (interaction == null) { return Collections.emptyList(); } - List<InteractionUse> refersToBy = new ArrayList<InteractionUse>(); + List<InteractionUse> refersToBy = new ArrayList<>(); Resource eResource = interaction.eResource(); if (eResource != null) { ResourceSet resourceSet = eResource.getResourceSet(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/HighlightUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/HighlightUtil.java index 6dc831edec6..35eaf192831 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/HighlightUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/HighlightUtil.java @@ -40,7 +40,7 @@ public class HighlightUtil { } } - private static Map<Object, FigureState> figureState = new HashMap<Object, FigureState>(); + private static Map<Object, FigureState> figureState = new HashMap<>(); /** * Make a private instance, avoid highlight above highlight. @@ -67,7 +67,7 @@ public class HighlightUtil { } private static List<IFigure> getHighlightFigures(EditPart host) { - List<IFigure> figures = new ArrayList<IFigure>(); + List<IFigure> figures = new ArrayList<>(); if (host instanceof LifelineEditPart) { LifelineEditPart part = (LifelineEditPart) host; //figures.add(part.getPrimaryShape().getFigureLifelineNameContainerFigure()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/InteractionOperatorKindCompatibleMapping.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/InteractionOperatorKindCompatibleMapping.java index 5e4f63409e8..107c940e22a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/InteractionOperatorKindCompatibleMapping.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/InteractionOperatorKindCompatibleMapping.java @@ -10,7 +10,7 @@ public class InteractionOperatorKindCompatibleMapping { /** * Set the true if the kind of InteractionOperator supports multi operand */ - private static final Map<InteractionOperatorKind, Boolean> map = new HashMap<InteractionOperatorKind, Boolean>(); + private static final Map<InteractionOperatorKind, Boolean> map = new HashMap<>(); static { map.put(InteractionOperatorKind.SEQ_LITERAL, true); map.put(InteractionOperatorKind.ALT_LITERAL, true); 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 9f8fcf11eef..6cb03ccd05d 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 @@ -37,8 +37,8 @@ import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper; import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart.PreserveAnchorsPositionCommandEx; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart.PreserveAnchorsPositionCommandEx; import org.eclipse.uml2.uml.Interaction; import org.eclipse.uml2.uml.InteractionFragment; import org.eclipse.uml2.uml.Lifeline; @@ -55,9 +55,9 @@ public class LifelineCoveredByUpdater { protected GraphicalEditPart context; - protected Map<LifelineEditPart, Rectangle> lifelines = new HashMap<LifelineEditPart, Rectangle>(); + protected Map<LifelineEditPart, Rectangle> lifelines = new HashMap<>(); - protected HashMap<GraphicalEditPart, Rectangle> interactionFragments = new HashMap<GraphicalEditPart, Rectangle>(); + protected HashMap<GraphicalEditPart, Rectangle> interactionFragments = new HashMap<>(); protected TransactionalEditingDomain editingDomain; @@ -86,12 +86,12 @@ public class LifelineCoveredByUpdater { } if (editPart instanceof GraphicalEditPart) { EObject modelObject = ViewUtil.resolveSemanticElement((View) editPart.getModel()); - if (modelObject instanceof InteractionFragment + if (modelObject instanceof InteractionFragment && false == modelObject instanceof Interaction) { IFigure figure = editPart.getFigure(); Rectangle childBounds = figure.getBounds().getCopy(); figure.translateToAbsolute(childBounds); - interactionFragments.put((GraphicalEditPart) editPart, childBounds); + interactionFragments.put(editPart, childBounds); } } for (Object child : editPart.getChildren()) { @@ -117,8 +117,8 @@ public class LifelineCoveredByUpdater { return; } EList<InteractionFragment> coveredByLifelines = lifeline.getCoveredBys(); - Set<InteractionFragment> coveredByLifelinesToAdd = new LinkedHashSet<InteractionFragment>(); - Set<InteractionFragment> coveredByLifelinesToRemove = new LinkedHashSet<InteractionFragment>(); + Set<InteractionFragment> coveredByLifelinesToAdd = new LinkedHashSet<>(); + Set<InteractionFragment> coveredByLifelinesToRemove = new LinkedHashSet<>(); // Update height of Lifeline when coveredBy some InteractionFragments. int bottom = 0; for (Map.Entry<GraphicalEditPart, Rectangle> entry : interactionFragments.entrySet()) { @@ -132,10 +132,10 @@ public class LifelineCoveredByUpdater { 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/LifelineEditPartUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java index c9dc75ad4fe..0eb580bb384 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineEditPartUtil.java @@ -70,7 +70,7 @@ public class LifelineEditPartUtil { if (lifeline == null) { return Collections.emptyList(); } - List<ShapeNodeEditPart> executionSpecificationList = new ArrayList<ShapeNodeEditPart>(); + List<ShapeNodeEditPart> executionSpecificationList = new ArrayList<>(); for (Object obj : lifeline.getChildren()) { if (obj instanceof AbstractExecutionSpecificationEditPart) { executionSpecificationList.add((ShapeNodeEditPart) obj); @@ -89,7 +89,7 @@ public class LifelineEditPartUtil { if (lifeline == null) { return Collections.emptyList(); } - List<LifelineEditPart> propertyList = new ArrayList<LifelineEditPart>(); + List<LifelineEditPart> propertyList = new ArrayList<>(); for (Object obj : lifeline.getChildren()) { if (obj instanceof LifelineEditPart) { propertyList.add((LifelineEditPart) obj); @@ -115,7 +115,7 @@ public class LifelineEditPartUtil { * the remove {@link MessageCreateEditPart} * @return the command when the last create message is remove to a lifeline to move it up and resize it. * @since 4.0 - * + * */ public static Command getRestoreLifelinePositionOnMessageCreateRemovedCommand(final ConnectionEditPart editPart) { Command commands = null; @@ -147,7 +147,7 @@ public class LifelineEditPartUtil { * the remove {@link MessageCreateEditPart} * @return the command when the last delete message is remove to a lifeline to move it up and resize it. * @since 3.1 - * + * */ public static Command getRestoreLifelinePositionOnMessageDeleteRemovedCommand(final ConnectionEditPart editPart) { Command commands = null; @@ -176,14 +176,14 @@ public class LifelineEditPartUtil { /** * Get the list of previous {@link OccurrenceSpecification} on the {@link LifelineEditPart} according to the position. - * + * * @param position * The reference position. * @param lifelineEditPart * The lifeline edit part */ public static List<OccurrenceSpecification> getPreviousEventsFromPosition(final Point position, final LifelineEditPart lifelineEditPart) { - List<OccurrenceSpecification> previous = new ArrayList<OccurrenceSpecification>(); + List<OccurrenceSpecification> previous = new ArrayList<>(); DiagramEditPart diagramEditPart = getDiagramEditPart(lifelineEditPart); Lifeline lifeline = (Lifeline) lifelineEditPart.resolveSemanticElement(); try { @@ -210,7 +210,7 @@ public class LifelineEditPartUtil { /** * @since 3.1 - * + * */ public static boolean hasPreviousEvent(final Point position, final LifelineEditPart lifelineEditPart) { return !getPreviousEventsFromPosition(position, lifelineEditPart).isEmpty(); @@ -218,7 +218,7 @@ public class LifelineEditPartUtil { /** * @since 3.1 - * + * */ public static boolean hasNextEvent(final Point position, final LifelineEditPart lifelineEditPart) { return !getNextEventsFromPosition(position, lifelineEditPart).isEmpty(); @@ -226,7 +226,7 @@ public class LifelineEditPartUtil { /** * Get the list of previous {@link OccurrenceSpecification} on the {@link LifelineEditPart} according to the position. - * + * * @param position * The reference position. * @param lifelineEditPart @@ -234,7 +234,7 @@ public class LifelineEditPartUtil { * @since 3.1 */ public static List<OccurrenceSpecification> getNextEventsFromPosition(final Point position, final LifelineEditPart lifelineEditPart) { - List<OccurrenceSpecification> previous = new ArrayList<OccurrenceSpecification>(); + List<OccurrenceSpecification> previous = new ArrayList<>(); DiagramEditPart diagramEditPart = getDiagramEditPart(lifelineEditPart); Lifeline lifeline = (Lifeline) lifelineEditPart.resolveSemanticElement(); try { @@ -262,7 +262,7 @@ public class LifelineEditPartUtil { /** * Walks up the editpart hierarchy to find and return the * <code>TopGraphicEditPart</code> instance. - * + * * @since 3.1 */ public static DiagramEditPart getDiagramEditPart(EditPart editPart) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java index 24594cf111e..6da4a2ab97a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java @@ -48,12 +48,11 @@ import org.eclipse.gmf.runtime.notation.Size; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.CombinedFragment; @@ -106,7 +105,7 @@ public class LifelineHeadUtil { if (lifeline == null || resized == 0) { return; } - List<LifelineEditPart> toMovedLifelines = new ArrayList<LifelineEditPart>(); + List<LifelineEditPart> toMovedLifelines = new ArrayList<>(); collectLifelines(toMovedLifelines, lifeline); List<ShapeNodeEditPart> children = LifelineEditPartUtil.getChildShapeNodeEditPart(lifeline); for (ShapeNodeEditPart child : children) { @@ -226,7 +225,7 @@ public class LifelineHeadUtil { if (SequenceUtil.isCreateMessageEndLifeline(lifeline)) { return; } - List<LifelineEditPart> toMovedLifelines = new ArrayList<LifelineEditPart>(); + List<LifelineEditPart> toMovedLifelines = new ArrayList<>(); collectLifelines(toMovedLifelines, lifeline); List<ShapeNodeEditPart> children = LifelineEditPartUtil.getChildShapeNodeEditPart(lifeline); for (ShapeNodeEditPart child : children) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java index b1ae2883c3b..01a8378d51b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineLabelHelper.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.ValueSpecification; public class LifelineLabelHelper extends StereotypedElementLabelHelper { public static final String SHOW_REPRESENT_NAME = "representsName"; - + public static final String SHOW_REPRESENT_SELECTOR = "representsSelector"; public static final String SHOW_REPRESENT_TYPE = "representsType"; @@ -66,7 +66,7 @@ public class LifelineLabelHelper extends StereotypedElementLabelHelper { } /** Map for masks */ - protected final Map<String, String> masks = new HashMap<String, String>(); + protected final Map<String, String> masks = new HashMap<>(); /** * Creates a new Operation label helper. 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 0f12f2bb050..2c799ee27c1 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 @@ -151,7 +151,7 @@ public class LifelineMessageCreateHelper { } public static List<?> getIncomingMessageCreate(EditPart target) { - List<EditPart> create = new ArrayList<EditPart>(); + List<EditPart> create = new ArrayList<>(); if (target instanceof LifelineEditPart) { List<?> list = ((LifelineEditPart) target).getTargetConnections(); if (list != null && list.size() > 0) { 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 index 412b33ab84e..19e680f7d4d 100644 --- 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 @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2014-2017 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 @@ -87,11 +87,11 @@ public class LifelineMessageDeleteHelper { /** * Get the list of incoming message delete of an edit part. - * + * * @since 4.0 */ public static List<?> getIncomingMessageDelete(final EditPart target) { - List<EditPart> create = new ArrayList<EditPart>(); + List<EditPart> create = new ArrayList<>(); if (target instanceof LifelineEditPart) { List<?> list = ((LifelineEditPart) target).getTargetConnections(); if (list != null && list.size() > 0) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineModelChildrenHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineModelChildrenHelper.java index 21ee4ec37ff..818c7b59cdc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineModelChildrenHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineModelChildrenHelper.java @@ -33,8 +33,8 @@ public class LifelineModelChildrenHelper { } private static List<View> sortChildren(List<View> children) { - List<View> result = new ArrayList<View>(); - List<View> original = new ArrayList<View>(children); + List<View> result = new ArrayList<>(); + List<View> original = new ArrayList<>(children); for (Iterator<View> iterator = original.iterator(); iterator.hasNext();) { View view = iterator.next(); EObject elt = ViewUtil.resolveSemanticElement(view); @@ -51,8 +51,8 @@ public class LifelineModelChildrenHelper { if (executionSpecifications.isEmpty()) { return executionSpecifications; } - List<View> views = new ArrayList<View>(executionSpecifications); - List<View> result = new ArrayList<View>(executionSpecifications.size()); + List<View> views = new ArrayList<>(executionSpecifications); + List<View> result = new ArrayList<>(executionSpecifications.size()); int minX = -1; for (View view : views) { Rectangle rect = getViewBounds(view); @@ -60,7 +60,7 @@ public class LifelineModelChildrenHelper { minX = rect.x; } } - List<View> firstLevelViews = new ArrayList<View>(); + List<View> firstLevelViews = new ArrayList<>(); for (View view : views) { Rectangle rect = getViewBounds(view); if (rect.x >= minX - 2 && rect.x <= minX + 2) { @@ -69,9 +69,9 @@ public class LifelineModelChildrenHelper { } List<View> insertViews = doSortVertically(firstLevelViews); for (View view : insertViews) { - doInsert(view, result, views, new ArrayList<View>(insertViews)); + doInsert(view, result, views, new ArrayList<>(insertViews)); } - List<View> remains = new ArrayList<View>(); + List<View> remains = new ArrayList<>(); for (View view : views) { if (!result.contains(view)) { remains.add(view); @@ -79,7 +79,7 @@ public class LifelineModelChildrenHelper { } insertViews = doSortVertically(remains); for (View view : remains) { - doInsert(view, result, views, new ArrayList<View>(insertViews)); + doInsert(view, result, views, new ArrayList<>(insertViews)); } return result; } @@ -91,7 +91,7 @@ public class LifelineModelChildrenHelper { result.add(view); } ignoreViews.add(view); - List<View> newLevelViews = new ArrayList<View>(); + List<View> newLevelViews = new ArrayList<>(); for (View v : allViews) { if (ignoreViews.contains(v)) { continue; @@ -110,7 +110,7 @@ public class LifelineModelChildrenHelper { } private static List<View> doSortVertically(List<View> views) { - List<View> insertViews = new ArrayList<View>(); + List<View> insertViews = new ArrayList<>(); for (int i = 0; i < views.size(); i++) { View current = views.get(i); Rectangle r1 = getViewBounds(current); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineResizeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineResizeHelper.java index a79098fb550..b9521df1bfb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineResizeHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineResizeHelper.java @@ -85,7 +85,7 @@ public class LifelineResizeHelper { return object; } if (adapter != null) { - return (View) adapter.getAdapter(View.class); + return adapter.getAdapter(View.class); } return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LinkRouteModelElementFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LinkRouteModelElementFactory.java index d160dda59b6..62c89fdb16d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LinkRouteModelElementFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LinkRouteModelElementFactory.java @@ -49,7 +49,7 @@ public class LinkRouteModelElementFactory extends AnnotationModelElementFactory public static final String AUTOMATIC = "Automatic"; - public static final Map<Object, LinkRouteModelElement> elements = new HashMap<Object, LinkRouteModelElement>(); + public static final Map<Object, LinkRouteModelElement> elements = new HashMap<>(); @Override protected AnnotationModelElement doCreateFromSource(Object sourceElement, DataContextElement context) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LogOptions.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LogOptions.java index fe32a0abc80..e0b0f89bb72 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LogOptions.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LogOptions.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -19,10 +19,10 @@ package org.eclipse.papyrus.uml.diagram.sequence.util; */ public class LogOptions { - /** + /** * tracing option for general sequence diagram debug */ - public static String SEQUENCE_DEBUG = "SequenceDebug"; //$NON-NLS-1$ + public static String SEQUENCE_DEBUG = "SequenceDebug"; //$NON-NLS-1$ /** * tracing option for sequence diagram grid debug */ @@ -31,8 +31,8 @@ public class LogOptions { * tracing option for sequence diagram util debug */ public static String SEQUENCE_DEBUG_UTIL = "SequenceDebugUtil"; //$NON-NLS-1$ - - + + } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java index 258448ae062..5d43b6d3dc6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/MessageAnchorRepairer.java @@ -31,8 +31,8 @@ import org.eclipse.gmf.runtime.notation.IdentityAnchor; import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; /** * @author Jin Liu (jin.liu@soyatec.com) 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 998756461ed..f6c1fd153a0 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 @@ -15,7 +15,6 @@ package org.eclipse.papyrus.uml.diagram.sequence.util; import org.eclipse.emf.common.util.EList; -import org.eclipse.papyrus.uml.diagram.sequence.CustomMessages; import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.uml2.uml.Element; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/NotificationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/NotificationHelper.java index ca94ac539c1..1e36439d76b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/NotificationHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/NotificationHelper.java @@ -23,7 +23,7 @@ public class NotificationHelper { private UIAdapterImpl modelListener; - private List<Notifier> listeners = new ArrayList<Notifier>(); + private List<Notifier> listeners = new ArrayList<>(); public NotificationHelper(UIAdapterImpl modelListener) { this.modelListener = modelListener; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java index 500e5109a5d..17abc328872 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java @@ -115,8 +115,8 @@ public class OccurrenceSpecificationHelper { if (canBeRemoved(oldEnd, newEnd, isStart)) { // "coveredBy" is bidirectional so must be cleaned prior to deletion of element itself // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=451320 - oldEnd.getCovereds().clear(); - + oldEnd.getCovereds().clear(); + EcoreUtil.remove(oldEnd); } return true; 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 31a6dc27471..ba34049f660 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 @@ -778,7 +778,7 @@ public class OccurrenceSpecificationMoveHelper { } CompoundCommand globalCmd = new CompoundCommand(); globalCmd.add(command); - List<EditPart> notToMoveEditParts = new ArrayList<EditPart>(1); + List<EditPart> notToMoveEditParts = new ArrayList<>(1); notToMoveEditParts.add(request.getConnectionEditPart()); // move time related elements linked with the event LifelineEditPart lifelinePart = SequenceUtil.getParentLifelinePart(connectableNode); @@ -842,7 +842,7 @@ public class OccurrenceSpecificationMoveHelper { int startY = newBounds.getTop().y; OccurrenceSpecification finish = ((ExecutionSpecification) execSpec).getFinish(); int finishY = newBounds.getBottom().y; - List<EditPart> notToMoveEditParts = new ArrayList<EditPart>(1); + List<EditPart> notToMoveEditParts = new ArrayList<>(1); notToMoveEditParts.add(executionSpecificationEP); // Fixed bug for moving ExecutionSpecification, since fixed bug(https://bugs.eclipse.org/bugs/show_bug.cgi?id=402975) // The start and finish event may be a MessageOccurrenceSpecification, in case, we need ignore the message when moving. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java index 3b4c44677d5..c976fb6d7b2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java @@ -674,7 +674,7 @@ public class OperandBoundsComputeHelper { } } // 3. Compute min area for all blocks, this will remove all margins. - Map<OperandBlock, Rectangle> constraints = new HashMap<OperandBoundsComputeHelper.OperandBlock, Rectangle>(); + Map<OperandBlock, Rectangle> constraints = new HashMap<>(); OperandBlock topBlock = operandBlocks.get(0); Rectangle minArea = new Rectangle(topBlock.getBounds()); minArea.height += EXECUTION_VERTICAL_MARGIN;// margin @@ -724,7 +724,7 @@ public class OperandBoundsComputeHelper { View model = (View) source.getModel(); EObject element = model.getElement(); if (toCheckExecutions.contains(element)) { - List<ExecutionSpecification> myCheckingList = new ArrayList<ExecutionSpecification>(toCheckExecutions); + List<ExecutionSpecification> myCheckingList = new ArrayList<>(toCheckExecutions); myCheckingList.remove(element); Rectangle rect = getExecutionGroupBounds(source, myCheckingList); groupRect.union(rect); @@ -732,7 +732,7 @@ public class OperandBoundsComputeHelper { } List<ShapeNodeEditPart> affixedExecutionSpecificationEditParts = OLDLifelineXYLayoutEditPolicy.getAffixedExecutionSpecificationEditParts((ShapeNodeEditPart) currentExecutionPart); for (ShapeNodeEditPart shapeNodeEditPart : affixedExecutionSpecificationEditParts) { - List<ExecutionSpecification> myCheckingList = new ArrayList<ExecutionSpecification>(toCheckExecutions); + List<ExecutionSpecification> myCheckingList = new ArrayList<>(toCheckExecutions); myCheckingList.remove(shapeNodeEditPart); Rectangle rect = getExecutionGroupBounds(shapeNodeEditPart, myCheckingList); groupRect.union(rect); @@ -755,7 +755,7 @@ public class OperandBoundsComputeHelper { newArea.translate(figure.getParent().getBounds().getLocation()); layout.layout(newArea, movedY > 0 ? true : false); - final Map<OperandBlock, Integer> blockToMove = new HashMap<OperandBoundsComputeHelper.OperandBlock, Integer>(); + final Map<OperandBlock, Integer> blockToMove = new HashMap<>(); for (OperandBlock blk : operandBlocks) { int moveDelta = layout.getMoveDelta(blk); if (moveDelta == 0) { @@ -792,7 +792,7 @@ public class OperandBoundsComputeHelper { return null; } - final Map<OperandBlock, Integer> blockToMove = new HashMap<OperandBoundsComputeHelper.OperandBlock, Integer>(); + final Map<OperandBlock, Integer> blockToMove = new HashMap<>(); for (OperandBlock blk : operandBlocks) { blockToMove.put(blk, movedY); } @@ -1110,11 +1110,11 @@ public class OperandBoundsComputeHelper { } private static List<OperandBlock> getOperandBlocks(InteractionOperandEditPart editPart) { - List<OperandBlock> blocks = new ArrayList<OperandBoundsComputeHelper.OperandBlock>(); + List<OperandBlock> blocks = new ArrayList<>(); if (editPart != null) { InteractionOperand interactionOperand = (InteractionOperand) editPart.resolveSemanticElement(); - Set<ExecutionSpecification> executions = new HashSet<ExecutionSpecification>(); - Set<Message> messages = new HashSet<Message>(); + Set<ExecutionSpecification> executions = new HashSet<>(); + Set<Message> messages = new HashSet<>(); EList<InteractionFragment> fragments = interactionOperand.getFragments(); for (InteractionFragment fragment : fragments) { if (fragment instanceof ExecutionSpecification) { @@ -1223,7 +1223,7 @@ public class OperandBoundsComputeHelper { return; } children.add(child); - List<ExecutionSpecification> toCheckExecutions = new ArrayList<ExecutionSpecification>(executions); + List<ExecutionSpecification> toCheckExecutions = new ArrayList<>(executions); toCheckExecutions.remove(child.resolveSemanticElement()); Set<ShapeNodeEditPart> executionGroups = getExecutionGroups(child, toCheckExecutions); if (executionGroups != null && !executionGroups.isEmpty()) { @@ -1267,7 +1267,7 @@ public class OperandBoundsComputeHelper { if (toCheckExecutions == null || toCheckExecutions.isEmpty()) { return null; } - Set<ShapeNodeEditPart> executionGroups = new HashSet<ShapeNodeEditPart>(); + Set<ShapeNodeEditPart> executionGroups = new HashSet<>(); List connections = new ArrayList(); connections.addAll(executionEditPart.getSourceConnections()); connections.addAll(executionEditPart.getTargetConnections()); @@ -1281,7 +1281,7 @@ public class OperandBoundsComputeHelper { EObject element = model.getElement(); if (toCheckExecutions.contains(element)) { executionGroups.add((ShapeNodeEditPart) source); - List<ExecutionSpecification> myCheckingList = new ArrayList<ExecutionSpecification>(toCheckExecutions); + List<ExecutionSpecification> myCheckingList = new ArrayList<>(toCheckExecutions); myCheckingList.remove(element); Set<ShapeNodeEditPart> myGroups = getExecutionGroups((ShapeNodeEditPart) source, myCheckingList); if (myGroups != null) { @@ -1293,7 +1293,7 @@ public class OperandBoundsComputeHelper { } public List<ShapeNodeEditPart> getShapeNodeChildren() { - List<ShapeNodeEditPart> shapes = new ArrayList<ShapeNodeEditPart>(); + List<ShapeNodeEditPart> shapes = new ArrayList<>(); List<EditPart> children = getChildren(); for (EditPart editPart : children) { if (editPart instanceof ShapeNodeEditPart) { @@ -1343,7 +1343,7 @@ public class OperandBoundsComputeHelper { private static abstract class OperandBlock { - protected List<EditPart> children = new ArrayList<EditPart>(); + protected List<EditPart> children = new ArrayList<>(); public boolean contains(EditPart child) { return children.contains(child); @@ -1354,7 +1354,7 @@ public class OperandBoundsComputeHelper { } public List<EditPart> getChildren() { - return new ArrayList<EditPart>(children); + return new ArrayList<>(children); } protected abstract Rectangle computeBounds(); @@ -1362,11 +1362,11 @@ public class OperandBoundsComputeHelper { private static class OperandBlockLayout { - private Map<OperandBlock, Rectangle> constraints = new HashMap<OperandBoundsComputeHelper.OperandBlock, Rectangle>(); + private Map<OperandBlock, Rectangle> constraints = new HashMap<>(); - private List<OperandBlock> fBlocks = new ArrayList<OperandBoundsComputeHelper.OperandBlock>(); + private List<OperandBlock> fBlocks = new ArrayList<>(); - private List<Rectangle> validBlocks = new ArrayList<Rectangle>(); + private List<Rectangle> validBlocks = new ArrayList<>(); /** * Constructor. @@ -1464,7 +1464,7 @@ public class OperandBoundsComputeHelper { constraints.put(invalidBlock, newRect); validBlocks.add(newRect); - List<OperandBlock> remainBlocks = new ArrayList<OperandBoundsComputeHelper.OperandBlock>(blocks); + List<OperandBlock> remainBlocks = new ArrayList<>(blocks); remainBlocks.remove(invalidBlock); return doLayout(area, remainBlocks, moveDown); } @@ -1507,7 +1507,7 @@ public class OperandBoundsComputeHelper { /** * Constructor. - * + * * @param domain * @param label * @param affectedFiles @@ -1528,7 +1528,7 @@ public class OperandBoundsComputeHelper { @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - List<OperandBlock> blocks = new ArrayList<OperandBoundsComputeHelper.OperandBlock>(blockToMove.keySet()); + List<OperandBlock> blocks = new ArrayList<>(blockToMove.keySet()); Collections.sort(blocks, new Comparator<OperandBlock>() { @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperationUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperationUtil.java index 15afcc8f7d8..6e51c352cc0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperationUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperationUtil.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; 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 c3ef3796d71..df545aacb2e 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 @@ -46,7 +46,7 @@ public class ReconnectMessageHelper { * @param message */ public static void updateMessage(Message message) { - + } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionCommandStackListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionCommandStackListener.java index 8d5213c7b9f..832c6db0378 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionCommandStackListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionCommandStackListener.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Patrick Tessier (CEA LIST) - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -22,7 +22,7 @@ import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener; /** * this class is to delegate all notification in all trre of an eObject to a notofication listener * for example an editpolicy - * + * * @since 4.0 */ public class RedirectionCommandStackListener implements CommandStackEventListener { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionContentAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionContentAdapter.java index 21a8ba70ac5..41b867e314c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionContentAdapter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionContentAdapter.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Patrick Tessier (CEA LIST) - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener; /** * this class is to delegate all notification in all trre of an eObject to a notofication listener * for example an editpolicy - * + * * @since 4.0 */ public class RedirectionContentAdapter extends EContentAdapter { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionOperationListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionOperationListener.java index b0342f13415..c5947e041de 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionOperationListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/RedirectionOperationListener.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * Patrick Tessier (CEA LIST) - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener; /** * this class is to delegate all of an operation History about done operation to for an example an editpolicy - * + * * @since 4.0 */ public class RedirectionOperationListener implements IOperationHistoryListener { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectMessagesEditPartTracker.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectMessagesEditPartTracker.java index 6e187d451ef..aea60ec01e7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectMessagesEditPartTracker.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectMessagesEditPartTracker.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,7 +8,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; @@ -88,7 +88,7 @@ public class SelectMessagesEditPartTracker extends SelectSeveralLinksEditPartTra // and find the MinDistancetop (maximum mouvment without reorder to the top) and the MinDistancebottom (maximum distance without reorder to the bottom) - ArrayList<GraphicalEditPart> nodeEditPart = new ArrayList<GraphicalEditPart>(); + ArrayList<GraphicalEditPart> nodeEditPart = new ArrayList<>(); List selectedEditparts = getOperationSet(); @@ -102,7 +102,7 @@ public class SelectMessagesEditPartTracker extends SelectSeveralLinksEditPartTra } // 2. take all messages between this nodes - ArrayList<AbstractMessageEditPart> messageEditPartList = new ArrayList<AbstractMessageEditPart>(); + ArrayList<AbstractMessageEditPart> messageEditPartList = new ArrayList<>(); for (GraphicalEditPart anodeEditPart : nodeEditPart) { for (Object connection : anodeEditPart.getSourceConnections()) { @@ -165,9 +165,10 @@ public class SelectMessagesEditPartTracker extends SelectSeveralLinksEditPartTra /* * (non-Javadoc) - * + * * @see org.eclipse.gef.Tool#deactivate() */ + @Override public void deactivate() { PlatformUI.getWorkbench().getDisplay().removeFilter(SWT.KeyUp, KeyDownListener); PlatformUI.getWorkbench().getDisplay().removeFilter(SWT.KeyUp, KeyUPListener); @@ -177,6 +178,7 @@ public class SelectMessagesEditPartTracker extends SelectSeveralLinksEditPartTra /** * @see org.eclipse.gef.tools.SimpleDragTracker#updateSourceRequest() */ + @Override protected void updateSourceRequest() { if (!allowReoder) { Dimension computedDelta = getLocation().getDifference(getStartLocation()); @@ -200,6 +202,7 @@ public class SelectMessagesEditPartTracker extends SelectSeveralLinksEditPartTra super.updateSourceRequest(); } + @Override protected Dimension getDragMoveDelta() { if (delta == null) { return getLocation().getDifference(getStartLocation()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectOrCreateDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectOrCreateDialog.java index 21a62c6e2fa..ec897788452 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectOrCreateDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectOrCreateDialog.java @@ -448,8 +448,8 @@ public class SelectOrCreateDialog extends FormDialog { } private Set<Signal> getAllSignals(List<Type> types) { - Set<Signal> accept = new HashSet<Signal>(); - Set<Classifier> collected = new HashSet<Classifier>(); + Set<Signal> accept = new HashSet<>(); + Set<Classifier> collected = new HashSet<>(); for (Type t : types) { if (t instanceof Classifier) { Classifier c = (Classifier) t; @@ -469,15 +469,18 @@ public class SelectOrCreateDialog extends FormDialog { for (org.eclipse.uml2.uml.Interface intf : comp.getProvideds()) { collectSignals(intf, accept, collected); } - + for (Property prop : comp.getAllAttributes()) { - if (!(prop instanceof Port)) + if (!(prop instanceof Port)) { continue; + } VisibilityKind v = prop.getVisibility(); - if (v == VisibilityKind.PRIVATE_LITERAL) + if (v == VisibilityKind.PRIVATE_LITERAL) { continue; - if (v == VisibilityKind.PACKAGE_LITERAL && (prop.getClass() == null || prop.getClass_().getNamespace() != c)) + } + if (v == VisibilityKind.PACKAGE_LITERAL && (prop.getClass() == null || prop.getClass_().getNamespace() != c)) { continue; + } Port port = (Port)prop; for (org.eclipse.uml2.uml.Interface intf : port.getProvideds()) { collectSignals(intf, accept, collected); @@ -491,7 +494,7 @@ public class SelectOrCreateDialog extends FormDialog { } } } - + if (c instanceof org.eclipse.uml2.uml.Class) { EList<Property> attrs = c.getAllAttributes(); for (Property p : attrs) { @@ -510,7 +513,7 @@ public class SelectOrCreateDialog extends FormDialog { return elements.toArray(new EObject[elements.size()]); } Set<Signal> accept = getAllSignals(types); - List<EObject> result = new ArrayList<EObject>(); + List<EObject> result = new ArrayList<>(); for (EObject o : elements) { if (!(o instanceof Signal)) { result.add(o); 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 93fa051d118..1b24fb005a7 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 @@ -44,12 +44,12 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand; import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService; -import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice; -import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ObservationLinkEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDLifelineXYLayoutEditPolicy; @@ -103,7 +103,7 @@ public class SequenceDeleteHelper { DestroyElementRequest myReq = new DestroyElementRequest(editingDomain, dos.getMessage(), false); deleteViewsCmd.add(new ICommandProxy(new DestroyElementCommand(myReq))); } - deleteViewsCmd.add(((OLDLifelineEditPart)lifelinePart).getAlignLifelineBottomToParentCommand(null, true)); + deleteViewsCmd.add(((OLDLifelineEditPart)lifelinePart).getAlignLifelineBottomToParentCommand(null, true)); } } } @@ -288,7 +288,7 @@ public class SequenceDeleteHelper { deleteElementsCommand.add(new ICommandProxy(new DestroyElementCommand(delEnd))); destroyMessageEvents(deleteElementsCommand, host, req.getEditingDomain()); if (host.getParent() instanceof LifelineEditPart) { - List<OccurrenceSpecification> oss = new ArrayList<OccurrenceSpecification>(); + List<OccurrenceSpecification> oss = new ArrayList<>(); oss.add(es.getStart()); oss.add(es.getFinish()); SequenceDeleteHelper.addDeleteRelatedTimeObservationLinkCommand(deleteElementsCommand, req.getEditingDomain(), (LifelineEditPart) host.getParent(), oss, true); @@ -304,7 +304,7 @@ public class SequenceDeleteHelper { static void destroyMessageEvents(CompoundCommand deleteElementsCommand, List<?> list, TransactionalEditingDomain transactionalEditingDomain) { for (Object o : list) { if (o instanceof ConnectionEditPart) { - ConnectionEditPart connectionEP = (ConnectionEditPart) o; + ConnectionEditPart connectionEP = (ConnectionEditPart) o; EObject model = ((ConnectionEditPart) o).resolveSemanticElement(); if (model instanceof Message) { Message message = (Message) model; @@ -377,7 +377,7 @@ public class SequenceDeleteHelper { * @param deleteRelatedEvent */ private static void addDeleteRelatedTimeObservationLinkCommand(CompoundCommand deleteViewsCmd, TransactionalEditingDomain editingDomain, OccurrenceSpecification os, LifelineEditPart srcLifelinePart, boolean deleteRelatedEvent) { - List<OccurrenceSpecification> oss = new ArrayList<OccurrenceSpecification>(); + List<OccurrenceSpecification> oss = new ArrayList<>(); oss.add(os); addDeleteRelatedTimeObservationLinkCommand(deleteViewsCmd, editingDomain, srcLifelinePart, oss, deleteRelatedEvent); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java index b90d585df22..2a3442fcaa5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDiagramConstants.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 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 @@ -8,13 +8,13 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; /** - * @author Céline JANSSENS + * @author C�line JANSSENS * */ public interface SequenceDiagramConstants { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java index 5de973d7235..e27297a95c5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java @@ -74,7 +74,7 @@ public class SequenceLinkMappingHelper implements ILinkMappingHelper { if (messageEnd instanceof MessageOccurrenceSpecification) { return ((MessageOccurrenceSpecification) messageEnd).getCovereds(); } else if (messageEnd instanceof Gate) { - ArrayList<Element> sources = new ArrayList<Element>(); + ArrayList<Element> sources = new ArrayList<>(); sources.add((messageEnd)/* .getOwner() */);// The gate view is available now. return sources; } @@ -109,7 +109,7 @@ public class SequenceLinkMappingHelper implements ILinkMappingHelper { if (messageEnd instanceof MessageOccurrenceSpecification) { return ((MessageOccurrenceSpecification) messageEnd).getCovereds(); } else if (messageEnd instanceof Gate) { - ArrayList<Element> sources = new ArrayList<Element>(); + ArrayList<Element> sources = new ArrayList<>(); sources.add((messageEnd)/* .getOwner() */);// The gate view is available now. return sources; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceRequestConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceRequestConstant.java index 798c860de4c..076c4b70e83 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceRequestConstant.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceRequestConstant.java @@ -15,9 +15,10 @@ package org.eclipse.papyrus.uml.diagram.sequence.util; /** * Constants used in the sequence diagram - * + * * @deprecated */ +@Deprecated public interface SequenceRequestConstant { /** A constant representing the container of an interactionFragment. It can be an Interaction or an InteractionOperand */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java index f4191c882f1..e037d703086 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java @@ -207,8 +207,8 @@ public class SequenceUtil { return null; } InteractionFragment container = null; - Set<InteractionFragment> coveredInteractions = new HashSet<InteractionFragment>(); - Set<CombinedFragment> coveredCF = new HashSet<CombinedFragment>(); + Set<InteractionFragment> coveredInteractions = new HashSet<>(); + Set<CombinedFragment> coveredCF = new HashSet<>(); Set<Entry<Object, EditPart>> allEditPartEntries = hostEditPart.getViewer().getEditPartRegistry().entrySet(); for (Entry<Object, EditPart> epEntry : allEditPartEntries) { EditPart ep = epEntry.getValue(); @@ -615,7 +615,7 @@ public class SequenceUtil { return null; } // Map referencing children occurrences by their location on the lifeline. - Map<Point, List<OccurrenceSpecification>> occurrences = new HashMap<Point, List<OccurrenceSpecification>>(); + Map<Point, List<OccurrenceSpecification>> occurrences = new HashMap<>(); // //Find message end directly. // EditPart editPart = lifelineEditPart.getViewer().findObjectAt(location); // if (editPart instanceof MessageEndEditPart){ @@ -928,7 +928,7 @@ public class SequenceUtil { if (occurrenceSpecificationList instanceof List<?>) { List<?> list = (List<?>) occurrenceSpecificationList; if (!list.isEmpty()) { - List<OccurrenceSpecification> newList = new ArrayList<OccurrenceSpecification>(list.size()); + List<OccurrenceSpecification> newList = new ArrayList<>(list.size()); for (Object elt : list) { if (elt instanceof OccurrenceSpecification) { newList.add((OccurrenceSpecification) elt); @@ -986,7 +986,7 @@ public class SequenceUtil { } public static List<Element> getCombinedFragmentAssociatedElement(CombinedFragment cf) { - List<Element> elements = new LinkedList<Element>(); + List<Element> elements = new LinkedList<>(); for (InteractionOperand operand : cf.getOperands()) { // Add all elements related to this operand elements.addAll(getInteractionOperandAssociatedElement(operand)); @@ -997,7 +997,7 @@ public class SequenceUtil { } public static List<Element> getInteractionOperandAssociatedElement(InteractionOperand interactionOperand) { - List<Element> elements = new LinkedList<Element>(); + List<Element> elements = new LinkedList<>(); for (InteractionFragment itf : interactionOperand.getFragments()) { if (itf instanceof CombinedFragment) { // add the combinedFragment @@ -1035,7 +1035,7 @@ public class SequenceUtil { @SuppressWarnings("unchecked") public static Set<Lifeline> getCoveredLifelines(Rectangle selectionRect, EditPart hostEditPart) { - Set<Lifeline> coveredLifelines = new HashSet<Lifeline>(); + Set<Lifeline> coveredLifelines = new HashSet<>(); // retrieve all the edit parts in the registry Set<Entry<Object, EditPart>> allEditPartEntries = hostEditPart.getViewer().getEditPartRegistry().entrySet(); for (Entry<Object, EditPart> epEntry : allEditPartEntries) { @@ -1069,9 +1069,9 @@ public class SequenceUtil { */ @SuppressWarnings("unchecked") public static Set<InteractionFragment> getCoveredInteractionFragments(Rectangle selectionRect, EditPart hostEditPart, Set<InteractionFragment> ignoreSet) { - Set<InteractionFragment> coveredInteractionFragments = new HashSet<InteractionFragment>(); + Set<InteractionFragment> coveredInteractionFragments = new HashSet<>(); if (ignoreSet == null) { - ignoreSet = new HashSet<InteractionFragment>(); + ignoreSet = new HashSet<>(); } // retrieve all the edit parts in the registry Set<Entry<Object, EditPart>> allEditPartEntries = hostEditPart.getViewer().getEditPartRegistry().entrySet(); @@ -1265,7 +1265,7 @@ public class SequenceUtil { // Rectangle bottom = new Rectangle(xCenter, absoluteNewBounds.bottom(), 0, 0); // // // associate es with its bounds, and start and finish event with the top and bottom of the bounds - HashMap<InteractionFragment, Rectangle> iftToCheckForUpdate = new HashMap<InteractionFragment, Rectangle>(); + HashMap<InteractionFragment, Rectangle> iftToCheckForUpdate = new HashMap<>(); // // ExecutionSpecification es = (ExecutionSpecification)executionSpecificationEP.resolveSemanticElement(); iftToCheckForUpdate.put(movedMos, new Rectangle(newLocation, new Dimension())); @@ -1345,7 +1345,7 @@ public class SequenceUtil { Rectangle top = new Rectangle(xCenter, absoluteNewBounds.y, 0, 0); Rectangle bottom = new Rectangle(xCenter, absoluteNewBounds.bottom(), 0, 0); // associate es with its bounds, and start and finish event with the top and bottom of the bounds - HashMap<InteractionFragment, Rectangle> iftToCheckForUpdate = new HashMap<InteractionFragment, Rectangle>(); + HashMap<InteractionFragment, Rectangle> iftToCheckForUpdate = new HashMap<>(); ExecutionSpecification es = (ExecutionSpecification) executionSpecificationEP.resolveSemanticElement(); iftToCheckForUpdate.put(es, absoluteNewBounds); iftToCheckForUpdate.put(es.getStart(), top); @@ -1607,7 +1607,7 @@ public class SequenceUtil { * @return List<TimeObservationLabelEditPart> */ public static List<TimeObservationLabelEditPart> findOccurenceSpecificationRelatedTimeObservationPart(LifelineEditPart lifelinePart, List<OccurrenceSpecification> oss) { - List<TimeObservationLabelEditPart> list = new ArrayList<TimeObservationLabelEditPart>(); + List<TimeObservationLabelEditPart> list = new ArrayList<>(); if (oss == null || oss.size() == 0) { return list; } @@ -1638,7 +1638,7 @@ public class SequenceUtil { * @return List<TimeObservationLabelEditPart> */ public static List<TimeObservationLabelEditPart> findOccurenceSpecificationRelatedTimeObservationPart(LifelineEditPart lifelinePart, OccurrenceSpecification os) { - List<OccurrenceSpecification> oss = new ArrayList<OccurrenceSpecification>(); + List<OccurrenceSpecification> oss = new ArrayList<>(); oss.add(os); return findOccurenceSpecificationRelatedTimeObservationPart(lifelinePart, oss); } @@ -1702,12 +1702,12 @@ public class SequenceUtil { /** * update the bounds of the rectangle to snap to grid * Snap is done with screen position. - * + * * @param editPart * the referential edit part * @param bounds * the bounds to snap - * + * */ public static PrecisionRectangle getSnappedBounds(final EditPart editPart, final Rectangle bounds) { PrecisionRectangle baseRect = new PrecisionRectangle(bounds); @@ -1724,12 +1724,12 @@ public class SequenceUtil { /** * update the bounds of the rectangle to snap to grid. * Snap is done with screen position. - * + * * @param editPart * the referential edit part * @param location * the location to snap - * + * */ public static PrecisionPoint getSnappedLocation(final EditPart editPart, final Point location) { PrecisionPoint baseRect = new PrecisionPoint(location); @@ -1745,14 +1745,14 @@ public class SequenceUtil { /** * This allows to get life lines from an element in an interaction. - * + * * @param editPart * The initial edit part from which one search the lifelines. * @return The existing lifelines. * @since 5.0 */ public static Set<LifelineEditPart> getLifeLinesFromEditPart(final EditPart editPart) { - final Set<LifelineEditPart> lifeLines = new HashSet<LifelineEditPart>(); + final Set<LifelineEditPart> lifeLines = new HashSet<>(); final EditPart interactionCompartment = getInteractionCompartment(editPart); if (null != interactionCompartment) { @@ -1775,7 +1775,7 @@ public class SequenceUtil { */ public static EditPart getInteractionCompartment(final EditPart editPart) { EditPart currentEditPart = editPart; - + if(editPart instanceof AbstractMessageEditPart) { if(((AbstractMessageEditPart)editPart).getSource() instanceof LifelineEditPart) { currentEditPart = ((AbstractMessageEditPart)editPart).getSource(); @@ -1783,7 +1783,7 @@ public class SequenceUtil { currentEditPart = ((AbstractMessageEditPart)editPart).getTarget(); } } - + while (currentEditPart != null && !(currentEditPart instanceof InteractionInteractionCompartmentEditPart)) { currentEditPart = currentEditPart.getParent(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SignalUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SignalUtil.java index ed215584545..5f5318f92de 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SignalUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SignalUtil.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 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 @@ -9,7 +9,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.util; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java index 3eba6003378..d42154efaba 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/TooltipUtil.java @@ -70,7 +70,7 @@ public class TooltipUtil { public static final String TOOLTIP_ROLE = "tooltip Edit Policy"; - private static final List<EClass> ELEMENT_SUPPORT_TOOLTIPS = new ArrayList<EClass>(); + private static final List<EClass> ELEMENT_SUPPORT_TOOLTIPS = new ArrayList<>(); static { ELEMENT_SUPPORT_TOOLTIPS.add(UMLPackage.Literals.LIFELINE); ELEMENT_SUPPORT_TOOLTIPS.add(UMLPackage.Literals.ACTION_EXECUTION_SPECIFICATION); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/FragmentOrderingKeeper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/FragmentOrderingKeeper.java index a5d1df795e6..1a865b5fe97 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/FragmentOrderingKeeper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/FragmentOrderingKeeper.java @@ -22,8 +22,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.osgi.util.NLS; -import org.eclipse.papyrus.infra.gmfdiag.common.utils.MDTUtil; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.MDTUtil; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.sequence.util.DestructionOccurrenceUtil; @@ -225,12 +225,12 @@ public class FragmentOrderingKeeper { diagram = ((IDiagramWorkbenchPart) editor).getDiagramEditPart(); } // reset constraints - constrainingNotRepresentedLifelines = new HashSet<Lifeline>(); - constrainingLifelineParts = new HashSet<LifelineEditPart>(); + constrainingNotRepresentedLifelines = new HashSet<>(); + constrainingLifelineParts = new HashSet<>(); /* constrainingCombinedFragments = new HashSet<CombinedFragment>(); */ - constrainingMessages = new HashSet<Message>(); - constrainingExecutions = new HashSet<ExecutionSpecification>(); - constrainingGeneralOrderings = new HashSet<GeneralOrdering>(); + constrainingMessages = new HashSet<>(); + constrainingExecutions = new HashSet<>(); + constrainingGeneralOrderings = new HashSet<>(); // get new constraining objects for (InteractionFragment fragment : orderedFragments) { // get Lifelines @@ -315,16 +315,16 @@ public class FragmentOrderingKeeper { * </li> */ private void constructPartialOrders() { - optionallyOrderedFragments = new HashMap<Integer, List<InteractionFragment>>(); + optionallyOrderedFragments = new HashMap<>(); int numberOfConstraints = constrainingNotRepresentedLifelines.size() + constrainingLifelineParts.size() + constrainingMessages.size() + constrainingExecutions.size() + constrainingGeneralOrderings.size(); /* * + constrainingCombinedFragments.size(); */ - orderConstraints = new ArrayList<List<InteractionFragment>>(numberOfConstraints); + orderConstraints = new ArrayList<>(numberOfConstraints); int indexConstraint = 0; // construct lifelines constraints (model only) for (Lifeline lifeline : constrainingNotRepresentedLifelines) { - List<InteractionFragment> constraint = new ArrayList<InteractionFragment>(); + List<InteractionFragment> constraint = new ArrayList<>(); // fill constraint : previous order for elements of lifeline not drawn for (InteractionFragment fragment : orderedFragments) { if (lifeline.getCoveredBys().contains(fragment)) { @@ -338,11 +338,11 @@ public class FragmentOrderingKeeper { } // construct lifelines constraints (graphical and model) for (LifelineEditPart part : constrainingLifelineParts) { - TreeMap<Float, InteractionFragment> constraint = new TreeMap<Float, InteractionFragment>(); + TreeMap<Float, InteractionFragment> constraint = new TreeMap<>(); // fill constraint : graphical location and previous order of elements not drawn fillConstraintWithLifelineEvents(constraint, part, indexConstraint); // store constraint - ArrayList<InteractionFragment> list = new ArrayList<InteractionFragment>(constraint.values()); + ArrayList<InteractionFragment> list = new ArrayList<>(constraint.values()); DestructionOccurrenceUtil.reorderDestructionOccurrence(list); orderConstraints.add(indexConstraint, list); indexConstraint++; @@ -361,7 +361,7 @@ public class FragmentOrderingKeeper { */ // construct messages constraints for (Message mess : constrainingMessages) { - List<InteractionFragment> constraint = new ArrayList<InteractionFragment>(2); + List<InteractionFragment> constraint = new ArrayList<>(2); // fill constraint : send > receive MessageEnd frag = mess.getSendEvent(); if (frag instanceof InteractionFragment && orderedFragments.contains(frag)) { @@ -378,7 +378,7 @@ public class FragmentOrderingKeeper { } // construct executions constraints for (ExecutionSpecification exe : constrainingExecutions) { - List<InteractionFragment> constraint = new ArrayList<InteractionFragment>(3); + List<InteractionFragment> constraint = new ArrayList<>(3); // fill constraint : start > execution > finish InteractionFragment frag = exe.getStart(); if (frag != null && orderedFragments.contains(frag)) { @@ -398,7 +398,7 @@ public class FragmentOrderingKeeper { } // construct general orderings constraints for (GeneralOrdering genOrd : constrainingGeneralOrderings) { - List<InteractionFragment> constraint = new ArrayList<InteractionFragment>(2); + List<InteractionFragment> constraint = new ArrayList<>(2); // fill constraint : before > after InteractionFragment frag = genOrd.getBefore(); if (frag != null && orderedFragments.contains(frag)) { @@ -427,7 +427,7 @@ public class FragmentOrderingKeeper { private void fillConstraintWithLifelineEvents(TreeMap<Float, InteractionFragment> constraint, LifelineEditPart lifelinePart, int indexConstraint) { EObject lifeline = lifelinePart.resolveSemanticElement(); if (lifeline instanceof Lifeline) { - List<InteractionFragment> nonLocalizedEvents = new ArrayList<InteractionFragment>(); + List<InteractionFragment> nonLocalizedEvents = new ArrayList<>(); // sort fragments according to their location on the lifeline for (InteractionFragment event : ((Lifeline) lifeline).getCoveredBys()) { if (orderedFragments.contains(event)) { @@ -572,8 +572,8 @@ public class FragmentOrderingKeeper { * @return true if a valid trace has been computed, false if there is no valid trace */ private boolean reorderFragmentsInAValidTrace() { - List<InteractionFragment> initialFragmentsList = new ArrayList<InteractionFragment>(orderedFragments); - List<InteractionFragment> reorderedFragments = new ArrayList<InteractionFragment>(orderedFragments.size()); + List<InteractionFragment> initialFragmentsList = new ArrayList<>(orderedFragments); + List<InteractionFragment> reorderedFragments = new ArrayList<>(orderedFragments.size()); /* * This algorithm merges constraints to compute a valid trace. * With little adaptation, it could compute all valid traces. @@ -587,7 +587,7 @@ public class FragmentOrderingKeeper { Arrays.fill(pointers, 0); while (getFragmentToInspect(-1, pointers) != null) { // inspect each constraint list to know whether fragment is mature enough, in such a case, store it with constraint index - Map<Integer, InteractionFragment> matureFragments = new HashMap<Integer, InteractionFragment>(n); + Map<Integer, InteractionFragment> matureFragments = new HashMap<>(n); for (int i = 0; i < n; i++) { InteractionFragment fragmentToInspect = getFragmentToInspect(i, pointers); // if no more fragment in this constraint (fragmentToInspect == null), nothing to do @@ -618,7 +618,7 @@ public class FragmentOrderingKeeper { if (matureFragments.isEmpty()) { // FIXME duplicated code : try again, without optional order // inspect each constraint list to know whether fragment is mature enough, in such a case, store it with constraint index - matureFragments = new HashMap<Integer, InteractionFragment>(n); + matureFragments = new HashMap<>(n); for (int i = 0; i < n; i++) { InteractionFragment fragmentToInspect = getFragmentToInspect(i, pointers); // if no more fragment in this constraint (fragmentToInspect == null), nothing to do @@ -667,7 +667,7 @@ public class FragmentOrderingKeeper { // no valid trace. if (valid) { // store first conflicting fragments for user explanation - conflictingFragments = new HashSet<InteractionFragment>(n); + conflictingFragments = new HashSet<>(n); for (int k = 0; k < n; k++) { InteractionFragment frag = getFragmentToInspect(k, pointers); if (frag != null) { @@ -697,7 +697,7 @@ public class FragmentOrderingKeeper { * branch and continuing the algorithm. */ // All matureFragments can happen in any order. Add them all (without doubles). - Set<InteractionFragment> fragmentsSet = new HashSet<InteractionFragment>(matureFragments.values()); + Set<InteractionFragment> fragmentsSet = new HashSet<>(matureFragments.values()); reorderedFragments.addAll(fragmentsSet); // increment pointers of constraints whose fragment has been added. for (int incrementingPointerIndex : matureFragments.keySet()) { @@ -742,7 +742,7 @@ public class FragmentOrderingKeeper { * branch and continuing the algorithm. */ // All matureFragments can happen in any order. Add them all (without doubles). - Set<InteractionFragment> fragmentsSet = new HashSet<InteractionFragment>(matureFragments.values()); + Set<InteractionFragment> fragmentsSet = new HashSet<>(matureFragments.values()); reorderedFragments.addAll(fragmentsSet); // increment pointers of constraints whose fragment has been added. for (int incrementingPointerIndex : matureFragments.keySet()) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContextLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContextLinkEditPart.java index 1bec0fd7e7b..3dffd561fdf 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContextLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContextLinkEditPart.java @@ -19,7 +19,6 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.figures.CustomContextLinkFigure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GateNameEditPart.java index 605cfef42b9..646e05afcfe 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GateNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GateNameEditPart.java @@ -853,7 +853,7 @@ public class GateNameEditPart extends FloatingLabelEditPart */ @Override public void refresh() { - + super.refresh(); } @@ -864,7 +864,7 @@ public class GateNameEditPart extends FloatingLabelEditPart */ @Override public void notifyChanged(Notification notification) { - + super.notifyChanged(notification); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java index 884de56a7ad..938debe9b94 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java @@ -105,7 +105,7 @@ public class InteractionEditPart extends RoundedCompartmentEditPart { */ @Override public Command getCommand(Request _request) { - + return super.getCommand(_request); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java index f0cafba65ad..ed9b8875762 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java @@ -65,7 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEd import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; -import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/parsers/MessageFormatParser.java index 736acd27f7e..a63e35e08c9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/parsers/MessageFormatParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/parsers/MessageFormatParser.java @@ -15,6 +15,8 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper; import org.eclipse.papyrus.infra.gmfdiag.common.parsers.AbstractElementTypeBasedAttributeParser; +import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser; +import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractFeatureParser; import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils; import org.eclipse.papyrus.uml.diagram.sequence.part.Messages; import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin; |