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 2013/10/05 01:45:53 UTC
svn commit: r1529349 [17/44] - in /pivot/trunk:
charts/src/org/apache/pivot/charts/
charts/src/org/apache/pivot/charts/skin/ core/src/org/apache/pivot/beans/
core/src/org/apache/pivot/collections/
core/src/org/apache/pivot/collections/adapter/ core/src...
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Fri Oct 4 23:45:40 2013
@@ -67,7 +67,7 @@ public class TerraMenuButtonSkin extends
private WindowStateListener menuPopupWindowStateListener = new WindowStateListener.Adapter() {
@Override
public void windowOpened(Window window) {
- MenuButton menuButton = (MenuButton)getComponent();
+ MenuButton menuButton = (MenuButton) getComponent();
// Size and position the popup
Display display = menuButton.getDisplay();
@@ -90,8 +90,7 @@ public class TerraMenuButtonSkin extends
window.setMaximumHeight(Integer.MAX_VALUE);
int popupHeight = window.getPreferredHeight();
int maximumHeight = displaySize.height - window.getY();
- if (popupHeight > maximumHeight
- && buttonLocation.y > maximumHeight) {
+ if (popupHeight > maximumHeight && buttonLocation.y > maximumHeight) {
window.setMaximumHeight(buttonLocation.y);
window.setY(buttonLocation.y - window.getPreferredHeight() + 1);
} else {
@@ -110,7 +109,7 @@ public class TerraMenuButtonSkin extends
private static final int TRIGGER_WIDTH = 10;
public TerraMenuButtonSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
font = theme.getFont();
color = theme.getColor(1);
@@ -140,12 +139,12 @@ public class TerraMenuButtonSkin extends
if (height == -1) {
preferredWidth = getPreferredSize().width;
} else {
- MenuButton menuButton = (MenuButton)getComponent();
+ MenuButton menuButton = (MenuButton) getComponent();
Button.DataRenderer dataRenderer = menuButton.getDataRenderer();
dataRenderer.render(menuButton.getButtonData(), menuButton, false);
- preferredWidth = dataRenderer.getPreferredWidth(-1) + TRIGGER_WIDTH
- + padding.left + padding.right + spacing + 2;
+ preferredWidth = dataRenderer.getPreferredWidth(-1) + TRIGGER_WIDTH + padding.left
+ + padding.right + spacing + 2;
// Adjust for preferred aspect ratio
if (!Float.isNaN(minumumAspectRatio)
@@ -164,13 +163,13 @@ public class TerraMenuButtonSkin extends
if (width == -1) {
preferredHeight = getPreferredSize().height;
} else {
- MenuButton menuButton = (MenuButton)getComponent();
+ MenuButton menuButton = (MenuButton) getComponent();
Button.DataRenderer dataRenderer = menuButton.getDataRenderer();
dataRenderer.render(menuButton.getButtonData(), menuButton, false);
- preferredHeight = dataRenderer.getPreferredHeight(-1)
- + padding.top + padding.bottom + 2;
+ preferredHeight = dataRenderer.getPreferredHeight(-1) + padding.top + padding.bottom
+ + 2;
// Adjust for preferred aspect ratio
if (!Float.isNaN(maximumAspectRatio)
@@ -184,7 +183,7 @@ public class TerraMenuButtonSkin extends
@Override
public Dimensions getPreferredSize() {
- MenuButton menuButton = (MenuButton)getComponent();
+ MenuButton menuButton = (MenuButton) getComponent();
Button.DataRenderer dataRenderer = menuButton.getDataRenderer();
dataRenderer.render(menuButton.getButtonData(), menuButton, false);
@@ -196,13 +195,11 @@ public class TerraMenuButtonSkin extends
// Adjust for preferred aspect ratio
float aspectRatio = (float) preferredWidth / (float) preferredHeight;
- if (!Float.isNaN(minumumAspectRatio)
- && aspectRatio < minumumAspectRatio) {
+ if (!Float.isNaN(minumumAspectRatio) && aspectRatio < minumumAspectRatio) {
preferredWidth = (int) (preferredHeight * minumumAspectRatio);
}
- if (!Float.isNaN(maximumAspectRatio)
- && aspectRatio > maximumAspectRatio) {
+ if (!Float.isNaN(maximumAspectRatio) && aspectRatio > maximumAspectRatio) {
preferredHeight = (int) (preferredWidth / maximumAspectRatio);
}
@@ -235,7 +232,7 @@ public class TerraMenuButtonSkin extends
@Override
public void paint(Graphics2D graphics) {
- MenuButton menuButton = (MenuButton)getComponent();
+ MenuButton menuButton = (MenuButton) getComponent();
int width = getWidth();
int height = getHeight();
@@ -245,15 +242,12 @@ public class TerraMenuButtonSkin extends
Color bevelColorLocal = null;
Color borderColorLocal = null;
- if (!toolbar
- || highlighted
- || menuButton.isFocused()
- || menuPopup.isOpen()) {
+ if (!toolbar || highlighted || menuButton.isFocused() || menuPopup.isOpen()) {
if (menuButton.isEnabled()) {
colorLocal = this.color;
backgroundColorLocal = this.backgroundColor;
- bevelColorLocal = (pressed || (menuPopup.isOpen() && !menuPopup.isClosing())) ?
- pressedBevelColor : this.bevelColor;
+ bevelColorLocal = (pressed || (menuPopup.isOpen() && !menuPopup.isClosing())) ? pressedBevelColor
+ : this.bevelColor;
borderColorLocal = this.borderColor;
} else {
colorLocal = disabledColor;
@@ -267,10 +261,9 @@ public class TerraMenuButtonSkin extends
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- if (backgroundColorLocal != null
- && bevelColorLocal != null) {
- graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColorLocal,
- width / 2f, height / 2f, backgroundColorLocal));
+ if (backgroundColorLocal != null && bevelColorLocal != null) {
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColorLocal, width / 2f,
+ height / 2f, backgroundColorLocal));
graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
}
@@ -279,14 +272,14 @@ public class TerraMenuButtonSkin extends
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
- Bounds contentBounds = new Bounds(padding.left + 1, padding.top + 1,
- Math.max(width - (padding.left + padding.right + spacing + TRIGGER_WIDTH + 2), 0),
- Math.max(height - (padding.top + padding.bottom + 2), 0));
+ Bounds contentBounds = new Bounds(padding.left + 1, padding.top + 1, Math.max(width
+ - (padding.left + padding.right + spacing + TRIGGER_WIDTH + 2), 0), Math.max(height
+ - (padding.top + padding.bottom + 2), 0));
Button.DataRenderer dataRenderer = menuButton.getDataRenderer();
dataRenderer.render(menuButton.getButtonData(), menuButton, highlighted);
dataRenderer.setSize(contentBounds.width, contentBounds.height);
- Graphics2D contentGraphics = (Graphics2D)graphics.create();
+ Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(contentBounds.x, contentBounds.y);
contentGraphics.clipRect(0, 0, contentBounds.width, contentBounds.height);
dataRenderer.paint(contentGraphics);
@@ -304,14 +297,13 @@ public class TerraMenuButtonSkin extends
}
// Paint the focus state
- if (menuButton.isFocused()
- && !toolbar) {
+ if (menuButton.isFocused() && !toolbar) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(this.borderColor);
- graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0),
- Math.max(height - 5, 0), CORNER_RADIUS / 2, CORNER_RADIUS / 2));
+ graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0), Math.max(
+ height - 5, 0), CORNER_RADIUS / 2, CORNER_RADIUS / 2));
}
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
@@ -324,12 +316,12 @@ public class TerraMenuButtonSkin extends
triggerIconShape.lineTo(6, 0);
triggerIconShape.closePath();
- Graphics2D triggerGraphics = (Graphics2D)graphics.create();
+ Graphics2D triggerGraphics = (Graphics2D) graphics.create();
triggerGraphics.setStroke(new BasicStroke(0));
triggerGraphics.setPaint(colorLocal);
- Bounds triggerBounds = new Bounds(Math.max(width - (padding.right + TRIGGER_WIDTH), 0),
- 0, TRIGGER_WIDTH, Math.max(height - (padding.top - padding.bottom), 0));
+ Bounds triggerBounds = new Bounds(Math.max(width - (padding.right + TRIGGER_WIDTH), 0), 0,
+ TRIGGER_WIDTH, Math.max(height - (padding.top - padding.bottom), 0));
int tx = triggerBounds.x + (triggerBounds.width - triggerIconShape.getBounds().width) / 2;
int ty = triggerBounds.y + (triggerBounds.height - triggerIconShape.getBounds().height) / 2;
triggerGraphics.translate(tx, ty);
@@ -347,10 +339,8 @@ public class TerraMenuButtonSkin extends
@Override
public boolean isOpaque() {
- MenuButton menuButton = (MenuButton)getComponent();
- return (!toolbar
- || highlighted
- || menuButton.isFocused());
+ MenuButton menuButton = (MenuButton) getComponent();
+ return (!toolbar || highlighted || menuButton.isFocused());
}
public Font getFont() {
@@ -404,7 +394,7 @@ public class TerraMenuButtonSkin extends
}
public final void setColor(int color) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setColor(theme.getColor(color));
}
@@ -430,7 +420,7 @@ public class TerraMenuButtonSkin extends
}
public final void setDisabledColor(int disabledColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledColor(theme.getColor(disabledColor));
}
@@ -458,7 +448,7 @@ public class TerraMenuButtonSkin extends
}
public final void setBackgroundColor(int backgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(backgroundColor));
}
@@ -485,7 +475,7 @@ public class TerraMenuButtonSkin extends
}
public final void setDisabledBackgroundColor(int disabledBackgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledBackgroundColor(theme.getColor(disabledBackgroundColor));
}
@@ -512,7 +502,7 @@ public class TerraMenuButtonSkin extends
}
public final void setBorderColor(int borderColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBorderColor(theme.getColor(borderColor));
}
@@ -538,7 +528,7 @@ public class TerraMenuButtonSkin extends
}
public final void setDisabledBorderColor(int disabledBorderColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledBorderColor(theme.getColor(disabledBorderColor));
}
@@ -608,9 +598,9 @@ public class TerraMenuButtonSkin extends
}
public void setMinimumAspectRatio(float minumumAspectRatio) {
- if (!Float.isNaN(maximumAspectRatio)
- && minumumAspectRatio > maximumAspectRatio) {
- throw new IllegalArgumentException("minumumAspectRatio is greater than maximumAspectRatio.");
+ if (!Float.isNaN(maximumAspectRatio) && minumumAspectRatio > maximumAspectRatio) {
+ throw new IllegalArgumentException(
+ "minumumAspectRatio is greater than maximumAspectRatio.");
}
this.minumumAspectRatio = minumumAspectRatio;
@@ -630,9 +620,9 @@ public class TerraMenuButtonSkin extends
}
public void setMaximumAspectRatio(float maximumAspectRatio) {
- if (!Float.isNaN(minumumAspectRatio)
- && maximumAspectRatio < minumumAspectRatio) {
- throw new IllegalArgumentException("maximumAspectRatio is less than minimumAspectRatio.");
+ if (!Float.isNaN(minumumAspectRatio) && maximumAspectRatio < minumumAspectRatio) {
+ throw new IllegalArgumentException(
+ "maximumAspectRatio is less than minimumAspectRatio.");
}
this.maximumAspectRatio = maximumAspectRatio;
@@ -654,8 +644,7 @@ public class TerraMenuButtonSkin extends
public void setToolbar(boolean toolbar) {
this.toolbar = toolbar;
- if (toolbar &&
- getComponent().isFocused()) {
+ if (toolbar && getComponent().isFocused()) {
Component.clearFocus();
}
@@ -682,8 +671,7 @@ public class TerraMenuButtonSkin extends
public void mouseOut(Component component) {
super.mouseOut(component);
- if (toolbar
- && component.isFocused()) {
+ if (toolbar && component.isFocused()) {
Component.clearFocus();
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java Fri Oct 4 23:45:40 2013
@@ -31,7 +31,6 @@ import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.media.Image;
import org.apache.pivot.wtk.skin.MenuItemSkin;
-
/**
* Terra menu item skin.
*/
@@ -52,10 +51,10 @@ public class TerraMenuItemSkin extends M
@Override
public void paint(Graphics2D graphics) {
- Menu.Item menuItem = (Menu.Item)getComponent();
- Menu menu = (Menu)menuItem.getParent();
+ Menu.Item menuItem = (Menu.Item) getComponent();
+ Menu menu = (Menu) menuItem.getParent();
- Color color = (Color)menu.getStyles().get("color");
+ Color color = (Color) menu.getStyles().get("color");
graphics.setColor(color);
graphics.setStroke(new BasicStroke(2.5f));
@@ -68,10 +67,8 @@ public class TerraMenuItemSkin extends M
int offsetX = (SIZE - (n + m)) / 2;
int offsetY = (SIZE - n) / 2;
- graphics.drawLine(offsetX, (n - m) + offsetY,
- m + offsetX, n + offsetY);
- graphics.drawLine(m + offsetX, n + offsetY,
- (m + n) + offsetX, offsetY);
+ graphics.drawLine(offsetX, (n - m) + offsetY, m + offsetX, n + offsetY);
+ graphics.drawLine(m + offsetX, n + offsetY, (m + n) + offsetX, offsetY);
}
}
@@ -84,13 +81,13 @@ public class TerraMenuItemSkin extends M
public void install(Component component) {
super.install(component);
- Menu.Item menuItem = (Menu.Item)component;
+ Menu.Item menuItem = (Menu.Item) component;
menuItem.setCursor(Cursor.DEFAULT);
}
@Override
public int getPreferredWidth(int height) {
- Menu.Item menuItem = (Menu.Item)getComponent();
+ Menu.Item menuItem = (Menu.Item) getComponent();
Button.DataRenderer dataRenderer = menuItem.getDataRenderer();
dataRenderer.render(menuItem.getButtonData(), menuItem, false);
@@ -100,7 +97,7 @@ public class TerraMenuItemSkin extends M
@Override
public int getPreferredHeight(int width) {
- Menu.Item menuItem = (Menu.Item)getComponent();
+ Menu.Item menuItem = (Menu.Item) getComponent();
Button.DataRenderer dataRenderer = menuItem.getDataRenderer();
dataRenderer.render(menuItem.getButtonData(), menuItem, false);
@@ -110,15 +107,15 @@ public class TerraMenuItemSkin extends M
@Override
public Dimensions getPreferredSize() {
- Menu.Item menuItem = (Menu.Item)getComponent();
+ Menu.Item menuItem = (Menu.Item) getComponent();
Button.DataRenderer dataRenderer = menuItem.getDataRenderer();
dataRenderer.render(menuItem.getButtonData(), menuItem, false);
Dimensions preferredSize = dataRenderer.getPreferredSize();
- return new Dimensions(preferredSize.width + EXPANDER_SIZE,
- Math.max(preferredSize.height, EXPANDER_SIZE));
+ return new Dimensions(preferredSize.width + EXPANDER_SIZE, Math.max(preferredSize.height,
+ EXPANDER_SIZE));
}
@Override
@@ -128,8 +125,8 @@ public class TerraMenuItemSkin extends M
@Override
public void paint(Graphics2D graphics) {
- Menu.Item menuItem = (Menu.Item)getComponent();
- Menu menu = (Menu)menuItem.getParent();
+ Menu.Item menuItem = (Menu.Item) getComponent();
+ Menu menu = (Menu) menuItem.getParent();
int width = getWidth();
int height = getHeight();
@@ -138,9 +135,10 @@ public class TerraMenuItemSkin extends M
// Paint highlight state
if (highlight) {
- Color activeBackgroundColor = (Color)menu.getStyles().get("activeBackgroundColor");
- graphics.setPaint(new GradientPaint(width / 2f, 0, TerraTheme.brighten(activeBackgroundColor),
- width / 2f, height, activeBackgroundColor));
+ Color activeBackgroundColor = (Color) menu.getStyles().get("activeBackgroundColor");
+ graphics.setPaint(new GradientPaint(width / 2f, 0,
+ TerraTheme.brighten(activeBackgroundColor), width / 2f, height,
+ activeBackgroundColor));
graphics.fillRect(0, 0, width, height);
}
@@ -153,8 +151,8 @@ public class TerraMenuItemSkin extends M
// Paint the expander
if (menuItem.getMenu() != null) {
- Color color = (Color)(highlight ?
- menu.getStyles().get("activeColor") : menu.getStyles().get("color"));
+ Color color = (Color) (highlight ? menu.getStyles().get("activeColor")
+ : menu.getStyles().get("color"));
graphics.setColor(color);
graphics.setStroke(new BasicStroke(0));
@@ -164,8 +162,8 @@ public class TerraMenuItemSkin extends M
graphics.translate(dataRenderer.getWidth() + (EXPANDER_SIZE - EXPANDER_ICON_SIZE) / 2,
(height - EXPANDER_ICON_SIZE) / 2);
- int[] xPoints = {0, EXPANDER_ICON_SIZE, 0};
- int[] yPoints = {0, EXPANDER_ICON_SIZE / 2, EXPANDER_ICON_SIZE};
+ int[] xPoints = { 0, EXPANDER_ICON_SIZE, 0 };
+ int[] yPoints = { 0, EXPANDER_ICON_SIZE / 2, EXPANDER_ICON_SIZE };
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -175,11 +173,11 @@ public class TerraMenuItemSkin extends M
public boolean isOpaque() {
boolean opaque = false;
- Menu.Item menuItem = (Menu.Item)getComponent();
+ Menu.Item menuItem = (Menu.Item) getComponent();
if (menuItem.isActive()) {
- Menu menu = (Menu)menuItem.getParent();
- Color activeBackgroundColor = (Color)menu.getStyles().get("activeBackgroundColor");
+ Menu menu = (Menu) menuItem.getParent();
+ Color activeBackgroundColor = (Color) menu.getStyles().get("activeBackgroundColor");
opaque = (activeBackgroundColor.getTransparency() == Transparency.OPAQUE);
}
@@ -191,7 +189,7 @@ public class TerraMenuItemSkin extends M
}
public Color getPopupBorderColor() {
- return (Color)menuPopup.getStyles().get("borderColor");
+ return (Color) menuPopup.getStyles().get("borderColor");
}
public void setPopupBorderColor(Color popupBorderColor) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Fri Oct 4 23:45:40 2013
@@ -27,6 +27,7 @@ import org.apache.pivot.wtk.ContainerMou
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.MenuItemSelectionListener;
import org.apache.pivot.wtk.MenuPopup;
@@ -37,7 +38,6 @@ import org.apache.pivot.wtk.Panorama;
import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.effects.DropShadowDecorator;
import org.apache.pivot.wtk.effects.Transition;
import org.apache.pivot.wtk.effects.TransitionListener;
@@ -51,7 +51,7 @@ public class TerraMenuPopupSkin extends
private class RepositionCallback implements Runnable {
@Override
public void run() {
- MenuPopup menuPopup = (MenuPopup)getComponent();
+ MenuPopup menuPopup = (MenuPopup) getComponent();
Display display = menuPopup.getDisplay();
Point location = menuPopup.getLocation();
@@ -64,7 +64,7 @@ public class TerraMenuPopupSkin extends
int y = location.y;
if (y + size.height > display.getHeight()) {
- y-= size.height;
+ y -= size.height;
}
menuPopup.setLocation(x, y);
@@ -83,18 +83,17 @@ public class TerraMenuPopupSkin extends
private ContainerMouseListener displayMouseListener = new ContainerMouseListener.Adapter() {
@Override
public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
- MenuPopup menuPopup = (MenuPopup)getComponent();
+ MenuPopup menuPopup = (MenuPopup) getComponent();
if (menuPopup.isContextMenu()) {
- Display display = (Display)container;
+ Display display = (Display) container;
Component descendant = display.getDescendantAt(x, y);
if (descendant != display) {
Window window = descendant.getWindow();
if (!menuPopup.isAncestor(descendant)
- && (window == null
- || !menuPopup.isOwner(window))) {
+ && (window == null || !menuPopup.isOwner(window))) {
menuPopup.close();
}
}
@@ -108,13 +107,11 @@ public class TerraMenuPopupSkin extends
int scrollAmount, int wheelRotation, int x, int y) {
boolean consumed = false;
- Display display = (Display)container;
- Window window = (Window)display.getComponentAt(x, y);
+ Display display = (Display) container;
+ Window window = (Window) display.getComponentAt(x, y);
- MenuPopup menuPopup = (MenuPopup)getComponent();
- if (window != menuPopup
- && (window == null
- || !menuPopup.isOwner(window))) {
+ MenuPopup menuPopup = (MenuPopup) getComponent();
+ if (window != menuPopup && (window == null || !menuPopup.isOwner(window))) {
consumed = true;
}
@@ -125,7 +122,7 @@ public class TerraMenuPopupSkin extends
private MenuItemSelectionListener menuItemSelectionListener = new MenuItemSelectionListener() {
@Override
public void itemSelected(Menu.Item item) {
- MenuPopup menuPopup = (MenuPopup)getComponent();
+ MenuPopup menuPopup = (MenuPopup) getComponent();
menuPopup.close();
}
};
@@ -134,8 +131,8 @@ public class TerraMenuPopupSkin extends
private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraMenuPopupSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
- setBackgroundColor((Color)null);
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
+ setBackgroundColor((Color) null);
panorama = new Panorama();
panorama.getStyles().put("buttonBackgroundColor", Color.WHITE);
@@ -151,7 +148,7 @@ public class TerraMenuPopupSkin extends
public void install(Component component) {
super.install(component);
- MenuPopup menuPopup = (MenuPopup)component;
+ MenuPopup menuPopup = (MenuPopup) component;
menuPopup.getMenuPopupListeners().add(this);
menuPopup.getMenuPopupStateListeners().add(this);
@@ -169,7 +166,7 @@ public class TerraMenuPopupSkin extends
}
public Color getBorderColor() {
- return (Color)border.getStyles().get("color");
+ return (Color) border.getStyles().get("color");
}
public void setBorderColor(Color borderColor) {
@@ -208,7 +205,7 @@ public class TerraMenuPopupSkin extends
boolean consumed = super.keyPressed(component, keyCode, keyLocation);
if (keyCode == Keyboard.KeyCode.ESCAPE) {
- MenuPopup menuPopup = (MenuPopup)getComponent();
+ MenuPopup menuPopup = (MenuPopup) getComponent();
menuPopup.close();
}
@@ -222,7 +219,7 @@ public class TerraMenuPopupSkin extends
Display display = window.getDisplay();
display.getContainerMouseListeners().add(displayMouseListener);
- MenuPopup menuPopup = (MenuPopup)window;
+ MenuPopup menuPopup = (MenuPopup) window;
Menu menu = menuPopup.getMenu();
if (menu != null) {
Menu.Item activeItem = menu.getActiveItem();
@@ -246,8 +243,7 @@ public class TerraMenuPopupSkin extends
display.getContainerMouseListeners().remove(displayMouseListener);
- if (owner != null
- && owner.isOpen()) {
+ if (owner != null && owner.isOpen()) {
owner.moveToFront();
}
}
@@ -268,13 +264,11 @@ public class TerraMenuPopupSkin extends
@Override
public Vote previewMenuPopupClose(final MenuPopup menuPopup, boolean immediate) {
- if (!immediate
- && closeTransition == null) {
+ if (!immediate && closeTransition == null) {
border.setEnabled(false);
- closeTransition = new FadeWindowTransition(menuPopup,
- closeTransitionDuration, closeTransitionRate,
- dropShadowDecorator);
+ closeTransition = new FadeWindowTransition(menuPopup, closeTransitionDuration,
+ closeTransitionRate, dropShadowDecorator);
closeTransition.start(new TransitionListener() {
@Override
@@ -284,14 +278,12 @@ public class TerraMenuPopupSkin extends
});
}
- return (closeTransition != null
- && closeTransition.isRunning()) ? Vote.DEFER : Vote.APPROVE;
+ return (closeTransition != null && closeTransition.isRunning()) ? Vote.DEFER : Vote.APPROVE;
}
@Override
public void menuPopupCloseVetoed(MenuPopup menuPopup, Vote reason) {
- if (reason == Vote.DENY
- && closeTransition != null) {
+ if (reason == Vote.DENY && closeTransition != null) {
closeTransition.stop();
border.setEnabled(true);
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=1529349&r1=1529348&r2=1529349&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 Fri Oct 4 23:45:40 2013
@@ -52,7 +52,7 @@ public class TerraMenuSkin extends Conta
private boolean showKeyboardShortcuts;
public TerraMenuSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
Color backgroundColor = theme.getColor(4);
backgroundColor = new Color(backgroundColor.getRed(), backgroundColor.getGreen(),
backgroundColor.getBlue(), 228);
@@ -76,7 +76,7 @@ public class TerraMenuSkin extends Conta
public void install(Component component) {
super.install(component);
- Menu menu = (Menu)component;
+ Menu menu = (Menu) component;
menu.getMenuListeners().add(this);
for (Menu.Section section : menu.getSections()) {
@@ -95,7 +95,7 @@ public class TerraMenuSkin extends Conta
public int getPreferredWidth(int height) {
int preferredWidth = 0;
- Menu menu = (Menu)getComponent();
+ Menu menu = (Menu) getComponent();
Menu.SectionSequence sections = menu.getSections();
for (int i = 0, n = sections.getLength(); i < n; i++) {
@@ -103,8 +103,7 @@ public class TerraMenuSkin extends Conta
for (Menu.Item item : section) {
if (item.isVisible()) {
- preferredWidth = Math.max(item.getPreferredWidth(-1),
- preferredWidth);
+ preferredWidth = Math.max(item.getPreferredWidth(-1), preferredWidth);
}
}
}
@@ -116,7 +115,7 @@ public class TerraMenuSkin extends Conta
public int getPreferredHeight(int width) {
int preferredHeight = 0;
- Menu menu = (Menu)getComponent();
+ Menu menu = (Menu) getComponent();
Menu.SectionSequence sections = menu.getSections();
for (int i = 0, n = sections.getLength(); i < n; i++) {
@@ -141,7 +140,7 @@ public class TerraMenuSkin extends Conta
int preferredWidth = 0;
int preferredHeight = 0;
- Menu menu = (Menu)getComponent();
+ Menu menu = (Menu) getComponent();
Menu.SectionSequence sections = menu.getSections();
for (int i = 0, n = sections.getLength(); i < n; i++) {
@@ -149,8 +148,7 @@ public class TerraMenuSkin extends Conta
for (Menu.Item item : section) {
if (item.isVisible()) {
- preferredWidth = Math.max(item.getPreferredWidth(),
- preferredWidth);
+ preferredWidth = Math.max(item.getPreferredWidth(), preferredWidth);
preferredHeight += item.getPreferredHeight();
}
}
@@ -165,7 +163,7 @@ public class TerraMenuSkin extends Conta
@Override
public void layout() {
- Menu menu = (Menu)getComponent();
+ Menu menu = (Menu) getComponent();
Menu.SectionSequence sections = menu.getSections();
int width = getWidth();
@@ -191,7 +189,7 @@ public class TerraMenuSkin extends Conta
public void paint(Graphics2D graphics) {
super.paint(graphics);
- Menu menu = (Menu)getComponent();
+ Menu menu = (Menu) getComponent();
int width = getWidth();
int height = getHeight();
@@ -393,15 +391,14 @@ public class TerraMenuSkin extends Conta
* {@link KeyCode#DOWN DOWN} Select the next enabled menu item.<br>
* {@link KeyCode#LEFT LEFT} Close the current sub-menu.<br>
* {@link KeyCode#RIGHT RIGHT} Open the sub-menu of the current menu
- * item.<br>
- * {@link KeyCode#ENTER ENTER} 'presses' the active menu item if it
- * does not have a sub-menu.
+ * item.<br> {@link KeyCode#ENTER ENTER} 'presses' the active menu item if
+ * it does not have a sub-menu.
*/
@Override
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = super.keyPressed(component, keyCode, keyLocation);
- Menu menu = (Menu)component;
+ Menu menu = (Menu) component;
if (keyCode == Keyboard.KeyCode.UP) {
Menu.SectionSequence sections = menu.getSections();
@@ -500,8 +497,7 @@ public class TerraMenuSkin extends Conta
Menu.Item activeItem = menu.getActiveItem();
// Press if the item has a sub-menu
- if (activeItem != null
- && activeItem.getMenu() != null) {
+ if (activeItem != null && activeItem.getMenu() != null) {
activeItem.press();
consumed = true;
}
@@ -509,8 +505,7 @@ public class TerraMenuSkin extends Conta
Menu.Item activeItem = menu.getActiveItem();
// Press if the item does not have a sub-menu
- if (activeItem != null
- && activeItem.getMenu() == null) {
+ if (activeItem != null && activeItem.getMenu() == null) {
activeItem.press();
consumed = true;
}
@@ -522,21 +517,20 @@ public class TerraMenuSkin extends Conta
}
/**
- * {@link KeyCode#SPACE SPACE} 'presses' the active menu item if it does
- * not have a sub-menu.
+ * {@link KeyCode#SPACE SPACE} 'presses' the active menu item if it does not
+ * have a sub-menu.
*/
@Override
public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = super.keyReleased(component, keyCode, keyLocation);
- Menu menu = (Menu)component;
+ Menu menu = (Menu) component;
if (keyCode == Keyboard.KeyCode.SPACE) {
Menu.Item activeItem = menu.getActiveItem();
// Press if the item does not have a sub-menu
- if (activeItem != null
- && activeItem.getMenu() == null) {
+ if (activeItem != null && activeItem.getMenu() == null) {
activeItem.press();
consumed = true;
}
@@ -553,7 +547,7 @@ public class TerraMenuSkin extends Conta
public boolean keyTyped(Component component, char character) {
boolean consumed = super.keyTyped(component, character);
- Menu menu = (Menu)component;
+ Menu menu = (Menu) component;
Menu.SectionSequence sections = menu.getSections();
int sectionCount = sections.getLength();
@@ -582,8 +576,7 @@ public class TerraMenuSkin extends Conta
Button.DataRenderer itemDataRenderer = item.getDataRenderer();
String string = itemDataRenderer.toString(item.getButtonData());
- if (string != null
- && string.length() > 0) {
+ if (string != null && string.length() > 0) {
char first = Character.toUpperCase(string.charAt(0));
if (first == characterUpper) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java Fri Oct 4 23:45:40 2013
@@ -37,12 +37,10 @@ import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.ComponentSkin;
-
/**
* Meter skin.
*/
-public class TerraMeterSkin extends ComponentSkin
- implements MeterListener {
+public class TerraMeterSkin extends ComponentSkin implements MeterListener {
private Color fillColor;
private Color gridColor;
private float gridFrequency;
@@ -54,7 +52,7 @@ public class TerraMeterSkin extends Comp
private static final int DEFAULT_HEIGHT = 12;
public TerraMeterSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
fillColor = theme.getColor(16);
gridColor = theme.getColor(10);
gridFrequency = 0.25f;
@@ -67,7 +65,7 @@ public class TerraMeterSkin extends Comp
public void install(Component component) {
super.install(component);
- Meter meter = (Meter)component;
+ Meter meter = (Meter) component;
meter.getMeterListeners().add(this);
}
@@ -78,23 +76,23 @@ public class TerraMeterSkin extends Comp
@Override
public int getPreferredWidth(int height) {
- Meter meter = (Meter)getComponent();
+ Meter meter = (Meter) getComponent();
int preferredWidth;
if (meter.getOrientation() == Orientation.HORIZONTAL) {
String text = meter.getText();
- if (text != null
- && text.length() > 0) {
+ if (text != null && text.length() > 0) {
FontRenderContext fontRenderContext = Platform.getFontRenderContext();
Rectangle2D stringBounds = font.getStringBounds(text, fontRenderContext);
- preferredWidth = (int)Math.ceil(stringBounds.getWidth()) + 2;
+ preferredWidth = (int) Math.ceil(stringBounds.getWidth()) + 2;
} else {
preferredWidth = 0;
}
- // If the meter has no content, its preferred width is hard-coded by the
+ // If the meter has no content, its preferred width is hard-coded by
+ // the
// class and is not affected by the height constraint
preferredWidth = Math.max(preferredWidth, DEFAULT_WIDTH);
} else {
@@ -106,7 +104,7 @@ public class TerraMeterSkin extends Comp
@Override
public int getPreferredHeight(int width) {
- Meter meter = (Meter)getComponent();
+ Meter meter = (Meter) getComponent();
int preferredHeight;
@@ -115,16 +113,16 @@ public class TerraMeterSkin extends Comp
} else {
String text = meter.getText();
- if (text != null
- && text.length() > 0) {
+ if (text != null && text.length() > 0) {
FontRenderContext fontRenderContext = Platform.getFontRenderContext();
LineMetrics lm = font.getLineMetrics("", fontRenderContext);
- preferredHeight = (int)Math.ceil(lm.getHeight()) + 2;
+ preferredHeight = (int) Math.ceil(lm.getHeight()) + 2;
} else {
preferredHeight = 0;
}
- // If the meter has no content, its preferred height is hard-coded by the
+ // If the meter has no content, its preferred height is hard-coded
+ // by the
// class and is not affected by the width constraint
preferredHeight = Math.max(preferredHeight, DEFAULT_HEIGHT);
}
@@ -134,22 +132,22 @@ public class TerraMeterSkin extends Comp
@Override
public Dimensions getPreferredSize() {
- Meter meter = (Meter)getComponent();
+ Meter meter = (Meter) getComponent();
String text = meter.getText();
int preferredWidth = 0;
int preferredHeight = 0;
- if (text != null
- && text.length() > 0) {
+ if (text != null && text.length() > 0) {
FontRenderContext fontRenderContext = Platform.getFontRenderContext();
Rectangle2D stringBounds = font.getStringBounds(text, fontRenderContext);
- preferredWidth = (int)Math.ceil(stringBounds.getWidth()) + 2;
+ preferredWidth = (int) Math.ceil(stringBounds.getWidth()) + 2;
LineMetrics lm = font.getLineMetrics("", fontRenderContext);
- preferredHeight = (int)Math.ceil(lm.getHeight()) + 2;
+ preferredHeight = (int) Math.ceil(lm.getHeight()) + 2;
}
- // If meter has no content, its preferred size is hard coded by the class
+ // If meter has no content, its preferred size is hard coded by the
+ // class
preferredWidth = Math.max(preferredWidth, DEFAULT_WIDTH);
preferredHeight = Math.max(preferredHeight, DEFAULT_HEIGHT);
@@ -167,13 +165,12 @@ public class TerraMeterSkin extends Comp
public int getBaseline(int width, int height) {
int baseline = -1;
- Meter meter = (Meter)getComponent();
+ Meter meter = (Meter) getComponent();
if (meter.getOrientation() == Orientation.HORIZONTAL) {
String text = meter.getText();
- if (text != null
- && text.length() > 0) {
+ if (text != null && text.length() > 0) {
FontRenderContext fontRenderContext = Platform.getFontRenderContext();
LineMetrics lm = font.getLineMetrics("", fontRenderContext);
float ascent = lm.getAscent();
@@ -193,7 +190,7 @@ public class TerraMeterSkin extends Comp
@Override
public void paint(Graphics2D graphics) {
- Meter meter = (Meter)getComponent();
+ Meter meter = (Meter) getComponent();
int width = getWidth();
int height = getHeight();
@@ -208,33 +205,32 @@ public class TerraMeterSkin extends Comp
}
private void drawMeter(Meter meter, Graphics2D graphics, int width, int height) {
- int meterStop = (int)(meter.getPercentage() * width);
+ int meterStop = (int) (meter.getPercentage() * width);
// Paint the interior fill
- graphics.setPaint(new GradientPaint(0, 0, TerraTheme.brighten(fillColor),
- 0, height, TerraTheme.darken(fillColor)));
+ graphics.setPaint(new GradientPaint(0, 0, TerraTheme.brighten(fillColor), 0, height,
+ TerraTheme.darken(fillColor)));
graphics.fillRect(0, 0, meterStop, height);
// Paint the grid
graphics.setPaint(gridColor);
GraphicsUtilities.drawRect(graphics, 0, 0, width, height);
- int nLines = (int)Math.ceil(1 / gridFrequency) - 1;
+ int nLines = (int) Math.ceil(1 / gridFrequency) - 1;
float gridSeparation = width * gridFrequency;
for (int i = 0; i < nLines; i++) {
- int gridX = (int)((i + 1) * gridSeparation);
+ int gridX = (int) ((i + 1) * gridSeparation);
GraphicsUtilities.drawLine(graphics, gridX, 0, height, Orientation.VERTICAL);
}
String text = meter.getText();
- if (text != null
- && text.length() > 0) {
+ if (text != null && text.length() > 0) {
FontRenderContext fontRenderContext = Platform.getFontRenderContext();
LineMetrics lm = font.getLineMetrics("", fontRenderContext);
float ascent = lm.getAscent();
Rectangle2D stringBounds = font.getStringBounds(text, fontRenderContext);
- float textWidth = (float)stringBounds.getWidth();
- float textHeight = (float)stringBounds.getHeight();
+ float textWidth = (float) stringBounds.getWidth();
+ float textHeight = (float) stringBounds.getHeight();
float textX = (width - textWidth) / 2;
float textY = (height - textHeight) / 2;
@@ -378,12 +374,9 @@ public class TerraMeterSkin extends Comp
/**
* Listener for meter percentage changes.
- *
- * @param meter
- * The source of the event.
- *
- * @param previousPercentage
- * The previous percentage value.
+ *
+ * @param meter The source of the event.
+ * @param previousPercentage The previous percentage value.
*/
@Override
public void percentageChanged(Meter meter, double previousPercentage) {
@@ -392,12 +385,9 @@ public class TerraMeterSkin extends Comp
/**
* Listener for meter text changes.
- *
- * @param meter
- * The source of the event.
- *
- * @param previousText
- * The previous text value.
+ *
+ * @param meter The source of the event.
+ * @param previousText The previous text value.
*/
@Override
public void textChanged(Meter meter, String previousText) {
@@ -406,9 +396,8 @@ public class TerraMeterSkin extends Comp
/**
* Listener for meter orientation changes.
- *
- * @param meter
- * The source of the event.
+ *
+ * @param meter The source of the event.
*/
@Override
public void orientationChanged(Meter meter) {
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=1529349&r1=1529348&r2=1529349&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 Fri Oct 4 23:45:40 2013
@@ -107,9 +107,8 @@ public class TerraPaletteSkin extends Wi
graphics.fillRect(0, 3, 2, 1);
graphics.fillRect(3, 3, 2, 1);
- graphics.setPaint(new Color(contentBorderColor.getRed(),
- contentBorderColor.getGreen(), contentBorderColor.getBlue(),
- ALPHA));
+ graphics.setPaint(new Color(contentBorderColor.getRed(), contentBorderColor.getGreen(),
+ contentBorderColor.getBlue(), ALPHA));
graphics.fillRect(3, 1, 2, 1);
graphics.fillRect(0, 4, 2, 1);
graphics.fillRect(3, 4, 2, 1);
@@ -139,13 +138,12 @@ public class TerraPaletteSkin extends Wi
private WindowClassListener windowClassListener = new WindowClassListener() {
@Override
public void activeWindowChanged(Window previousActiveWindow) {
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
Window owner = palette.getOwner();
Window activeWindow = Window.getActiveWindow();
palette.setVisible(activeWindow != null
- && (owner == activeWindow
- || owner.isOwner(activeWindow)));
+ && (owner == activeWindow || owner.isOwner(activeWindow)));
invalidateComponent();
}
};
@@ -161,7 +159,7 @@ public class TerraPaletteSkin extends Wi
private Color contentBevelColor;
public TerraPaletteSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(10));
titleBarColor = theme.getColor(4);
@@ -192,7 +190,8 @@ public class TerraPaletteSkin extends Wi
titleBoxPane.getStyles().put("padding", new Insets(0, 0, 0, 3));
Font titleFont = theme.getFont();
- titleFont = titleFont.deriveFont(Font.BOLD, Math.round(titleFont.getSize2D() * titleFontScale));
+ titleFont = titleFont.deriveFont(Font.BOLD,
+ Math.round(titleFont.getSize2D() * titleFontScale));
titleLabel.getStyles().put("font", titleFont);
titleLabel.getStyles().put("color", titleBarColor);
@@ -201,19 +200,20 @@ public class TerraPaletteSkin extends Wi
buttonBoxPane.getStyles().put("verticalAlignment", VerticalAlignment.CENTER);
buttonBoxPane.add(closeButton);
- closeButton.getComponentMouseButtonListeners().add(new ComponentMouseButtonListener.Adapter() {
- @Override
- public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
- // Consume the event so we don't process it as a click on
- // the title bar and try to move the window
- return true;
- }
- });
+ closeButton.getComponentMouseButtonListeners().add(
+ new ComponentMouseButtonListener.Adapter() {
+ @Override
+ public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
+ // Consume the event so we don't process it as a click on
+ // the title bar and try to move the window
+ return true;
+ }
+ });
closeButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
public void buttonPressed(Button button) {
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
palette.close();
}
});
@@ -223,7 +223,7 @@ public class TerraPaletteSkin extends Wi
public void install(Component component) {
super.install(component);
- Palette palette = (Palette)component;
+ Palette palette = (Palette) component;
palette.add(titleBarTablePane);
// Attach the drop-shadow decorator
@@ -239,7 +239,7 @@ public class TerraPaletteSkin extends Wi
public int getPreferredWidth(int height) {
int preferredWidth = 0;
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
Component content = palette.getContent();
Dimensions preferredTitleBarSize = titleBarTablePane.getPreferredSize();
@@ -247,12 +247,11 @@ public class TerraPaletteSkin extends Wi
if (content != null) {
if (height != -1) {
- height = Math.max(height - preferredTitleBarSize.height - 4 -
- padding.top - padding.bottom, 0);
+ height = Math.max(height - preferredTitleBarSize.height - 4 - padding.top
+ - padding.bottom, 0);
}
- preferredWidth = Math.max(preferredWidth,
- content.getPreferredWidth(height));
+ preferredWidth = Math.max(preferredWidth, content.getPreferredWidth(height));
}
preferredWidth += (padding.left + padding.right) + 2;
@@ -264,7 +263,7 @@ public class TerraPaletteSkin extends Wi
public int getPreferredHeight(int width) {
int preferredHeight = 0;
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
Component content = palette.getContent();
if (width != -1) {
@@ -291,7 +290,7 @@ public class TerraPaletteSkin extends Wi
int preferredWidth = 0;
int preferredHeight = 0;
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
Component content = palette.getContent();
Dimensions preferredTitleBarSize = titleBarTablePane.getPreferredSize();
@@ -314,7 +313,7 @@ public class TerraPaletteSkin extends Wi
@Override
public void layout() {
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
int width = getWidth();
int height = getHeight();
@@ -332,19 +331,17 @@ public class TerraPaletteSkin extends Wi
resizeHandle.setSize(resizeHandle.getPreferredSize());
resizeHandle.setLocation(clientWidth - resizeHandle.getWidth(),
clientHeight - resizeHandle.getHeight());
- resizeHandle.setVisible(palette.isPreferredWidthSet()
- || palette.isPreferredHeightSet());
+ resizeHandle.setVisible(palette.isPreferredWidthSet() || palette.isPreferredHeightSet());
// Size/position content
Component content = palette.getContent();
if (content != null) {
- content.setLocation(padding.left + 1,
- titleBarTablePane.getHeight() + padding.top + 3);
+ content.setLocation(padding.left + 1, titleBarTablePane.getHeight() + padding.top + 3);
int contentWidth = Math.max(width - (padding.left + padding.right + 2), 0);
- int contentHeight = Math.max(height - (titleBarTablePane.getHeight()
- + padding.top + padding.bottom + 4), 0);
+ int contentHeight = Math.max(height
+ - (titleBarTablePane.getHeight() + padding.top + padding.bottom + 4), 0);
content.setSize(contentWidth, contentHeight);
}
@@ -361,25 +358,27 @@ public class TerraPaletteSkin extends Wi
graphics.setStroke(new BasicStroke());
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
boolean active = palette.getOwner().isActive();
boolean enabled = palette.isEnabled();
- Color currentTitleBarBackgroundColor = (active && enabled) ? titleBarBackgroundColor : inactiveTitleBarBackgroundColor;
- Color currentTitleBarBorderColor = (active && enabled) ? titleBarBorderColor : inactiveTitleBarBorderColor;
+ Color currentTitleBarBackgroundColor = (active && enabled) ? titleBarBackgroundColor
+ : inactiveTitleBarBackgroundColor;
+ Color currentTitleBarBorderColor = (active && enabled) ? titleBarBorderColor
+ : inactiveTitleBarBorderColor;
Color titleBarBevelColor = TerraTheme.brighten(currentTitleBarBackgroundColor);
// Draw the title area
- graphics.setPaint(new GradientPaint(width / 2f, 0, titleBarBevelColor,
- width / 2f, titleBarHeight + 1, currentTitleBarBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, titleBarBevelColor, width / 2f,
+ titleBarHeight + 1, currentTitleBarBackgroundColor));
graphics.fillRect(0, 0, width, titleBarHeight + 1);
// Draw the border
graphics.setPaint(currentTitleBarBorderColor);
GraphicsUtilities.drawRect(graphics, 0, 0, width, titleBarHeight + 1);
// Draw the content area
- Bounds contentAreaRectangle = new Bounds(0, titleBarHeight + 2,
- width, height - (titleBarHeight + 2));
+ Bounds contentAreaRectangle = new Bounds(0, titleBarHeight + 2, width, height
+ - (titleBarHeight + 2));
graphics.setPaint(contentBorderColor);
GraphicsUtilities.drawRect(graphics, contentAreaRectangle.x, contentAreaRectangle.y,
contentAreaRectangle.width, contentAreaRectangle.height);
@@ -447,7 +446,10 @@ public class TerraPaletteSkin extends Wi
/**
* Sets the font used in rendering the titlebar text
- * @param font A {@link org.apache.pivot.wtk.skin.ComponentSkin#decodeFont(String) font specification}
+ *
+ * @param font A
+ * {@link org.apache.pivot.wtk.skin.ComponentSkin#decodeFont(String) font
+ * specification}
*/
public final void setTitleFont(String font) {
if (font == null) {
@@ -459,6 +461,7 @@ public class TerraPaletteSkin extends Wi
/**
* Sets the font used in rendering the titlebar text
+ *
* @param font A dictionary {@link Theme#deriveFont describing a font}
*/
public final void setTitleFont(Dictionary<String, ?> font) {
@@ -476,7 +479,7 @@ public class TerraPaletteSkin extends Wi
public final void setTitleFontScale(float scale) {
this.titleFontScale = scale;
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
Font titleFont = theme.getFont();
titleFont = titleFont.deriveFont(Font.BOLD, Math.round(titleFont.getSize2D() * scale));
titleLabel.getStyles().put("font", titleFont);
@@ -488,7 +491,7 @@ public class TerraPaletteSkin extends Wi
boolean consumed = super.mouseMove(component, x, y);
if (Mouse.getCapturer() == component) {
- Palette palette = (Palette)getComponent();
+ Palette palette = (Palette) getComponent();
Display display = palette.getDisplay();
Point location = palette.mapPointToAncestor(display, x, y);
@@ -525,14 +528,11 @@ public class TerraPaletteSkin extends Wi
}
} else {
Cursor cursor = null;
- if (resizeHandle.isVisible()
- && x > resizeHandle.getX()
- && y > resizeHandle.getY()) {
+ if (resizeHandle.isVisible() && x > resizeHandle.getX() && y > resizeHandle.getY()) {
boolean preferredWidthSet = component.isPreferredWidthSet();
boolean preferredHeightSet = component.isPreferredHeightSet();
- if (preferredWidthSet
- && preferredHeightSet) {
+ if (preferredWidthSet && preferredHeightSet) {
cursor = Cursor.RESIZE_SOUTH_EAST;
} else if (preferredWidthSet) {
cursor = Cursor.RESIZE_EAST;
@@ -551,11 +551,10 @@ public class TerraPaletteSkin extends Wi
public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
boolean consumed = super.mouseDown(component, button, x, y);
- Window window = (Window)getComponent();
+ Window window = (Window) getComponent();
boolean maximized = window.isMaximized();
- if (button == Mouse.Button.LEFT
- && !maximized) {
+ if (button == Mouse.Button.LEFT && !maximized) {
Bounds titleBarBounds = titleBarTablePane.getBounds();
if (titleBarBounds.contains(x, y)) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanelSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanelSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanelSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanelSkin.java Fri Oct 4 23:45:40 2013
@@ -24,7 +24,7 @@ import org.apache.pivot.wtk.skin.PanelSk
*/
public class TerraPanelSkin extends PanelSkin {
public final void setBackgroundColor(int backgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(backgroundColor));
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java Fri Oct 4 23:45:40 2013
@@ -75,8 +75,8 @@ public class TerraPanoramaSkin extends C
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = {0, 3, 6};
- int[] yPoints = {5, 1, 5};
+ int[] xPoints = { 0, 3, 6 };
+ int[] yPoints = { 5, 1, 5 };
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -90,8 +90,8 @@ public class TerraPanoramaSkin extends C
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = {0, 3, 6};
- int[] yPoints = {1, 5, 1};
+ int[] xPoints = { 0, 3, 6 };
+ int[] yPoints = { 1, 5, 1 };
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -105,8 +105,8 @@ public class TerraPanoramaSkin extends C
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = {1, 5, 1};
- int[] yPoints = {0, 3, 6};
+ int[] xPoints = { 1, 5, 1 };
+ int[] yPoints = { 0, 3, 6 };
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -120,8 +120,8 @@ public class TerraPanoramaSkin extends C
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = {5, 1, 5};
- int[] yPoints = {0, 3, 6};
+ int[] xPoints = { 5, 1, 5 };
+ int[] yPoints = { 0, 3, 6 };
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -159,7 +159,7 @@ public class TerraPanoramaSkin extends C
@Override
public void paint(Graphics2D graphics) {
- ScrollButton scrollButton = (ScrollButton)getComponent();
+ ScrollButton scrollButton = (ScrollButton) getComponent();
int width = getWidth();
int height = getHeight();
@@ -177,8 +177,7 @@ public class TerraPanoramaSkin extends C
}
/**
- * @return
- * <tt>false</tt>; link buttons are not focusable.
+ * @return <tt>false</tt>; link buttons are not focusable.
*/
@Override
public boolean isFocusable() {
@@ -189,13 +188,11 @@ public class TerraPanoramaSkin extends C
private class ScrollCallback implements Runnable {
@Override
public void run() {
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
if (northButton.isMouseOver()) {
- int scrollTop = Math.max(panorama.getScrollTop()
- - (int)scrollDistance, 0);
- if (scrollTop == 0
- && scheduledScrollCallback != null) {
+ int scrollTop = Math.max(panorama.getScrollTop() - (int) scrollDistance, 0);
+ if (scrollTop == 0 && scheduledScrollCallback != null) {
scheduledScrollCallback.cancel();
scheduledScrollCallback = null;
}
@@ -203,10 +200,9 @@ public class TerraPanoramaSkin extends C
panorama.setScrollTop(scrollTop);
} else if (southButton.isMouseOver()) {
int maxScrollTop = getMaxScrollTop();
- int scrollTop = Math.min(panorama.getScrollTop()
- + (int)scrollDistance, maxScrollTop);
- if (scrollTop == maxScrollTop
- && scheduledScrollCallback != null) {
+ int scrollTop = Math.min(panorama.getScrollTop() + (int) scrollDistance,
+ maxScrollTop);
+ if (scrollTop == maxScrollTop && scheduledScrollCallback != null) {
scheduledScrollCallback.cancel();
scheduledScrollCallback = null;
}
@@ -214,20 +210,17 @@ public class TerraPanoramaSkin extends C
panorama.setScrollTop(scrollTop);
} else if (eastButton.isMouseOver()) {
int maxScrollLeft = getMaxScrollLeft();
- int scrollLeft = Math.min(panorama.getScrollLeft()
- + (int)scrollDistance, maxScrollLeft);
- if (scrollLeft == maxScrollLeft
- && scheduledScrollCallback != null) {
+ int scrollLeft = Math.min(panorama.getScrollLeft() + (int) scrollDistance,
+ maxScrollLeft);
+ if (scrollLeft == maxScrollLeft && scheduledScrollCallback != null) {
scheduledScrollCallback.cancel();
scheduledScrollCallback = null;
}
panorama.setScrollLeft(scrollLeft);
} else if (westButton.isMouseOver()) {
- int scrollLeft = Math.max(panorama.getScrollLeft()
- - (int)scrollDistance, 0);
- if (scrollLeft == 0
- && scheduledScrollCallback != null) {
+ int scrollLeft = Math.max(panorama.getScrollLeft() - (int) scrollDistance, 0);
+ if (scrollLeft == 0 && scheduledScrollCallback != null) {
scheduledScrollCallback.cancel();
scheduledScrollCallback = null;
}
@@ -235,8 +228,7 @@ public class TerraPanoramaSkin extends C
panorama.setScrollLeft(scrollLeft);
}
- scrollDistance = Math.min(scrollDistance * SCROLL_ACCELERATION,
- MAXIMUM_SCROLL_DISTANCE);
+ scrollDistance = Math.min(scrollDistance * SCROLL_ACCELERATION, MAXIMUM_SCROLL_DISTANCE);
}
}
@@ -253,7 +245,7 @@ public class TerraPanoramaSkin extends C
private static final Button.DataRenderer DEFAULT_DATA_RENDERER = new ButtonDataRenderer();
public TerraPanoramaSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
buttonColor = theme.getColor(1);
buttonBackgroundColor = null;
buttonPadding = 4;
@@ -264,8 +256,8 @@ public class TerraPanoramaSkin extends C
public void mouseOver(Component component) {
// Start scroll timer
scrollDistance = INITIAL_SCROLL_DISTANCE;
- scheduledScrollCallback =
- ApplicationContext.scheduleRecurringCallback(scrollCallback, SCROLL_RATE);
+ scheduledScrollCallback = ApplicationContext.scheduleRecurringCallback(scrollCallback,
+ SCROLL_RATE);
}
@Override
@@ -293,7 +285,7 @@ public class TerraPanoramaSkin extends C
public void install(Component component) {
super.install(component);
- Panorama panorama = (Panorama)component;
+ Panorama panorama = (Panorama) component;
panorama.getViewportListeners().add(this);
// Add scroll arrow link buttons and attach mouse listeners
@@ -319,7 +311,7 @@ public class TerraPanoramaSkin extends C
int preferredWidth = 0;
// The panorama's preferred width is the preferred width of the view
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
Component view = panorama.getView();
if (view != null) {
preferredWidth = view.getPreferredWidth(height);
@@ -333,7 +325,7 @@ public class TerraPanoramaSkin extends C
int preferredHeight = 0;
// The panorama's preferred height is the preferred height of the view
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
Component view = panorama.getView();
if (view != null) {
preferredHeight = view.getPreferredHeight(width);
@@ -347,7 +339,7 @@ public class TerraPanoramaSkin extends C
Dimensions preferredSize = null;
// The panorama's preferred size is the preferred size of the view
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
Component view = panorama.getView();
if (view == null) {
preferredSize = new Dimensions(0, 0);
@@ -360,7 +352,7 @@ public class TerraPanoramaSkin extends C
@Override
public void layout() {
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
int width = getWidth();
int height = getHeight();
@@ -440,7 +432,7 @@ public class TerraPanoramaSkin extends C
int wheelRotation, int x, int y) {
boolean consumed = false;
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
Component view = panorama.getView();
if (view != null) {
@@ -449,8 +441,8 @@ public class TerraPanoramaSkin extends C
if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) {
// Treat the mouse wheel as a horizontal scroll event
int previousScrollLeft = panorama.getScrollLeft();
- int newScrollLeft = previousScrollLeft + (scrollAmount * wheelRotation *
- (int)INITIAL_SCROLL_DISTANCE);
+ int newScrollLeft = previousScrollLeft
+ + (scrollAmount * wheelRotation * (int) INITIAL_SCROLL_DISTANCE);
if (wheelRotation > 0) {
int maxScrollLeft = getMaxScrollLeft();
@@ -471,8 +463,8 @@ public class TerraPanoramaSkin extends C
} else {
// Treat the mouse wheel as a vertical scroll event
int previousScrollTop = panorama.getScrollTop();
- int newScrollTop = previousScrollTop + (scrollAmount * wheelRotation *
- (int)INITIAL_SCROLL_DISTANCE);
+ int newScrollTop = previousScrollTop
+ + (scrollAmount * wheelRotation * (int) INITIAL_SCROLL_DISTANCE);
if (wheelRotation > 0) {
int maxScrollTop = getMaxScrollTop();
@@ -539,7 +531,7 @@ public class TerraPanoramaSkin extends C
}
public final void setButtonBackgroundColor(int buttonBackgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setButtonBackgroundColor(theme.getColor(buttonBackgroundColor));
}
@@ -576,7 +568,7 @@ public class TerraPanoramaSkin extends C
protected int getMaxScrollTop() {
int maxScrollTop = 0;
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
int height = getHeight();
Component view = panorama.getView();
@@ -590,7 +582,7 @@ public class TerraPanoramaSkin extends C
protected int getMaxScrollLeft() {
int maxScrollLeft = 0;
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
int width = getWidth();
Component view = panorama.getView();
@@ -602,22 +594,18 @@ public class TerraPanoramaSkin extends C
}
protected void updateScrollButtonVisibility() {
- Panorama panorama = (Panorama)getComponent();
+ Panorama panorama = (Panorama) getComponent();
boolean mouseOver = panorama.isMouseOver();
int scrollTop = panorama.getScrollTop();
int maxScrollTop = getMaxScrollTop();
- northButton.setVisible((alwaysShowScrollButtons
- || mouseOver) && scrollTop > 0);
- southButton.setVisible((alwaysShowScrollButtons
- || mouseOver) && scrollTop < maxScrollTop);
+ northButton.setVisible((alwaysShowScrollButtons || mouseOver) && scrollTop > 0);
+ southButton.setVisible((alwaysShowScrollButtons || mouseOver) && scrollTop < maxScrollTop);
int scrollLeft = panorama.getScrollLeft();
int maxScrollLeft = getMaxScrollLeft();
- westButton.setVisible((alwaysShowScrollButtons
- || mouseOver) && scrollLeft > 0);
- eastButton.setVisible((alwaysShowScrollButtons
- || mouseOver) && scrollLeft < maxScrollLeft);
+ westButton.setVisible((alwaysShowScrollButtons || mouseOver) && scrollLeft > 0);
+ eastButton.setVisible((alwaysShowScrollButtons || mouseOver) && scrollLeft < maxScrollLeft);
}
// User input
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Fri Oct 4 23:45:40 2013
@@ -18,10 +18,10 @@ package org.apache.pivot.wtk.skin.terra;
import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.MessageType;
@@ -34,8 +34,7 @@ import org.apache.pivot.wtk.Window;
/**
* Prompt skin.
*/
-public class TerraPromptSkin extends TerraSheetSkin
- implements PromptListener {
+public class TerraPromptSkin extends TerraSheetSkin implements PromptListener {
private ImageView typeImageView = null;
private Label messageLabel = null;
private BoxPane messageBoxPane = null;
@@ -47,7 +46,7 @@ public class TerraPromptSkin extends Ter
int optionIndex = optionButtonBoxPane.indexOf(button);
if (optionIndex >= 0) {
- Prompt prompt = (Prompt)getComponent();
+ Prompt prompt = (Prompt) getComponent();
prompt.setSelectedOptionIndex(optionIndex);
prompt.close(true);
}
@@ -62,7 +61,7 @@ public class TerraPromptSkin extends Ter
public void install(Component component) {
super.install(component);
- Prompt prompt = (Prompt)component;
+ Prompt prompt = (Prompt) component;
prompt.setPreferredWidth(320);
prompt.setMinimumWidth(160);
@@ -73,23 +72,23 @@ public class TerraPromptSkin extends Ter
Component content;
try {
- content = (Component)bxmlSerializer.readObject(TerraPromptSkin.class,
+ content = (Component) bxmlSerializer.readObject(TerraPromptSkin.class,
"terra_prompt_skin.bxml");
- } catch(Exception exception) {
+ } catch (Exception exception) {
throw new RuntimeException(exception);
}
prompt.setContent(content);
- typeImageView = (ImageView)bxmlSerializer.getNamespace().get("typeImageView");
- messageLabel = (Label)bxmlSerializer.getNamespace().get("messageLabel");
- messageBoxPane = (BoxPane)bxmlSerializer.getNamespace().get("messageBoxPane");
- optionButtonBoxPane = (BoxPane)bxmlSerializer.getNamespace().get("optionButtonBoxPane");
+ typeImageView = (ImageView) bxmlSerializer.getNamespace().get("typeImageView");
+ messageLabel = (Label) bxmlSerializer.getNamespace().get("messageLabel");
+ messageBoxPane = (BoxPane) bxmlSerializer.getNamespace().get("messageBoxPane");
+ optionButtonBoxPane = (BoxPane) bxmlSerializer.getNamespace().get("optionButtonBoxPane");
for (Object option : prompt.getOptions()) {
PushButton optionButton = new PushButton(option);
- optionButton.setStyleName(TerraPromptSkin.class.getPackage().getName()
- + "." + TerraTheme.COMMAND_BUTTON_STYLE);
+ optionButton.setStyleName(TerraPromptSkin.class.getPackage().getName() + "."
+ + TerraTheme.COMMAND_BUTTON_STYLE);
optionButton.getButtonPressListeners().add(optionButtonPressListener);
optionButtonBoxPane.add(optionButton);
@@ -104,7 +103,7 @@ public class TerraPromptSkin extends Ter
public void windowOpened(Window window) {
super.windowOpened(window);
- Prompt prompt = (Prompt)window;
+ Prompt prompt = (Prompt) window;
int index = prompt.getSelectedOptionIndex();
if (index >= 0) {
@@ -116,7 +115,7 @@ public class TerraPromptSkin extends Ter
@Override
public void messageTypeChanged(Prompt prompt, MessageType previousMessageType) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
typeImageView.setImage(theme.getMessageIcon(prompt.getMessageType()));
}
@@ -143,8 +142,8 @@ public class TerraPromptSkin extends Ter
Object option = prompt.getOptions().get(index);
PushButton optionButton = new PushButton(option);
- optionButton.setStyleName(TerraPromptSkin.class.getPackage().getName()
- + "." + TerraTheme.COMMAND_BUTTON_STYLE);
+ optionButton.setStyleName(TerraPromptSkin.class.getPackage().getName() + "."
+ + TerraTheme.COMMAND_BUTTON_STYLE);
optionButton.getButtonPressListeners().add(optionButtonPressListener);
optionButtonBoxPane.insert(optionButton, index);
@@ -159,8 +158,7 @@ public class TerraPromptSkin extends Ter
public void selectedOptionChanged(Prompt prompt, int previousSelectedOption) {
int index = prompt.getSelectedOptionIndex();
- if (prompt.isOpen()
- && index >= 0) {
+ if (prompt.isOpen() && index >= 0) {
optionButtonBoxPane.get(index).requestFocus();
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Fri Oct 4 23:45:40 2013
@@ -58,7 +58,7 @@ public class TerraPushButtonSkin extends
private static final int CORNER_RADIUS = 4;
public TerraPushButtonSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
font = theme.getFont();
color = theme.getColor(1);
@@ -96,8 +96,7 @@ public class TerraPushButtonSkin extends
contentHeight = Math.max(contentHeight - paddingHeight(), 0);
}
- preferredWidth = dataRenderer.getPreferredWidth(contentHeight)
- + paddingWidth();
+ preferredWidth = dataRenderer.getPreferredWidth(contentHeight) + paddingWidth();
// Adjust for preferred aspect ratio
if (!Float.isNaN(minimumAspectRatio)
@@ -127,8 +126,7 @@ public class TerraPushButtonSkin extends
contentWidth = Math.max(contentWidth - paddingWidth(), 0);
}
- preferredHeight = dataRenderer.getPreferredHeight(contentWidth)
- + paddingHeight();
+ preferredHeight = dataRenderer.getPreferredHeight(contentWidth) + paddingHeight();
// Adjust for preferred aspect ratio
if (!Float.isNaN(maximumAspectRatio)
@@ -154,13 +152,11 @@ public class TerraPushButtonSkin extends
// Adjust for preferred aspect ratio
float aspectRatio = (float) preferredWidth / (float) preferredHeight;
- if (!Float.isNaN(minimumAspectRatio)
- && aspectRatio < minimumAspectRatio) {
+ if (!Float.isNaN(minimumAspectRatio) && aspectRatio < minimumAspectRatio) {
preferredWidth = (int) (preferredHeight * minimumAspectRatio);
}
- if (!Float.isNaN(maximumAspectRatio)
- && aspectRatio > maximumAspectRatio) {
+ if (!Float.isNaN(maximumAspectRatio) && aspectRatio > maximumAspectRatio) {
preferredHeight = (int) (preferredWidth / maximumAspectRatio);
}
@@ -196,13 +192,11 @@ public class TerraPushButtonSkin extends
Color bevelColorLocal = null;
Color borderColorLocal = null;
- if (!toolbar
- || highlighted
- || pushButton.isFocused()) {
+ if (!toolbar || highlighted || pushButton.isFocused()) {
if (pushButton.isEnabled()) {
backgroundColorLocal = this.backgroundColor;
- bevelColorLocal = (pressed
- || pushButton.isSelected()) ? pressedBevelColor : this.bevelColor;
+ bevelColorLocal = (pressed || pushButton.isSelected()) ? pressedBevelColor
+ : this.bevelColor;
borderColorLocal = this.borderColor;
} else {
backgroundColorLocal = disabledBackgroundColor;
@@ -215,10 +209,9 @@ public class TerraPushButtonSkin extends
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- if (backgroundColorLocal != null
- && bevelColorLocal != null) {
- graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColorLocal,
- width / 2f, height / 2f, backgroundColorLocal));
+ if (backgroundColorLocal != null && bevelColorLocal != null) {
+ graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColorLocal, width / 2f,
+ height / 2f, backgroundColorLocal));
graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
}
@@ -229,10 +222,8 @@ public class TerraPushButtonSkin extends
Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
dataRenderer.render(pushButton.getButtonData(), pushButton, highlighted);
- dataRenderer.setSize(
- Math.max(width - paddingWidth(), 0),
- Math.max(getHeight() - paddingHeight(), 0)
- );
+ dataRenderer.setSize(Math.max(width - paddingWidth(), 0),
+ Math.max(getHeight() - paddingHeight(), 0));
Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(padding.left + 1, padding.top + 1);
@@ -252,14 +243,13 @@ public class TerraPushButtonSkin extends
}
// Paint the focus state
- if (pushButton.isFocused()
- && !toolbar) {
+ if (pushButton.isFocused() && !toolbar) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(this.borderColor);
- graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0),
- Math.max(height - 5, 0), CORNER_RADIUS / 2, CORNER_RADIUS / 2));
+ graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0), Math.max(
+ height - 5, 0), CORNER_RADIUS / 2, CORNER_RADIUS / 2));
}
}
@@ -270,10 +260,8 @@ public class TerraPushButtonSkin extends
@Override
public boolean isOpaque() {
- PushButton pushButton = (PushButton)getComponent();
- return (!toolbar
- || highlighted
- || pushButton.isFocused());
+ PushButton pushButton = (PushButton) getComponent();
+ return (!toolbar || highlighted || pushButton.isFocused());
}
public Font getFont() {
@@ -327,7 +315,7 @@ public class TerraPushButtonSkin extends
}
public final void setColor(int color) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setColor(theme.getColor(color));
}
@@ -353,7 +341,7 @@ public class TerraPushButtonSkin extends
}
public final void setDisabledColor(int disabledColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledColor(theme.getColor(disabledColor));
}
@@ -381,7 +369,7 @@ public class TerraPushButtonSkin extends
}
public final void setBackgroundColor(int backgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(backgroundColor));
}
@@ -408,7 +396,7 @@ public class TerraPushButtonSkin extends
}
public final void setDisabledBackgroundColor(int disabledBackgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledBackgroundColor(theme.getColor(disabledBackgroundColor));
}
@@ -434,7 +422,7 @@ public class TerraPushButtonSkin extends
}
public final void setBorderColor(int borderColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBorderColor(theme.getColor(borderColor));
}
@@ -460,7 +448,7 @@ public class TerraPushButtonSkin extends
}
public final void setDisabledBorderColor(int disabledBorderColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledBorderColor(theme.getColor(disabledBorderColor));
}
@@ -518,9 +506,9 @@ public class TerraPushButtonSkin extends
}
public void setMinimumAspectRatio(float minimumAspectRatio) {
- if (!Float.isNaN(maximumAspectRatio)
- && minimumAspectRatio > maximumAspectRatio) {
- throw new IllegalArgumentException("minimumAspectRatio is greater than maximumAspectRatio.");
+ if (!Float.isNaN(maximumAspectRatio) && minimumAspectRatio > maximumAspectRatio) {
+ throw new IllegalArgumentException(
+ "minimumAspectRatio is greater than maximumAspectRatio.");
}
this.minimumAspectRatio = minimumAspectRatio;
@@ -540,9 +528,9 @@ public class TerraPushButtonSkin extends
}
public void setMaximumAspectRatio(float maximumAspectRatio) {
- if (!Float.isNaN(minimumAspectRatio)
- && maximumAspectRatio < minimumAspectRatio) {
- throw new IllegalArgumentException("maximumAspectRatio is less than minimumAspectRatio.");
+ if (!Float.isNaN(minimumAspectRatio) && maximumAspectRatio < minimumAspectRatio) {
+ throw new IllegalArgumentException(
+ "maximumAspectRatio is less than minimumAspectRatio.");
}
this.maximumAspectRatio = maximumAspectRatio;
@@ -564,8 +552,7 @@ public class TerraPushButtonSkin extends
public void setToolbar(boolean toolbar) {
this.toolbar = toolbar;
- if (toolbar &&
- getComponent().isFocused()) {
+ if (toolbar && getComponent().isFocused()) {
Component.clearFocus();
}
@@ -576,8 +563,7 @@ public class TerraPushButtonSkin extends
public void mouseOut(Component component) {
super.mouseOut(component);
- if (toolbar
- && component.isFocused()) {
+ if (toolbar && component.isFocused()) {
Component.clearFocus();
}
}