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 2014/08/04 11:16:38 UTC
svn commit: r1615517 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/content/
wtk/src/org/apache/pivot/wtk/skin/
Author: smartini
Date: Mon Aug 4 09:16:37 2014
New Revision: 1615517
URL: http://svn.apache.org/r1615517
Log:
cleanup and fix some eclipse warnings
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java Mon Aug 4 09:16:37 2014
@@ -52,6 +52,7 @@ public class TerraCheckboxSkin extends C
private static final int CHECKBOX_SIZE = 14;
private static final int CHECKMARK_SIZE = 10;
+ private static final int ALPHA = 68;
public TerraCheckboxSkin() {
TerraTheme theme = (TerraTheme) Theme.getTheme();
@@ -169,7 +170,7 @@ public class TerraCheckboxSkin extends C
if (checkbox.isFocused()) {
if (buttonData == null) {
Color focusColor = new Color(buttonSelectionColor.getRed(),
- buttonSelectionColor.getGreen(), buttonSelectionColor.getBlue(), 0x44);
+ buttonSelectionColor.getGreen(), buttonSelectionColor.getBlue(), ALPHA);
graphics.setColor(focusColor);
graphics.fillRect(0, 0, CHECKBOX_SIZE, CHECKBOX_SIZE);
} else {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java Mon Aug 4 09:16:37 2014
@@ -339,10 +339,11 @@ public class TerraColorChooserSkin exten
private boolean updating = false;
+ @SuppressWarnings("unused")
public TerraColorChooserSkin() {
- tablePane.getStyles().put("horizontalSpacing", 6);
- new TablePane.Column(tablePane, 31, true);
- new TablePane.Column(tablePane, 4, true);
+ tablePane.getStyles().put("horizontalSpacing", new Integer(6));
+ new TablePane.Column(tablePane, 31, true); // note: this is useful, even if not used directly
+ new TablePane.Column(tablePane, 4, true); // note: this is useful, even if not used directly
TablePane.Row row = new TablePane.Row(tablePane, 1, true);
@@ -385,7 +386,7 @@ public class TerraColorChooserSkin exten
}
public int getSpacing() {
- return (Integer) tablePane.getStyles().get("horizontalSpacing");
+ return ((Integer) tablePane.getStyles().get("horizontalSpacing")).intValue();
}
public void setSpacing(int spacing) {
@@ -393,7 +394,7 @@ public class TerraColorChooserSkin exten
throw new IllegalArgumentException("spacing is negative.");
}
- tablePane.getStyles().put("horizontalSpacing", spacing);
+ tablePane.getStyles().put("horizontalSpacing", new Integer(spacing));
}
public final void setSpacing(Number spacing) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Mon Aug 4 09:16:37 2014
@@ -170,7 +170,7 @@ public class TerraFrameSkin extends Wind
* Resize button image.
*/
protected class ResizeImage extends Image {
- public static final int ALPHA = 64;
+ private static final int ALPHA_IMAGE = 64;
@Override
public int getWidth() {
@@ -184,13 +184,13 @@ public class TerraFrameSkin extends Wind
@Override
public void paint(Graphics2D graphics) {
- graphics.setPaint(new Color(0, 0, 0, ALPHA));
+ graphics.setPaint(new Color(0, 0, 0, ALPHA_IMAGE));
graphics.fillRect(3, 0, 2, 1);
graphics.fillRect(0, 3, 2, 1);
graphics.fillRect(3, 3, 2, 1);
graphics.setPaint(new Color(contentBorderColor.getRed(), contentBorderColor.getGreen(),
- contentBorderColor.getBlue(), ALPHA));
+ contentBorderColor.getBlue(), ALPHA_IMAGE));
graphics.fillRect(3, 1, 2, 1);
graphics.fillRect(0, 4, 2, 1);
graphics.fillRect(3, 4, 2, 1);
@@ -237,6 +237,7 @@ public class TerraFrameSkin extends Wind
private Color contentBevelColor;
private static final float INACTIVE_ICON_OPACITY = 0.5f;
+ protected static final int ALPHA = 235;
@SuppressWarnings("unused")
public TerraFrameSkin() {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Mon Aug 4 09:16:37 2014
@@ -51,11 +51,13 @@ public class TerraMenuSkin extends Conta
private int sectionSpacing;
private boolean showKeyboardShortcuts;
+ private static final int ALPHA = 228;
+
public TerraMenuSkin() {
TerraTheme theme = (TerraTheme) Theme.getTheme();
Color backgroundColor = theme.getColor(4);
backgroundColor = new Color(backgroundColor.getRed(), backgroundColor.getGreen(),
- backgroundColor.getBlue(), 228);
+ backgroundColor.getBlue(), ALPHA);
setBackgroundColor(backgroundColor);
font = theme.getFont();
@@ -65,7 +67,7 @@ public class TerraMenuSkin extends Conta
activeBackgroundColor = theme.getColor(14);
marginColor = theme.getColor(11);
marginColor = new Color(marginColor.getRed(), marginColor.getGreen(),
- marginColor.getBlue(), 228);
+ marginColor.getBlue(), ALPHA);
margin = 20;
separatorColor = theme.getColor(7);
sectionSpacing = 7;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Mon Aug 4 09:16:37 2014
@@ -88,7 +88,7 @@ public class TerraPaletteSkin extends Wi
* Resize button image.
*/
protected class ResizeImage extends Image {
- public static final int ALPHA = 64;
+ private static final int ALPHA_IMAGE = 64;
@Override
public int getWidth() {
@@ -102,13 +102,13 @@ public class TerraPaletteSkin extends Wi
@Override
public void paint(Graphics2D graphics) {
- graphics.setPaint(new Color(0, 0, 0, ALPHA));
+ graphics.setPaint(new Color(0, 0, 0, ALPHA_IMAGE));
graphics.fillRect(3, 0, 2, 1);
graphics.fillRect(0, 3, 2, 1);
graphics.fillRect(3, 3, 2, 1);
graphics.setPaint(new Color(contentBorderColor.getRed(), contentBorderColor.getGreen(),
- contentBorderColor.getBlue(), ALPHA));
+ contentBorderColor.getBlue(), ALPHA_IMAGE));
graphics.fillRect(3, 1, 2, 1);
graphics.fillRect(0, 4, 2, 1);
graphics.fillRect(3, 4, 2, 1);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java Mon Aug 4 09:16:37 2014
@@ -52,6 +52,7 @@ public class TerraRadioButtonSkin extend
private static final int BUTTON_DIAMETER = 14;
private static final int BUTTON_SELECTION_DIAMETER = 6;
+ private static final int ALPHA = 68;
public TerraRadioButtonSkin() {
TerraTheme theme = (TerraTheme) Theme.getTheme();
@@ -167,7 +168,7 @@ public class TerraRadioButtonSkin extend
if (radioButton.isFocused()) {
if (buttonData == null) {
Color focusColor = new Color(buttonSelectionColor.getRed(),
- buttonSelectionColor.getGreen(), buttonSelectionColor.getBlue(), 0x44);
+ buttonSelectionColor.getGreen(), buttonSelectionColor.getBlue(), ALPHA);
graphics.setColor(focusColor);
graphics.fillOval(0, 0, BUTTON_DIAMETER - 1, BUTTON_DIAMETER - 1);
} else {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Mon Aug 4 09:16:37 2014
@@ -136,7 +136,7 @@ public class TerraSheetSkin extends Wind
* Resize button image.
*/
protected class ResizeImage extends Image {
- public static final int ALPHA = 64;
+ private static final int ALPHA_IMAGE = 64;
@Override
public int getWidth() {
@@ -150,13 +150,13 @@ public class TerraSheetSkin extends Wind
@Override
public void paint(Graphics2D graphics) {
- graphics.setPaint(new Color(0, 0, 0, ALPHA));
+ graphics.setPaint(new Color(0, 0, 0, ALPHA_IMAGE));
graphics.fillRect(3, 0, 2, 1);
graphics.fillRect(0, 3, 2, 1);
graphics.fillRect(3, 3, 2, 1);
graphics.setPaint(new Color(borderColor.getRed(), borderColor.getGreen(),
- borderColor.getBlue(), ALPHA));
+ borderColor.getBlue(), ALPHA_IMAGE));
graphics.fillRect(3, 1, 2, 1);
graphics.fillRect(0, 4, 2, 1);
graphics.fillRect(3, 4, 2, 1);
@@ -253,13 +253,14 @@ public class TerraSheetSkin extends Wind
private static final int DEFAULT_STATE_TRANSITION_DURATION = 300;
private static final int DEFAULT_STATE_TRANSITION_RATE = 30;
+ private static final int ALPHA = 235;
public TerraSheetSkin() {
TerraTheme theme = (TerraTheme) Theme.getTheme();
Color backgroundColor = theme.getColor(11);
backgroundColor = new Color(backgroundColor.getRed(), backgroundColor.getGreen(),
- backgroundColor.getBlue(), 235);
+ backgroundColor.getBlue(), ALPHA);
setBackgroundColor(backgroundColor);
borderColor = theme.getColor(7);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java Mon Aug 4 09:16:37 2014
@@ -103,10 +103,10 @@ public class Platform {
Integer multiClickInterval = (Integer) toolkit.getDesktopProperty("awt.multiClickInterval");
if (multiClickInterval == null) {
- multiClickInterval = DEFAULT_MULTI_CLICK_INTERVAL;
+ multiClickInterval = new Integer(DEFAULT_MULTI_CLICK_INTERVAL);
}
- return multiClickInterval;
+ return multiClickInterval.intValue();
}
/**
@@ -117,10 +117,10 @@ public class Platform {
Integer cursorBlinkRate = (Integer) toolkit.getDesktopProperty("awt.cursorBlinkRate");
if (cursorBlinkRate == null) {
- cursorBlinkRate = DEFAULT_CURSOR_BLINK_RATE;
+ cursorBlinkRate = new Integer(DEFAULT_CURSOR_BLINK_RATE);
}
- return cursorBlinkRate;
+ return cursorBlinkRate.intValue();
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java Mon Aug 4 09:16:37 2014
@@ -916,12 +916,12 @@ public class TablePane extends Container
public static int getRowSpan(Component component) {
Integer value = (Integer) component.getAttribute(Attribute.ROW_SPAN);
- return (value == null) ? 1 : value;
+ return (value == null) ? 1 : value.intValue();
}
public static void setRowSpan(Component component, int rowSpan) {
- Integer previousValue = (Integer) component.setAttribute(Attribute.ROW_SPAN, rowSpan);
- int previousRowSpan = (previousValue == null) ? 1 : previousValue;
+ Integer previousValue = (Integer) component.setAttribute(Attribute.ROW_SPAN, new Integer(rowSpan));
+ int previousRowSpan = (previousValue == null) ? 1 : previousValue.intValue();
if (previousRowSpan != rowSpan) {
Container parent = component.getParent();
@@ -936,12 +936,12 @@ public class TablePane extends Container
public static int getColumnSpan(Component component) {
Integer value = (Integer) component.getAttribute(Attribute.COLUMN_SPAN);
- return (value == null) ? 1 : value;
+ return (value == null) ? 1 : value.intValue();
}
public static void setColumnSpan(Component component, int columnSpan) {
- Integer previousValue = (Integer) component.setAttribute(Attribute.COLUMN_SPAN, columnSpan);
- int previousColumnSpan = (previousValue == null) ? 1 : previousValue;
+ Integer previousValue = (Integer) component.setAttribute(Attribute.COLUMN_SPAN, new Integer(columnSpan));
+ int previousColumnSpan = (previousValue == null) ? 1 : previousValue.intValue();
if (previousColumnSpan != columnSpan) {
Container parent = component.getParent();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java Mon Aug 4 09:16:37 2014
@@ -1018,7 +1018,7 @@ public class Window extends Container {
for (Window ownedWindow : ownedWindows) {
if (ownedWindow.isOpen()) {
- ownedWindowIndexes.add(display.indexOf(ownedWindow));
+ ownedWindowIndexes.add(new Integer(display.indexOf(ownedWindow)));
}
}
@@ -1026,7 +1026,7 @@ public class Window extends Container {
ArrayList<Window> sortedOwnedWindows = new ArrayList<>(ownedWindows.getLength());
for (Integer index : ownedWindowIndexes) {
- sortedOwnedWindows.add((Window) display.get(index));
+ sortedOwnedWindows.add((Window) display.get(index.intValue()));
}
for (Window ownedWindow : sortedOwnedWindows) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java Mon Aug 4 09:16:37 2014
@@ -33,17 +33,18 @@ public class LinkButtonDataRenderer exte
protected ImageView imageView = new ImageView();
protected Label label = new Label();
+ @SuppressWarnings("unused")
public LinkButtonDataRenderer() {
- getStyles().put("horizontalSpacing", 4);
+ getStyles().put("horizontalSpacing", new Integer(4));
- new TablePane.Column(this);
- new TablePane.Column(this, 1, true);
+ new TablePane.Column(this); // note: this is useful, even if not used directly
+ new TablePane.Column(this, 1, true); // note: this is useful, even if not used directly
TablePane.Row row = new TablePane.Row(this);
row.add(imageView);
row.add(label);
- label.getStyles().put("wrapText", true);
+ label.getStyles().put("wrapText", new Boolean(true));
}
@Override
@@ -75,7 +76,7 @@ public class LinkButtonDataRenderer exte
imageView.setVisible(true);
imageView.setImage(icon);
- imageView.getStyles().put("opacity", button.isEnabled() ? 1.0f : 0.5f);
+ imageView.getStyles().put("opacity", button.isEnabled() ? new Float(1.0f) : new Float(0.5f));
}
// Update the label
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorItemRenderer.java Mon Aug 4 09:16:37 2014
@@ -26,6 +26,8 @@ import org.apache.pivot.wtk.ImageView;
* List button renderer for displaying color swatches.
*/
public class ListButtonColorItemRenderer extends ImageView implements Button.DataRenderer {
+ private static final int ALPHA = 153;
+
private ListViewColorItemRenderer.ColorBadge colorBadge = new ListViewColorItemRenderer.ColorBadge();
public ListButtonColorItemRenderer() {
@@ -56,7 +58,7 @@ public class ListButtonColorItemRenderer
}
colorBadge.setColor(button.isEnabled() ? color : new Color(color.getRed(),
- color.getGreen(), color.getBlue(), 0x99));
+ color.getGreen(), color.getBlue(), ALPHA));
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorItemRenderer.java Mon Aug 4 09:16:37 2014
@@ -27,6 +27,8 @@ import org.apache.pivot.wtk.media.Image;
* List view renderer for displaying color swatches.
*/
public class ListViewColorItemRenderer extends ListViewItemRenderer {
+ private static final int ALPHA = 153;
+
/**
* Internal image class for rendering color swatches.
*/
@@ -92,7 +94,7 @@ public class ListViewColorItemRenderer e
String name = colorItem.getName();
colorBadge.setColor(listView.isEnabled() ? color : new Color(color.getRed(),
- color.getGreen(), color.getBlue(), 0x99));
+ color.getGreen(), color.getBlue(), ALPHA));
listItem.setText(name);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java Mon Aug 4 09:16:37 2014
@@ -38,11 +38,12 @@ public class MenuItemDataRenderer extend
protected Label textLabel = new Label();
protected Label keyboardShortcutLabel = new Label();
+ @SuppressWarnings("unused")
public MenuItemDataRenderer() {
getStyles().put("padding", new Insets(2));
- new TablePane.Column(this, 1, true);
- new TablePane.Column(this);
+ new TablePane.Column(this, 1, true); // note: this is useful, even if not used directly
+ new TablePane.Column(this); // note: this is useful, even if not used directly
BoxPane boxPane = new BoxPane();
boxPane.add(imageView);
@@ -95,12 +96,12 @@ public class MenuItemDataRenderer extend
Menu.Item menuItem = (Menu.Item) button;
Menu menu = (Menu) menuItem.getParent();
- int margin = (Integer) menu.getStyles().get("margin");
+ int margin = ((Integer) menu.getStyles().get("margin")).intValue();
Insets padding = (Insets) getStyles().get("padding");
imageView.setImage(icon);
imageView.setPreferredWidth(margin - padding.left * 2);
- imageView.getStyles().put("opacity", button.isEnabled() ? 1.0f : 0.5f);
+ imageView.getStyles().put("opacity", button.isEnabled() ? new Float(1.0f) : new Float(0.5f));
// Update the labels
textLabel.setText(text != null ? text : "");
@@ -125,7 +126,7 @@ public class MenuItemDataRenderer extend
boolean showKeyboardShortcuts = false;
if (menu.getStyles().containsKey("showKeyboardShortcuts")) {
- showKeyboardShortcuts = (Boolean) menu.getStyles().get("showKeyboardShortcuts");
+ showKeyboardShortcuts = ((Boolean) menu.getStyles().get("showKeyboardShortcuts")).booleanValue();
}
if (showKeyboardShortcuts) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java?rev=1615517&r1=1615516&r2=1615517&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java Mon Aug 4 09:16:37 2014
@@ -481,10 +481,10 @@ class TextPaneSkinTextNodeView extends T
if (offset == length) {
return new Bounds((int) Math.ceil(glyphBounds2D.getX() + glyphBounds2D.getWidth()), 0,
1, getHeight());
- } else {
- return new Bounds((int) Math.floor(glyphBounds2D.getX()), 0,
- (int) Math.ceil(glyphBounds2D.getWidth()), getHeight());
}
+
+ return new Bounds((int) Math.floor(glyphBounds2D.getX()), 0,
+ (int) Math.ceil(glyphBounds2D.getWidth()), getHeight());
}
@Override