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/05 01:41:37 UTC

svn commit: r811575 - in /incubator/pivot/trunk: demos/src/org/apache/pivot/demos/clock/ demos/src/org/apache/pivot/demos/scripting/ wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/content/ wtk/test/org/apache/pivot/wtk/test/

Author: gbrown
Date: Fri Sep  4 23:41:36 2009
New Revision: 811575

URL: http://svn.apache.org/viewvc?rev=811575&view=rev
Log:
Various minor bug fixes.

Removed:
    incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FocusTest.java
Modified:
    incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java
    incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
    incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ApplicationHandlerTest.java
    incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/application_handler_test.wtkx

Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java Fri Sep  4 23:41:36 2009
@@ -68,7 +68,7 @@
 
         int seconds = calendar.get(Calendar.SECOND);
         int minutes = calendar.get(Calendar.MINUTE);
-        int hours = calendar.get(Calendar.HOUR) + 1;
+        int hours = calendar.get(Calendar.HOUR);
 
         secondsRotation.setAngle(seconds * 6);
         minutesRotation.setAngle(minutes * 6 + seconds * (6d / 60));

Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java Fri Sep  4 23:41:36 2009
@@ -24,7 +24,6 @@
 import org.apache.pivot.wtk.DesktopApplicationContext;
 import org.apache.pivot.wtk.Display;
 import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
 import org.apache.pivot.wtkx.WTKXSerializer;
 
 public class ScriptingDemo implements Application {
@@ -37,15 +36,16 @@
 
     private Window window = null;
 
-    @WTKX private String foo;
-    @WTKX private List<?> listData;
+    private String foo;
+    private List<?> listData;
 
     @Override
     public void startup(Display display, Map<String, String> properties)
         throws Exception {
         WTKXSerializer wtkxSerializer = new WTKXSerializer();
         window = (Window)wtkxSerializer.readObject(this, "scripting_demo.wtkx");
-        wtkxSerializer.bind(this, ScriptingDemo.class);
+        foo = (String)wtkxSerializer.get("foo");
+        listData = (List<?>)wtkxSerializer.get("listData");
 
         System.out.println("foo = " + (foo == null ? null : "\"" + foo + "\""));
         System.out.println("listData.getLength() = " + listData.getLength());

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java Fri Sep  4 23:41:36 2009
@@ -185,7 +185,8 @@
 
                     // Move the owner to the front
                     Window owner = getOwner();
-                    if (owner.isOpen()) {
+                    if (owner != null
+                        && owner.isOpen()) {
                         owner.moveToFront();
                     }
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java Fri Sep  4 23:41:36 2009
@@ -162,6 +162,11 @@
         }
 
         public void setActive(boolean active) {
+            if (active
+                && !isEnabled()) {
+                throw new IllegalStateException();
+            }
+
             if (this.active != active) {
                 this.active = active;
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java Fri Sep  4 23:41:36 2009
@@ -132,6 +132,11 @@
         }
 
         public void setActive(boolean active) {
+            if (active
+                && !isEnabled()) {
+                throw new IllegalStateException();
+            }
+
             if (this.active != active) {
                 this.active = active;
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java Fri Sep  4 23:41:36 2009
@@ -498,7 +498,7 @@
 
         // Open the popup over the row
         popup.setLocation(editBounds.x, editBounds.y);
-        popup.setPreferredSize(editBounds.width, editBounds.height);
+        popup.setPreferredSize(editBounds.width, editBounds.height + 1);
         popup.open(tableView.getWindow());
     }
 

Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ApplicationHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ApplicationHandlerTest.java?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ApplicationHandlerTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ApplicationHandlerTest.java Fri Sep  4 23:41:36 2009
@@ -73,6 +73,7 @@
 
     @Override
     public void uncaughtExceptionThrown(Exception exception) {
+        System.out.println("Uncaught exception thrown.");
         exception.printStackTrace();
     }
 

Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/application_handler_test.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/application_handler_test.wtkx?rev=811575&r1=811574&r2=811575&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/application_handler_test.wtkx (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/application_handler_test.wtkx Fri Sep  4 23:41:36 2009
@@ -21,7 +21,7 @@
     xmlns="org.apache.pivot.wtk">
     <content>
         <BoxPane>
-            <PushButton buttonData="Push Button">
+            <PushButton buttonData="Throw Exception">
                 <buttonPressListeners>
                     <wtkx:script>
                     function buttonPressed(button) {