Author: gbrown
Date: Thu May 6 11:42:11 2010
New Revision: 941675
URL: http://svn.apache.org/viewvc?rev=941675&view=rev
Log:
Trim whitespace.
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPaneAttributeListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java
(original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java Thu
May 6 11:42:11 2010
@@ -29,7 +29,7 @@ import org.apache.pivot.wtkx.WTKXSeriali
public class ColorListButtonTest implements Application {
private Frame frame = null;
private ListButton listButton = null;
-
+
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
@@ -38,7 +38,7 @@ public class ColorListButtonTest impleme
listButton = (ListButton)wtkxSerializer.get("listButton");
// test the getListPopup() method
listButton.getListPopup().getDecorators().add(new
ReflectionDecorator());
-
+
frame = new Frame(boxPane);
frame.setTitle("Color List Button Test");
frame.setPreferredSize(480, 360);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Thu May 6
11:42:11 2010
@@ -110,9 +110,9 @@ public class CalendarButton extends Butt
* component and the skin.
*/
public interface Skin {
- public Window getListPopup();
+ public Window getListPopup();
}
-
+
private int year;
private int month;
@@ -164,14 +164,14 @@ public class CalendarButton extends Butt
super.setSkin(skin);
}
-
+
/**
* @return the popup window associated with this components skin
*/
public Window getListPopup() {
return ((CalendarButton.Skin) getSkin()).getListPopup();
}
-
+
/**
* @throws UnsupportedOperationException
* This method is not supported by CalendarButton.
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java Thu May 6
11:42:11 2010
@@ -82,9 +82,9 @@ public class ColorChooserButton extends
* component and the skin.
*/
public interface Skin {
- public Window getListPopup();
+ public Window getListPopup();
}
-
+
private Color selectedColor = null;
private String selectedColorKey = null;
@@ -119,14 +119,14 @@ public class ColorChooserButton extends
super.setSkin(skin);
}
-
+
/**
* @return the popup window associated with this components skin
*/
public Window getListPopup() {
return ((ColorChooserButton.Skin) getSkin()).getListPopup();
}
-
+
/**
* @throws UnsupportedOperationException
* This method is not supported by ColorChooserButton.
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Thu May 6
11:42:11 2010
@@ -125,9 +125,9 @@ public class ListButton extends Button {
* component and the skin.
*/
public interface Skin {
- public Window getListPopup();
+ public Window getListPopup();
}
-
+
private List<?> listData;
private ListView.ItemRenderer itemRenderer;
private int selectedIndex = -1;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java Thu May 6
11:42:11 2010
@@ -54,9 +54,9 @@ public class MenuButton extends Button {
* component and the skin.
*/
public interface Skin {
- public Window getListPopup();
+ public Window getListPopup();
}
-
+
private Menu menu = null;
private boolean repeatable = false;
@@ -78,14 +78,14 @@ public class MenuButton extends Button {
super.setSkin(skin);
}
-
+
/**
* @return the popup window associated with this components skin
*/
public Window getListPopup() {
return ((MenuButton.Skin) getSkin()).getListPopup();
}
-
+
@Override
public void setToggleButton(boolean toggleButton) {
throw new UnsupportedOperationException("Menu buttons cannot be toggle
buttons.");
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java Thu May 6 11:42:11
2010
@@ -211,7 +211,7 @@ public class TabPane extends Container {
listener.closeableChanged(tabPane, component);
}
}
-
+
@Override
public void tooltipTextChanged(TabPane tabPane, Component component,
String previousTooltipText) {
for (TabPaneAttributeListener listener : this) {
@@ -402,7 +402,7 @@ public class TabPane extends Container {
}
}
}
-
+
/**
* Returns the tab component's tooltip text.
*
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPaneAttributeListener.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPaneAttributeListener.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPaneAttributeListener.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPaneAttributeListener.java Thu
May 6 11:42:11 2010
@@ -37,7 +37,7 @@ public interface TabPaneAttributeListene
@Override
public void closeableChanged(TabPane tabPane, Component component) {
}
-
+
@Override
public void tooltipTextChanged(TabPane tabPane, Component component,
String previousTooltipText) {
@@ -69,7 +69,7 @@ public interface TabPaneAttributeListene
* @param component
*/
public void closeableChanged(TabPane tabPane, Component component);
-
+
/**
* Called when a tab's tooltipText attribute has changed.
*
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Thu May 6 11:42:11
2010
@@ -694,14 +694,14 @@ public class TextArea extends Component
if (selectionStart < 0) {
throw new IndexOutOfBoundsException("selectionStart < 0,
selectionStart=" + selectionStart);
}
-
+
if (selectionStart >= document.getCharacterCount()) {
throw new IndexOutOfBoundsException("selectionStart=" +
selectionStart
+ ", document.characterCount=" + document.getCharacterCount());
}
-
+
if (selectionStart + selectionLength > document.getCharacterCount()) {
- throw new IndexOutOfBoundsException("selectionStart=" +
selectionStart + ", selectionLength=" + selectionLength
+ throw new IndexOutOfBoundsException("selectionStart=" +
selectionStart + ", selectionLength=" + selectionLength
+ ", document.characterCount=" + document.getCharacterCount());
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java Thu
May 6 11:42:11 2010
@@ -181,7 +181,7 @@ public abstract class CalendarButtonSkin
public Window getListPopup() {
return calendarPopup;
}
-
+
// Component state events
@Override
public void enabledChanged(Component component) {
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
Thu May 6 11:42:11 2010
@@ -192,7 +192,7 @@ public abstract class ColorChooserButton
public Window getListPopup() {
return colorChooserPopup;
}
-
+
// ComponentStateListener methods
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Thu May
6 11:42:11 2010
@@ -178,7 +178,7 @@ public abstract class ListButtonSkin ext
public Window getListPopup() {
return listViewPopup;
}
-
+
// Component state events
@Override
public void enabledChanged(Component component) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Thu May
6 11:42:11 2010
@@ -85,7 +85,7 @@ public abstract class MenuButtonSkin ext
public Window getListPopup() {
return menuPopup;
}
-
+
// Component state events
@Override
public void enabledChanged(Component component) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=941675&r1=941674&r2=941675&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Thu May 6
11:42:11 2010
@@ -2082,7 +2082,7 @@ public class TextAreaSkin extends Compon
// Move the caret to the start of the next word to our left
if (selectionStart > 0) {
// first, skip over any space immediately to our left
- while (selectionStart > 0
+ while (selectionStart > 0
&&
Character.isWhitespace(document.getCharacterAt(selectionStart - 1))) {
selectionStart--;
}
@@ -2091,7 +2091,7 @@ public class TextAreaSkin extends Compon
&&
!Character.isWhitespace(document.getCharacterAt(selectionStart - 1))) {
selectionStart--;
}
-
+
selectionLength = 0;
}
} else {
@@ -2136,10 +2136,10 @@ public class TextAreaSkin extends Compon
&&
Character.isWhitespace(document.getCharacterAt(selectionStart))) {
selectionStart++;
}
-
+
textArea.setSelection(selectionStart, 0);
scrollCharacterToVisible(selectionStart);
-
+
caretX = caret.x;
}
} else {
