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/06/12 20:37:06 UTC
svn commit: r784226 - in /incubator/pivot/trunk: demos/ demos/lib/
demos/src/pivot/demos/scripting/ wtk/src/pivot/wtkx/
Author: gbrown
Date: Fri Jun 12 18:37:05 2009
New Revision: 784226
URL: http://svn.apache.org/viewvc?rev=784226&view=rev
Log:
Update Groovy examples to work with new scripting features; log error to console when a script has an error rather than aborting entire load.
Added:
incubator/pivot/trunk/demos/lib/groovy-all-1.6.3.jar (with props)
Removed:
incubator/pivot/trunk/demos/lib/groovy-all-1.5.6.jar
Modified:
incubator/pivot/trunk/demos/.classpath
incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java
incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.groovy
incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.js
incubator/pivot/trunk/demos/src/pivot/demos/scripting/scripting_demo.wtkx
incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
Modified: incubator/pivot/trunk/demos/.classpath
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/.classpath?rev=784226&r1=784225&r2=784226&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/.classpath (original)
+++ incubator/pivot/trunk/demos/.classpath Fri Jun 12 18:37:05 2009
@@ -8,7 +8,7 @@
<classpathentry kind="lib" path="lib/smack.jar"/>
<classpathentry kind="lib" path="lib/smackx.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/charts"/>
- <classpathentry kind="lib" path="lib/groovy-all-1.5.6.jar"/>
<classpathentry kind="lib" path="lib/groovy-engine.jar"/>
+ <classpathentry kind="lib" path="lib/groovy-all-1.6.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: incubator/pivot/trunk/demos/lib/groovy-all-1.6.3.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/lib/groovy-all-1.6.3.jar?rev=784226&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/trunk/demos/lib/groovy-all-1.6.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java?rev=784226&r1=784225&r2=784226&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java Fri Jun 12 18:37:05 2009
@@ -45,7 +45,7 @@
window = (Window)wtkxSerializer.readObject(this, "scripting_demo.wtkx");
wtkxSerializer.bind(this);
- System.out.println("foo = \"" + foo + "\"");
+ System.out.println("foo = " + (foo == null ? null : "\"" + foo + "\""));
System.out.println("listData.getLength() = " + listData.getLength());
window.open(display);
Modified: incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.groovy
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.groovy?rev=784226&r1=784225&r2=784226&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.groovy (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.groovy Fri Jun 12 18:37:05 2009
@@ -14,8 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import pivot.wtk.*
+import pivot.collections.adapter.*
-def showAlert(button) {
- Alert.alert("You clicked me!", button.getWindow())
-}
+listData = []
+listData << "One"
+listData << "Two"
+listData << "Three"
+
+listData = new ListAdapter(listData)
Modified: incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.js
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.js?rev=784226&r1=784225&r2=784226&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.js (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/scripting/demo.js Fri Jun 12 18:37:05 2009
@@ -14,8 +14,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-importPackage(Packages.pivot.wtk);
-
-function showAlert(button) {
- Alert.alert("You clicked me!", button.getWindow());
-}
+var foo = "ABCDE";
Modified: incubator/pivot/trunk/demos/src/pivot/demos/scripting/scripting_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/scripting/scripting_demo.wtkx?rev=784226&r1=784225&r2=784226&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/scripting/scripting_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/scripting/scripting_demo.wtkx Fri Jun 12 18:37:05 2009
@@ -20,37 +20,8 @@
xmlns:wtkx="http://incubator.apache.org/pivot/wtkx/1.1"
xmlns:scripting="pivot.demos.scripting"
xmlns="pivot.wtk">
- <wtkx:script language="javascript">
- <![CDATA[
- importPackage(Packages.pivot.collections);
-
- var foo = "Hello World";
-
- var listData = new ArrayList();
- listData.add("One");
- listData.add("Two");
- listData.add("Three");
- ]]>
- </wtkx:script>
<wtkx:script src="demo.js"/>
-
- <!--
- <wtkx:script language="groovy">
- <![CDATA[
- import pivot.collections.adapter.*
-
- def foo = "ABCDE"
-
- def listData = []
- listData << "One"
- listData << "Two"
- listData << "Three"
-
- listData = new ListAdapter(listData)
- ]]>
- </wtkx:script>
<wtkx:script src="demo.groovy"/>
- -->
<content>
<Border>
@@ -60,35 +31,20 @@
<buttonPressListeners>
<wtkx:script language="javascript">
<![CDATA[
+ importPackage(Packages.pivot.wtk);
function buttonPressed(button) {
- showAlert(button);
- }
- ]]>
- </wtkx:script>
- <wtkx:script language="javascript">
- <![CDATA[
- function buttonPressed(button) {
- java.lang.System.out.println("[JavaScript] A button was clicked.");
+ Alert.alert("Hello from JavaScript!", button.getWindow());
}
]]>
</wtkx:script>
- <!--
- <wtkx:script language="groovy">
- <![CDATA[
- def buttonPressed(button) {
- showAlert(button);
- }
- ]]>
- </wtkx:script>
<wtkx:script language="groovy">
<![CDATA[
- def buttonPressed(Button button) {
- System.out.println("[Groovy] A button was clicked.");
+ buttonPressed = {
+ out.println("Hello from Groovy!")
}
]]>
</wtkx:script>
- -->
</buttonPressListeners>
</PushButton>
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java?rev=784226&r1=784225&r2=784226&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java Fri Jun 12 18:37:05 2009
@@ -76,7 +76,7 @@
public void putAll(Map<? extends String, ? extends Object> map) {
for (String key : map.keySet()) {
- namedObjects.put(key, map.get(key));
+ put(key, map.get(key));
}
}
@@ -681,7 +681,7 @@
scriptReader = new BufferedReader(new InputStreamReader(scriptLocation.openStream()));
scriptEngine.eval(scriptReader);
} catch(ScriptException exception) {
- throw new SerializationException(exception);
+ System.err.println(exception.getMessage());
} finally {
if (scriptReader != null) {
scriptReader.close();
@@ -705,7 +705,7 @@
try {
scriptEngine.eval((String)element.value);
} catch (ScriptException exception) {
- throw new SerializationException(exception);
+ System.err.println(exception.getMessage());
}
}
} else {