Author: rwhitcomb
Date: Wed Apr 25 20:28:22 2018
New Revision: 1830117
URL: http://svn.apache.org/viewvc?rev=1830117&view=rev
Log:
PIVOT-1032: Fix or remove unused import statements in the wtk-terra
classes where this check-style error was reported.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.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/TerraTabPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -40,6 +40,7 @@ import org.apache.pivot.wtk.GraphicsUtil
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.Mouse;
import org.apache.pivot.wtk.Platform;
@@ -745,68 +746,68 @@ public class TerraAccordionSkin extends
* @see Platform#getCommandModifier()
*/
@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);
if (!consumed) {
Accordion accordion = (Accordion) getComponent();
Accordion.PanelSequence panels = accordion.getPanels();
- Keyboard.Modifier commandModifier = Platform.getCommandModifier();
+ Modifier commandModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(commandModifier)) {
int selectedIndex = -1;
switch (keyCode) {
- case Keyboard.KeyCode.KEYPAD_1:
- case Keyboard.KeyCode.N1: {
+ case KeyCode.KEYPAD_1:
+ case KeyCode.N1: {
selectedIndex = 0;
break;
}
- case Keyboard.KeyCode.KEYPAD_2:
- case Keyboard.KeyCode.N2: {
+ case KeyCode.KEYPAD_2:
+ case KeyCode.N2: {
selectedIndex = 1;
break;
}
- case Keyboard.KeyCode.KEYPAD_3:
- case Keyboard.KeyCode.N3: {
+ case KeyCode.KEYPAD_3:
+ case KeyCode.N3: {
selectedIndex = 2;
break;
}
- case Keyboard.KeyCode.KEYPAD_4:
- case Keyboard.KeyCode.N4: {
+ case KeyCode.KEYPAD_4:
+ case KeyCode.N4: {
selectedIndex = 3;
break;
}
- case Keyboard.KeyCode.KEYPAD_5:
- case Keyboard.KeyCode.N5: {
+ case KeyCode.KEYPAD_5:
+ case KeyCode.N5: {
selectedIndex = 4;
break;
}
- case Keyboard.KeyCode.KEYPAD_6:
- case Keyboard.KeyCode.N6: {
+ case KeyCode.KEYPAD_6:
+ case KeyCode.N6: {
selectedIndex = 5;
break;
}
- case Keyboard.KeyCode.KEYPAD_7:
- case Keyboard.KeyCode.N7: {
+ case KeyCode.KEYPAD_7:
+ case KeyCode.N7: {
selectedIndex = 6;
break;
}
- case Keyboard.KeyCode.KEYPAD_8:
- case Keyboard.KeyCode.N8: {
+ case KeyCode.KEYPAD_8:
+ case KeyCode.N8: {
selectedIndex = 7;
break;
}
- case Keyboard.KeyCode.KEYPAD_9:
- case Keyboard.KeyCode.N9: {
+ case KeyCode.KEYPAD_9:
+ case KeyCode.N9: {
selectedIndex = 8;
break;
}
@@ -821,12 +822,12 @@ public class TerraAccordionSkin extends
accordion.setSelectedIndex(selectedIndex);
consumed = true;
}
- } else if (Keyboard.isPressed(Keyboard.Modifier.ALT)) {
+ } else if (Keyboard.isPressed(Modifier.ALT)) {
int n = panels.getLength();
int selectedIndex = accordion.getSelectedIndex();
switch (keyCode) {
- case Keyboard.KeyCode.UP: {
+ case KeyCode.UP: {
do {
selectedIndex--;
} while (selectedIndex >= 0 &&
!panels.get(selectedIndex).isEnabled());
@@ -834,7 +835,7 @@ public class TerraAccordionSkin extends
break;
}
- case Keyboard.KeyCode.DOWN: {
+ case KeyCode.DOWN: {
do {
selectedIndex++;
} while (selectedIndex < n &&
!panels.get(selectedIndex).isEnabled());
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -17,7 +17,6 @@
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.ActivityIndicator;
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -44,8 +44,8 @@ import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.HorizontalAlignment;
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.Label;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
@@ -234,15 +234,15 @@ public class TerraCalendarSkin extends C
* around the date grid.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
boolean consumed = false;
DateButton dateButton = (DateButton) getComponent();
- if (keyCode == Keyboard.KeyCode.ENTER) {
+ if (keyCode == KeyCode.ENTER) {
dateButton.press();
- } else if (keyCode == Keyboard.KeyCode.UP || keyCode ==
Keyboard.KeyCode.DOWN
- || keyCode == Keyboard.KeyCode.LEFT || keyCode ==
Keyboard.KeyCode.RIGHT) {
+ } else if (keyCode == KeyCode.UP || keyCode == KeyCode.DOWN
+ || keyCode == KeyCode.LEFT || keyCode == KeyCode.RIGHT) {
CalendarDate date = (CalendarDate) dateButton.getButtonData();
Calendar calendar = (Calendar)
TerraCalendarSkin.this.getComponent();
@@ -252,7 +252,7 @@ public class TerraCalendarSkin extends C
Component nextButton;
switch (keyCode) {
- case Keyboard.KeyCode.UP: {
+ case KeyCode.UP: {
do {
rowIndex--;
if (rowIndex < 0) {
@@ -267,7 +267,7 @@ public class TerraCalendarSkin extends C
break;
}
- case Keyboard.KeyCode.DOWN: {
+ case KeyCode.DOWN: {
do {
rowIndex++;
if (rowIndex > 5) {
@@ -282,7 +282,7 @@ public class TerraCalendarSkin extends C
break;
}
- case Keyboard.KeyCode.LEFT: {
+ case KeyCode.LEFT: {
TablePane.Row row =
calendarTablePane.getRows().get(rowIndex + 2);
do {
@@ -298,7 +298,7 @@ public class TerraCalendarSkin extends C
break;
}
- case Keyboard.KeyCode.RIGHT: {
+ case KeyCode.RIGHT: {
TablePane.Row row =
calendarTablePane.getRows().get(rowIndex + 2);
do {
@@ -332,12 +332,12 @@ public class TerraCalendarSkin extends C
*/
@Override
public boolean keyReleased(Component component, int keyCode,
- Keyboard.KeyLocation keyLocation) {
+ KeyLocation keyLocation) {
boolean consumed = false;
DateButton dateButton = (DateButton) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
dateButton.press();
consumed = true;
} else {
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -22,7 +22,6 @@ import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.Paint;
-import java.awt.RenderingHints;
import java.awt.geom.Rectangle2D;
import org.apache.pivot.collections.Dictionary;
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
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=1830117&r1=1830116&r2=1830117&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
Wed Apr 25 20:28:22 2018
@@ -27,8 +27,8 @@ import org.apache.pivot.wtk.DialogListen
import org.apache.pivot.wtk.DialogStateListener;
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.Keyboard.KeyLocation;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.util.ColorUtilities;
@@ -129,15 +129,15 @@ public class TerraDialogSkin extends Ter
* {@link KeyCode#ESCAPE ESCAPE} Close the dialog with a 'result' of false.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
Dialog dialog = (Dialog) getComponent();
- if (keyCode == Keyboard.KeyCode.ENTER) {
+ if (keyCode == KeyCode.ENTER) {
dialog.close(true);
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.ESCAPE) {
+ } else if (keyCode == KeyCode.ESCAPE) {
dialog.close(false);
consumed = true;
} else {
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
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=1830117&r1=1830116&r2=1830117&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 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.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -59,6 +58,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;
@@ -803,13 +804,13 @@ public class TerraFileBrowserSkin extend
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();
@@ -1088,12 +1089,12 @@ public class TerraFileBrowserSkin extend
* 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);
FileBrowser fileBrowser = (FileBrowser) getComponent();
- if (keyCode == Keyboard.KeyCode.ENTER &&
keyboardFolderTraversalEnabled) {
+ if (keyCode == KeyCode.ENTER && keyboardFolderTraversalEnabled) {
Sequence<File> selectedFiles = fileBrowser.getSelectedFiles();
if (selectedFiles.getLength() == 1) {
@@ -1103,14 +1104,14 @@ public class TerraFileBrowserSkin extend
consumed = true;
}
}
- } else if (keyCode == Keyboard.KeyCode.DELETE || keyCode ==
Keyboard.KeyCode.BACKSPACE) {
+ } else if (keyCode == KeyCode.DELETE || keyCode == KeyCode.BACKSPACE) {
File rootDirectory = fileBrowser.getRootDirectory();
File parentDirectory = rootDirectory.getParentFile();
if (parentDirectory != null) {
fileBrowser.setRootDirectory(parentDirectory);
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.F5) {
+ } else if (keyCode == KeyCode.F5) {
refreshFileList();
consumed = true;
}
@@ -1125,11 +1126,11 @@ public class TerraFileBrowserSkin extend
* @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;
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
Wed Apr 25 20:28:22 2018
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin.terra;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.Line2D;
import org.apache.pivot.collections.Dictionary;
@@ -42,6 +41,9 @@ import org.apache.pivot.wtk.HorizontalAl
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.MenuBar;
import org.apache.pivot.wtk.Mouse;
@@ -795,14 +797,14 @@ public class TerraFrameSkin extends Wind
}
@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);
Frame frame = (Frame) component;
MenuBar menuBar = frame.getMenuBar();
- if (menuBar != null && keyCode == Keyboard.KeyCode.SPACE
- && Keyboard.isPressed(Keyboard.Modifier.ALT)) {
+ if (menuBar != null && keyCode == KeyCode.SPACE
+ && Keyboard.isPressed(Modifier.ALT)) {
MenuBar.Item activeItem = menuBar.getActiveItem();
MenuBar.ItemSequence items = menuBar.getItems();
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
Wed Apr 25 20:28:22 2018
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin.terra;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Font;
-import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.font.FontRenderContext;
@@ -38,7 +37,6 @@ import org.apache.pivot.wtk.GaugeListene
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Origin;
-import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.ComponentSkin;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
import java.awt.geom.Path2D;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
Wed Apr 25 20:28:22 2018
@@ -36,6 +36,7 @@ import org.apache.pivot.wtk.GraphicsUtil
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.ListView;
import org.apache.pivot.wtk.ListView.SelectMode;
@@ -344,7 +345,7 @@ public class TerraListViewSkin extends C
// Paint the item content
for (int itemIndex = itemStart; itemIndex <= itemEnd; itemIndex++) {
Object item = listData.get(itemIndex);
- boolean highlighted = (itemIndex == highlightIndex &&
listView.getSelectMode() != ListView.SelectMode.NONE);
+ boolean highlighted = (itemIndex == highlightIndex &&
listView.getSelectMode() != SelectMode.NONE);
boolean selected = listView.isItemSelected(itemIndex);
boolean disabled = listView.isItemDisabled(itemIndex);
int itemY = getItemY(itemIndex);
@@ -491,7 +492,7 @@ public class TerraListViewSkin extends C
@Override
public boolean isFocusable() {
ListView listView = (ListView) getComponent();
- return (listView.getSelectMode() != ListView.SelectMode.NONE);
+ return (listView.getSelectMode() != SelectMode.NONE);
}
@Override
@@ -765,7 +766,7 @@ public class TerraListViewSkin extends C
highlightIndex = getItemAt(y);
if (previousHighlightIndex != highlightIndex
- && listView.getSelectMode() != ListView.SelectMode.NONE &&
showHighlight) {
+ && listView.getSelectMode() != SelectMode.NONE && showHighlight) {
if (previousHighlightIndex != -1) {
repaintComponent(getItemBounds(previousHighlightIndex));
}
@@ -784,7 +785,7 @@ public class TerraListViewSkin extends C
ListView listView = (ListView) getComponent();
- if (highlightIndex != -1 && listView.getSelectMode() !=
ListView.SelectMode.NONE
+ if (highlightIndex != -1 && listView.getSelectMode() != SelectMode.NONE
&& showHighlight) {
Bounds itemBounds = getItemBounds(highlightIndex);
repaintComponent(itemBounds.x, itemBounds.y, itemBounds.width,
itemBounds.height);
@@ -804,13 +805,13 @@ public class TerraListViewSkin extends C
if (itemIndex != -1 && !listView.isItemDisabled(itemIndex)) {
if (!listView.getCheckmarksEnabled() ||
listView.isCheckmarkDisabled(itemIndex)
|| !getCheckboxBounds(itemIndex).contains(x, y)) {
- ListView.SelectMode selectMode = listView.getSelectMode();
+ SelectMode selectMode = listView.getSelectMode();
if (button == Mouse.Button.LEFT) {
- Keyboard.Modifier commandModifier =
Platform.getCommandModifier();
+ Modifier commandModifier = Platform.getCommandModifier();
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && selectMode == ListView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && selectMode == SelectMode.MULTI) {
Filter<?> disabledItemFilter =
listView.getDisabledItemFilter();
if (disabledItemFilter == null) {
@@ -826,7 +827,7 @@ public class TerraListViewSkin extends C
listView.setSelectedRanges(selectedRanges);
}
} else if (Keyboard.isPressed(commandModifier)
- && selectMode == ListView.SelectMode.MULTI) {
+ && selectMode == SelectMode.MULTI) {
// Toggle the item's selection state
if (listView.isItemSelected(itemIndex)) {
listView.removeSelectedIndex(itemIndex);
@@ -834,7 +835,7 @@ public class TerraListViewSkin extends C
listView.addSelectedIndex(itemIndex);
}
} else if (Keyboard.isPressed(commandModifier)
- && selectMode == ListView.SelectMode.SINGLE) {
+ && selectMode == SelectMode.SINGLE) {
// Toggle the item's selection state
if (listView.isItemSelected(itemIndex)) {
listView.setSelectedIndex(-1);
@@ -842,7 +843,7 @@ public class TerraListViewSkin extends C
listView.setSelectedIndex(itemIndex);
}
} else {
- if (selectMode != ListView.SelectMode.NONE) {
+ if (selectMode != SelectMode.NONE) {
if (listView.isItemSelected(itemIndex)) {
selectIndex = itemIndex;
} else {
@@ -943,7 +944,7 @@ public class TerraListViewSkin extends C
highlightIndex = -1;
- if (listView.getSelectMode() != ListView.SelectMode.NONE &&
showHighlight) {
+ if (listView.getSelectMode() != SelectMode.NONE && showHighlight) {
repaintComponent(itemBounds.x, itemBounds.y, itemBounds.width,
itemBounds.height,
true);
}
@@ -964,15 +965,15 @@ public class TerraListViewSkin extends C
* 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 = super.keyPressed(component, keyCode, keyLocation);
ListView listView = (ListView) getComponent();
- ListView.SelectMode selectMode = listView.getSelectMode();
+ SelectMode selectMode = listView.getSelectMode();
switch (keyCode) {
- case Keyboard.KeyCode.UP: {
- if (selectMode != ListView.SelectMode.NONE) {
+ case KeyCode.UP: {
+ if (selectMode != SelectMode.NONE) {
int index = listView.getFirstSelectedIndex();
int count = listView.getListData().getLength();
@@ -981,14 +982,14 @@ public class TerraListViewSkin extends C
} while (index >= 0 && listView.isItemDisabled(index));
if (index >= 0) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && listView.getSelectMode() ==
ListView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && listView.getSelectMode() == SelectMode.MULTI) {
listView.addSelectedIndex(index);
} else {
listView.setSelectedIndex(index);
}
- } else if (!Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && listView.getSelectMode() ==
ListView.SelectMode.MULTI
+ } else if (!Keyboard.isPressed(Modifier.SHIFT)
+ && listView.getSelectMode() == SelectMode.MULTI
&& count == listView.getSelectedItems().getLength()) {
index = listView.getLastSelectedIndex();
do {
@@ -1004,8 +1005,8 @@ public class TerraListViewSkin extends C
break;
}
- case Keyboard.KeyCode.DOWN: {
- if (selectMode != ListView.SelectMode.NONE) {
+ case KeyCode.DOWN: {
+ if (selectMode != SelectMode.NONE) {
int index = listView.getLastSelectedIndex();
int count = listView.getListData().getLength();
@@ -1014,14 +1015,14 @@ public class TerraListViewSkin extends C
} while (index < count && listView.isItemDisabled(index));
if (index < count) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && listView.getSelectMode() ==
ListView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && listView.getSelectMode() == SelectMode.MULTI) {
listView.addSelectedIndex(index);
} else {
listView.setSelectedIndex(index);
}
- } else if (!Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && listView.getSelectMode() ==
ListView.SelectMode.MULTI
+ } else if (!Keyboard.isPressed(Modifier.SHIFT)
+ && listView.getSelectMode() == SelectMode.MULTI
&& count == listView.getSelectedItems().getLength()) {
index = 0;
do {
@@ -1043,7 +1044,7 @@ public class TerraListViewSkin extends C
}
// Clear the highlight
- if (highlightIndex != -1 && listView.getSelectMode() !=
ListView.SelectMode.NONE
+ if (highlightIndex != -1 && listView.getSelectMode() != SelectMode.NONE
&& showHighlight && consumed) {
repaintComponent(getItemBounds(highlightIndex));
}
@@ -1058,15 +1059,15 @@ public class TerraListViewSkin 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 = super.keyReleased(component, keyCode, keyLocation);
ListView listView = (ListView) getComponent();
switch (keyCode) {
- case Keyboard.KeyCode.SPACE: {
+ case KeyCode.SPACE: {
if (listView.getCheckmarksEnabled()
- && listView.getSelectMode() == ListView.SelectMode.SINGLE)
{
+ && listView.getSelectMode() == SelectMode.SINGLE) {
int selectedIndex = listView.getSelectedIndex();
if (!listView.isCheckmarkDisabled(selectedIndex)) {
@@ -1171,7 +1172,7 @@ public class TerraListViewSkin extends C
}
@Override
- public void selectModeChanged(ListView listView, ListView.SelectMode
previousSelectMode) {
+ public void selectModeChanged(ListView listView, SelectMode
previousSelectMode) {
repaintComponent();
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
Wed Apr 25 20:28:22 2018
@@ -20,10 +20,8 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.Transparency;
-import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Cursor;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
Wed Apr 25 20:28:22 2018
@@ -26,8 +26,8 @@ import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
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.Keyboard.KeyLocation;
import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.MenuItemSelectionListener;
import org.apache.pivot.wtk.MenuPopup;
@@ -204,10 +204,10 @@ public class TerraMenuPopupSkin extends
* {@link KeyCode#ESCAPE ESCAPE} Close the menu popup.
*/
@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);
- if (keyCode == Keyboard.KeyCode.ESCAPE) {
+ if (keyCode == KeyCode.ESCAPE) {
MenuPopup menuPopup = (MenuPopup) getComponent();
menuPopup.close();
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
Wed Apr 25 20:28:22 2018
@@ -27,8 +27,8 @@ import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
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.Menu;
import org.apache.pivot.wtk.Menu.Item;
import org.apache.pivot.wtk.Menu.Section;
@@ -358,12 +358,12 @@ public class TerraMenuSkin extends Conta
* it does not have a sub-menu.
*/
@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);
Menu menu = (Menu) component;
- if (keyCode == Keyboard.KeyCode.UP) {
+ if (keyCode == KeyCode.UP) {
Menu.SectionSequence sections = menu.getSections();
int sectionCount = sections.getLength();
@@ -409,7 +409,7 @@ public class TerraMenuSkin extends Conta
}
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.DOWN) {
+ } else if (keyCode == KeyCode.DOWN) {
Menu.SectionSequence sections = menu.getSections();
int sectionCount = sections.getLength();
@@ -449,14 +449,14 @@ public class TerraMenuSkin extends Conta
}
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.LEFT) {
+ } else if (keyCode == KeyCode.LEFT) {
// Close the window if this is not a top-level menu
if (menu.getItem() != null) {
Window window = menu.getWindow();
window.close();
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.RIGHT) {
+ } else if (keyCode == KeyCode.RIGHT) {
Menu.Item activeItem = menu.getActiveItem();
// Press if the item has a sub-menu
@@ -464,7 +464,7 @@ public class TerraMenuSkin extends Conta
activeItem.press();
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.ENTER) {
+ } else if (keyCode == KeyCode.ENTER) {
Menu.Item activeItem = menu.getActiveItem();
// Press if the item does not have a sub-menu
@@ -472,7 +472,7 @@ public class TerraMenuSkin extends Conta
activeItem.press();
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.TAB) {
+ } else if (keyCode == KeyCode.TAB) {
consumed = false;
}
@@ -484,12 +484,12 @@ public class TerraMenuSkin extends Conta
* have a sub-menu.
*/
@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);
Menu menu = (Menu) component;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
Menu.Item activeItem = menu.getActiveItem();
// Press if the item does not have a sub-menu
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
Wed Apr 25 20:28:22 2018
@@ -20,7 +20,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.Line2D;
import org.apache.pivot.collections.Dictionary;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
Wed Apr 25 20:28:22 2018
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin.terra;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.ApplicationContext;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.RoundRectangle2D;
import org.apache.pivot.collections.Dictionary;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
Wed Apr 25 20:28:22 2018
@@ -22,7 +22,6 @@ import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Paint;
import java.awt.RadialGradientPaint;
-import java.awt.RenderingHints;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Rectangle2D;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
Wed Apr 25 20:28:22 2018
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin.terra;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.RoundRectangle2D;
import org.apache.pivot.util.Utils;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
Wed Apr 25 20:28:22 2018
@@ -20,7 +20,6 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
Wed Apr 25 20:28:22 2018
@@ -16,7 +16,6 @@
*/
package org.apache.pivot.wtk.skin.terra;
-import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.ScrollPaneSkin;
/**
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
Wed Apr 25 20:28:22 2018
@@ -35,8 +35,8 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.GraphicsUtilities;
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.Mouse;
import org.apache.pivot.wtk.Mouse.Button;
import org.apache.pivot.wtk.Orientation;
@@ -490,15 +490,15 @@ public class TerraSheetSkin extends Wind
* {@link KeyCode#ESCAPE ESCAPE} Close the sheet with a 'result' of false.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
Sheet sheet = (Sheet) getComponent();
- if (keyCode == Keyboard.KeyCode.ENTER) {
+ if (keyCode == KeyCode.ENTER) {
sheet.close(true);
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.ESCAPE) {
+ } else if (keyCode == KeyCode.ESCAPE) {
sheet.close(false);
consumed = true;
} else {
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
Wed Apr 25 20:28:22 2018
@@ -20,14 +20,13 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
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.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Point;
@@ -228,7 +227,7 @@ public class TerraSliderSkin extends Sli
* UP} Increment the slider's value.
*/
@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);
Slider slider = (Slider) TerraSliderSkin.this.getComponent();
@@ -240,10 +239,10 @@ public class TerraSliderSkin extends Sli
int value = slider.getValue();
int increment = length / 10;
- if (keyCode == Keyboard.KeyCode.LEFT || keyCode ==
Keyboard.KeyCode.DOWN) {
+ if (keyCode == KeyCode.LEFT || keyCode == KeyCode.DOWN) {
slider.setValue(Math.max(start, value - increment));
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.RIGHT || keyCode ==
Keyboard.KeyCode.UP) {
+ } else if (keyCode == KeyCode.RIGHT || keyCode == KeyCode.UP) {
slider.setValue(Math.min(end, value + increment));
consumed = true;
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.Rectangle2D;
import org.apache.pivot.collections.Dictionary;
@@ -32,8 +31,8 @@ import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
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.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Spinner;
@@ -255,7 +254,7 @@ public class TerraSpinnerSkin extends Co
* {@link KeyCode#DOWN DOWN} Select the next spinner item.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
boolean consumed = false;
Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
@@ -266,13 +265,13 @@ public class TerraSpinnerSkin extends Co
int selectedIndex = spinner.getSelectedIndex();
int newSelectedIndex = selectedIndex;
- if (keyCode == Keyboard.KeyCode.UP) {
+ if (keyCode == KeyCode.UP) {
if (selectedIndex < count - 1) {
newSelectedIndex++;
} else if (circular) {
newSelectedIndex = 0;
}
- } else if (keyCode == Keyboard.KeyCode.DOWN) {
+ } else if (keyCode == KeyCode.DOWN) {
if (selectedIndex > 0) {
newSelectedIndex--;
} else if (circular) {
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=1830117&r1=1830116&r2=1830117&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 Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Font;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
-import org.apache.pivot.util.Utils;
import org.apache.pivot.util.Vote;
import org.apache.pivot.wtk.Border;
import org.apache.pivot.wtk.Component;
@@ -34,6 +33,7 @@ import org.apache.pivot.wtk.FocusTravers
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.ListView;
import org.apache.pivot.wtk.ListViewSelectionListener;
@@ -115,19 +115,19 @@ public class TerraSuggestionPopupSkin ex
* false.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
boolean consumed = false;
SuggestionPopup suggestionPopup = (SuggestionPopup) getComponent();
- if (keyCode == Keyboard.KeyCode.DOWN) {
+ if (keyCode == KeyCode.DOWN) {
if (listView.getSelectedIndex() == -1 &&
listView.getListData().getLength() > 0) {
listView.setSelectedIndex(0);
}
suggestionPopup.requestFocus();
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.ESCAPE) {
+ } else if (keyCode == KeyCode.ESCAPE) {
suggestionPopup.close(false);
consumed = true;
}
@@ -155,16 +155,16 @@ public class TerraSuggestionPopupSkin ex
* backwards from the TextInput.<br>
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
SuggestionPopup suggestionPopup = (SuggestionPopup) getComponent();
TextInput textInput = suggestionPopup.getTextInput();
switch (keyCode) {
- case Keyboard.KeyCode.TAB: {
+ case KeyCode.TAB: {
returnFocusToTextInput = false;
suggestionPopup.close(true);
- FocusTraversalDirection direction =
(Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
+ FocusTraversalDirection direction =
(Keyboard.isPressed(Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
: FocusTraversalDirection.FORWARD;
textInput.transferFocus(direction);
@@ -296,16 +296,16 @@ public class TerraSuggestionPopupSkin ex
* 'result' of false.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
SuggestionPopup suggestionPopup = (SuggestionPopup) getComponent();
switch (keyCode) {
- case Keyboard.KeyCode.ENTER: {
+ case KeyCode.ENTER: {
suggestionPopup.close(true);
break;
}
- case Keyboard.KeyCode.ESCAPE: {
+ case KeyCode.ESCAPE: {
suggestionPopup.close(false);
break;
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.Line2D;
import java.awt.geom.RoundRectangle2D;
@@ -42,6 +41,8 @@ import org.apache.pivot.wtk.HorizontalAl
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.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Panorama;
@@ -1418,10 +1419,10 @@ public class TerraTabPaneSkin extends Ta
* @see Platform#getCommandModifier()
*/
@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);
- Keyboard.Modifier commandModifier = Platform.getCommandModifier();
+ Modifier commandModifier = Platform.getCommandModifier();
if (!consumed && Keyboard.isPressed(commandModifier)) {
TabPane tabPane = (TabPane) getComponent();
TabPane.TabSequence tabs = tabPane.getTabs();
@@ -1429,63 +1430,63 @@ public class TerraTabPaneSkin extends Ta
int selectedIndex = -1;
switch (keyCode) {
- case Keyboard.KeyCode.KEYPAD_1:
- case Keyboard.KeyCode.N1: {
+ case KeyCode.KEYPAD_1:
+ case KeyCode.N1: {
selectedIndex = 0;
break;
}
- case Keyboard.KeyCode.KEYPAD_2:
- case Keyboard.KeyCode.N2: {
+ case KeyCode.KEYPAD_2:
+ case KeyCode.N2: {
selectedIndex = 1;
break;
}
- case Keyboard.KeyCode.KEYPAD_3:
- case Keyboard.KeyCode.N3: {
+ case KeyCode.KEYPAD_3:
+ case KeyCode.N3: {
selectedIndex = 2;
break;
}
- case Keyboard.KeyCode.KEYPAD_4:
- case Keyboard.KeyCode.N4: {
+ case KeyCode.KEYPAD_4:
+ case KeyCode.N4: {
selectedIndex = 3;
break;
}
- case Keyboard.KeyCode.KEYPAD_5:
- case Keyboard.KeyCode.N5: {
+ case KeyCode.KEYPAD_5:
+ case KeyCode.N5: {
selectedIndex = 4;
break;
}
- case Keyboard.KeyCode.KEYPAD_6:
- case Keyboard.KeyCode.N6: {
+ case KeyCode.KEYPAD_6:
+ case KeyCode.N6: {
selectedIndex = 5;
break;
}
- case Keyboard.KeyCode.KEYPAD_7:
- case Keyboard.KeyCode.N7: {
+ case KeyCode.KEYPAD_7:
+ case KeyCode.N7: {
selectedIndex = 6;
break;
}
- case Keyboard.KeyCode.KEYPAD_8:
- case Keyboard.KeyCode.N8: {
+ case KeyCode.KEYPAD_8:
+ case KeyCode.N8: {
selectedIndex = 7;
break;
}
- case Keyboard.KeyCode.KEYPAD_9:
- case Keyboard.KeyCode.N9: {
+ case KeyCode.KEYPAD_9:
+ case KeyCode.N9: {
selectedIndex = 8;
break;
}
- case Keyboard.KeyCode.TAB:
+ case KeyCode.TAB:
selectedIndex = tabPane.getSelectedIndex();
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) {
+ if (Keyboard.isPressed(Modifier.SHIFT)) {
if (selectedIndex <= 0) {
selectedIndex = tabs.getLength() - 1;
} else {
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
Wed Apr 25 20:28:22 2018
@@ -34,6 +34,7 @@ import org.apache.pivot.wtk.Dimensions;
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;
@@ -407,7 +408,7 @@ public class TerraTableViewSkin extends
// Paint the row content
for (int rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
Object rowData = tableData.get(rowIndex);
- boolean rowHighlighted = (rowIndex == highlightIndex &&
tableView.getSelectMode() != TableView.SelectMode.NONE);
+ boolean rowHighlighted = (rowIndex == highlightIndex &&
tableView.getSelectMode() != SelectMode.NONE);
boolean rowSelected = tableView.isRowSelected(rowIndex);
boolean rowDisabled = tableView.isRowDisabled(rowIndex);
int rowY = getRowY(rowIndex);
@@ -717,7 +718,7 @@ public class TerraTableViewSkin extends
@Override
public boolean isFocusable() {
TableView tableView = (TableView) getComponent();
- return (tableView.getSelectMode() != TableView.SelectMode.NONE);
+ return (tableView.getSelectMode() != SelectMode.NONE);
}
@Override
@@ -1091,7 +1092,7 @@ public class TerraTableViewSkin extends
highlightIndex = getRowAt(y);
if (previousHighlightIndex != highlightIndex
- && tableView.getSelectMode() != TableView.SelectMode.NONE &&
showHighlight) {
+ && tableView.getSelectMode() != SelectMode.NONE && showHighlight) {
if (previousHighlightIndex != -1) {
repaintComponent(getRowBounds(previousHighlightIndex));
}
@@ -1110,7 +1111,7 @@ public class TerraTableViewSkin extends
TableView tableView = (TableView) getComponent();
- if (highlightIndex != -1 && tableView.getSelectMode() !=
TableView.SelectMode.NONE
+ if (highlightIndex != -1 && tableView.getSelectMode() !=
SelectMode.NONE
&& showHighlight) {
repaintComponent(getRowBounds(highlightIndex));
}
@@ -1127,13 +1128,13 @@ public class TerraTableViewSkin extends
int rowIndex = getRowAt(y);
if (rowIndex >= 0 && !tableView.isRowDisabled(rowIndex)) {
- TableView.SelectMode selectMode = tableView.getSelectMode();
+ SelectMode selectMode = tableView.getSelectMode();
if (button == Mouse.Button.LEFT) {
- Keyboard.Modifier commandModifier =
Platform.getCommandModifier();
+ Modifier commandModifier = Platform.getCommandModifier();
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && selectMode == TableView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && selectMode == SelectMode.MULTI) {
Filter<?> disabledRowFilter =
tableView.getDisabledRowFilter();
if (disabledRowFilter == null) {
@@ -1156,7 +1157,7 @@ public class TerraTableViewSkin extends
}
}
} else if (Keyboard.isPressed(commandModifier)
- && selectMode == TableView.SelectMode.MULTI) {
+ && selectMode == SelectMode.MULTI) {
// Toggle the item's selection state
if (tableView.isRowSelected(rowIndex)) {
tableView.removeSelectedIndex(rowIndex);
@@ -1164,7 +1165,7 @@ public class TerraTableViewSkin extends
tableView.addSelectedIndex(rowIndex);
}
} else if (Keyboard.isPressed(commandModifier)
- && selectMode == TableView.SelectMode.SINGLE) {
+ && selectMode == SelectMode.SINGLE) {
// Toggle the item's selection state
if (tableView.isRowSelected(rowIndex)) {
tableView.setSelectedIndex(-1);
@@ -1172,7 +1173,7 @@ public class TerraTableViewSkin extends
tableView.setSelectedIndex(rowIndex);
}
} else {
- if (selectMode != TableView.SelectMode.NONE) {
+ if (selectMode != SelectMode.NONE) {
if (!tableView.isRowSelected(rowIndex)) {
tableView.setSelectedIndex(rowIndex);
}
@@ -1249,7 +1250,7 @@ public class TerraTableViewSkin extends
highlightIndex = -1;
- if (tableView.getSelectMode() != TableView.SelectMode.NONE &&
showHighlight) {
+ if (tableView.getSelectMode() != SelectMode.NONE && showHighlight)
{
repaintComponent(rowBounds.x, rowBounds.y, rowBounds.width,
rowBounds.height, true);
}
}
@@ -1271,15 +1272,15 @@ public class TerraTableViewSkin extends
* {@link KeyCode#SPACE SPACE} wil select/unselect the "current" location
*/
@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);
TableView tableView = (TableView) getComponent();
- TableView.SelectMode selectMode = tableView.getSelectMode();
+ SelectMode selectMode = tableView.getSelectMode();
switch (keyCode) {
- case Keyboard.KeyCode.UP: {
- if (selectMode != TableView.SelectMode.NONE) {
+ case KeyCode.UP: {
+ if (selectMode != SelectMode.NONE) {
int index = tableView.getFirstSelectedIndex();
do {
@@ -1287,8 +1288,8 @@ public class TerraTableViewSkin extends
} while (index >= 0 && tableView.isRowDisabled(index));
if (index >= 0) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && tableView.getSelectMode() ==
TableView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && tableView.getSelectMode() == SelectMode.MULTI) {
tableView.addSelectedIndex(index);
} else {
tableView.setSelectedIndex(index);
@@ -1302,8 +1303,8 @@ public class TerraTableViewSkin extends
break;
}
- case Keyboard.KeyCode.DOWN: {
- if (selectMode != TableView.SelectMode.NONE) {
+ case KeyCode.DOWN: {
+ if (selectMode != SelectMode.NONE) {
int index = tableView.getLastSelectedIndex();
int count = tableView.getTableData().getLength();
@@ -1312,8 +1313,8 @@ public class TerraTableViewSkin extends
} while (index < count && tableView.isRowDisabled(index));
if (index < count) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
- && tableView.getSelectMode() ==
TableView.SelectMode.MULTI) {
+ if (Keyboard.isPressed(Modifier.SHIFT)
+ && tableView.getSelectMode() == SelectMode.MULTI) {
tableView.addSelectedIndex(index);
} else {
tableView.setSelectedIndex(index);
@@ -1327,8 +1328,8 @@ public class TerraTableViewSkin extends
break;
}
- case Keyboard.KeyCode.SPACE: {
- if (lastKeyboardSelectIndex != -1 && selectMode !=
TableView.SelectMode.NONE) {
+ case KeyCode.SPACE: {
+ if (lastKeyboardSelectIndex != -1 && selectMode !=
SelectMode.NONE) {
if (!tableView.isRowDisabled(lastKeyboardSelectIndex)) {
switch (selectMode) {
case SINGLE:
@@ -1352,10 +1353,10 @@ public class TerraTableViewSkin extends
break;
}
- case Keyboard.KeyCode.A: {
+ case KeyCode.A: {
Modifier cmdModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(cmdModifier)) {
- if (selectMode == TableView.SelectMode.MULTI) {
+ if (selectMode == SelectMode.MULTI) {
tableView.selectAll();
lastKeyboardSelectIndex =
tableView.getTableData().getLength() - 1; // TODO: what should it be?
consumed = true;
@@ -1364,7 +1365,7 @@ public class TerraTableViewSkin extends
break;
}
- case Keyboard.KeyCode.U: {
+ case KeyCode.U: {
Modifier cmdModifier = Platform.getCommandModifier();
if (Keyboard.isPressed(cmdModifier)) {
switch (selectMode) {
@@ -1387,7 +1388,7 @@ public class TerraTableViewSkin extends
}
// Clear the highlight
- if (highlightIndex != -1 && tableView.getSelectMode() !=
TableView.SelectMode.NONE
+ if (highlightIndex != -1 && tableView.getSelectMode() !=
SelectMode.NONE
&& showHighlight && consumed) {
repaintComponent(getRowBounds(highlightIndex));
}
@@ -1439,7 +1440,7 @@ public class TerraTableViewSkin extends
}
@Override
- public void selectModeChanged(TableView tableView, TableView.SelectMode
previousSelectMode) {
+ public void selectModeChanged(TableView tableView, SelectMode
previousSelectMode) {
repaintComponent();
}
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=1830117&r1=1830116&r2=1830117&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 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.Shape;
import java.awt.Toolkit;
import java.awt.event.InputMethodEvent;
@@ -53,6 +52,7 @@ import org.apache.pivot.wtk.HorizontalAl
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.Mouse;
import org.apache.pivot.wtk.Orientation;
@@ -1109,7 +1109,7 @@ public class TerraTextInputSkin extends
// TODO: this logic won't work in the presence of composed (but
not yet committed) text...
if (anchor != -1) {
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) {
+ if (Keyboard.isPressed(Modifier.SHIFT)) {
// Select the range
int selectionStart = textInput.getSelectionStart();
@@ -1191,7 +1191,7 @@ public class TerraTextInputSkin extends
// Ignore characters in the control range and the ASCII delete
// character as well as meta key presses
if (character > 0x1F && character != 0x7F
- && !Keyboard.isPressed(Keyboard.Modifier.META)) {
+ && !Keyboard.isPressed(Modifier.META)) {
if (deleteSelectionDuringTyping(textInput, 1)) {
// NOTE We explicitly call getSelectionStart() a second
time
// here in case the remove event is vetoed
@@ -1255,7 +1255,7 @@ public class TerraTextInputSkin extends
* @see Platform#getCommandModifier()
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
TextInput textInput = (TextInput) getComponent();
@@ -1264,19 +1264,19 @@ public class TerraTextInputSkin extends
int start = textInput.getSelectionStart();
int length = textInput.getSelectionLength();
- Keyboard.Modifier commandModifier = Platform.getCommandModifier();
- Keyboard.Modifier wordNavigationModifier =
Platform.getWordNavigationModifier();
- boolean isMetaPressed = Keyboard.isPressed(Keyboard.Modifier.META);
- boolean isShiftPressed = Keyboard.isPressed(Keyboard.Modifier.SHIFT);
+ Modifier commandModifier = Platform.getCommandModifier();
+ Modifier wordNavigationModifier = Platform.getWordNavigationModifier();
+ boolean isMetaPressed = Keyboard.isPressed(Modifier.META);
+ boolean isShiftPressed = Keyboard.isPressed(Modifier.SHIFT);
- if (keyCode == Keyboard.KeyCode.DELETE && isEditable) {
+ if (keyCode == KeyCode.DELETE && isEditable) {
if (start < textInput.getCharacterCount()) {
int count = Math.max(length, 1);
textInput.removeText(start, count);
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.BACKSPACE && isEditable) {
+ } else if (keyCode == KeyCode.BACKSPACE && isEditable) {
if (length == 0 && start > 0) {
textInput.removeText(start - 1, 1);
consumed = true;
@@ -1284,8 +1284,8 @@ public class TerraTextInputSkin extends
textInput.removeText(start, length);
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.HOME
- || (keyCode == Keyboard.KeyCode.LEFT && isMetaPressed)) {
+ } else if (keyCode == KeyCode.HOME
+ || (keyCode == KeyCode.LEFT && isMetaPressed)) {
if (isShiftPressed) {
// Select from the beginning of the text to the current pivot
position
if (selectDirection == SelectDirection.LEFT) {
@@ -1303,8 +1303,8 @@ public class TerraTextInputSkin extends
scrollCharacterToVisible(0);
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.END
- || (keyCode == Keyboard.KeyCode.RIGHT && isMetaPressed)) {
+ } else if (keyCode == KeyCode.END
+ || (keyCode == KeyCode.RIGHT && isMetaPressed)) {
int n = textInput.getCharacterCount();
if (isShiftPressed) {
@@ -1323,7 +1323,7 @@ public class TerraTextInputSkin extends
scrollCharacterToVisible(n);
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.LEFT) {
+ } else if (keyCode == KeyCode.LEFT) {
// Sometimes while selecting we need to make the opposite end
visible
SelectDirection visiblePosition = SelectDirection.LEFT;
@@ -1419,7 +1419,7 @@ public class TerraTextInputSkin extends
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.RIGHT) {
+ } else if (keyCode == KeyCode.RIGHT) {
// Sometimes while selecting we need to make the opposite end
visible
SelectDirection visiblePosition = SelectDirection.RIGHT;
@@ -1507,10 +1507,10 @@ public class TerraTextInputSkin extends
consumed = true;
}
} else if (Keyboard.isPressed(commandModifier)) {
- if (keyCode == Keyboard.KeyCode.A) {
+ if (keyCode == KeyCode.A) {
textInput.setSelection(0, textInput.getCharacterCount());
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.X && isEditable) {
+ } else if (keyCode == KeyCode.X && isEditable) {
if (textInput.isPassword()) {
Toolkit.getDefaultToolkit().beep();
} else {
@@ -1518,7 +1518,7 @@ public class TerraTextInputSkin extends
}
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.C) {
+ } else if (keyCode == KeyCode.C) {
if (textInput.isPassword()) {
Toolkit.getDefaultToolkit().beep();
} else {
@@ -1526,17 +1526,17 @@ public class TerraTextInputSkin extends
}
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.V && isEditable) {
+ } else if (keyCode == KeyCode.V && isEditable) {
textInput.paste();
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.Z && isEditable) {
+ } else if (keyCode == KeyCode.Z && isEditable) {
if (!isShiftPressed) {
textInput.undo();
}
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.INSERT) {
+ } else if (keyCode == KeyCode.INSERT) {
if (isShiftPressed && isEditable) {
textInput.paste();
consumed = true;
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java?rev=1830117&r1=1830116&r2=1830117&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
(original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
Wed Apr 25 20:28:22 2018
@@ -21,7 +21,6 @@ import java.awt.Font;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.Locale;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
@@ -35,7 +34,6 @@ import org.apache.pivot.wtk.Accordion;
import org.apache.pivot.wtk.ActivityIndicator;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Border;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Calendar;
import org.apache.pivot.wtk.CalendarButton;
import org.apache.pivot.wtk.Checkbox;
@@ -46,7 +44,6 @@ import org.apache.pivot.wtk.Dialog;
import org.apache.pivot.wtk.Expander;
import org.apache.pivot.wtk.FileBrowser;
import org.apache.pivot.wtk.FileBrowserSheet;
-import org.apache.pivot.wtk.FillPane;
import org.apache.pivot.wtk.Form;
import org.apache.pivot.wtk.Frame;
import org.apache.pivot.wtk.Gauge;
@@ -64,7 +61,6 @@ import org.apache.pivot.wtk.MenuPopup;
import org.apache.pivot.wtk.MessageType;
import org.apache.pivot.wtk.Meter;
import org.apache.pivot.wtk.Palette;
-import org.apache.pivot.wtk.Panel;
import org.apache.pivot.wtk.Panorama;
import org.apache.pivot.wtk.Prompt;
import org.apache.pivot.wtk.PushButton;
