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 2010/06/29 20:25:22 UTC
svn commit: r959068 - in /pivot/trunk:
core/src/org/apache/pivot/json/JSON.java
wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
Author: gbrown
Date: Tue Jun 29 18:25:22 2010
New Revision: 959068
URL: http://svn.apache.org/viewvc?rev=959068&view=rev
Log:
Apply fixes for PIVOT-510 and PIVOT-549.
Modified:
pivot/trunk/core/src/org/apache/pivot/json/JSON.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
Modified: pivot/trunk/core/src/org/apache/pivot/json/JSON.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/json/JSON.java?rev=959068&r1=959067&r2=959068&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/json/JSON.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/json/JSON.java Tue Jun 29 18:25:22 2010
@@ -419,7 +419,8 @@ public class JSON {
while(i <= n
&& c != '.'
&& c != '[') {
- if (!Character.isJavaIdentifierPart(c)) {
+ if (!Character.isJavaIdentifierPart(c)
+ && c != '~') {
throw new IllegalArgumentException("Illegal identifier character.");
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=959068&r1=959067&r2=959068&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Tue Jun 29 18:25:22 2010
@@ -19,6 +19,7 @@ package org.apache.pivot.wtk;
import java.awt.AWTEvent;
import java.awt.Graphics;
import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
@@ -528,6 +529,18 @@ public final class DesktopApplicationCon
width = preferences.getInt(WIDTH_ARGUMENT, width);
height = preferences.getInt(HEIGHT_ARGUMENT, height);
maximized = preferences.getBoolean(MAXIMIZED_ARGUMENT, maximized);
+
+ // Update positioning if window is offscreen
+ GraphicsDevice[] screenDevices = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
+ if (screenDevices.length == 1) {
+ if (x < 0) {
+ x = 0;
+ }
+
+ if (y < 0) {
+ y = 0;
+ }
+ }
} catch (SecurityException exception) {
System.err.println("Unable to retrieve startup preferences: " + exception);
}