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 2009/10/15 18:06:35 UTC
svn commit: r825540 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: ./ skin/ skin/terra/
Author: gbrown
Date: Thu Oct 15 16:06:34 2009
New Revision: 825540
URL: http://svn.apache.org/viewvc?rev=825540&view=rev
Log:
Move command modifier and keystroke modifier separator properties to Platform class.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Thu Oct 15 16:06:34 2009
@@ -1277,7 +1277,7 @@
boolean consumed = false;
// Don't fire key typed if a command key was pressed
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (!Keyboard.isPressed(commandModifier)) {
char keyChar = event.getKeyChar();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java Thu Oct 15 16:06:34 2009
@@ -114,7 +114,7 @@
awtModifiers |= KeyEvent.SHIFT_DOWN_MASK;
}
- return KeyEvent.getModifiersExText(awtModifiers) + KEYSTROKE_MODIFIER_SEPARATOR
+ return KeyEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
+ KeyEvent.getKeyText(keyCode);
}
@@ -249,21 +249,6 @@
private static int modifiers = 0;
- private static final Modifier COMMAND_MODIFIER;
- private static final String KEYSTROKE_MODIFIER_SEPARATOR;
-
- static {
- String osName = System.getProperty("os.name").toLowerCase();
-
- if (osName.startsWith("mac os x")) {
- COMMAND_MODIFIER = Modifier.META;
- KEYSTROKE_MODIFIER_SEPARATOR = "";
- } else {
- COMMAND_MODIFIER = Modifier.CTRL;
- KEYSTROKE_MODIFIER_SEPARATOR = "-";
- }
- }
-
/**
* Returns a bitfield representing the keyboard modifiers that are
* currently pressed.
@@ -313,13 +298,5 @@
return dropAction;
}
-
- public static Modifier getCommandModifier() {
- return COMMAND_MODIFIER;
- }
-
- public static String getKeyStrokeModifierSeparator() {
- return KEYSTROKE_MODIFIER_SEPARATOR;
- }
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java Thu Oct 15 16:06:34 2009
@@ -21,6 +21,8 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import org.apache.pivot.wtk.Keyboard.Modifier;
+
/**
* Provides platform-specific information.
*/
@@ -30,6 +32,21 @@
private static final int DEFAULT_MULTI_CLICK_INTERVAL = 400;
private static final int DEFAULT_CURSOR_BLINK_RATE = 600;
+ private static final Modifier COMMAND_MODIFIER;
+ private static final String KEYSTROKE_MODIFIER_SEPARATOR;
+
+ static {
+ String osName = System.getProperty("os.name").toLowerCase();
+
+ if (osName.startsWith("mac os x")) {
+ COMMAND_MODIFIER = Modifier.META;
+ KEYSTROKE_MODIFIER_SEPARATOR = "";
+ } else {
+ COMMAND_MODIFIER = Modifier.CTRL;
+ KEYSTROKE_MODIFIER_SEPARATOR = "-";
+ }
+ }
+
/**
* Returns the system text anti-aliasing hint.
*/
@@ -95,4 +112,11 @@
return java.awt.dnd.DragSource.getDragThreshold();
}
+ public static Modifier getCommandModifier() {
+ return COMMAND_MODIFIER;
+ }
+
+ public static String getKeyStrokeModifierSeparator() {
+ return KEYSTROKE_MODIFIER_SEPARATOR;
+ }
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Thu Oct 15 16:06:34 2009
@@ -481,7 +481,7 @@
i = -(i + 1) - 1;
}
- // TODO i should never be less than 0 here?
+ // TODO i should never be less than 0 here? What about in getCharacterBounds()?
int offset;
if (i < 0) {
offset = -1;
@@ -615,6 +615,12 @@
// TODO Don't queue the validate callback until layout()? Then we
// wouldn't have to abort it in multiple locations...
+ // TODO Why do we need to abort it in multiple places?
+
+ // TODO Move setBreakWidth() to layout()? Then we'd just queue the callbacks here?
+
+ // TODO Use QueuedCallback#cancel() instead of abort()
+
if (!isValid()) {
TextArea textArea = (TextArea)getComponent();
Container parent = textArea.getParent();
@@ -1057,6 +1063,9 @@
// TODO Can we use a glyph vector for this? We could create the
// vector when the view is created so we don't need to rebuild it
// every time
+
+ // TODO This also may help solve the problem of identifying the wrong
+ // character
int offset;
if (text.length() > 0) {
TextLayout textLayout = new TextLayout(text, font, fontRenderContext);
@@ -1223,6 +1232,7 @@
Document document = textArea.getDocument();
if (document != null) {
+ // TODO Pass document to attach() instead of constructor
documentView = new DocumentView(document);
documentView.attach();
}
@@ -1427,6 +1437,8 @@
public void locationChanged(Component component, int previousX, int previousY) {
super.locationChanged(component, previousX, previousY);
+ // TODO Is there a better way to do this? We are trying to ensure that the newly
+ // visible area of the document is now valid.
if (documentView != null
&& !documentView.isValid()
&& component.getY() > previousY) {
@@ -1490,7 +1502,7 @@
if (textArea.isEditable()) {
Document document = textArea.getDocument();
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (document != null) {
if (keyCode == Keyboard.KeyCode.ENTER) {
textArea.insertParagraph();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Thu Oct 15 16:06:34 2009
@@ -40,6 +40,7 @@
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
+import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.content.ButtonData;
import org.apache.pivot.wtk.content.ButtonDataRenderer;
@@ -650,7 +651,7 @@
Accordion accordion = (Accordion)getComponent();
Accordion.PanelSequence panels = accordion.getPanels();
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(commandModifier)) {
int selectedIndex = -1;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Thu Oct 15 16:06:34 2009
@@ -56,6 +56,7 @@
import org.apache.pivot.wtk.ListButtonSelectionListener;
import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.Mouse;
+import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.ScrollPane;
@@ -674,7 +675,7 @@
public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = super.keyReleased(component, keyCode, keyLocation);
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (keyCode == Keyboard.KeyCode.F
&& Keyboard.isPressed(commandModifier)) {
searchTextInput.requestFocus();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Thu Oct 15 16:06:34 2009
@@ -39,6 +39,7 @@
import org.apache.pivot.wtk.ListViewListener;
import org.apache.pivot.wtk.ListViewSelectionListener;
import org.apache.pivot.wtk.Mouse;
+import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.ComponentSkin;
@@ -640,7 +641,7 @@
listView.setSelectedIndex(itemIndex);
}
} else {
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
&& selectMode == ListView.SelectMode.MULTI) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Thu Oct 15 16:06:34 2009
@@ -40,6 +40,7 @@
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Panorama;
+import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.TabPane;
import org.apache.pivot.wtk.TabPaneAttributeListener;
import org.apache.pivot.wtk.TabPaneListener;
@@ -1092,7 +1093,7 @@
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = super.keyPressed(component, keyCode, keyLocation);
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (!consumed
&& Keyboard.isPressed(commandModifier)) {
TabPane tabPane = (TabPane)getComponent();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Thu Oct 15 16:06:34 2009
@@ -34,6 +34,7 @@
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
+import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.SortDirection;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.TableView;
@@ -1031,7 +1032,7 @@
tableView.setSelectedIndex(rowIndex);
}
} else {
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
&& selectMode == TableView.SelectMode.MULTI) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Thu Oct 15 16:06:34 2009
@@ -1103,7 +1103,7 @@
TextInput textInput = (TextInput)getComponent();
TextNode textNode = textInput.getTextNode();
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (keyCode == Keyboard.KeyCode.DELETE
|| keyCode == Keyboard.KeyCode.BACKSPACE) {
consumed = true;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=825540&r1=825539&r2=825540&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Thu Oct 15 16:06:34 2009
@@ -40,6 +40,7 @@
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
+import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.TreeView;
import org.apache.pivot.wtk.TreeViewBranchListener;
@@ -1569,7 +1570,7 @@
treeView.setSelectedPath(path);
}
} else if (selectMode == TreeView.SelectMode.MULTI) {
- Keyboard.Modifier commandModifier = Keyboard.getCommandModifier();
+ Keyboard.Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(commandModifier)) {
if (nodeInfo.isSelected()) {
treeView.removeSelectedPath(path);