You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/03/03 14:17:32 UTC
svn commit: r918462 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/skin/
Author: gbrown
Date: Wed Mar 3 13:17:31 2010
New Revision: 918462
URL: http://svn.apache.org/viewvc?rev=918462&view=rev
Log:
Rename Direction enum to FocusTraversalDirection (PIVOT-427).
Added:
pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalDirection.java
- copied, changed from r916487, pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java
Removed:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalPolicy.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.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/ComponentSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Wed Mar 3 13:17:31 2010
@@ -45,7 +45,7 @@
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.Dimensions;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.FileBrowser;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.ImageView;
@@ -778,7 +778,7 @@
fileBrowser.setFocusTraversalPolicy(new IndexFocusTraversalPolicy() {
@Override
public Component getNextComponent(Container container, Component component,
- Direction direction) {
+ FocusTraversalDirection direction) {
Component nextComponent;
if (component == null) {
nextComponent = fileTableView;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Wed Mar 3 13:17:31 2010
@@ -29,7 +29,7 @@
import org.apache.pivot.wtk.ComponentStateListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Keyboard;
@@ -236,8 +236,8 @@
case Keyboard.KeyCode.TAB: {
suggestionPopup.close(false);
- Direction direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
- Direction.BACKWARD : Direction.FORWARD;
+ FocusTraversalDirection direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
+ FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
textInput.transferFocus(direction);
break;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Wed Mar 3 13:17:31 2010
@@ -38,7 +38,7 @@
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Cursor;
import org.apache.pivot.wtk.Dimensions;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
@@ -119,7 +119,7 @@
private boolean caretOn = true;
- private Direction scrollDirection = null;
+ private FocusTraversalDirection scrollDirection = null;
private BlinkCaretCallback blinkCaretCallback = new BlinkCaretCallback();
private ApplicationContext.ScheduledCallback scheduledBlinkCaretCallback = null;
@@ -956,7 +956,7 @@
}
} else {
if (scheduledScrollSelectionCallback == null) {
- scrollDirection = (x < 0) ? Direction.BACKWARD : Direction.FORWARD;
+ scrollDirection = (x < 0) ? FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
scheduledScrollSelectionCallback =
ApplicationContext.scheduleRecurringCallback(scrollSelectionCallback,
@@ -1097,8 +1097,7 @@
Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (keyCode == Keyboard.KeyCode.DELETE
|| keyCode == Keyboard.KeyCode.BACKSPACE) {
- Direction direction = (keyCode == Keyboard.KeyCode.DELETE ?
- Direction.FORWARD : Direction.BACKWARD);
+ boolean backspace = (keyCode == Keyboard.KeyCode.DELETE ? false : true);
Validator validator = textInput.getValidator();
@@ -1111,7 +1110,7 @@
if (count > 0) {
buf.delete(index, index + count);
} else {
- if (direction == Direction.BACKWARD) {
+ if (backspace) {
index--;
}
@@ -1122,12 +1121,12 @@
}
if (validator.isValid(buf.toString())) {
- textInput.delete(direction);
+ textInput.delete(backspace);
} else {
Toolkit.getDefaultToolkit().beep();
}
} else {
- textInput.delete(direction);
+ textInput.delete(backspace);
}
consumed = true;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Wed Mar 3 13:17:31 2010
@@ -2297,7 +2297,7 @@
* @param direction
* The direction in which to transfer focus.
*/
- public Component transferFocus(Direction direction) {
+ public Component transferFocus(FocusTraversalDirection direction) {
Component component = null;
Container parent = getParent();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java Wed Mar 3 13:17:31 2010
@@ -458,12 +458,12 @@
focused = super.requestFocus();
} else {
if (focusTraversalPolicy != null) {
- Component first = focusTraversalPolicy.getNextComponent(this, null, Direction.FORWARD);
+ Component first = focusTraversalPolicy.getNextComponent(this, null, FocusTraversalDirection.FORWARD);
Component component = first;
while (component != null
&& !component.requestFocus()) {
- component = focusTraversalPolicy.getNextComponent(this, component, Direction.FORWARD);
+ component = focusTraversalPolicy.getNextComponent(this, component, FocusTraversalDirection.FORWARD);
// Ensure that we don't get into an infinite loop
if (component == first) {
@@ -487,7 +487,7 @@
* @param direction
* The direction in which to transfer focus.
*/
- public Component transferFocus(Component component, Direction direction) {
+ public Component transferFocus(Component component, FocusTraversalDirection direction) {
if (focusTraversalPolicy == null) {
// The container has no traversal policy; move up a level
component = transferFocus(direction);
Copied: pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalDirection.java (from r916487, pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java)
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalDirection.java?p2=pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalDirection.java&p1=pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java&r1=916487&r2=918462&rev=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalDirection.java Wed Mar 3 13:17:31 2010
@@ -19,7 +19,7 @@
/**
* Enumeration representing a two-dimensional direction.
*/
-public enum Direction {
+public enum FocusTraversalDirection {
FORWARD,
BACKWARD
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalPolicy.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalPolicy.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalPolicy.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FocusTraversalPolicy.java Wed Mar 3 13:17:31 2010
@@ -39,5 +39,5 @@
* The component to focus, or <tt>null</tt> if there are no more components
* in the given direction or next component cannot be determined.
*/
- Component getNextComponent(Container container, Component component, Direction direction);
+ Component getNextComponent(Container container, Component component, FocusTraversalDirection direction);
}
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=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Wed Mar 3 13:17:31 2010
@@ -67,7 +67,7 @@
* @return
* The next insertion point.
*/
- public int getNextInsertionPoint(int x, int from, Direction direction);
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction);
/**
* Returns the row index of the character at a given offset within the document.
@@ -336,7 +336,7 @@
}
if (selectionLength > 0) {
- delete(Direction.FORWARD);
+ delete(false);
}
Node descendant = document.getDescendantAt(selectionStart);
@@ -440,11 +440,7 @@
return (document == null) ? 0 : document.getCharacterCount();
}
- public void delete(Direction direction) {
- if (direction == null) {
- throw new IllegalArgumentException("direction is null.");
- }
-
+ public void delete(boolean backspace) {
if (document == null
|| document.getCharacterCount() == 0) {
throw new IllegalStateException();
@@ -456,7 +452,7 @@
if (selectionLength > 0) {
characterCount = selectionLength;
} else {
- if (direction == Direction.BACKWARD) {
+ if (backspace) {
offset--;
}
@@ -571,7 +567,7 @@
if (selectionLength > 0) {
// TODO Make this part of the undoable action (for all such
// actions)
- delete(Direction.BACKWARD);
+ delete(true);
}
// Insert the clipboard contents
@@ -816,7 +812,7 @@
return textAreaSkin.getInsertionPoint(x, y);
}
- public int getNextInsertionPoint(int x, int from, Direction direction) {
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction) {
TextArea.Skin textAreaSkin = (TextArea.Skin)getSkin();
return textAreaSkin.getNextInsertionPoint(x, from, direction);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Wed Mar 3 13:17:31 2010
@@ -391,15 +391,11 @@
return (textNode == null) ? 0 : textNode.getCharacterCount();
}
- public void delete(Direction direction) {
+ public void delete(boolean backspace) {
if (textNode == null) {
throw new IllegalStateException();
}
- if (direction == null) {
- throw new IllegalArgumentException("direction is null.");
- }
-
if (selectionLength > 0) {
// TODO Make this part of the undoable action (for all such
// actions)
@@ -407,7 +403,7 @@
} else {
int offset = selectionStart;
- if (direction == Direction.BACKWARD) {
+ if (backspace) {
offset--;
}
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=918462&r1=918461&r2=918462&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 Wed Mar 3 13:17:31 2010
@@ -29,7 +29,7 @@
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
@@ -82,8 +82,8 @@
calendarPopup.close();
if (keyCode == Keyboard.KeyCode.TAB) {
- Direction direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
- Direction.BACKWARD : Direction.FORWARD;
+ FocusTraversalDirection direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
+ FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
calendarButton.transferFocus(direction);
}
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=918462&r1=918461&r2=918462&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 Wed Mar 3 13:17:31 2010
@@ -23,7 +23,7 @@
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.ColorChooser;
@@ -85,8 +85,8 @@
colorChooserPopup.close();
if (keyCode == Keyboard.KeyCode.TAB) {
- Direction direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
- Direction.BACKWARD : Direction.FORWARD;
+ FocusTraversalDirection direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
+ FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
colorChooserButton.transferFocus(direction);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java Wed Mar 3 13:17:31 2010
@@ -32,7 +32,7 @@
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.Cursor;
import org.apache.pivot.wtk.Dimensions;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.DragSource;
import org.apache.pivot.wtk.DropTarget;
@@ -303,8 +303,8 @@
if (keyCode == Keyboard.KeyCode.TAB
&& getComponent().isFocused()) {
- Direction direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
- Direction.BACKWARD : Direction.FORWARD;
+ FocusTraversalDirection direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
+ FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
Component previousFocusedComponent = Component.getFocusedComponent();
previousFocusedComponent.transferFocus(direction);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java Wed Mar 3 13:17:31 2010
@@ -27,7 +27,7 @@
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerListener;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.FocusTraversalPolicy;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Mouse;
@@ -54,7 +54,7 @@
}
@Override
- public Component getNextComponent(Container container, Component component, Direction direction) {
+ public Component getNextComponent(Container container, Component component, FocusTraversalDirection direction) {
if (container == null) {
throw new IllegalArgumentException("container is null.");
}
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=918462&r1=918461&r2=918462&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 Wed Mar 3 13:17:31 2010
@@ -23,7 +23,7 @@
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.ListButton;
@@ -83,8 +83,8 @@
int index = listView.getSelectedIndex();
listButton.setSelectedIndex(index);
- Direction direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
- Direction.BACKWARD : Direction.FORWARD;
+ FocusTraversalDirection direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
+ FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
listButton.transferFocus(direction);
break;
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=918462&r1=918461&r2=918462&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 Wed Mar 3 13:17:31 2010
@@ -40,7 +40,7 @@
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Cursor;
import org.apache.pivot.wtk.Dimensions;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
@@ -232,7 +232,7 @@
public abstract NodeView getNext();
public abstract int getInsertionPoint(int x, int y);
- public abstract int getNextInsertionPoint(int x, int from, Direction direction);
+ public abstract int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction);
public abstract int getRowIndex(int offset);
public abstract int getRowCount();
public abstract Bounds getCharacterBounds(int offset);
@@ -521,12 +521,12 @@
}
@Override
- public int getNextInsertionPoint(int x, int from, Direction direction) {
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction) {
int offset = -1;
if (getLength() > 0) {
if (from == -1) {
- int i = (direction == Direction.FORWARD) ? 0 : getLength() - 1;
+ int i = (direction == FocusTraversalDirection.FORWARD) ? 0 : getLength() - 1;
NodeView nodeView = get(i);
offset = nodeView.getNextInsertionPoint(x - nodeView.getX(), -1, direction);
@@ -558,7 +558,7 @@
if (offset == -1) {
// Move to the next or previous node view
- if (direction == Direction.FORWARD) {
+ if (direction == FocusTraversalDirection.FORWARD) {
nodeView = (i < n - 1) ? get(i + 1) : null;
} else {
nodeView = (i > 0) ? get(i - 1) : null;
@@ -817,7 +817,7 @@
}
@Override
- public int getNextInsertionPoint(int x, int from, Direction direction) {
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction) {
int offset = -1;
int n = rows.getLength();
@@ -828,7 +828,7 @@
} else {
int i;
if (from == -1) {
- i = (direction == Direction.FORWARD) ? -1 : rows.getLength();
+ i = (direction == FocusTraversalDirection.FORWARD) ? -1 : rows.getLength();
} else {
// Find the row that contains offset
if (from == getCharacterCount() - 1) {
@@ -850,7 +850,7 @@
}
// Move to the next or previous row
- if (direction == Direction.FORWARD) {
+ if (direction == FocusTraversalDirection.FORWARD) {
i++;
} else {
i--;
@@ -1160,7 +1160,7 @@
}
@Override
- public int getNextInsertionPoint(int x, int from, Direction direction) {
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction) {
int offset = -1;
if (from == -1) {
@@ -1293,7 +1293,7 @@
}
@Override
- public int getNextInsertionPoint(int x, int from, Direction direction) {
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction) {
return (from == -1) ? 0 : -1;
}
@@ -1413,7 +1413,7 @@
private boolean caretOn = false;
private int anchor = -1;
- private Direction scrollDirection = null;
+ private FocusTraversalDirection scrollDirection = null;
private int mouseX = -1;
private BlinkCaretCallback blinkCaretCallback = new BlinkCaretCallback();
@@ -1612,9 +1612,9 @@
x = Math.min(documentView.getWidth() - 1, Math.max(x - margin.left, 0));
if (y < margin.top) {
- offset = documentView.getNextInsertionPoint(x, -1, Direction.FORWARD);
+ offset = documentView.getNextInsertionPoint(x, -1, FocusTraversalDirection.FORWARD);
} else if (y > documentView.getHeight() + margin.top) {
- offset = documentView.getNextInsertionPoint(x, -1, Direction.BACKWARD);
+ offset = documentView.getNextInsertionPoint(x, -1, FocusTraversalDirection.BACKWARD);
} else {
offset = documentView.getInsertionPoint(x, y - margin.top);
}
@@ -1624,7 +1624,7 @@
}
@Override
- public int getNextInsertionPoint(int x, int from, Direction direction) {
+ public int getNextInsertionPoint(int x, int from, FocusTraversalDirection direction) {
int offset;
if (documentView == null) {
@@ -1947,7 +1947,7 @@
}
} else {
if (scheduledScrollSelectionCallback == null) {
- scrollDirection = (y < visibleArea.y) ? Direction.BACKWARD : Direction.FORWARD;
+ scrollDirection = (y < visibleArea.y) ? FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
scheduledScrollSelectionCallback =
ApplicationContext.scheduleRecurringCallback(scrollSelectionCallback,
@@ -2068,12 +2068,12 @@
consumed = true;
} else if (keyCode == Keyboard.KeyCode.DELETE
&& textArea.isEditable()) {
- textArea.delete(Direction.FORWARD);
+ textArea.delete(false);
consumed = true;
} else if (keyCode == Keyboard.KeyCode.BACKSPACE
&& textArea.isEditable()) {
- textArea.delete(Direction.BACKWARD);
+ textArea.delete(true);
consumed = true;
} else if (keyCode == Keyboard.KeyCode.LEFT) {
@@ -2136,7 +2136,7 @@
} else if (keyCode == Keyboard.KeyCode.UP) {
int selectionStart = textArea.getSelectionStart();
- int offset = getNextInsertionPoint(caretX, selectionStart, Direction.BACKWARD);
+ int offset = getNextInsertionPoint(caretX, selectionStart, FocusTraversalDirection.BACKWARD);
if (offset == -1) {
offset = 0;
@@ -2174,7 +2174,7 @@
x = trailingSelectionBounds.x + trailingSelectionBounds.width;
}
- int offset = getNextInsertionPoint(x, from, Direction.FORWARD);
+ int offset = getNextInsertionPoint(x, from, FocusTraversalDirection.FORWARD);
if (offset == -1) {
offset = documentView.getCharacterCount() - 1;
@@ -2199,7 +2199,7 @@
from = selectionStart + selectionLength - 1;
}
- int offset = getNextInsertionPoint(caretX, from, Direction.FORWARD);
+ int offset = getNextInsertionPoint(caretX, from, FocusTraversalDirection.FORWARD);
if (offset == -1) {
offset = documentView.getCharacterCount() - 1;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java?rev=918462&r1=918461&r2=918462&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java Wed Mar 3 13:17:31 2010
@@ -23,7 +23,7 @@
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.Dimensions;
-import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FocusTraversalPolicy;
import org.apache.pivot.wtk.Mouse;
@@ -43,7 +43,7 @@
*/
public static class WindowFocusTraversalPolicy implements FocusTraversalPolicy {
@Override
- public Component getNextComponent(Container container, Component component, Direction direction) {
+ public Component getNextComponent(Container container, Component component, FocusTraversalDirection direction) {
assert (container instanceof Window) : "container is not a Window";
if (direction == null) {