Author: rwhitcomb
Date: Thu Apr 26 14:20:02 2018
New Revision: 1830230
URL: http://svn.apache.org/viewvc?rev=1830230&view=rev
Log:
PIVOT-1032: Fix or remove unused import statements in the sub-packages of wtk
where this check-style error was reported.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BaselineDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/OverlayDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RulerSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNodeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/validation/RegexTextValidator.java
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
Thu Apr 26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.content;
import java.awt.Color;
-import java.awt.Font;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.BoxPane;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/SpinnerItemRenderer.java
Thu Apr 26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.content;
import java.awt.Color;
-import java.awt.Font;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Label;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewCellRenderer.java
Thu Apr 26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.content;
import java.awt.Color;
-import java.awt.Font;
import org.apache.pivot.json.JSON;
import org.apache.pivot.wtk.Component;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
---
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
(original)
+++
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
Thu Apr 26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.content;
import java.awt.Color;
-import java.awt.Font;
import org.apache.pivot.json.JSON;
import org.apache.pivot.wtk.Component;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BaselineDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BaselineDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BaselineDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BaselineDecorator.java Thu
Apr 26 14:20:02 2018
@@ -18,9 +18,7 @@ package org.apache.pivot.wtk.effects;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Orientation;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java Thu Apr
26 14:20:02 2018
@@ -17,12 +17,10 @@
package org.apache.pivot.wtk.effects;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.ConvolveOp;
import java.awt.image.Kernel;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java Thu Apr
26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.effects;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
Thu Apr 26 14:20:02 2018
@@ -19,12 +19,10 @@ package org.apache.pivot.wtk.effects;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Transparency;
-import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
-import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.GraphicsUtilities;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java Thu Apr
26 14:20:02 2018
@@ -18,9 +18,7 @@ package org.apache.pivot.wtk.effects;
import java.awt.AlphaComposite;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
/**
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java
Thu Apr 26 14:20:02 2018
@@ -19,13 +19,11 @@ package org.apache.pivot.wtk.effects;
import java.awt.Graphics2D;
import java.awt.Transparency;
import java.awt.color.ColorSpace;
-import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.ComponentColorModel;
import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/OverlayDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/OverlayDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/OverlayDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/OverlayDecorator.java Thu
Apr 26 14:20:02 2018
@@ -17,9 +17,7 @@
package org.apache.pivot.wtk.effects;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
/**
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java
Thu Apr 26 14:20:02 2018
@@ -22,12 +22,10 @@ package org.apache.pivot.wtk.effects;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
import org.apache.pivot.util.Utils;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java Thu
Apr 26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.effects;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.font.FontRenderContext;
import java.awt.geom.AffineTransform;
@@ -27,7 +26,6 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.HorizontalAlignment;
-import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.VerticalAlignment;
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java Thu
Apr 26 14:20:02 2018
@@ -19,10 +19,8 @@ package org.apache.pivot.wtk.effects;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import org.apache.pivot.util.Utils;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.GraphicsUtilities;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java Thu Apr
26 14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.effects;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Bounds;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
Thu Apr 26 14:20:02 2018
@@ -19,14 +19,10 @@ package org.apache.pivot.wtk.effects;
import java.awt.AlphaComposite;
import java.awt.Font;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import java.net.URL;
-import org.apache.pivot.json.JSONSerializer;
-import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.util.ImageUtils;
import org.apache.pivot.util.Utils;
-import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.FontUtilities;
@@ -34,7 +30,6 @@ import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Style;
-import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.VerticalAlignment;
import org.apache.pivot.wtk.media.Image;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java Thu Apr 26
14:20:02 2018
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk.media;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import com.kitfox.svg.SVGDiagram;
import com.kitfox.svg.SVGElementException;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java Thu Apr 26
14:20:02 2018
@@ -30,7 +30,6 @@ import org.apache.pivot.util.Utils;
import org.apache.pivot.util.concurrent.TaskExecutionException;
import org.apache.pivot.util.concurrent.TaskListener;
import org.apache.pivot.wtk.ApplicationContext;
-import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Visual;
import com.kitfox.svg.SVGDiagram;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java Thu Apr 26
14:20:02 2018
@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Paint;
-import java.awt.RenderingHints;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
import java.awt.geom.Area;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java Thu
Apr 26 14:20:02 2018
@@ -35,6 +35,8 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FocusTraversalDirection;
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.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -69,25 +71,25 @@ public abstract class CalendarButtonSkin
* {@link KeyCode#ENTER ENTER} Choose the selected date.<br>
* {@link KeyCode#TAB TAB} Choose the selected date and transfer focus
* forwards.<br> {@link KeyCode#TAB TAB} +
- * {@link Keyboard.Modifier#SHIFT SHIFT} Choose the selected date and
+ * {@link Modifier#SHIFT SHIFT} Choose the selected date and
* transfer focus backwards.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
CalendarButton calendarButton = (CalendarButton) getComponent();
switch (keyCode) {
- case Keyboard.KeyCode.ESCAPE: {
+ case KeyCode.ESCAPE: {
calendarPopup.close();
break;
}
- case Keyboard.KeyCode.TAB:
- case Keyboard.KeyCode.ENTER: {
+ case KeyCode.TAB:
+ case KeyCode.ENTER: {
calendarPopup.close();
- if (keyCode == Keyboard.KeyCode.TAB) {
- FocusTraversalDirection direction =
(Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
+ if (keyCode == KeyCode.TAB) {
+ FocusTraversalDirection direction =
(Keyboard.isPressed(Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
: FocusTraversalDirection.FORWARD;
calendarButton.transferFocus(direction);
}
@@ -282,14 +284,13 @@ public abstract class CalendarButtonSkin
* {@link KeyCode#SPACE SPACE} Repaints the component to reflect the
pressed
* state.
*
- * @see #keyReleased(Component, int,
- * org.apache.pivot.wtk.Keyboard.KeyLocation)
+ * @see #keyReleased(Component, int, Keyboard.KeyLocation)
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = true;
repaintComponent();
@@ -311,10 +312,10 @@ public abstract class CalendarButtonSkin
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = false;
repaintComponent();
} else {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java Thu Apr 26
14:20:02 2018
@@ -18,8 +18,8 @@ package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Checkbox;
import org.apache.pivot.wtk.Component;
-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;
/**
@@ -47,12 +47,12 @@ public abstract class CheckboxSkin exten
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
Checkbox checkbox = (Checkbox) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
checkbox.press();
} else {
consumed = super.keyReleased(component, keyCode, keyLocation);
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
Thu Apr 26 14:20:02 2018
@@ -31,6 +31,7 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FocusTraversalDirection;
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.Window;
@@ -78,21 +79,21 @@ public abstract class ColorChooserButton
* Choose the selected color and transfer focus backwards.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
ColorChooserButton colorChooserButton = (ColorChooserButton)
getComponent();
switch (keyCode) {
- case Keyboard.KeyCode.ESCAPE: {
+ case KeyCode.ESCAPE: {
colorChooserPopup.close();
break;
}
- case Keyboard.KeyCode.TAB:
- case Keyboard.KeyCode.ENTER: {
+ case KeyCode.TAB:
+ case KeyCode.ENTER: {
colorChooserPopup.close();
- if (keyCode == Keyboard.KeyCode.TAB) {
- FocusTraversalDirection direction =
(Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
+ if (keyCode == KeyCode.TAB) {
+ FocusTraversalDirection direction =
(Keyboard.isPressed(Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
: FocusTraversalDirection.FORWARD;
colorChooserButton.transferFocus(direction);
}
@@ -293,14 +294,13 @@ public abstract class ColorChooserButton
* {@link KeyCode#SPACE SPACE} Repaints the component to reflect the
pressed
* state.
*
- * @see #keyReleased(Component, int,
- * org.apache.pivot.wtk.Keyboard.KeyLocation)
+ * @see #keyReleased(Component, int, Keyboard.KeyLocation)
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = true;
repaintComponent();
@@ -322,10 +322,10 @@ public abstract class ColorChooserButton
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = false;
repaintComponent();
} else {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java Thu Apr 26
14:20:02 2018
@@ -20,9 +20,6 @@ import java.awt.Color;
import java.awt.Font;
import org.apache.pivot.collections.EnumSet;
-import org.apache.pivot.json.JSONSerializer;
-import org.apache.pivot.serialization.SerializationException;
-import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentKeyListener;
@@ -42,6 +39,7 @@ import org.apache.pivot.wtk.FocusTravers
import org.apache.pivot.wtk.FontUtilities;
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.MenuHandler;
@@ -273,17 +271,17 @@ public abstract class ComponentSkin impl
*/
@Override
public boolean keyPressed(Component componentArgument, int keyCode,
- Keyboard.KeyLocation keyLocation) {
+ KeyLocation keyLocation) {
boolean consumed = false;
- EnumSet<Keyboard.Modifier> otherModifiers =
EnumSet.noneOf(Keyboard.Modifier.class);
- otherModifiers.addAll(Keyboard.Modifier.ALL_MODIFIERS);
- otherModifiers.remove(Keyboard.Modifier.SHIFT);
+ EnumSet<Modifier> otherModifiers = EnumSet.noneOf(Modifier.class);
+ otherModifiers.addAll(Modifier.ALL_MODIFIERS);
+ otherModifiers.remove(Modifier.SHIFT);
- if (keyCode == Keyboard.KeyCode.TAB &&
+ if (keyCode == KeyCode.TAB &&
!Keyboard.areAnyPressed(otherModifiers) &&
getComponent().isFocused()) {
- FocusTraversalDirection direction =
(Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
+ FocusTraversalDirection direction =
(Keyboard.isPressed(Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
: FocusTraversalDirection.FORWARD;
// Transfer focus to the next component
@@ -303,7 +301,7 @@ public abstract class ComponentSkin impl
@Override
public boolean keyReleased(Component componentArgument, int keyCode,
- Keyboard.KeyLocation keyLocation) {
+ KeyLocation keyLocation) {
return false;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Thu Apr
26 14:20:02 2018
@@ -29,6 +29,8 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FocusTraversalDirection;
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.ListButton;
import org.apache.pivot.wtk.ListButtonListener;
import org.apache.pivot.wtk.ListButtonSelectionListener;
@@ -69,15 +71,15 @@ public abstract class ListButtonSkin ext
* {@link KeyCode#ENTER ENTER} Choose the selected list item.<br>
* {@link KeyCode#TAB TAB} Choose the selected list item and transfer
* focus forwards.<br> {@link KeyCode#TAB TAB} +
- * {@link Keyboard.Modifier#SHIFT SHIFT} Choose the selected list item
+ * {@link Modifier#SHIFT SHIFT} Choose the selected list item
* and transfer focus backwards.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
ListButton listButton = (ListButton) getComponent();
switch (keyCode) {
- case Keyboard.KeyCode.ENTER: {
+ case KeyCode.ENTER: {
listViewPopup.close();
int index = listView.getSelectedIndex();
@@ -90,20 +92,20 @@ public abstract class ListButtonSkin ext
break;
}
- case Keyboard.KeyCode.TAB: {
+ case KeyCode.TAB: {
listViewPopup.close();
int index = listView.getSelectedIndex();
listButton.setSelectedIndex(index);
- FocusTraversalDirection direction =
(Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
+ FocusTraversalDirection direction =
(Keyboard.isPressed(Modifier.SHIFT)) ? FocusTraversalDirection.BACKWARD
: FocusTraversalDirection.FORWARD;
listButton.transferFocus(direction);
break;
}
- case Keyboard.KeyCode.ESCAPE: {
+ case KeyCode.ESCAPE: {
listViewPopup.close();
break;
}
@@ -300,16 +302,15 @@ public abstract class ListButtonSkin ext
* enabled list item.<br> {@link KeyCode#DOWN DOWN} Selects the next
enabled
* list item.
*
- * @see #keyReleased(Component, int,
- * org.apache.pivot.wtk.Keyboard.KeyLocation)
+ * @see #keyReleased(Component, int, Keyboard.KeyLocation)
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
ListButton listButton = (ListButton) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = true;
repaintComponent();
@@ -318,7 +319,7 @@ public abstract class ListButtonSkin ext
} else if (!listButton.isRepeatable()) {
listViewPopup.open(component.getWindow());
}
- } else if (keyCode == Keyboard.KeyCode.UP) {
+ } else if (keyCode == KeyCode.UP) {
int index = listButton.getSelectedIndex();
do {
@@ -329,8 +330,8 @@ public abstract class ListButtonSkin ext
listButton.setSelectedIndex(index);
consumed = true;
}
- } else if (keyCode == Keyboard.KeyCode.DOWN) {
- if (Keyboard.isPressed(Keyboard.Modifier.ALT)) {
+ } else if (keyCode == KeyCode.DOWN) {
+ if (Keyboard.isPressed(Modifier.ALT)) {
listViewPopup.open(component.getWindow());
consumed = true;
@@ -358,12 +359,12 @@ public abstract class ListButtonSkin ext
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
ListButton listButton = (ListButton) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = false;
repaintComponent();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java Thu Apr
26 14:20:02 2018
@@ -23,6 +23,8 @@ import org.apache.pivot.wtk.ContainerMou
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.Keyboard.Modifier;
import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.MenuBar;
import org.apache.pivot.wtk.MenuPopup;
@@ -41,24 +43,24 @@ public abstract class MenuBarItemSkin ex
private ComponentKeyListener menuPopupComponentKeyListener = new
ComponentKeyListener() {
/**
* {@link KeyCode#LEFT LEFT} or {@link KeyCode#TAB TAB} +
- * {@link Keyboard.Modifier#SHIFT SHIFT} Activate the menu to the left
+ * {@link Modifier#SHIFT SHIFT} Activate the menu to the left
* of the current menu.<br> {@link KeyCode#RIGHT RIGHT} or
* {@link KeyCode#TAB TAB} Activate the menu to the right of the
current
* menu.<br>
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
boolean consumed = false;
MenuBar.Item menuBarItem = (MenuBar.Item) getComponent();
MenuBar menuBar = (MenuBar) menuBarItem.getParent();
- if (keyCode == Keyboard.KeyCode.LEFT
- || (keyCode == Keyboard.KeyCode.TAB &&
Keyboard.isPressed(Keyboard.Modifier.SHIFT))) {
+ if (keyCode == KeyCode.LEFT
+ || (keyCode == KeyCode.TAB &&
Keyboard.isPressed(Modifier.SHIFT))) {
menuBar.activatePreviousItem();
consumed = true;
- } else if (keyCode == Keyboard.KeyCode.RIGHT || keyCode ==
Keyboard.KeyCode.TAB) {
+ } else if (keyCode == KeyCode.RIGHT || keyCode == KeyCode.TAB) {
menuBar.activateNextItem();
consumed = true;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Thu Apr
26 14:20:02 2018
@@ -21,8 +21,8 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
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.MenuButton;
import org.apache.pivot.wtk.MenuButtonListener;
@@ -169,14 +169,13 @@ public abstract class MenuButtonSkin ext
* {@link KeyCode#SPACE SPACE} Repaints the component to reflect the
pressed
* state.
*
- * @see #keyReleased(Component, int,
- * org.apache.pivot.wtk.Keyboard.KeyLocation)
+ * @see #keyReleased(Component, int, Keyboard.KeyLocation)
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = true;
repaintComponent();
@@ -198,12 +197,12 @@ public abstract class MenuButtonSkin ext
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
MenuButton menuButton = (MenuButton) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = false;
repaintComponent();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java Thu Apr
26 14:20:02 2018
@@ -17,8 +17,8 @@
package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Component;
-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.PushButton;
@@ -83,14 +83,13 @@ public abstract class PushButtonSkin ext
* {@link KeyCode#SPACE SPACE} Repaints the component to reflect the
pressed
* state.
*
- * @see #keyReleased(Component, int,
- * org.apache.pivot.wtk.Keyboard.KeyLocation)
+ * @see #keyReleased(Component, int, Keyboard.KeyLocation)
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyPressed(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = true;
repaintComponent();
} else {
@@ -104,12 +103,12 @@ public abstract class PushButtonSkin ext
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
PushButton pushButton = (PushButton) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
pressed = false;
repaintComponent();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java Thu Apr
26 14:20:02 2018
@@ -17,8 +17,8 @@
package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Component;
-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.RadioButton;
@@ -47,12 +47,12 @@ public abstract class RadioButtonSkin ex
* {@link KeyCode#SPACE SPACE} 'presses' the button.
*/
@Override
- public boolean keyReleased(Component component, int keyCode,
Keyboard.KeyLocation keyLocation) {
+ public boolean keyReleased(Component component, int keyCode, KeyLocation
keyLocation) {
boolean consumed = false;
RadioButton radioButton = (RadioButton) getComponent();
- if (keyCode == Keyboard.KeyCode.SPACE) {
+ if (keyCode == KeyCode.SPACE) {
radioButton.press();
} else {
consumed = super.keyReleased(component, keyCode, keyLocation);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RulerSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RulerSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RulerSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RulerSkin.java Thu Apr 26
14:20:02 2018
@@ -31,7 +31,6 @@ import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Borders;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.CSSColor;
-import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Orientation;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java Thu Apr
26 14:20:02 2018
@@ -28,6 +28,8 @@ import org.apache.pivot.wtk.DesktopAppli
import org.apache.pivot.wtk.Dimensions;
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.ScrollBar;
@@ -358,7 +360,7 @@ public class ScrollPaneSkin extends Cont
if (view != null) {
// The scroll orientation is tied to whether the shift key was
// pressed while the mouse wheel was scrolled
- if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) {
+ if (Keyboard.isPressed(Modifier.SHIFT)) {
// Treat the mouse wheel as a horizontal scroll event
int previousScrollLeft = scrollPane.getScrollLeft();
int newScrollLeft = previousScrollLeft
@@ -421,7 +423,7 @@ public class ScrollPaneSkin extends Cont
* @see ScrollBar#getUnitIncrement()
*/
@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) {
@@ -430,40 +432,40 @@ public class ScrollPaneSkin extends Cont
int scrollTop = scrollPane.getScrollTop();
int scrollLeft = scrollPane.getScrollLeft();
- if (keyCode == Keyboard.KeyCode.UP) {
+ if (keyCode == KeyCode.UP) {
int newScrollTop = Math.max(scrollTop -
verticalScrollBar.getUnitIncrement(), 0);
scrollPane.setScrollTop(newScrollTop);
consumed = (newScrollTop != scrollTop);
- } else if (keyCode == Keyboard.KeyCode.DOWN) {
+ } else if (keyCode == KeyCode.DOWN) {
int newScrollTop = Math.min(scrollTop +
verticalScrollBar.getUnitIncrement(),
getMaxScrollTop());
scrollPane.setScrollTop(newScrollTop);
consumed = (newScrollTop != scrollTop);
- } else if (keyCode == Keyboard.KeyCode.LEFT) {
+ } else if (keyCode == KeyCode.LEFT) {
int newScrollLeft = Math.max(scrollLeft -
horizontalScrollBar.getUnitIncrement(), 0);
scrollPane.setScrollLeft(newScrollLeft);
consumed = (newScrollLeft != scrollLeft);
- } else if (keyCode == Keyboard.KeyCode.RIGHT) {
+ } else if (keyCode == KeyCode.RIGHT) {
int newScrollLeft = Math.min(scrollLeft +
horizontalScrollBar.getUnitIncrement(),
getMaxScrollLeft());
scrollPane.setScrollLeft(newScrollLeft);
consumed = (newScrollLeft != scrollLeft);
- } else if (keyCode == Keyboard.KeyCode.PAGE_UP) {
+ } else if (keyCode == KeyCode.PAGE_UP) {
int increment = verticalScrollBar.getBlockIncrement();
int newScrollTop = Math.max(scrollTop - increment, 0);
scrollPane.setScrollTop(newScrollTop);
consumed = (newScrollTop != scrollTop);
- } else if (keyCode == Keyboard.KeyCode.PAGE_DOWN) {
+ } else if (keyCode == KeyCode.PAGE_DOWN) {
int increment = verticalScrollBar.getBlockIncrement();
int newScrollTop = Math.min(scrollTop + increment,
getMaxScrollTop());
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java Thu Apr 26
14:20:02 2018
@@ -20,7 +20,6 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
import java.awt.geom.Area;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Thu Apr 26
14:20:02 2018
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.geom.Area;
import java.awt.geom.Rectangle2D;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java Thu Apr 26
14:20:02 2018
@@ -24,7 +24,6 @@ import java.awt.event.InputMethodEvent;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
import java.awt.font.TextHitInfo;
-import java.awt.font.TextLayout;
import java.awt.geom.Area;
import java.text.AttributedCharacterIterator;
@@ -32,7 +31,6 @@ import org.apache.pivot.collections.Dict
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.text.AttributedStringCharacterIterator;
import org.apache.pivot.text.CharSpan;
-import org.apache.pivot.text.CompositeIterator;
import org.apache.pivot.util.CharUtils;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.ApplicationContext;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNodeView.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNodeView.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNodeView.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNodeView.java Thu
Apr 26 14:20:02 2018
@@ -17,8 +17,6 @@
package org.apache.pivot.wtk.skin;
import java.awt.Graphics2D;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.Sequence;
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinTextNodeView.java
Thu Apr 26 14:20:02 2018
@@ -43,7 +43,6 @@ import org.apache.pivot.wtk.text.Element
import org.apache.pivot.wtk.text.Paragraph;
import org.apache.pivot.wtk.text.TextNode;
import org.apache.pivot.wtk.text.TextNodeListener;
-import org.apache.pivot.wtk.text.TextSpan;
/**
* Text node view.
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java Thu Apr 26
14:20:02 2018
@@ -23,14 +23,11 @@ import java.util.Iterator;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Sequence;
-import org.apache.pivot.json.JSONSerializer;
-import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.util.ImmutableIterator;
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.FontUtilities;
import org.apache.pivot.wtk.GraphicsUtilities;
-import org.apache.pivot.wtk.Theme;
/**
* Abstract base class for elements. <p> TODO Add style properties. <p> TODO
Add
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/validation/RegexTextValidator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/validation/RegexTextValidator.java?rev=1830230&r1=1830229&r2=1830230&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/validation/RegexTextValidator.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/validation/RegexTextValidator.java
Thu Apr 26 14:20:02 2018
@@ -14,7 +14,6 @@
package org.apache.pivot.wtk.validation;
import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
/**
* A validator for a regular expression.
