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 [14/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/web/src/org/apache/pivot/web/QueryListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web/src/org/apache/pivot/web/QueryListener.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/web/src/org/apache/pivot/web/QueryListener.java (original)
+++ pivot/trunk/web/src/org/apache/pivot/web/QueryListener.java Fri Oct 4 23:45:40 2013
@@ -48,7 +48,7 @@ public interface QueryListener<V> {
/**
* Called when a query has connected to the server but the request has not
* yet been sent.
- *
+ *
* @param query
*/
public void connected(Query<V> query);
@@ -56,21 +56,21 @@ public interface QueryListener<V> {
/**
* Called when the request has been sent to the server but the response has
* not yet been received.
- *
+ *
* @param query
*/
public void requestSent(Query<V> query);
/**
* Called when a response has been received from the server.
- *
+ *
* @param query
*/
public void responseReceived(Query<V> query);
/**
* Called when an error has occurred
- *
+ *
* @param query
*/
public void failed(Query<V> query);
Modified: pivot/trunk/web/test/org/apache/pivot/web/test/QueryDictionaryTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web/test/org/apache/pivot/web/test/QueryDictionaryTest.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/web/test/org/apache/pivot/web/test/QueryDictionaryTest.java (original)
+++ pivot/trunk/web/test/org/apache/pivot/web/test/QueryDictionaryTest.java Fri Oct 4 23:45:40 2013
@@ -27,9 +27,8 @@ import java.util.Set;
import org.apache.pivot.web.QueryDictionary;
import org.junit.Test;
-
public class QueryDictionaryTest {
- @Test(expected=IndexOutOfBoundsException.class)
+ @Test(expected = IndexOutOfBoundsException.class)
public void testQueryDictionary() {
QueryDictionary dict = new QueryDictionary(true);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Fri Oct 4 23:45:40 2013
@@ -54,8 +54,8 @@ import org.apache.pivot.wtk.skin.Contain
/**
* Accordion skin.
*/
-public class TerraAccordionSkin extends ContainerSkin
- implements AccordionListener, AccordionSelectionListener, AccordionAttributeListener {
+public class TerraAccordionSkin extends ContainerSkin implements AccordionListener,
+ AccordionSelectionListener, AccordionAttributeListener {
protected class PanelHeader extends Button {
private final Component panel;
@@ -78,7 +78,7 @@ public class TerraAccordionSkin extends
@Override
public Button.DataRenderer getDataRenderer() {
- Accordion accordion = (Accordion)TerraAccordionSkin.this.getComponent();
+ Accordion accordion = (Accordion) TerraAccordionSkin.this.getComponent();
return accordion.getHeaderDataRenderer();
}
@@ -117,20 +117,20 @@ public class TerraAccordionSkin extends
protected class PanelHeaderSkin extends ButtonSkin {
@Override
public int getPreferredWidth(int height) {
- PanelHeader panelHeader = (PanelHeader)getComponent();
+ PanelHeader panelHeader = (PanelHeader) getComponent();
Button.DataRenderer dataRenderer = panelHeader.getDataRenderer();
dataRenderer.render(panelHeader.getButtonData(), panelHeader, false);
- int preferredWidth = dataRenderer.getPreferredWidth(-1)
- + buttonPadding.left + buttonPadding.right + 2;
+ int preferredWidth = dataRenderer.getPreferredWidth(-1) + buttonPadding.left
+ + buttonPadding.right + 2;
return preferredWidth;
}
@Override
public int getPreferredHeight(int width) {
- PanelHeader panelHeader = (PanelHeader)getComponent();
+ PanelHeader panelHeader = (PanelHeader) getComponent();
Button.DataRenderer dataRenderer = panelHeader.getDataRenderer();
dataRenderer.render(panelHeader.getButtonData(), panelHeader, false);
@@ -138,37 +138,37 @@ public class TerraAccordionSkin extends
// Include padding and border in constraint
int contentWidth = width;
if (contentWidth != -1) {
- contentWidth = Math.max(contentWidth - (buttonPadding.left
- + buttonPadding.right + 2), 0);
+ contentWidth = Math.max(contentWidth
+ - (buttonPadding.left + buttonPadding.right + 2), 0);
}
- int preferredHeight = dataRenderer.getPreferredHeight(contentWidth)
- + buttonPadding.top + buttonPadding.bottom + 2;
+ int preferredHeight = dataRenderer.getPreferredHeight(contentWidth) + buttonPadding.top
+ + buttonPadding.bottom + 2;
return preferredHeight;
}
@Override
public Dimensions getPreferredSize() {
- PanelHeader panelHeader = (PanelHeader)getComponent();
+ PanelHeader panelHeader = (PanelHeader) getComponent();
Button.DataRenderer dataRenderer = panelHeader.getDataRenderer();
dataRenderer.render(panelHeader.getButtonData(), panelHeader, false);
Dimensions preferredContentSize = dataRenderer.getPreferredSize();
- int preferredWidth = preferredContentSize.width
- + buttonPadding.left + buttonPadding.right + 2;
+ int preferredWidth = preferredContentSize.width + buttonPadding.left
+ + buttonPadding.right + 2;
- int preferredHeight = preferredContentSize.height
- + buttonPadding.top + buttonPadding.bottom + 2;
+ int preferredHeight = preferredContentSize.height + buttonPadding.top
+ + buttonPadding.bottom + 2;
return new Dimensions(preferredWidth, preferredHeight);
}
@Override
public int getBaseline(int width, int height) {
- PanelHeader panelHeader = (PanelHeader)getComponent();
+ PanelHeader panelHeader = (PanelHeader) getComponent();
Button.DataRenderer dataRenderer = panelHeader.getDataRenderer();
dataRenderer.render(panelHeader.getButtonData(), panelHeader, false);
@@ -187,14 +187,14 @@ public class TerraAccordionSkin extends
@Override
public void paint(Graphics2D graphics) {
- PanelHeader panelHeader = (PanelHeader)getComponent();
+ PanelHeader panelHeader = (PanelHeader) getComponent();
int width = getWidth();
int height = getHeight();
// Paint the background
- graphics.setPaint(new GradientPaint(width / 2f, 0, buttonBevelColor,
- width / 2f, height, buttonBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, buttonBevelColor, width / 2f,
+ height, buttonBackgroundColor));
graphics.fillRect(0, 0, width, height);
// Paint the border
@@ -204,10 +204,11 @@ public class TerraAccordionSkin extends
// Paint the content
Button.DataRenderer dataRenderer = panelHeader.getDataRenderer();
dataRenderer.render(panelHeader.getButtonData(), panelHeader, false);
- dataRenderer.setSize(Math.max(width - (buttonPadding.left + buttonPadding.right + 2), 0),
+ dataRenderer.setSize(
+ Math.max(width - (buttonPadding.left + buttonPadding.right + 2), 0),
Math.max(getHeight() - (buttonPadding.top + buttonPadding.bottom + 2), 0));
- Graphics2D contentGraphics = (Graphics2D)graphics.create();
+ Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(buttonPadding.left + 1, buttonPadding.top + 1);
contentGraphics.clipRect(0, 0, dataRenderer.getWidth(), dataRenderer.getHeight());
dataRenderer.paint(contentGraphics);
@@ -221,7 +222,7 @@ public class TerraAccordionSkin extends
@Override
public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
- PanelHeader panelHeader = (PanelHeader)getComponent();
+ PanelHeader panelHeader = (PanelHeader) getComponent();
panelHeader.press();
return true;
@@ -305,7 +306,7 @@ public class TerraAccordionSkin extends
private ComponentStateListener panelStateListener = new ComponentStateListener.Adapter() {
@Override
public void enabledChanged(Component component) {
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
int i = accordion.getPanels().indexOf(component);
panelHeaders.get(i).setEnabled(component.isEnabled());
}
@@ -317,7 +318,7 @@ public class TerraAccordionSkin extends
private static final int DEFAULT_SELECTION_CHANGE_RATE = 30;
public TerraAccordionSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(4));
borderColor = theme.getColor(7);
@@ -335,9 +336,9 @@ public class TerraAccordionSkin extends
@Override
public void selectionChanged(ButtonGroup buttonGroup, Button previousSelection) {
Button button = panelHeaderGroup.getSelection();
- int index = (button == null) ? -1 : panelHeaders.indexOf((PanelHeader)button);
+ int index = (button == null) ? -1 : panelHeaders.indexOf((PanelHeader) button);
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
accordion.setSelectedIndex(index);
}
});
@@ -356,7 +357,7 @@ public class TerraAccordionSkin extends
public void install(Component component) {
super.install(component);
- Accordion accordion = (Accordion)component;
+ Accordion accordion = (Accordion) component;
accordion.getAccordionListeners().add(this);
accordion.getAccordionSelectionListeners().add(this);
accordion.getAccordionAttributeListeners().add(this);
@@ -364,7 +365,7 @@ public class TerraAccordionSkin extends
@Override
public int getPreferredWidth(int height) {
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
// The preferred width is the maximum unconstrained preferred width of
// the headers and the panels, plus border
@@ -386,7 +387,7 @@ public class TerraAccordionSkin extends
@Override
public int getPreferredHeight(int width) {
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
int preferredHeight = 0;
@@ -412,7 +413,7 @@ public class TerraAccordionSkin extends
@Override
public Dimensions getPreferredSize() {
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
int preferredHeight = 0;
@@ -446,7 +447,8 @@ public class TerraAccordionSkin extends
if (panelHeaders.getLength() > 0) {
PanelHeader firstPanelHeader = panelHeaders.get(0);
- baseline = firstPanelHeader.getBaseline(width, firstPanelHeader.getPreferredHeight(width));
+ baseline = firstPanelHeader.getBaseline(width,
+ firstPanelHeader.getPreferredHeight(width));
}
return baseline;
@@ -454,7 +456,7 @@ public class TerraAccordionSkin extends
@Override
public void layout() {
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
int width = getWidth();
int height = getHeight();
@@ -508,8 +510,8 @@ public class TerraAccordionSkin extends
if (panel == selectionChangeTransition.fromPanel) {
panel.setLocation(padding.left + 1, panelY + padding.top + 1);
- int previousSelectedPanelHeight = Math.round(panelHeight * (1.0f
- - selectionChangeTransition.getEasedPercentComplete()));
+ int previousSelectedPanelHeight = Math.round(panelHeight
+ * (1.0f - selectionChangeTransition.getEasedPercentComplete()));
previousSelectedPanelClipDecorator.setWidth(contentWidth);
previousSelectedPanelClipDecorator.setHeight(previousSelectedPanelHeight);
@@ -660,7 +662,7 @@ public class TerraAccordionSkin extends
}
public final void setButtonColor(int buttonColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setButtonColor(theme.getColor(buttonColor));
}
@@ -686,7 +688,7 @@ public class TerraAccordionSkin extends
}
public final void setDisabledButtonColor(int disabledButtonColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledButtonColor(theme.getColor(disabledButtonColor));
}
@@ -713,7 +715,7 @@ public class TerraAccordionSkin extends
}
public final void setButtonBackgroundColor(int buttonBackgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setButtonBackgroundColor(theme.getColor(buttonBackgroundColor));
}
@@ -779,12 +781,11 @@ public class TerraAccordionSkin extends
* CommandModifier + {@link KeyCode#KEYPAD_1 KEYPAD_1} to
* {@link KeyCode#KEYPAD_9 KEYPAD_9}<br>or CommandModifier +
* {@link KeyCode#N1 1} to {@link KeyCode#N9 9} Select the (enabled) pane at
- * index 0 to 8 respectively<p>
- * {@link Modifier#ALT ALT} + {@link KeyCode#UP UP} Select the next enabled
- * panel.<br>
+ * index 0 to 8 respectively<p> {@link Modifier#ALT ALT} +
+ * {@link KeyCode#UP UP} Select the next enabled panel.<br>
* {@link Modifier#ALT ALT} + {@link KeyCode#DOWN DOWN} Select the previous
* enabled panel.
- *
+ *
* @see Platform#getCommandModifier()
*/
@Override
@@ -792,7 +793,7 @@ public class TerraAccordionSkin extends
boolean consumed = super.keyPressed(component, keyCode, keyLocation);
if (!consumed) {
- Accordion accordion = (Accordion)getComponent();
+ Accordion accordion = (Accordion) getComponent();
Accordion.PanelSequence panels = accordion.getPanels();
Keyboard.Modifier commandModifier = Platform.getCommandModifier();
@@ -859,8 +860,7 @@ public class TerraAccordionSkin extends
}
}
- if (selectedIndex >= 0
- && selectedIndex < panels.getLength()
+ if (selectedIndex >= 0 && selectedIndex < panels.getLength()
&& panels.get(selectedIndex).isEnabled()) {
accordion.setSelectedIndex(selectedIndex);
consumed = true;
@@ -873,8 +873,7 @@ public class TerraAccordionSkin extends
case Keyboard.KeyCode.UP: {
do {
selectedIndex--;
- } while (selectedIndex >= 0
- && !panels.get(selectedIndex).isEnabled());
+ } while (selectedIndex >= 0 && !panels.get(selectedIndex).isEnabled());
break;
}
@@ -882,8 +881,7 @@ public class TerraAccordionSkin extends
case Keyboard.KeyCode.DOWN: {
do {
selectedIndex++;
- } while (selectedIndex < n
- && !panels.get(selectedIndex).isEnabled());
+ } while (selectedIndex < n && !panels.get(selectedIndex).isEnabled());
break;
}
@@ -893,8 +891,7 @@ public class TerraAccordionSkin extends
}
}
- if (selectedIndex >= 0
- && selectedIndex < n
+ if (selectedIndex >= 0 && selectedIndex < n
&& panels.get(selectedIndex).isEnabled()) {
accordion.setSelectedIndex(selectedIndex);
consumed = true;
@@ -955,7 +952,8 @@ public class TerraAccordionSkin extends
}
@Override
- public void headerDataRendererChanged(Accordion accordion, Button.DataRenderer previousHeaderDataRenderer) {
+ public void headerDataRendererChanged(Accordion accordion,
+ Button.DataRenderer previousHeaderDataRenderer) {
for (Component panelHeader : panelHeaders) {
panelHeader.invalidate();
}
@@ -966,18 +964,15 @@ public class TerraAccordionSkin extends
public Vote previewSelectedIndexChange(final Accordion accordion, final int selectedIndex) {
Vote vote = Vote.APPROVE;
- if (accordion.isShowing()
- && accordion.isValid()) {
+ if (accordion.isShowing() && accordion.isValid()) {
if (selectionChangeTransition == null) {
int previousSelectedIndex = accordion.getSelectedIndex();
- if (selectedIndex != -1
- && previousSelectedIndex != -1) {
+ if (selectedIndex != -1 && previousSelectedIndex != -1) {
Component fromPanel = accordion.getPanels().get(previousSelectedIndex);
Component toPanel = accordion.getPanels().get(selectedIndex);
- selectionChangeTransition = new SelectionChangeTransition(fromPanel,
- toPanel);
+ selectionChangeTransition = new SelectionChangeTransition(fromPanel, toPanel);
layout();
selectionChangeTransition.start(new TransitionListener() {
@@ -1004,8 +999,7 @@ public class TerraAccordionSkin extends
@Override
public void selectedIndexChangeVetoed(Accordion accordion, Vote reason) {
- if (reason == Vote.DENY
- && selectionChangeTransition != null) {
+ if (reason == Vote.DENY && selectionChangeTransition != null) {
// NOTE We stop, rather than end, the transition so the completion
// event isn't fired; if the event fires, the listener will set
// the selection state
@@ -1040,13 +1034,15 @@ public class TerraAccordionSkin extends
// Accordion attribute events
@Override
- public void headerDataChanged(Accordion accordion, Component component, Object previousHeaderData) {
+ public void headerDataChanged(Accordion accordion, Component component,
+ Object previousHeaderData) {
int i = accordion.getPanels().indexOf(component);
panelHeaders.get(i).invalidate();
}
@Override
- public void tooltipTextChanged(Accordion accordion, Component component, String previousTooltipText) {
+ public void tooltipTextChanged(Accordion accordion, Component component,
+ String previousTooltipText) {
// No-op
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java Fri Oct 4 23:45:40 2013
@@ -25,7 +25,6 @@ import org.apache.pivot.wtk.GraphicsUtil
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.ActivityIndicatorSkin;
-
/**
* Activity indicator skin.
*/
@@ -38,7 +37,7 @@ public class TerraActivityIndicatorSkin
private ApplicationContext.ScheduledCallback updateCallback = null;
public TerraActivityIndicatorSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setColor(theme.getColor(2));
backgroundColor = null;
}
@@ -55,7 +54,7 @@ public class TerraActivityIndicatorSkin
@Override
public void paint(Graphics2D graphics) {
- ActivityIndicator activityIndicator = (ActivityIndicator)getComponent();
+ ActivityIndicator activityIndicator = (ActivityIndicator) getComponent();
int width = getWidth();
int height = getHeight();
@@ -108,7 +107,7 @@ public class TerraActivityIndicatorSkin
colors = new Color[12];
for (int i = 0; i < 12; i++) {
float alpha = 255f * i / 12;
- colors[i] = new Color(color.getRed(), color.getGreen(), color.getBlue(), (int)alpha);
+ colors[i] = new Color(color.getRed(), color.getGreen(), color.getBlue(), (int) alpha);
}
}
@@ -121,7 +120,7 @@ public class TerraActivityIndicatorSkin
}
public final void setColor(int color) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setColor(theme.getColor(color));
}
@@ -143,7 +142,7 @@ public class TerraActivityIndicatorSkin
}
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/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Fri Oct 4 23:45:40 2013
@@ -20,10 +20,10 @@ import org.apache.pivot.beans.BXMLSerial
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.AlertListener;
+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;
/**
* Alert skin.
*/
-public class TerraAlertSkin extends TerraDialogSkin
- implements AlertListener {
+public class TerraAlertSkin extends TerraDialogSkin implements AlertListener {
private ImageView typeImageView = null;
private Label messageLabel = null;
private BoxPane messageBoxPane = null;
@@ -47,7 +46,7 @@ public class TerraAlertSkin extends Terr
int optionIndex = optionButtonBoxPane.indexOf(button);
if (optionIndex >= 0) {
- Alert alert = (Alert)getComponent();
+ Alert alert = (Alert) getComponent();
alert.setSelectedOptionIndex(optionIndex);
alert.close(true);
}
@@ -55,7 +54,7 @@ public class TerraAlertSkin extends Terr
};
public TerraAlertSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(9));
}
@@ -63,7 +62,7 @@ public class TerraAlertSkin extends Terr
public void install(Component component) {
super.install(component);
- Alert alert = (Alert)component;
+ Alert alert = (Alert) component;
alert.setPreferredWidth(320);
alert.setMinimumWidth(160);
@@ -74,23 +73,23 @@ public class TerraAlertSkin extends Terr
Component content;
try {
- content = (Component)bxmlSerializer.readObject(TerraAlertSkin.class,
+ content = (Component) bxmlSerializer.readObject(TerraAlertSkin.class,
"terra_alert_skin.bxml");
- } catch(Exception exception) {
+ } catch (Exception exception) {
throw new RuntimeException(exception);
}
alert.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 : alert.getOptions()) {
PushButton optionButton = new PushButton(option);
- optionButton.setStyleName(TerraAlertSkin.class.getPackage().getName()
- + "." + TerraTheme.COMMAND_BUTTON_STYLE);
+ optionButton.setStyleName(TerraAlertSkin.class.getPackage().getName() + "."
+ + TerraTheme.COMMAND_BUTTON_STYLE);
optionButton.getButtonPressListeners().add(optionButtonPressListener);
optionButtonBoxPane.add(optionButton);
@@ -105,7 +104,7 @@ public class TerraAlertSkin extends Terr
public void windowOpened(Window window) {
super.windowOpened(window);
- Alert alert = (Alert)window;
+ Alert alert = (Alert) window;
int index = alert.getSelectedOptionIndex();
if (index >= 0) {
@@ -117,7 +116,7 @@ public class TerraAlertSkin extends Terr
@Override
public void messageTypeChanged(Alert alert, MessageType previousMessageType) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
typeImageView.setImage(theme.getMessageIcon(alert.getMessageType()));
}
@@ -143,8 +142,8 @@ public class TerraAlertSkin extends Terr
Object option = alert.getOptions().get(index);
PushButton optionButton = new PushButton(option);
- optionButton.setStyleName(TerraAlertSkin.class.getPackage().getName()
- + "." + TerraTheme.COMMAND_BUTTON_STYLE);
+ optionButton.setStyleName(TerraAlertSkin.class.getPackage().getName() + "."
+ + TerraTheme.COMMAND_BUTTON_STYLE);
optionButton.getButtonPressListeners().add(optionButtonPressListener);
optionButtonBoxPane.insert(optionButton, index);
@@ -159,8 +158,7 @@ public class TerraAlertSkin extends Terr
public void selectedOptionChanged(Alert alert, int previousSelectedOption) {
int index = alert.getSelectedOptionIndex();
- if (alert.isOpen()
- && index >= 0) {
+ if (alert.isOpen() && index >= 0) {
optionButtonBoxPane.get(index).requestFocus();
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBorderSkin.java Fri Oct 4 23:45:40 2013
@@ -30,17 +30,17 @@ public class TerraBorderSkin extends Bor
}
public final void setColor(int color) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setColor(theme.getColor(color));
}
public final void setTitleColor(int titleColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setTitleColor(theme.getColor(titleColor));
}
public final void setBackgroundColor(int color) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(color));
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBoxPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBoxPaneSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBoxPaneSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraBoxPaneSkin.java Fri Oct 4 23:45:40 2013
@@ -24,7 +24,7 @@ import org.apache.pivot.wtk.skin.BoxPane
*/
public class TerraBoxPaneSkin extends BoxPaneSkin {
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/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Fri Oct 4 23:45:40 2013
@@ -46,15 +46,13 @@ import org.apache.pivot.wtk.effects.Tran
import org.apache.pivot.wtk.skin.CalendarButtonSkin;
/**
- * Terra calendar button skin.
- * <p>
- * TODO Calendar pass-through styles.
+ * Terra calendar button skin. <p> TODO Calendar pass-through styles.
*/
public class TerraCalendarButtonSkin extends CalendarButtonSkin {
private WindowStateListener calendarPopupStateListener = new WindowStateListener.Adapter() {
@Override
public void windowOpened(Window window) {
- CalendarButton calendarButton = (CalendarButton)getComponent();
+ CalendarButton calendarButton = (CalendarButton) getComponent();
// Size and position the popup
Display display = calendarButton.getDisplay();
@@ -73,8 +71,7 @@ public class TerraCalendarButtonSkin ext
int popupHeight = window.getPreferredHeight();
int maximumHeight = displaySize.height - window.getY();
- if (popupHeight > maximumHeight
- && buttonLocation.y > maximumHeight) {
+ if (popupHeight > maximumHeight && buttonLocation.y > maximumHeight) {
window.setY(buttonLocation.y - window.getPreferredHeight() + 1);
}
@@ -149,7 +146,7 @@ public class TerraCalendarButtonSkin ext
private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraCalendarButtonSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
font = theme.getFont();
color = theme.getColor(1);
@@ -182,7 +179,7 @@ public class TerraCalendarButtonSkin ext
@Override
public int getPreferredWidth(int height) {
- CalendarButton calendarButton = (CalendarButton)getComponent();
+ CalendarButton calendarButton = (CalendarButton) getComponent();
Button.DataRenderer dataRenderer = calendarButton.getDataRenderer();
dataRenderer.render(calendarButton.getButtonData(), calendarButton, false);
@@ -195,7 +192,7 @@ public class TerraCalendarButtonSkin ext
@Override
public int getPreferredHeight(int width) {
- CalendarButton calendarButton = (CalendarButton)getComponent();
+ CalendarButton calendarButton = (CalendarButton) getComponent();
Button.DataRenderer dataRenderer = calendarButton.getDataRenderer();
dataRenderer.render(calendarButton.getButtonData(), calendarButton, false);
@@ -208,7 +205,7 @@ public class TerraCalendarButtonSkin ext
@Override
public Dimensions getPreferredSize() {
- CalendarButton calendarButton = (CalendarButton)getComponent();
+ CalendarButton calendarButton = (CalendarButton) getComponent();
Button.DataRenderer dataRenderer = calendarButton.getDataRenderer();
dataRenderer.render(calendarButton.getButtonData(), calendarButton, false);
@@ -222,7 +219,7 @@ public class TerraCalendarButtonSkin ext
@Override
public int getBaseline(int width, int height) {
- CalendarButton calendarButton = (CalendarButton)getComponent();
+ CalendarButton calendarButton = (CalendarButton) getComponent();
Button.DataRenderer dataRenderer = calendarButton.getDataRenderer();
dataRenderer.render(calendarButton.getButtonData(), calendarButton, false);
@@ -246,7 +243,7 @@ public class TerraCalendarButtonSkin ext
@Override
public void paint(Graphics2D graphics) {
- CalendarButton calendarButton = (CalendarButton)getComponent();
+ CalendarButton calendarButton = (CalendarButton) getComponent();
int width = getWidth();
int height = getHeight();
@@ -257,8 +254,8 @@ public class TerraCalendarButtonSkin ext
if (calendarButton.isEnabled()) {
backgroundColorLocal = this.backgroundColor;
- bevelColorLocal = (pressed || (calendarPopup.isOpen() && !calendarPopup.isClosing())) ?
- pressedBevelColor : this.bevelColor;
+ bevelColorLocal = (pressed || (calendarPopup.isOpen() && !calendarPopup.isClosing())) ? pressedBevelColor
+ : this.bevelColor;
borderColorLocal = this.borderColor;
} else {
backgroundColorLocal = disabledBackgroundColor;
@@ -270,8 +267,8 @@ public class TerraCalendarButtonSkin ext
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColorLocal, width / 2f, height / 2f,
- backgroundColorLocal));
+ 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));
@@ -283,10 +280,11 @@ public class TerraCalendarButtonSkin ext
height - 1, 0));
Button.DataRenderer dataRenderer = calendarButton.getDataRenderer();
dataRenderer.render(calendarButton.getButtonData(), calendarButton, false);
- dataRenderer.setSize(Math.max(contentBounds.width - (padding.left + padding.right + 2) + 1,
- 0), Math.max(contentBounds.height - (padding.top + padding.bottom + 2) + 1, 0));
+ dataRenderer.setSize(
+ Math.max(contentBounds.width - (padding.left + padding.right + 2) + 1, 0),
+ Math.max(contentBounds.height - (padding.top + padding.bottom + 2) + 1, 0));
- Graphics2D contentGraphics = (Graphics2D)graphics.create();
+ Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(padding.left + 1, padding.top + 1);
contentGraphics.clipRect(0, 0, dataRenderer.getWidth(), dataRenderer.getHeight());
dataRenderer.paint(contentGraphics);
@@ -323,7 +321,7 @@ public class TerraCalendarButtonSkin ext
triggerIconShape.lineTo(6, 0);
triggerIconShape.closePath();
- Graphics2D triggerGraphics = (Graphics2D)graphics.create();
+ Graphics2D triggerGraphics = (Graphics2D) graphics.create();
triggerGraphics.setStroke(new BasicStroke(0));
triggerGraphics.setPaint(color);
@@ -390,7 +388,7 @@ public class TerraCalendarButtonSkin ext
}
public final void setColor(int color) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setColor(theme.getColor(color));
}
@@ -416,7 +414,7 @@ public class TerraCalendarButtonSkin ext
}
public final void setDisabledColor(int disabledColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledColor(theme.getColor(disabledColor));
}
@@ -444,7 +442,7 @@ public class TerraCalendarButtonSkin ext
}
public final void setBackgroundColor(int backgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBackgroundColor(theme.getColor(backgroundColor));
}
@@ -471,7 +469,7 @@ public class TerraCalendarButtonSkin ext
}
public final void setDisabledBackgroundColor(int disabledBackgroundColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledBackgroundColor(theme.getColor(disabledBackgroundColor));
}
@@ -498,7 +496,7 @@ public class TerraCalendarButtonSkin ext
}
public final void setBorderColor(int borderColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setBorderColor(theme.getColor(borderColor));
}
@@ -524,7 +522,7 @@ public class TerraCalendarButtonSkin ext
}
public final void setDisabledBorderColor(int disabledBorderColor) {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
setDisabledBorderColor(theme.getColor(disabledBorderColor));
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Fri Oct 4 23:45:40 2013
@@ -100,7 +100,7 @@ public class TerraCalendarSkin extends C
@Override
public int getPreferredWidth(int height) {
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
int preferredWidth = 0;
@@ -116,7 +116,7 @@ public class TerraCalendarSkin extends C
public int getPreferredHeight(int width) {
int preferredHeight = 0;
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
Button.DataRenderer dataRenderer = dateButton.getDataRenderer();
dataRenderer.render(dateButton.getButtonData(), dateButton, false);
@@ -128,28 +128,28 @@ public class TerraCalendarSkin extends C
@Override
public Dimensions getPreferredSize() {
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
Button.DataRenderer dataRenderer = dateButton.getDataRenderer();
dataRenderer.render(dateButton.getButtonData(), dateButton, false);
Dimensions preferredSize = dataRenderer.getPreferredSize();
- return new Dimensions(preferredSize.width + padding * 2,
- preferredSize.height + padding * 2);
+ return new Dimensions(preferredSize.width + padding * 2, preferredSize.height + padding
+ * 2);
}
@Override
public void paint(Graphics2D graphics) {
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
int width = getWidth();
int height = getHeight();
// Paint the background
if (dateButton.isSelected()) {
- graphics.setPaint(new GradientPaint(width / 2f, 0, selectionBevelColor,
- width / 2f, height, selectionBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, selectionBevelColor, width / 2f,
+ height, selectionBackgroundColor));
graphics.fillRect(0, 0, width, height);
} else {
@@ -160,7 +160,7 @@ public class TerraCalendarSkin extends C
}
// Paint a border if this button represents today
- CalendarDate date = (CalendarDate)dateButton.getButtonData();
+ CalendarDate date = (CalendarDate) dateButton.getButtonData();
if (date.equals(today)) {
graphics.setColor(dividerColor);
GraphicsUtilities.drawRect(graphics, 0, 0, width, height);
@@ -203,7 +203,7 @@ public class TerraCalendarSkin extends C
public void mouseOver(Component component) {
super.mouseOver(component);
- Calendar calendar = (Calendar)TerraCalendarSkin.this.getComponent();
+ Calendar calendar = (Calendar) TerraCalendarSkin.this.getComponent();
if (calendar.containsFocus()) {
component.requestFocus();
@@ -214,7 +214,7 @@ public class TerraCalendarSkin extends C
public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
boolean consumed = super.mouseClick(component, button, x, y, count);
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
dateButton.requestFocus();
dateButton.press();
@@ -231,17 +231,15 @@ public class TerraCalendarSkin extends C
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = false;
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
if (keyCode == Keyboard.KeyCode.ENTER) {
dateButton.press();
- } else if (keyCode == Keyboard.KeyCode.UP
- || keyCode == Keyboard.KeyCode.DOWN
- || keyCode == Keyboard.KeyCode.LEFT
- || keyCode == Keyboard.KeyCode.RIGHT) {
- CalendarDate date = (CalendarDate)dateButton.getButtonData();
+ } else if (keyCode == Keyboard.KeyCode.UP || keyCode == Keyboard.KeyCode.DOWN
+ || keyCode == Keyboard.KeyCode.LEFT || keyCode == Keyboard.KeyCode.RIGHT) {
+ CalendarDate date = (CalendarDate) dateButton.getButtonData();
- Calendar calendar = (Calendar)TerraCalendarSkin.this.getComponent();
+ Calendar calendar = (Calendar) TerraCalendarSkin.this.getComponent();
int cellIndex = getCellIndex(date.year, date.month, date.day, calendar.getLocale());
int rowIndex = cellIndex / 7;
int columnIndex = cellIndex % 7;
@@ -327,10 +325,11 @@ public class TerraCalendarSkin extends C
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode,
+ Keyboard.KeyLocation keyLocation) {
boolean consumed = false;
- DateButton dateButton = (DateButton)getComponent();
+ DateButton dateButton = (DateButton) getComponent();
if (keyCode == Keyboard.KeyCode.SPACE) {
dateButton.press();
@@ -346,10 +345,11 @@ public class TerraCalendarSkin extends C
public class MonthSpinnerItemRenderer extends SpinnerItemRenderer {
@Override
public void render(Object item, Spinner spinner) {
- Calendar calendar = (Calendar)getComponent();
+ Calendar calendar = (Calendar) getComponent();
- // Since we're only rendering the month, the year and day do not matter here
- CalendarDate date = new CalendarDate(2000, (Integer)item, 0);
+ // Since we're only rendering the month, the year and day do not
+ // matter here
+ CalendarDate date = new CalendarDate(2000, (Integer) item, 0);
SimpleDateFormat monthFormat = new SimpleDateFormat("MMMM", calendar.getLocale());
Object itemFromFormat = monthFormat.format(date.toCalendar().getTime());
@@ -361,7 +361,7 @@ public class TerraCalendarSkin extends C
private static class DateButtonDataRenderer extends ButtonDataRenderer {
@Override
public void render(Object data, Button button, boolean highlighted) {
- CalendarDate date = (CalendarDate)data;
+ CalendarDate date = (CalendarDate) data;
super.render(date.day + 1, button, highlighted);
if (button.isSelected()) {
@@ -396,7 +396,7 @@ public class TerraCalendarSkin extends C
private Color selectionBevelColor;
public TerraCalendarSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
font = theme.getFont();
color = theme.getColor(1);
disabledColor = theme.getColor(7);
@@ -424,8 +424,8 @@ public class TerraCalendarSkin extends C
monthSpinner.getSpinnerSelectionListeners().add(new SpinnerSelectionListener.Adapter() {
@Override
public void selectedItemChanged(Spinner spinner, Object previousSelectedItem) {
- Calendar calendar = (Calendar)getComponent();
- calendar.setMonth((Integer)spinner.getSelectedItem());
+ Calendar calendar = (Calendar) getComponent();
+ calendar.setMonth((Integer) spinner.getSelectedItem());
}
});
@@ -436,15 +436,16 @@ public class TerraCalendarSkin extends C
yearSpinner.getSpinnerSelectionListeners().add(new SpinnerSelectionListener.Adapter() {
@Override
public void selectedItemChanged(Spinner spinner, Object previousSelectedItem) {
- Calendar calendar = (Calendar)getComponent();
- calendar.setYear((Integer)spinner.getSelectedItem());
+ Calendar calendar = (Calendar) getComponent();
+ calendar.setYear((Integer) spinner.getSelectedItem());
}
});
// Attach a listener to consume mouse clicks
ComponentMouseButtonListener spinnerMouseButtonListener = new ComponentMouseButtonListener.Adapter() {
@Override
- public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
+ public boolean mouseClick(Component component, Mouse.Button button, int x, int y,
+ int count) {
return true;
}
};
@@ -492,7 +493,7 @@ public class TerraCalendarSkin extends C
dateButtonGroup.getButtonGroupListeners().add(new ButtonGroupListener.Adapter() {
@Override
public void selectionChanged(ButtonGroup buttonGroup, Button previousSelection) {
- Calendar calendar = (Calendar)getComponent();
+ Calendar calendar = (Calendar) getComponent();
Button selection = buttonGroup.getSelection();
if (selection == null) {
@@ -502,12 +503,11 @@ public class TerraCalendarSkin extends C
// result of the user toggling the date button (as opposed
// to changing the month or year), clear the selection
if (selectedDate == null
- || (selectedDate.year == yearSpinner.getSelectedIndex()
- && selectedDate.month == monthSpinner.getSelectedIndex())) {
- calendar.setSelectedDate((CalendarDate)null);
+ || (selectedDate.year == yearSpinner.getSelectedIndex() && selectedDate.month == monthSpinner.getSelectedIndex())) {
+ calendar.setSelectedDate((CalendarDate) null);
}
} else {
- calendar.setSelectedDate((CalendarDate)selection.getButtonData());
+ calendar.setSelectedDate((CalendarDate) selection.getButtonData());
}
}
});
@@ -542,7 +542,7 @@ public class TerraCalendarSkin extends C
public void install(Component component) {
super.install(component);
- Calendar calendar = (Calendar)component;
+ Calendar calendar = (Calendar) component;
calendar.add(calendarTablePane);
yearSpinner.setSelectedIndex(calendar.getYear());
@@ -584,27 +584,28 @@ public class TerraCalendarSkin extends C
int width = getWidth();
Bounds monthYearRowBounds = calendarTablePane.getRowBounds(0);
graphics.setColor(highlightBackgroundColor);
- graphics.fillRect(monthYearRowBounds.x, monthYearRowBounds.y,
- monthYearRowBounds.width, monthYearRowBounds.height);
+ graphics.fillRect(monthYearRowBounds.x, monthYearRowBounds.y, monthYearRowBounds.width,
+ monthYearRowBounds.height);
Bounds labelRowBounds = calendarTablePane.getRowBounds(1);
graphics.setColor(dividerColor);
int dividerY = labelRowBounds.y + labelRowBounds.height - 2;
- GraphicsUtilities.drawLine(graphics, 2, dividerY, Math.max(0, width - 4), Orientation.HORIZONTAL);
+ GraphicsUtilities.drawLine(graphics, 2, dividerY, Math.max(0, width - 4),
+ Orientation.HORIZONTAL);
}
private void updateLabels() {
TablePane.Row row = calendarTablePane.getRows().get(1);
- Calendar calendar = (Calendar)getComponent();
+ Calendar calendar = (Calendar) getComponent();
Locale locale = calendar.getLocale();
GregorianCalendar gregorianCalendar = new GregorianCalendar(locale);
SimpleDateFormat monthFormat = new SimpleDateFormat("E", locale);
int firstDayOfWeek = gregorianCalendar.getFirstDayOfWeek();
for (int i = 0; i < 7; i++) {
- Label label = (Label)row.get(i);
+ Label label = (Label) row.get(i);
gregorianCalendar.set(java.util.Calendar.DAY_OF_WEEK, firstDayOfWeek + i);
String text = monthFormat.format(gregorianCalendar.getTime());
text = Character.toString(text.charAt(weekdayCharacterIndex));
@@ -613,7 +614,7 @@ public class TerraCalendarSkin extends C
}
private void updateCalendar() {
- Calendar calendar = (Calendar)getComponent();
+ Calendar calendar = (Calendar) getComponent();
int month = calendar.getMonth();
int year = calendar.getYear();
@@ -626,9 +627,9 @@ public class TerraCalendarSkin extends C
Locale locale = calendar.getLocale();
GregorianCalendar gregorianCalendar = new GregorianCalendar(locale);
gregorianCalendar.set(year, month, 1);
- int firstIndex = (7 + gregorianCalendar.get(java.util.Calendar.DAY_OF_WEEK)
- - gregorianCalendar.getFirstDayOfWeek()) % 7;
- int lastIndex = firstIndex + gregorianCalendar.getActualMaximum(java.util.Calendar.DAY_OF_MONTH);
+ int firstIndex = (7 + gregorianCalendar.get(java.util.Calendar.DAY_OF_WEEK) - gregorianCalendar.getFirstDayOfWeek()) % 7;
+ int lastIndex = firstIndex
+ + gregorianCalendar.getActualMaximum(java.util.Calendar.DAY_OF_MONTH);
// Determine the last day of last month
gregorianCalendar.add(java.util.Calendar.MONTH, -1);
@@ -669,13 +670,12 @@ public class TerraCalendarSkin extends C
CalendarDate buttonData = new CalendarDate(year, month, day);
dateButton.setButtonData(buttonData);
dateButton.setEnabled(enabled
- && (disabledDateFilter == null
- || !disabledDateFilter.include(buttonData)));
+ && (disabledDateFilter == null || !disabledDateFilter.include(buttonData)));
}
}
// Show/hide last row
- CalendarDate lastWeekStartDate = (CalendarDate)dateButtons[5][0].getButtonData();
+ CalendarDate lastWeekStartDate = (CalendarDate) dateButtons[5][0].getButtonData();
boolean visible = (lastWeekStartDate.month == calendar.getMonth());
for (Component component : calendarTablePane.getRows().get(7)) {
component.setVisible(visible);
@@ -686,7 +686,7 @@ public class TerraCalendarSkin extends C
}
private void updateSelection(CalendarDate selectedDate) {
- Calendar calendar = (Calendar)getComponent();
+ Calendar calendar = (Calendar) getComponent();
Button selection = dateButtonGroup.getSelection();
if (selectedDate == null) {
@@ -697,8 +697,7 @@ public class TerraCalendarSkin extends C
int year = selectedDate.year;
int month = selectedDate.month;
- if (year == calendar.getYear()
- && month == calendar.getMonth()) {
+ if (year == calendar.getYear() && month == calendar.getMonth()) {
int day = selectedDate.day;
// Update the button group
@@ -707,7 +706,7 @@ public class TerraCalendarSkin extends C
int columnIndex = cellIndex % 7;
TablePane.Row row = calendarTablePane.getRows().get(rowIndex + 2);
- DateButton dateButton = (DateButton)row.get(columnIndex);
+ DateButton dateButton = (DateButton) row.get(columnIndex);
dateButton.setSelected(true);
} else {
if (selection != null) {
@@ -720,8 +719,7 @@ public class TerraCalendarSkin extends C
private static int getCellIndex(int year, int month, int day, Locale locale) {
GregorianCalendar gregorianCalendar = new GregorianCalendar(locale);
gregorianCalendar.set(year, month, 1);
- int firstDay = ((gregorianCalendar.get(java.util.Calendar.DAY_OF_WEEK)
- - gregorianCalendar.getFirstDayOfWeek()) + 7) % 7;
+ int firstDay = ((gregorianCalendar.get(java.util.Calendar.DAY_OF_WEEK) - gregorianCalendar.getFirstDayOfWeek()) + 7) % 7;
int cellIndex = firstDay + day;
return cellIndex;
@@ -743,7 +741,7 @@ public class TerraCalendarSkin extends C
TablePane.Row row = calendarTablePane.getRows().get(1);
for (int i = 0; i < 7; i++) {
- Label label = (Label)row.get(i);
+ Label label = (Label) row.get(i);
label.getStyles().put("font", font);
}
@@ -957,7 +955,8 @@ public class TerraCalendarSkin extends C
}
@Override
- public void disabledDateFilterChanged(Calendar calendar, Filter<CalendarDate> previousDisabledDateFilter) {
+ public void disabledDateFilterChanged(Calendar calendar,
+ Filter<CalendarDate> previousDisabledDateFilter) {
updateCalendar();
}
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=1529349&r1=1529348&r2=1529349&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 Fri Oct 4 23:45:40 2013
@@ -35,9 +35,7 @@ import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.CheckboxSkin;
/**
- * Terra checkbox skin.
- * <p>
- * TODO Button alignment style (vertical only).
+ * Terra checkbox skin. <p> TODO Button alignment style (vertical only).
*/
public class TerraCheckboxSkin extends CheckboxSkin {
private Font font;
@@ -56,7 +54,7 @@ public class TerraCheckboxSkin extends C
private static final int CHECKMARK_SIZE = 10;
public TerraCheckboxSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
font = theme.getFont();
color = theme.getColor(1);
disabledColor = theme.getColor(7);
@@ -72,7 +70,7 @@ public class TerraCheckboxSkin extends C
@Override
public int getPreferredWidth(int height) {
- Checkbox checkbox = (Checkbox)getComponent();
+ Checkbox checkbox = (Checkbox) getComponent();
Button.DataRenderer dataRenderer = checkbox.getDataRenderer();
int preferredWidth = CHECKBOX_SIZE;
@@ -80,8 +78,7 @@ public class TerraCheckboxSkin extends C
Object buttonData = checkbox.getButtonData();
if (buttonData != null) {
dataRenderer.render(buttonData, checkbox, false);
- preferredWidth += dataRenderer.getPreferredWidth(height)
- + spacing * 2;
+ preferredWidth += dataRenderer.getPreferredWidth(height) + spacing * 2;
}
return preferredWidth;
@@ -89,7 +86,7 @@ public class TerraCheckboxSkin extends C
@Override
public int getPreferredHeight(int width) {
- Checkbox checkbox = (Checkbox)getComponent();
+ Checkbox checkbox = (Checkbox) getComponent();
Button.DataRenderer dataRenderer = checkbox.getDataRenderer();
int preferredHeight = CHECKBOX_SIZE;
@@ -102,8 +99,7 @@ public class TerraCheckboxSkin extends C
dataRenderer.render(checkbox.getButtonData(), checkbox, false);
- preferredHeight = Math.max(preferredHeight,
- dataRenderer.getPreferredHeight(width));
+ preferredHeight = Math.max(preferredHeight, dataRenderer.getPreferredHeight(width));
}
return preferredHeight;
@@ -111,7 +107,7 @@ public class TerraCheckboxSkin extends C
@Override
public Dimensions getPreferredSize() {
- Checkbox checkbox = (Checkbox)getComponent();
+ Checkbox checkbox = (Checkbox) getComponent();
Button.DataRenderer dataRenderer = checkbox.getDataRenderer();
dataRenderer.render(checkbox.getButtonData(), checkbox, false);
@@ -122,11 +118,9 @@ public class TerraCheckboxSkin extends C
Object buttonData = checkbox.getButtonData();
if (buttonData != null) {
dataRenderer.render(buttonData, checkbox, false);
- preferredWidth += dataRenderer.getPreferredWidth(-1)
- + spacing * 2;
+ preferredWidth += dataRenderer.getPreferredWidth(-1) + spacing * 2;
- preferredHeight = Math.max(preferredHeight,
- dataRenderer.getPreferredHeight(-1));
+ preferredHeight = Math.max(preferredHeight, dataRenderer.getPreferredHeight(-1));
}
return new Dimensions(preferredWidth, preferredHeight);
@@ -149,7 +143,7 @@ public class TerraCheckboxSkin extends C
@Override
public void paint(Graphics2D graphics) {
- Checkbox checkbox = (Checkbox)getComponent();
+ Checkbox checkbox = (Checkbox) getComponent();
int width = getWidth();
int height = getHeight();
@@ -165,7 +159,7 @@ public class TerraCheckboxSkin extends C
dataRenderer.render(buttonData, checkbox, false);
dataRenderer.setSize(Math.max(width - (CHECKBOX_SIZE + spacing * 2), 0), height);
- Graphics2D contentGraphics = (Graphics2D)graphics.create();
+ Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(CHECKBOX_SIZE + spacing, 0);
contentGraphics.clipRect(0, 0, dataRenderer.getWidth(), dataRenderer.getHeight());
dataRenderer.paint(contentGraphics);
@@ -175,13 +169,12 @@ 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(), 0x44);
graphics.setColor(focusColor);
graphics.fillRect(0, 0, CHECKBOX_SIZE, CHECKBOX_SIZE);
} else {
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(buttonBorderColor);
@@ -190,8 +183,7 @@ public class TerraCheckboxSkin extends C
RenderingHints.VALUE_ANTIALIAS_ON);
Rectangle2D focusRectangle = new Rectangle2D.Double(CHECKBOX_SIZE + 1, 0.5,
- dataRenderer.getWidth() + spacing * 2 - 2,
- dataRenderer.getHeight() - 1);
+ dataRenderer.getWidth() + spacing * 2 - 2, dataRenderer.getHeight() - 1);
graphics.draw(focusRectangle);
}
}
@@ -235,15 +227,13 @@ public class TerraCheckboxSkin extends C
int offsetX = (CHECKBOX_SIZE - (n + m)) / 2;
int offsetY = (CHECKBOX_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);
} else {
if (state == Button.State.MIXED) {
graphics.setColor(buttonSelectionColorLocal);
- GraphicsUtilities.drawLine(graphics, 4, (CHECKBOX_SIZE - 3) / 2 + 1, CHECKBOX_SIZE - 8,
- Orientation.HORIZONTAL, 2);
+ GraphicsUtilities.drawLine(graphics, 4, (CHECKBOX_SIZE - 3) / 2 + 1,
+ CHECKBOX_SIZE - 8, Orientation.HORIZONTAL, 2);
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Fri Oct 4 23:45:40 2013
@@ -51,7 +51,7 @@ public class TerraColorChooserButtonSkin
private WindowStateListener colorChooserPopupStateListener = new WindowStateListener.Adapter() {
@Override
public void windowOpened(Window window) {
- ColorChooserButton colorChooserButton = (ColorChooserButton)getComponent();
+ ColorChooserButton colorChooserButton = (ColorChooserButton) getComponent();
colorChooser.setSelectedColor(colorChooserButton.getSelectedColor());
// Size and position the popup
@@ -71,8 +71,7 @@ public class TerraColorChooserButtonSkin
int popupHeight = window.getPreferredHeight();
int maximumHeight = displaySize.height - window.getY();
- if (popupHeight > maximumHeight
- && buttonLocation.y > maximumHeight) {
+ if (popupHeight > maximumHeight && buttonLocation.y > maximumHeight) {
window.setY(buttonLocation.y - window.getPreferredHeight() + 1);
}
@@ -147,7 +146,7 @@ public class TerraColorChooserButtonSkin
private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraColorChooserButtonSkin() {
- TerraTheme theme = (TerraTheme)Theme.getTheme();
+ TerraTheme theme = (TerraTheme) Theme.getTheme();
font = theme.getFont();
color = theme.getColor(1);
@@ -180,33 +179,33 @@ public class TerraColorChooserButtonSkin
@Override
public int getPreferredWidth(int height) {
- ColorChooserButton colorChooserButton = (ColorChooserButton)getComponent();
+ ColorChooserButton colorChooserButton = (ColorChooserButton) getComponent();
Button.DataRenderer dataRenderer = colorChooserButton.getDataRenderer();
dataRenderer.render(colorChooserButton.getButtonData(), colorChooserButton, false);
- int preferredWidth = dataRenderer.getPreferredWidth(-1) + TRIGGER_WIDTH
- + padding.left + padding.right + 2;
+ int preferredWidth = dataRenderer.getPreferredWidth(-1) + TRIGGER_WIDTH + padding.left
+ + padding.right + 2;
return preferredWidth;
}
@Override
public int getPreferredHeight(int width) {
- ColorChooserButton colorChooserButton = (ColorChooserButton)getComponent();
+ ColorChooserButton colorChooserButton = (ColorChooserButton) getComponent();
Button.DataRenderer dataRenderer = colorChooserButton.getDataRenderer();
dataRenderer.render(colorChooserButton.getButtonData(), colorChooserButton, false);
- int preferredHeight = dataRenderer.getPreferredHeight(-1)
- + padding.top + padding.bottom + 2;
+ int preferredHeight = dataRenderer.getPreferredHeight(-1) + padding.top + padding.bottom
+ + 2;
return preferredHeight;
}
@Override
public Dimensions getPreferredSize() {
- ColorChooserButton colorChooserButton = (ColorChooserButton)getComponent();
+ ColorChooserButton colorChooserButton = (ColorChooserButton) getComponent();
Button.DataRenderer dataRenderer = colorChooserButton.getDataRenderer();
dataRenderer.render(colorChooserButton.getButtonData(), colorChooserButton, false);
@@ -220,7 +219,7 @@ public class TerraColorChooserButtonSkin
@Override
public int getBaseline(int width, int height) {
- ColorChooserButton colorChooserButton = (ColorChooserButton)getComponent();
+ ColorChooserButton colorChooserButton = (ColorChooserButton) getComponent();
Button.DataRenderer dataRenderer = colorChooserButton.getDataRenderer();
dataRenderer.render(colorChooserButton.getButtonData(), colorChooserButton, false);
@@ -244,7 +243,7 @@ public class TerraColorChooserButtonSkin
@Override
public void paint(Graphics2D graphics) {
- ColorChooserButton colorChooserButton = (ColorChooserButton)getComponent();
+ ColorChooserButton colorChooserButton = (ColorChooserButton) getComponent();
int width = getWidth();
int height = getHeight();
@@ -255,8 +254,8 @@ public class TerraColorChooserButtonSkin
if (colorChooserButton.isEnabled()) {
backgroundColorLocal = this.backgroundColor;
- bevelColorLocal = (pressed || (colorChooserPopup.isOpen() && !colorChooserPopup.isClosing())) ?
- pressedBevelColor : this.bevelColor;
+ bevelColorLocal = (pressed || (colorChooserPopup.isOpen() && !colorChooserPopup.isClosing())) ? pressedBevelColor
+ : this.bevelColor;
borderColorLocal = this.borderColor;
} else {
backgroundColorLocal = disabledBackgroundColor;
@@ -268,23 +267,24 @@ public class TerraColorChooserButtonSkin
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- 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));
+ 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));
// Paint the content
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
- Bounds contentBounds = new Bounds(0, 0,
- Math.max(width - TRIGGER_WIDTH - 1, 0), Math.max(height - 1, 0));
+ Bounds contentBounds = new Bounds(0, 0, Math.max(width - TRIGGER_WIDTH - 1, 0), Math.max(
+ height - 1, 0));
Button.DataRenderer dataRenderer = colorChooserButton.getDataRenderer();
dataRenderer.render(colorChooserButton.getButtonData(), colorChooserButton, false);
- dataRenderer.setSize(Math.max(contentBounds.width - (padding.left + padding.right + 2) + 1, 0),
+ dataRenderer.setSize(
+ Math.max(contentBounds.width - (padding.left + padding.right + 2) + 1, 0),
Math.max(contentBounds.height - (padding.top + padding.bottom + 2) + 1, 0));
- Graphics2D contentGraphics = (Graphics2D)graphics.create();
+ Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(padding.left + 1, padding.top + 1);
contentGraphics.clipRect(0, 0, dataRenderer.getWidth(), dataRenderer.getHeight());
dataRenderer.paint(contentGraphics);
@@ -304,21 +304,21 @@ public class TerraColorChooserButtonSkin
// Paint the focus state
if (colorChooserButton.isFocused()) {
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));
}
// Paint the focus state
if (colorChooserButton.isFocused()) {
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,
@@ -331,12 +331,12 @@ public class TerraColorChooserButtonSkin
triggerIconShape.lineTo(6, 0);
triggerIconShape.closePath();
- Graphics2D triggerGraphics = (Graphics2D)graphics.create();
+ Graphics2D triggerGraphics = (Graphics2D) graphics.create();
triggerGraphics.setStroke(new BasicStroke(0));
triggerGraphics.setPaint(color);
- 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);
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=1529349&r1=1529348&r2=1529349&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 Fri Oct 4 23:45:40 2013
@@ -77,7 +77,7 @@ public class TerraColorChooserSkin exten
// Paint the hue spectrum
for (int y = 0; y < height; y++) {
- Color color = Color.getHSBColor(1f - (y / (float)height), 1f, 1f);
+ Color color = Color.getHSBColor(1f - (y / (float) height), 1f, 1f);
hueSpectrumImageGraphics.setColor(color);
hueSpectrumImageGraphics.fillRect(0, y, width, 1);
}
@@ -90,7 +90,7 @@ public class TerraColorChooserSkin exten
// Mark the selected hue
float hue = hueChooser.getHue();
graphics.setColor(Color.BLACK);
- graphics.fillRect(0, Math.min((int)(height * (1f - hue)), height - 1), width, 1);
+ graphics.fillRect(0, Math.min((int) (height * (1f - hue)), height - 1), width, 1);
}
@Override
@@ -102,8 +102,7 @@ public class TerraColorChooserSkin exten
public boolean mouseMove(Component component, int x, int y) {
boolean consumed = super.mouseMove(component, x, y);
- if (capture
- && Mouse.getCapturer() != component) {
+ if (capture && Mouse.getCapturer() != component) {
Mouse.capture(component);
}
@@ -152,11 +151,11 @@ public class TerraColorChooserSkin exten
}
private void setSelectedColor(int y) {
- ColorChooser colorChooser = (ColorChooser)TerraColorChooserSkin.this.getComponent();
+ ColorChooser colorChooser = (ColorChooser) TerraColorChooserSkin.this.getComponent();
int height = getHeight();
- float hue = 1f - (Math.min(Math.max(y, 0), height - 1) / (float)height);
+ float hue = 1f - (Math.min(Math.max(y, 0), height - 1) / (float) height);
float saturation = saturationValueChooser.getSaturation();
float value = saturationValueChooser.getValue();
@@ -228,8 +227,8 @@ public class TerraColorChooserSkin exten
// Paint the saturation/value spectrum
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
- Color color = Color.getHSBColor(hue, 1f - (y / (float)height),
- x / (float)width);
+ Color color = Color.getHSBColor(hue, 1f - (y / (float) height), x
+ / (float) width);
saturationValueImageGraphics.setColor(color);
saturationValueImageGraphics.fillRect(x, y, 1, 1);
}
@@ -246,8 +245,9 @@ public class TerraColorChooserSkin exten
float value = saturationValueChooser.getValue();
graphics.setColor(Color.WHITE);
graphics.setXORMode(Color.getHSBColor(hue, 0f, 0f));
- graphics.fillRect(0, Math.min((int)(height * (1f - saturation)), height - 1), width, 1);
- graphics.fillRect(Math.min((int)(width * value), width - 1), 0, 1, height);
+ graphics.fillRect(0, Math.min((int) (height * (1f - saturation)), height - 1),
+ width, 1);
+ graphics.fillRect(Math.min((int) (width * value), width - 1), 0, 1, height);
}
}
@@ -260,8 +260,7 @@ public class TerraColorChooserSkin exten
public boolean mouseMove(Component component, int x, int y) {
boolean consumed = super.mouseMove(component, x, y);
- if (capture
- && Mouse.getCapturer() != component) {
+ if (capture && Mouse.getCapturer() != component) {
Mouse.capture(component);
}
@@ -310,14 +309,14 @@ public class TerraColorChooserSkin exten
}
private void setSelectedColor(int x, int y) {
- ColorChooser colorChooser = (ColorChooser)TerraColorChooserSkin.this.getComponent();
+ ColorChooser colorChooser = (ColorChooser) TerraColorChooserSkin.this.getComponent();
int width = getWidth();
int height = getHeight();
float hue = hueChooser.getHue();
- float saturation = 1f - (Math.min(Math.max(y, 0), height - 1) / (float)height);
- float value = Math.min(Math.max(x, 0), width - 1) / (float)width;
+ float saturation = 1f - (Math.min(Math.max(y, 0), height - 1) / (float) height);
+ float value = Math.min(Math.max(x, 0), width - 1) / (float) width;
saturationValueChooser.setSaturation(saturation);
saturationValueChooser.setValue(value);
@@ -356,7 +355,7 @@ public class TerraColorChooserSkin exten
public void install(Component component) {
super.install(component);
- ColorChooser colorChooser = (ColorChooser)component;
+ ColorChooser colorChooser = (ColorChooser) component;
colorChooser.add(tablePane);
selectedColorChanged(colorChooser, null);
@@ -387,7 +386,7 @@ public class TerraColorChooserSkin exten
}
public int getSpacing() {
- return (Integer)tablePane.getStyles().get("horizontalSpacing");
+ return (Integer) tablePane.getStyles().get("horizontalSpacing");
}
public void setSpacing(int spacing) {
@@ -418,8 +417,8 @@ public class TerraColorChooserSkin exten
float value = 0f;
if (color != null) {
- float[] hsb = Color.RGBtoHSB(color.getRed(), color.getGreen(),
- color.getBlue(), null);
+ float[] hsb = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(),
+ null);
hue = hsb[0];
saturation = hsb[1];
value = hsb[2];
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=1529349&r1=1529348&r2=1529349&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Fri Oct 4 23:45:40 2013
@@ -27,15 +27,14 @@ import org.apache.pivot.wtk.DialogStateL
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.Mouse;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
/**
* Dialog skin.
*/
-public class TerraDialogSkin extends TerraFrameSkin
- implements DialogListener, DialogStateListener {
+public class TerraDialogSkin extends TerraFrameSkin implements DialogListener, DialogStateListener {
private static final float GOLDEN_SECTION = 0.382f;
private ContainerMouseListener displayMouseListener = new ContainerMouseListener.Adapter() {
@@ -48,7 +47,7 @@ public class TerraDialogSkin extends Ter
public boolean mouseDown(Container display, Mouse.Button button, int x, int y) {
boolean consumed = false;
- Dialog dialog = (Dialog)getComponent();
+ Dialog dialog = (Dialog) getComponent();
if (isMouseOverOwner(display, x, y)) {
Window rootOwner = dialog.getRootOwner();
rootOwner.moveToFront();
@@ -72,15 +71,15 @@ public class TerraDialogSkin extends Ter
}
@Override
- public boolean mouseWheel(Container display, Mouse.ScrollType scrollType,
- int scrollAmount, int wheelRotation, int x, int y) {
+ public boolean mouseWheel(Container display, Mouse.ScrollType scrollType, int scrollAmount,
+ int wheelRotation, int x, int y) {
return isMouseOverOwner(display, x, y);
}
private boolean isMouseOverOwner(Container display, int x, int y) {
boolean mouseOverOwner = false;
- Dialog dialog = (Dialog)getComponent();
+ Dialog dialog = (Dialog) getComponent();
if (dialog.isModal()) {
Component descendant = display.getDescendantAt(x, y);
@@ -98,7 +97,7 @@ public class TerraDialogSkin extends Ter
public void install(Component component) {
super.install(component);
- Dialog dialog = (Dialog)component;
+ Dialog dialog = (Dialog) component;
dialog.getDialogStateListeners().add(this);
setShowMaximizeButton(false);
@@ -107,7 +106,7 @@ public class TerraDialogSkin extends Ter
@Override
public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
- Dialog dialog = (Dialog)container;
+ Dialog dialog = (Dialog) container;
if (!dialog.isTopMost()) {
Window rootOwner = dialog.getRootOwner();
rootOwner.moveToFront();
@@ -124,7 +123,7 @@ public class TerraDialogSkin extends Ter
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = false;
- Dialog dialog = (Dialog)getComponent();
+ Dialog dialog = (Dialog) getComponent();
if (keyCode == Keyboard.KeyCode.ENTER) {
dialog.close(true);