From 441cc2b1916a33c29f98b02277d89d886413ecfd Mon Sep 17 00:00:00 2001 From: Alois Zoitl Date: Mon, 8 Jan 2024 22:13:32 +0100 Subject: [PATCH] [Mondernize Code] Typified the last generics in draw2d --- .../src/org/eclipse/draw2d/ButtonGroup.java | 6 +++--- .../src/org/eclipse/draw2d/LayoutAnimator.java | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonGroup.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonGroup.java index 89c94f35f..8d97c89d8 100644 --- a/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonGroup.java +++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonGroup.java @@ -31,8 +31,8 @@ public class ButtonGroup { private ButtonModel selectedModel; private ButtonModel defaultModel; - private List members = new ArrayList<>(); - private List listeners = new ArrayList<>(); + private final List members = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * Constructs a ButtonGroup with no default selection. @@ -96,7 +96,7 @@ public ButtonModel getDefault() { * @return The List of ButtonModels in this ButtonGroup * @since 2.0 */ - public List getElements() { + public List getElements() { return members; } diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/LayoutAnimator.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/LayoutAnimator.java index 9748e4498..e92a2b451 100644 --- a/org.eclipse.draw2d/src/org/eclipse/draw2d/LayoutAnimator.java +++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/LayoutAnimator.java @@ -105,10 +105,11 @@ public final boolean layout(IFigure container) { * * @see Animator#playback(IFigure) */ + @SuppressWarnings("unchecked") @Override protected boolean playback(IFigure container) { - Map initial = (Map) Animation.getInitialState(this, container); - Map ending = (Map) Animation.getFinalState(this, container); + Map initial = (Map) Animation.getInitialState(this, container); + Map ending = (Map) Animation.getFinalState(this, container); if (initial == null) { return false; } @@ -116,11 +117,9 @@ protected boolean playback(IFigure container) { float progress = Animation.getProgress(); float ssergorp = 1 - progress; - Rectangle rect1, rect2; - for (IFigure child : container.getChildren()) { - rect1 = (Rectangle) initial.get(child); - rect2 = (Rectangle) ending.get(child); + Rectangle rect1 = initial.get(child); + Rectangle rect2 = ending.get(child); // TODO need to change this to hide the figure until the end. if (rect1 == null) { @@ -153,6 +152,7 @@ public final void postLayout(IFigure container) { */ @Override public final void remove(IFigure child) { + // unused } /** @@ -162,6 +162,7 @@ public final void remove(IFigure child) { */ @Override public final void setConstraint(IFigure child, Object constraint) { + // unused } }