Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauline DEVILLE2023-07-20 14:10:14 +0000
committerPauline DEVILLE2023-07-21 12:13:55 +0000
commit4e288a4503e1974e18ae9e0ec149be680ed7f3dc (patch)
treeaf2a0957ba8f24668c438795800babb2d87ab834 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse
parent5f670a58dcd6b90ca0ef28d29466ae8a745cc343 (diff)
downloadorg.eclipse.papyrus-4e288a4503e1974e18ae9e0ec149be680ed7f3dc.tar.gz
org.eclipse.papyrus-4e288a4503e1974e18ae9e0ec149be680ed7f3dc.tar.xz
org.eclipse.papyrus-4e288a4503e1974e18ae9e0ec149be680ed7f3dc.zip
Bug 582075 - [Releng] Update target platform for 2023-09 M1
Change-Id: Ia520fc0907e2562e915933f324af1935372f6017 Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java10
4 files changed, 12 insertions, 7 deletions
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 dea047ff071..b06be83ba0e 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
@@ -59,7 +59,7 @@ public abstract class InteractionFragmentEditPart extends RoundedCompartmentEdit
if (lifelineCoveredList != null && getParent() != null) {
// we get the interactionCompartimentEditPart to have access to all lifelines
// EditParts
- List<EditPart> childrenEditPart = getParent().getChildren();
+ List<? extends EditPart> childrenEditPart = getParent().getChildren();
if (childrenEditPart != null) {
// The max value guarantee that the first figure will set the minX value
int minX = Integer.MAX_VALUE;
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 0888a941d97..4169276c92c 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
@@ -114,6 +114,7 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc
* the {@link CreateViewAndElementRequest} request
* @return the command to update weak references
*/
+ @SuppressWarnings("unchecked")
private Command getUpdateWeakRefForExecSpecCreate(final CreateViewAndElementRequest request) {
Command command = null;
CreateViewAndElementRequest createRequest = request;
@@ -148,7 +149,8 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc
ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request);
- List<?> connectionsAndChildren = new ArrayList<>();
+ @SuppressWarnings("rawtypes")
+ List connectionsAndChildren = new ArrayList<>();
connectionsAndChildren.addAll(((GraphicalEditPart) host).getSourceConnections());
connectionsAndChildren.addAll(((GraphicalEditPart) host).getTargetConnections());
connectionsAndChildren.addAll(((GraphicalEditPart) host).getChildren());
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 d63757199ed..af360ec3578 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
@@ -137,7 +137,8 @@ public class UpdateWeakReferenceForMessageSpecEditPolicy extends UpdateWeakRefer
IGraphicalEditPart targetLifeLineEP = (IGraphicalEditPart) createRequest.getTargetEditPart();
ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request);
- List<?> connectionsAndChildren = new ArrayList<>();
+ @SuppressWarnings("rawtypes")
+ List connectionsAndChildren = new ArrayList<>();
if (null != sourceLifeLineEP) {
connectionsAndChildren.addAll(sourceLifeLineEP.getSourceConnections());
connectionsAndChildren.addAll(sourceLifeLineEP.getTargetConnections());
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 a77c463e4bf..acc4c21d014 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
@@ -317,6 +317,7 @@ public class OperandBoundsComputeHelper {
* @param combinedFragmentEditPart
* @return Command
*/
+ @SuppressWarnings("unchecked")
public static Command createUpdateIOBoundsForCFResizeCommand(CompoundCommand compoundCmd, final ChangeBoundsRequest request, CombinedFragmentEditPart combinedFragmentEditPart) {
if (combinedFragmentEditPart.getChildren().size() > 0 && combinedFragmentEditPart.getChildren().get(0) instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) {
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) combinedFragmentEditPart.getChildren().get(0);
@@ -327,7 +328,7 @@ public class OperandBoundsComputeHelper {
} else if ((request.getResizeDirection() & PositionConstants.SOUTH) != 0) {
targetIOEP = findLastIOEP(compartment);
}
- updateIOBoundsForCFResize(request, compoundCmd, compartment.getChildren(), cf, targetIOEP != null ? (InteractionOperand) targetIOEP.resolveSemanticElement() : null, request.getSizeDelta(), request.getResizeDirection());
+ updateIOBoundsForCFResize(request, compoundCmd, (List<EditPart>) compartment.getChildren(), cf, targetIOEP != null ? (InteractionOperand) targetIOEP.resolveSemanticElement() : null, request.getSizeDelta(), request.getResizeDirection());
if (targetIOEP != null && request.getSizeDelta().height != 0) {
int heightDelta = request.getSizeDelta().height;
int movedY = heightDelta;
@@ -846,7 +847,7 @@ public class OperandBoundsComputeHelper {
CombinedFragmentEditPart combinedFragmentEditPart = (CombinedFragmentEditPart) child;
if (combinedFragmentEditPart.getChildren().size() > 0 && combinedFragmentEditPart.getChildren().get(0) instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) {
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) combinedFragmentEditPart.getChildren().get(0);
- List<EditPart> combinedFragmentChildrenEditParts = compartment.getChildren();
+ List<? extends EditPart> combinedFragmentChildrenEditParts = compartment.getChildren();
CombinedFragment cf = (CombinedFragment) combinedFragmentEditPart.resolveSemanticElement();
InteractionOperand targetOperand = null;
if ((request.getResizeDirection() & PositionConstants.NORTH) != 0) {
@@ -854,7 +855,8 @@ public class OperandBoundsComputeHelper {
} else if ((request.getResizeDirection() & PositionConstants.SOUTH) != 0) {
targetOperand = cf.getOperands().get(cf.getOperands().size() - 1);
}
- InteractionOperandEditPart targetOperandEditPart = OperandBoundsComputeHelper.findTargetOperandEditPart(cf, targetOperand, combinedFragmentChildrenEditParts);
+ @SuppressWarnings("unchecked")
+ InteractionOperandEditPart targetOperandEditPart = OperandBoundsComputeHelper.findTargetOperandEditPart(cf, targetOperand, (List<EditPart>) combinedFragmentChildrenEditParts);
int heightDelta = request.getSizeDelta().height();
if (targetOperandEditPart != null && heightDelta < 0) {
int height = targetOperandEditPart.getFigure().getBounds().height();
@@ -879,7 +881,7 @@ public class OperandBoundsComputeHelper {
if (editPart.getParent() instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) {
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) editPart.getParent();
if (compartment.getParent() instanceof CombinedFragmentEditPart) {
- List<EditPart> combinedFragmentChildrenEditParts = compartment.getChildren();
+ List<? extends EditPart> combinedFragmentChildrenEditParts = compartment.getChildren();
InteractionOperandEditPart previousIOEP = null;
InteractionOperandEditPart latterIOEP = null;
boolean isFirstOperand = false;

Back to the top