You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/12/01 17:31:22 UTC
svn commit: r885822 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: effects/
skin/obsidian/ skin/terra/
Author: smartini
Date: Tue Dec 1 16:31:21 2009
New Revision: 885822
URL: http://svn.apache.org/viewvc?rev=885822&view=rev
Log:
fixed warning (by FindBugs) of integer division when needed a float value
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/obsidian/ObsidianPushButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java Tue Dec 1 16:31:21 2009
@@ -68,7 +68,7 @@
int width = componentImage.getWidth();
int height = componentImage.getHeight();
- GradientPaint mask = new GradientPaint(0, height / 4, new Color(1.0f, 1.0f, 1.0f, 0.0f),
+ GradientPaint mask = new GradientPaint(0, height / 4f, new Color(1.0f, 1.0f, 1.0f, 0.0f),
0, height, new Color(1.0f, 1.0f, 1.0f, 0.5f));
componentImageGraphics.setPaint(mask);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/obsidian/ObsidianPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/obsidian/ObsidianPushButtonSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/obsidian/ObsidianPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/obsidian/ObsidianPushButtonSkin.java Tue Dec 1 16:31:21 2009
@@ -157,8 +157,8 @@
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- graphics.setPaint(new GradientPaint(width / 2, 0, gradientStartColor,
- width / 2, height, gradientEndColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, gradientStartColor,
+ width / 2f, height, gradientEndColor));
graphics.fill(buttonRectangle);
// Paint the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Tue Dec 1 16:31:21 2009
@@ -164,8 +164,8 @@
int height = getHeight();
// Paint the background
- graphics.setPaint(new GradientPaint(width / 2, 0, buttonBevelColor,
- width / 2, height, buttonBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, buttonBevelColor,
+ width / 2f, height, buttonBackgroundColor));
graphics.fillRect(0, 0, width, height);
// Paint the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Tue Dec 1 16:31:21 2009
@@ -236,8 +236,8 @@
graphics.setStroke(new BasicStroke());
// Paint the background
- graphics.setPaint(new GradientPaint(width / 2, 0, bevelColor,
- width / 2, height / 2, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
+ width / 2f, height / 2, backgroundColor));
graphics.fillRect(0, 0, width, height);
// Paint the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Tue Dec 1 16:31:21 2009
@@ -143,8 +143,8 @@
// Paint the background
if (dateButton.isSelected()) {
- graphics.setPaint(new GradientPaint(width / 2, 0, selectionBevelColor,
- width / 2, height, selectionBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, selectionBevelColor,
+ width / 2f, height, selectionBackgroundColor));
graphics.fillRect(0, 0, width, height);
} else {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Tue Dec 1 16:31:21 2009
@@ -182,8 +182,8 @@
graphics.setStroke(new BasicStroke());
// Paint the background
- graphics.setPaint(new GradientPaint(width / 2, 0, bevelColor,
- width / 2, height / 2, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
+ width / 2f, height / 2, backgroundColor));
graphics.fillRect(0, 0, width, height);
// Paint the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Tue Dec 1 16:31:21 2009
@@ -557,8 +557,8 @@
Color titleBarBevelColor = frame.isActive() ?
this.titleBarBevelColor : inactiveTitleBarBevelColor;
- graphics.setPaint(new GradientPaint(width / 2, 0, titleBarBevelColor,
- width / 2, titleBarHeight + 1, titleBarBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, titleBarBevelColor,
+ width / 2f, titleBarHeight + 1, titleBarBackgroundColor));
graphics.fillRect(0, 0, width, titleBarHeight + 1);
// Draw the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Tue Dec 1 16:31:21 2009
@@ -263,8 +263,8 @@
graphics.setStroke(new BasicStroke());
// Paint the background
- graphics.setPaint(new GradientPaint(width / 2, 0, bevelColor,
- width / 2, height / 2, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
+ width / 2f, height / 2, backgroundColor));
graphics.fillRect(0, 0, width, height);
// Paint the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Tue Dec 1 16:31:21 2009
@@ -185,8 +185,8 @@
// Paint the background
if (backgroundColor != null
&& bevelColor != null) {
- graphics.setPaint(new GradientPaint(width / 2, 0, bevelColor,
- width / 2, height / 2, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
+ width / 2f, height / 2, backgroundColor));
graphics.fillRect(0, 0, width, height);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java Tue Dec 1 16:31:21 2009
@@ -139,8 +139,8 @@
// Paint highlight state
if (highlight) {
Color activeBackgroundColor = (Color)menu.getStyles().get("activeBackgroundColor");
- graphics.setPaint(new GradientPaint(width / 2, 0, TerraTheme.brighten(activeBackgroundColor),
- width / 2, height, activeBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, TerraTheme.brighten(activeBackgroundColor),
+ width / 2f, height, activeBackgroundColor));
graphics.fillRect(0, 0, width, height);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Tue Dec 1 16:31:21 2009
@@ -357,8 +357,8 @@
graphics.setStroke(new BasicStroke());
// Draw the title area
- graphics.setPaint(new GradientPaint(width / 2, 0, titleBarBevelColor,
- width / 2, titleBarHeight + 1, titleBarBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, titleBarBevelColor,
+ width / 2f, titleBarHeight + 1, titleBarBackgroundColor));
graphics.fillRect(0, 0, width, titleBarHeight + 1);
// Draw the border
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Tue Dec 1 16:31:21 2009
@@ -218,8 +218,8 @@
// Paint the background
if (backgroundColor != null
&& bevelColor != null) {
- graphics.setPaint(new GradientPaint(width / 2, 0, bevelColor,
- width / 2, height / 2, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
+ width / 2f, height / 2, backgroundColor));
graphics.fillRect(0, 0, width, height);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java Tue Dec 1 16:31:21 2009
@@ -78,8 +78,8 @@
int width = getWidth();
int height = getHeight();
- graphics.setPaint(new GradientPaint(width / 2, 0, buttonBevelColor,
- width / 2, height, buttonBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, buttonBevelColor,
+ width / 2f, height, buttonBackgroundColor));
graphics.fillRect(0, 0, width, height);
float alpha = (highlighted || dragOffset != null) ? 0.25f : 0.0f;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Tue Dec 1 16:31:21 2009
@@ -190,8 +190,8 @@
graphics.fillRect(0, 0, width, height);
// Draw the bevel
- graphics.setPaint(new GradientPaint(width / 2, 1, buttonBevelColor,
- width / 2, GRADIENT_BEVEL_THICKNESS, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 1, buttonBevelColor,
+ width / 2f, GRADIENT_BEVEL_THICKNESS, backgroundColor));
switch(tabOrientation) {
case HORIZONTAL: {
@@ -889,8 +889,8 @@
// Draw the bevel for vertical tabs
if (tabOrientation == Orientation.VERTICAL) {
- graphics.setPaint(new GradientPaint(width / 2, contentBounds.y + 1, buttonBevelColor,
- width / 2, contentBounds.y + 1 + GRADIENT_BEVEL_THICKNESS, activeTabColor));
+ graphics.setPaint(new GradientPaint(width / 2f, contentBounds.y + 1, buttonBevelColor,
+ width / 2f, contentBounds.y + 1 + GRADIENT_BEVEL_THICKNESS, activeTabColor));
graphics.fillRect(contentBounds.x + 1, contentBounds.y + 1,
contentBounds.width - 2, GRADIENT_BEVEL_THICKNESS);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=885822&r1=885821&r2=885822&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Tue Dec 1 16:31:21 2009
@@ -288,8 +288,8 @@
// Paint the pressed bevel
if (columnIndex == pressedHeaderIndex) {
- graphics.setPaint(new GradientPaint(width / 2, 0, pressedBevelColor,
- width / 2, height, backgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, pressedBevelColor,
+ width / 2f, height, backgroundColor));
graphics.fillRect(0, 0, width, height);
}