You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2018/08/23 16:12:56 UTC
svn commit: r1838738 [3/3] - in /pivot/trunk: core/src/org/apache/pivot/xml/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/effects/
wtk/src/org/apache/pivot/wtk/media/ wtk/src/org/apache/pivot...
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Thu Aug 23 16:12:55 2018
@@ -60,7 +60,7 @@ public class CardPaneSkin extends Contai
public final Component toCard;
public final int direction;
- public SelectionChangeTransition(int from, int to) {
+ public SelectionChangeTransition(final int from, final int to) {
super(selectionChangeDuration, selectionChangeRate, false);
this.from = from;
@@ -92,12 +92,12 @@ public class CardPaneSkin extends Contai
private FadeDecorator fadeOutDecorator = new FadeDecorator();
private FadeDecorator fadeInDecorator = new FadeDecorator();
- public CrossfadeTransition(int from, int to) {
+ public CrossfadeTransition(final int from, final int to) {
super(from, to);
}
@Override
- public void start(TransitionListener transitionListener) {
+ public void start(final TransitionListener transitionListener) {
if (fromCard != null) {
fromCard.getDecorators().add(fadeOutDecorator);
}
@@ -145,12 +145,12 @@ public class CardPaneSkin extends Contai
public class SlideTransition extends SelectionChangeTransition {
private Easing slideEasing = new Quartic();
- public SlideTransition(int from, int to) {
+ public SlideTransition(final int from, final int to) {
super(from, to);
}
@Override
- public void start(TransitionListener transitionListener) {
+ public void start(final TransitionListener transitionListener) {
toCard.setVisible(true);
super.start(transitionListener);
@@ -191,13 +191,13 @@ public class CardPaneSkin extends Contai
private double theta;
private ScaleDecorator scaleDecorator = new ScaleDecorator();
- public FlipTransition(Orientation orientation, int from, int to) {
+ public FlipTransition(final Orientation orientation, final int from, final int to) {
super(from, to);
this.orientation = orientation;
}
@Override
- public void start(TransitionListener transitionListener) {
+ public void start(final TransitionListener transitionListener) {
theta = 0;
getComponent().getDecorators().add(scaleDecorator);
@@ -215,7 +215,7 @@ public class CardPaneSkin extends Contai
protected void update() {
float percentComplete = getPercentComplete();
- if (percentComplete < 1f) {
+ if (percentComplete < 1.0f) {
theta = Math.PI * percentComplete;
float scale = (float) Math.abs(Math.cos(theta));
@@ -241,12 +241,12 @@ public class CardPaneSkin extends Contai
private ScaleDecorator fromScaleDecorator = new ScaleDecorator();
private ScaleDecorator toScaleDecorator = new ScaleDecorator();
- public ZoomTransition(int from, int to) {
+ public ZoomTransition(final int from, final int to) {
super(from, to);
}
@Override
- public void start(TransitionListener transitionListener) {
+ public void start(final TransitionListener transitionListener) {
if (fromCard != null) {
fromCard.getDecorators().add(fromScaleDecorator);
}
@@ -302,7 +302,7 @@ public class CardPaneSkin extends Contai
private static final int DEFAULT_SELECTION_CHANGE_RATE = 30;
@Override
- public void install(Component component) {
+ public void install(final Component component) {
super.install(component);
CardPane cardPane = (CardPane) component;
@@ -310,7 +310,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int height) {
int preferredWidth = 0;
CardPane cardPane = (CardPane) getComponent();
@@ -353,7 +353,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int width) {
int preferredHeight = 0;
CardPane cardPane = (CardPane) getComponent();
@@ -457,7 +457,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public int getBaseline(int width, int height) {
+ public int getBaseline(final int width, final int height) {
int baseline = -1;
if (sizeToSelection) {
@@ -497,7 +497,7 @@ public class CardPaneSkin extends Contai
* @return The amount of space between the edge of the CardPane and its
* content.
*/
- public Insets getPadding() {
+ public final Insets getPadding() {
return padding;
}
@@ -507,7 +507,7 @@ public class CardPaneSkin extends Contai
*
* @param padding The new padding values for all edges.
*/
- public void setPadding(Insets padding) {
+ public final void setPadding(final Insets padding) {
Utils.checkNull(padding, "padding");
this.padding = padding;
@@ -520,7 +520,7 @@ public class CardPaneSkin extends Contai
*
* @param padding A dictionary with keys in the set {top, left, bottom, right}.
*/
- public final void setPadding(Dictionary<String, ?> padding) {
+ public final void setPadding(final Dictionary<String, ?> padding) {
setPadding(new Insets(padding));
}
@@ -530,7 +530,7 @@ public class CardPaneSkin extends Contai
*
* @param padding A sequence with values in the order [top, left, bottom, right].
*/
- public final void setPadding(Sequence<?> padding) {
+ public final void setPadding(final Sequence<?> padding) {
setPadding(new Insets(padding));
}
@@ -540,7 +540,7 @@ public class CardPaneSkin extends Contai
*
* @param padding The new single padding value to use for all edges.
*/
- public final void setPadding(int padding) {
+ public final void setPadding(final int padding) {
setPadding(new Insets(padding));
}
@@ -550,7 +550,7 @@ public class CardPaneSkin extends Contai
*
* @param padding The new integer value to use for the padding on all edges.
*/
- public void setPadding(Number padding) {
+ public final void setPadding(final Number padding) {
setPadding(new Insets(padding));
}
@@ -561,7 +561,7 @@ public class CardPaneSkin extends Contai
* @param padding A string containing an integer or a JSON dictionary with
* keys top, left, bottom, and/or right.
*/
- public final void setPadding(String padding) {
+ public final void setPadding(final String padding) {
setPadding(Insets.decode(padding));
}
@@ -569,7 +569,7 @@ public class CardPaneSkin extends Contai
return sizeToSelection;
}
- public void setSizeToSelection(boolean sizeToSelection) {
+ public void setSizeToSelection(final boolean sizeToSelection) {
if (selectionChangeTransition != null) {
selectionChangeTransition.end();
}
@@ -582,7 +582,7 @@ public class CardPaneSkin extends Contai
return selectionChangeEffect;
}
- public void setSelectionChangeEffect(SelectionChangeEffect selectionChangeEffect) {
+ public void setSelectionChangeEffect(final SelectionChangeEffect selectionChangeEffect) {
if (selectionChangeTransition != null) {
selectionChangeTransition.end();
}
@@ -594,7 +594,7 @@ public class CardPaneSkin extends Contai
return selectionChangeDuration;
}
- public void setSelectionChangeDuration(int selectionChangeDuration) {
+ public void setSelectionChangeDuration(final int selectionChangeDuration) {
this.selectionChangeDuration = selectionChangeDuration;
}
@@ -602,7 +602,7 @@ public class CardPaneSkin extends Contai
return selectionChangeRate;
}
- public void setSelectionChangeRate(int selectionChangeRate) {
+ public void setSelectionChangeRate(final int selectionChangeRate) {
this.selectionChangeRate = selectionChangeRate;
}
@@ -640,12 +640,12 @@ public class CardPaneSkin extends Contai
* @param circular <tt>true</tt> if directional transitions should be
* circular; <tt>false</tt> otherwise
*/
- public void setCircular(boolean circular) {
+ public void setCircular(final boolean circular) {
this.circular = circular;
}
@Override
- public void componentInserted(Container container, int index) {
+ public void componentInserted(final Container container, final int index) {
if (selectionChangeTransition != null) {
selectionChangeTransition.end();
}
@@ -664,7 +664,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public void componentsRemoved(Container container, int index, Sequence<Component> removed) {
+ public void componentsRemoved(final Container container, final int index, final Sequence<Component> removed) {
if (selectionChangeTransition != null) {
selectionChangeTransition.end();
}
@@ -680,7 +680,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public Vote previewSelectedIndexChange(CardPane cardPane, int selectedIndex) {
+ public Vote previewSelectedIndexChange(final CardPane cardPane, final int selectedIndex) {
Vote vote;
if (cardPane.isShowing() && selectionChangeEffect != null
@@ -688,48 +688,42 @@ public class CardPaneSkin extends Contai
int previousSelectedIndex = cardPane.getSelectedIndex();
switch (selectionChangeEffect) {
- case CROSSFADE: {
+ case CROSSFADE:
selectionChangeTransition = new CrossfadeTransition(previousSelectedIndex,
selectedIndex);
break;
- }
case HORIZONTAL_SLIDE:
- case VERTICAL_SLIDE: {
+ case VERTICAL_SLIDE:
if (previousSelectedIndex != -1 && selectedIndex != -1) {
selectionChangeTransition = new SlideTransition(previousSelectedIndex,
selectedIndex);
}
break;
- }
- case HORIZONTAL_FLIP: {
+ case HORIZONTAL_FLIP:
if (previousSelectedIndex != -1 && selectedIndex != -1) {
selectionChangeTransition = new FlipTransition(Orientation.HORIZONTAL,
previousSelectedIndex, selectedIndex);
}
break;
- }
- case VERTICAL_FLIP: {
+ case VERTICAL_FLIP:
if (previousSelectedIndex != -1 && selectedIndex != -1) {
selectionChangeTransition = new FlipTransition(Orientation.VERTICAL,
previousSelectedIndex, selectedIndex);
}
break;
- }
- case ZOOM: {
+ case ZOOM:
if (previousSelectedIndex != -1 && selectedIndex != -1) {
selectionChangeTransition = new ZoomTransition(previousSelectedIndex,
selectedIndex);
}
break;
- }
- default: {
+ default:
break;
- }
}
if (selectionChangeTransition != null) {
@@ -758,7 +752,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public void selectedIndexChangeVetoed(CardPane cardPane, Vote reason) {
+ public void selectedIndexChangeVetoed(final CardPane cardPane, final Vote reason) {
if (reason == Vote.DENY && selectionChangeTransition != null) {
// NOTE We stop, rather than end, the transition so the completion
// event isn't fired; if the event fires, the listener will set
@@ -773,7 +767,7 @@ public class CardPaneSkin extends Contai
}
@Override
- public void selectedIndexChanged(CardPane cardPane, int previousSelectedIndex) {
+ public void selectedIndexChanged(final CardPane cardPane, final int previousSelectedIndex) {
int selectedIndex = cardPane.getSelectedIndex();
if (selectedIndex != previousSelectedIndex) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java Thu Aug 23 16:12:55 2018
@@ -50,13 +50,13 @@ public abstract class ContainerSkin exte
this(false);
}
- public IndexFocusTraversalPolicy(boolean wrap) {
+ public IndexFocusTraversalPolicy(final boolean wrap) {
this.wrap = wrap;
}
@Override
- public Component getNextComponent(Container container, Component component,
- FocusTraversalDirection direction) {
+ public Component getNextComponent(final Container container, final Component component,
+ final FocusTraversalDirection direction) {
Utils.checkNull(container, "container");
Utils.checkNull(direction, "direction");
@@ -65,7 +65,7 @@ public abstract class ContainerSkin exte
int n = container.getLength();
if (n > 0) {
switch (direction) {
- case FORWARD: {
+ case FORWARD:
if (component == null) {
// Return the first component in the sequence
nextComponent = container.get(0);
@@ -86,9 +86,8 @@ public abstract class ContainerSkin exte
}
break;
- }
- case BACKWARD: {
+ case BACKWARD:
if (component == null) {
// Return the last component in the sequence
nextComponent = container.get(n - 1);
@@ -109,11 +108,9 @@ public abstract class ContainerSkin exte
}
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -126,7 +123,7 @@ public abstract class ContainerSkin exte
private static final FocusTraversalPolicy DEFAULT_FOCUS_TRAVERSAL_POLICY = new IndexFocusTraversalPolicy();
@Override
- public void install(Component component) {
+ public void install(final Component component) {
super.install(component);
Container container = (Container) component;
@@ -140,17 +137,17 @@ public abstract class ContainerSkin exte
}
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int height) {
return 0;
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int width) {
return 0;
}
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
if (backgroundPaint != null) {
graphics.setPaint(backgroundPaint);
graphics.fillRect(0, 0, getWidth(), getHeight());
@@ -183,7 +180,7 @@ public abstract class ContainerSkin exte
*
* @param backgroundPaint The new {@link Paint} object to paint the background.
*/
- public void setBackgroundPaint(Paint backgroundPaint) {
+ public void setBackgroundPaint(final Paint backgroundPaint) {
this.backgroundPaint = backgroundPaint;
repaintComponent();
}
@@ -194,7 +191,7 @@ public abstract class ContainerSkin exte
* @param backgroundPaint A string recognized by Pivot as a
* {@linkplain GraphicsUtilities#decodePaint(String) Color or Paint value}.
*/
- public final void setBackgroundPaint(String backgroundPaint) {
+ public final void setBackgroundPaint(final String backgroundPaint) {
setBackgroundPaint(GraphicsUtilities.decodePaint(backgroundPaint));
}
@@ -204,7 +201,7 @@ public abstract class ContainerSkin exte
* @param backgroundPaint A dictionary containing a
* {@linkplain GraphicsUtilities#decodePaint(Dictionary) Paint description}.
*/
- public final void setBackgroundPaint(Dictionary<String, ?> backgroundPaint) {
+ public final void setBackgroundPaint(final Dictionary<String, ?> backgroundPaint) {
setBackgroundPaint(GraphicsUtilities.decodePaint(backgroundPaint));
}
@@ -221,7 +218,7 @@ public abstract class ContainerSkin exte
*
* @param backgroundColor The new background color for the container.
*/
- public void setBackgroundColor(Color backgroundColor) {
+ public void setBackgroundColor(final Color backgroundColor) {
setBackgroundPaint(backgroundColor);
}
@@ -232,7 +229,7 @@ public abstract class ContainerSkin exte
* {@linkplain GraphicsUtilities#decodeColor color values recognized by
* Pivot}.
*/
- public final void setBackgroundColor(String backgroundColor) {
+ public final void setBackgroundColor(final String backgroundColor) {
setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor, "backgroundColor"));
}
@@ -241,51 +238,51 @@ public abstract class ContainerSkin exte
*
* @param backgroundColor An index into the theme's color palette.
*/
- public final void setBackgroundColor(int backgroundColor) {
+ public final void setBackgroundColor(final int backgroundColor) {
Theme theme = currentTheme();
setBackgroundColor(theme.getColor(backgroundColor));
}
// Container events
@Override
- public void componentInserted(Container container, int index) {
+ public void componentInserted(final Container container, final int index) {
// No-op
}
@Override
- public void componentsRemoved(Container container, int index, Sequence<Component> removed) {
+ public void componentsRemoved(final Container container, final int index, final Sequence<Component> removed) {
// No-op
}
@Override
- public void componentMoved(Container container, int from, int to) {
+ public void componentMoved(final Container container, final int from, final int to) {
// No-op
}
@Override
- public void focusTraversalPolicyChanged(Container container,
- FocusTraversalPolicy previousFocusTraversalPolicy) {
+ public void focusTraversalPolicyChanged(final Container container,
+ final FocusTraversalPolicy previousFocusTraversalPolicy) {
// No-op
}
@Override
- public boolean mouseMove(Container container, int x, int y) {
+ public boolean mouseMove(final Container container, final int x, final int y) {
return false;
}
@Override
- public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
+ public boolean mouseDown(final Container container, final Mouse.Button button, final int x, final int y) {
return false;
}
@Override
- public boolean mouseUp(Container container, Mouse.Button button, int x, int y) {
+ public boolean mouseUp(final Container container, final Mouse.Button button, final int x, final int y) {
return false;
}
@Override
- public boolean mouseWheel(Container container, Mouse.ScrollType scrollType, int scrollAmount,
- int wheelRotation, int x, int y) {
+ public boolean mouseWheel(final Container container, final Mouse.ScrollType scrollType, final int scrollAmount,
+ final int wheelRotation, final int x, final int y) {
return false;
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java Thu Aug 23 16:12:55 2018
@@ -45,7 +45,7 @@ public class FlowPaneSkin extends Contai
}
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int height) {
FlowPane flowPane = (FlowPane) getComponent();
int preferredWidth = 0;
@@ -74,7 +74,7 @@ public class FlowPaneSkin extends Contai
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int width) {
FlowPane flowPane = (FlowPane) getComponent();
int preferredHeight;
@@ -199,7 +199,7 @@ public class FlowPaneSkin extends Contai
}
@Override
- public int getBaseline(int width, int height) {
+ public int getBaseline(final int width, final int height) {
FlowPane flowPane = (FlowPane) getComponent();
int baseline = -1;
@@ -293,21 +293,17 @@ public class FlowPaneSkin extends Contai
int x = 0;
switch (alignment) {
- case LEFT: {
+ case LEFT:
x = padding.left;
break;
- }
- case CENTER: {
+ case CENTER:
x = (width - rowWidth) / 2;
break;
- }
- case RIGHT: {
+ case RIGHT:
x = width - rowWidth - padding.right;
break;
- }
- default: {
+ default:
break;
- }
}
for (Component component : row) {
@@ -334,7 +330,7 @@ public class FlowPaneSkin extends Contai
return alignment;
}
- public void setAlignment(HorizontalAlignment alignment) {
+ public void setAlignment(final HorizontalAlignment alignment) {
Utils.checkNull(alignment, "alignment");
this.alignment = alignment;
@@ -355,7 +351,7 @@ public class FlowPaneSkin extends Contai
*
* @param padding The individual padding values for each edge.
*/
- public void setPadding(Insets padding) {
+ public void setPadding(final Insets padding) {
Utils.checkNull(padding, "padding");
this.padding = padding;
@@ -368,7 +364,7 @@ public class FlowPaneSkin extends Contai
*
* @param padding A dictionary with keys in the set {top, left, bottom, right}.
*/
- public final void setPadding(Dictionary<String, ?> padding) {
+ public final void setPadding(final Dictionary<String, ?> padding) {
setPadding(new Insets(padding));
}
@@ -378,7 +374,7 @@ public class FlowPaneSkin extends Contai
*
* @param padding A sequence with values in the order [top, left, bottom, right].
*/
- public final void setPadding(Sequence<?> padding) {
+ public final void setPadding(final Sequence<?> padding) {
setPadding(new Insets(padding));
}
@@ -388,7 +384,7 @@ public class FlowPaneSkin extends Contai
*
* @param padding The single padding value for all four sides.
*/
- public final void setPadding(int padding) {
+ public final void setPadding(final int padding) {
setPadding(new Insets(padding));
}
@@ -398,7 +394,7 @@ public class FlowPaneSkin extends Contai
*
* @param padding The single padding value for all four sides.
*/
- public final void setPadding(Number padding) {
+ public final void setPadding(final Number padding) {
setPadding(new Insets(padding));
}
@@ -409,7 +405,7 @@ public class FlowPaneSkin extends Contai
* @param padding A string containing an integer or a JSON dictionary with
* keys left, top, bottom, and/or right.
*/
- public final void setPadding(String padding) {
+ public final void setPadding(final String padding) {
setPadding(Insets.decode(padding));
}
@@ -417,14 +413,14 @@ public class FlowPaneSkin extends Contai
return horizontalSpacing;
}
- public void setHorizontalSpacing(int horizontalSpacing) {
+ public void setHorizontalSpacing(final int horizontalSpacing) {
Utils.checkNonNegative(horizontalSpacing, "horizontalSpacing");
this.horizontalSpacing = horizontalSpacing;
invalidateComponent();
}
- public final void setHorizontalSpacing(Number horizontalSpacing) {
+ public final void setHorizontalSpacing(final Number horizontalSpacing) {
Utils.checkNull(horizontalSpacing, "horizontalSpacing");
setHorizontalSpacing(horizontalSpacing.intValue());
@@ -434,14 +430,14 @@ public class FlowPaneSkin extends Contai
return verticalSpacing;
}
- public void setVerticalSpacing(int verticalSpacing) {
+ public void setVerticalSpacing(final int verticalSpacing) {
Utils.checkNonNegative(verticalSpacing, "verticalSpacing");
this.verticalSpacing = verticalSpacing;
invalidateComponent();
}
- public final void setVerticalSpacing(Number verticalSpacing) {
+ public final void setVerticalSpacing(final Number verticalSpacing) {
Utils.checkNull(verticalSpacing, "verticalSpacing");
setVerticalSpacing(verticalSpacing.intValue());
@@ -451,7 +447,7 @@ public class FlowPaneSkin extends Contai
return alignToBaseline;
}
- public void setAlignToBaseline(boolean alignToBaseline) {
+ public void setAlignToBaseline(final boolean alignToBaseline) {
this.alignToBaseline = alignToBaseline;
invalidateComponent();
}