You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/09/28 18:33:01 UTC
svn commit: r819635 - in /incubator/pivot/trunk:
tutorials/src/org/apache/pivot/tutorials/clipboard/
wtk/src/org/apache/pivot/wtk/skin/terra/ wtk/src/org/apache/pivot/wtkx/
Author: gbrown
Date: Mon Sep 28 16:33:00 2009
New Revision: 819635
URL: http://svn.apache.org/viewvc?rev=819635&view=rev
Log:
Various minor fixes.
Modified:
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.wtkx
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.wtkx?rev=819635&r1=819634&r2=819635&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.wtkx Mon Sep 28 16:33:00 2009
@@ -53,7 +53,7 @@
function selectionChanged(buttonGroup, previousSelection) {
var selection = buttonGroup.getSelection();
if (selection != null) {
- var index = copyImageButtonBoxPane.indexOf(buttonGroup.getSelection());
+ var index = copyImageButtonBoxPane.indexOf(selection);
copyImageCardPane.setSelectedIndex(index);
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=819635&r1=819634&r2=819635&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Mon Sep 28 16:33:00 2009
@@ -145,6 +145,15 @@
}
@Override
+ public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
+ Dialog dialog = (Dialog)component;
+ Window rootOwner = dialog.getRootOwner();
+ rootOwner.moveToFront();
+
+ return super.mouseDown(component, button, x, y);
+ }
+
+ @Override
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = false;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=819635&r1=819634&r2=819635&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Mon Sep 28 16:33:00 2009
@@ -85,14 +85,14 @@
private ContainerMouseListener displayMouseListener = new ContainerMouseListener() {
@Override
public boolean mouseMove(Container display, int x, int y) {
- return isMouseOverClientArea(display, x, y);
+ return isMouseOverOwnerClientArea(display, x, y);
}
@Override
public boolean mouseDown(Container display, Mouse.Button button, int x, int y) {
boolean consumed = false;
- if (isMouseOverClientArea(display, x, y)) {
+ if (isMouseOverOwnerClientArea(display, x, y)) {
Sheet sheet = (Sheet)getComponent();
Window owner = sheet.getOwner();
owner.moveToFront();
@@ -106,16 +106,16 @@
@Override
public boolean mouseUp(Container display, Mouse.Button button, int x, int y) {
- return isMouseOverClientArea(display, x, y);
+ return isMouseOverOwnerClientArea(display, x, y);
}
@Override
public boolean mouseWheel(Container display, Mouse.ScrollType scrollType,
int scrollAmount, int wheelRotation, int x, int y) {
- return isMouseOverClientArea(display, x, y);
+ return isMouseOverOwnerClientArea(display, x, y);
}
- private boolean isMouseOverClientArea(Container display, int x, int y) {
+ private boolean isMouseOverOwnerClientArea(Container display, int x, int y) {
boolean mouseOverClientArea = false;
Sheet sheet = (Sheet)getComponent();
@@ -291,6 +291,15 @@
}
@Override
+ public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
+ Sheet sheet = (Sheet)component;
+ Window owner = sheet.getOwner();
+ owner.moveToFront();
+
+ return super.mouseDown(component, button, x, y);
+ }
+
+ @Override
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
boolean consumed = false;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java?rev=819635&r1=819634&r2=819635&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java Mon Sep 28 16:33:00 2009
@@ -1028,8 +1028,14 @@
}
private void logException(Exception exception) {
- String message = "An error occurred while processing element <" + element.tagName + ">"
- + " starting at line number " + element.lineNumber;
+ String message = "An error occurred while processing ";
+
+ if (element == null) {
+ message += " the root element";
+ } else {
+ message += " element <" + element.tagName + ">"
+ + " starting at line number " + element.lineNumber;
+ }
if (location != null) {
message += " in file " + location.getPath();