You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2018/04/25 20:28:23 UTC
svn commit: r1830117 [2/2] -
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Rectangle;
-import java.awt.RenderingHints;
import java.awt.Transparency;
import java.awt.geom.GeneralPath;
import java.util.Iterator;
@@ -42,6 +41,7 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Keyboard.KeyLocation;
import org.apache.pivot.wtk.Keyboard.Modifier;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
@@ -1453,7 +1453,7 @@ public class TerraTreeViewSkin extends C
TreeView treeView = (TreeView) getComponent();
- if (showHighlight && treeView.getSelectMode() != TreeView.SelectMode.NONE) {
+ if (showHighlight && treeView.getSelectMode() != SelectMode.NONE) {
NodeInfo previousHighlightedNode = highlightedNode;
highlightedNode = getNodeInfoAt(y);
@@ -1520,13 +1520,13 @@ public class TerraTreeViewSkin extends C
// If we haven't consumed the event, then proceed to manage
// the selection state of the node
if (!consumed) {
- TreeView.SelectMode selectMode = treeView.getSelectMode();
+ SelectMode selectMode = treeView.getSelectMode();
if (button == Mouse.Button.LEFT) {
- Keyboard.Modifier commandModifier = Platform.getCommandModifier();
+ Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(commandModifier)
- && selectMode == TreeView.SelectMode.MULTI) {
+ && selectMode == SelectMode.MULTI) {
// Toggle the item's selection state
if (nodeInfo.isSelected()) {
treeView.removeSelectedPath(path);
@@ -1534,7 +1534,7 @@ public class TerraTreeViewSkin extends C
treeView.addSelectedPath(path);
}
} else if (Keyboard.isPressed(commandModifier)
- && selectMode == TreeView.SelectMode.SINGLE) {
+ && selectMode == SelectMode.SINGLE) {
// Toggle the item's selection state
if (nodeInfo.isSelected()) {
treeView.clearSelection();
@@ -1542,7 +1542,7 @@ public class TerraTreeViewSkin extends C
treeView.setSelectedPath(path);
}
} else {
- if (selectMode != TreeView.SelectMode.NONE) {
+ if (selectMode != SelectMode.NONE) {
if (nodeInfo.isSelected()) {
selectPath = path;
} else {
@@ -1648,15 +1648,15 @@ public class TerraTreeViewSkin extends C
* next enabled node when select mode is {@link SelectMode#MULTI}
*/
@Override
- public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation keyLocation) {
boolean consumed = false;
TreeView treeView = (TreeView) getComponent();
- TreeView.SelectMode selectMode = treeView.getSelectMode();
+ SelectMode selectMode = treeView.getSelectMode();
switch (keyCode) {
- case Keyboard.KeyCode.UP: {
- if (selectMode != TreeView.SelectMode.NONE) {
+ case KeyCode.UP: {
+ if (selectMode != SelectMode.NONE) {
Path firstSelectedPath = treeView.getFirstSelectedPath();
int index;
@@ -1674,8 +1674,8 @@ public class TerraTreeViewSkin extends C
} while (newSelectedNode != null && newSelectedNode.isDisabled());
if (newSelectedNode != null) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && treeView.getSelectMode() == TreeView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && treeView.getSelectMode() == SelectMode.MULTI) {
treeView.addSelectedPath(newSelectedNode.getPath());
} else {
treeView.setSelectedPath(newSelectedNode.getPath());
@@ -1687,8 +1687,8 @@ public class TerraTreeViewSkin extends C
break;
}
- case Keyboard.KeyCode.DOWN: {
- if (selectMode != TreeView.SelectMode.NONE) {
+ case KeyCode.DOWN: {
+ if (selectMode != SelectMode.NONE) {
Path lastSelectedPath = treeView.getLastSelectedPath();
int index;
@@ -1707,8 +1707,8 @@ public class TerraTreeViewSkin extends C
} while (newSelectedNode != null && newSelectedNode.isDisabled());
if (newSelectedNode != null) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && treeView.getSelectMode() == TreeView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && treeView.getSelectMode() == SelectMode.MULTI) {
treeView.addSelectedPath(newSelectedNode.getPath());
} else {
treeView.setSelectedPath(newSelectedNode.getPath());
@@ -1720,7 +1720,7 @@ public class TerraTreeViewSkin extends C
break;
}
- case Keyboard.KeyCode.LEFT: {
+ case KeyCode.LEFT: {
if (showBranchControls) {
Sequence<Path> paths = treeView.getSelectedPaths();
@@ -1739,7 +1739,7 @@ public class TerraTreeViewSkin extends C
break;
}
- case Keyboard.KeyCode.RIGHT: {
+ case KeyCode.RIGHT: {
if (showBranchControls) {
Sequence<Path> paths = treeView.getSelectedPaths();
@@ -1775,14 +1775,14 @@ public class TerraTreeViewSkin extends C
* is {@link SelectMode#SINGLE}
*/
@Override
- public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation keyLocation) {
boolean consumed = false;
TreeView treeView = (TreeView) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
if (treeView.getCheckmarksEnabled()
- && treeView.getSelectMode() == TreeView.SelectMode.SINGLE) {
+ && treeView.getSelectMode() == SelectMode.SINGLE) {
Path selectedPath = treeView.getSelectedPath();
if (selectedPath != null) {
@@ -1803,7 +1803,7 @@ public class TerraTreeViewSkin extends C
@Override
public boolean isFocusable() {
TreeView treeView = (TreeView) getComponent();
- return (treeView.getSelectMode() != TreeView.SelectMode.NONE);
+ return (treeView.getSelectMode() != SelectMode.NONE);
}
@Override
@@ -1908,7 +1908,7 @@ public class TerraTreeViewSkin extends C
}
@Override
- public void selectModeChanged(TreeView treeView, TreeView.SelectMode previousSelectMode) {
+ public void selectModeChanged(TreeView treeView, SelectMode previousSelectMode) {
// The selection has implicitly been cleared
clearFields(NodeInfo.SELECTED_MASK);
repaintComponent();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java Wed Apr 25 20:28:22 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.skin.terra;
import java.awt.Color;
-import java.awt.Font;
import java.io.IOException;
import java.io.Serializable;
import java.text.DateFormat;
@@ -64,6 +63,8 @@ import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Keyboard.KeyLocation;
+import org.apache.pivot.wtk.Keyboard.Modifier;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.ListButton;
import org.apache.pivot.wtk.ListButtonSelectionListener;
@@ -943,13 +944,13 @@ public class TerraVFSBrowserSkin extends
searchTextInput.getComponentKeyListeners().add(new ComponentKeyListener() {
@Override
public boolean keyPressed(Component componentArgument, int keyCode,
- Keyboard.KeyLocation keyLocation) {
+ KeyLocation keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.ESCAPE) {
+ if (keyCode == KeyCode.ESCAPE) {
searchTextInput.setText("");
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.DOWN) {
+ } else if (keyCode == KeyCode.DOWN) {
if (fileTableView.getTableData().getLength() > 0) {
fileTableView.setSelectedIndex(0);
fileTableView.requestFocus();
@@ -1246,12 +1247,12 @@ public class TerraVFSBrowserSkin extends
* F5} Refresh the file list.
*/
@Override
- public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation keyLocation) {
boolean consumed = super.keyPressed(component, keyCode, keyLocation);
VFSBrowser fileBrowser = (VFSBrowser) getComponent();
- if (keyCode == Keyboard.KeyCode.ENTER && keyboardFolderTraversalEnabled) {
+ if (keyCode == KeyCode.ENTER && keyboardFolderTraversalEnabled) {
Sequence<FileObject> selectedFiles = fileBrowser.getSelectedFiles();
if (selectedFiles.getLength() == 1) {
@@ -1265,7 +1266,7 @@ public class TerraVFSBrowserSkin extends
throw new RuntimeException(fse);
}
}
- } else if (keyCode == Keyboard.KeyCode.DELETE || keyCode == Keyboard.KeyCode.BACKSPACE) {
+ } else if (keyCode == KeyCode.DELETE || keyCode == KeyCode.BACKSPACE) {
FileObject rootDirectory = fileBrowser.getRootDirectory();
try {
FileObject parentDirectory = rootDirectory.getParent();
@@ -1276,7 +1277,7 @@ public class TerraVFSBrowserSkin extends
} catch (FileSystemException fse) {
throw new RuntimeException(fse);
}
- } else if (keyCode == Keyboard.KeyCode.F5) {
+ } else if (keyCode == KeyCode.F5) {
refreshFileList();
consumed = true;
}
@@ -1291,11 +1292,11 @@ public class TerraVFSBrowserSkin extends
* @see Platform#getCommandModifier()
*/
@Override
- public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation keyLocation) {
boolean consumed = super.keyReleased(component, keyCode, keyLocation);
- Keyboard.Modifier commandModifier = Platform.getCommandModifier();
- if (keyCode == Keyboard.KeyCode.F && Keyboard.isPressed(commandModifier)) {
+ Modifier commandModifier = Platform.getCommandModifier();
+ if (keyCode == KeyCode.F && Keyboard.isPressed(commandModifier)) {
searchTextInput.requestFocus();
consumed = true;
}