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/04 17:27:57 UTC
svn commit: r811444 - in /incubator/pivot/trunk: demos/ demos/lib/
demos/src/org/apache/pivot/demos/scripting/ demos/www/
wtk/src/org/apache/pivot/wtk/skin/terra/
Author: gbrown
Date: Fri Sep 4 15:27:54 2009
New Revision: 811444
URL: http://svn.apache.org/viewvc?rev=811444&view=rev
Log:
Remove Groovy examples from scripting demo.
Removed:
incubator/pivot/trunk/demos/lib/groovy-all-1.6.3.jar
incubator/pivot/trunk/demos/lib/groovy-engine.jar
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/demo.groovy
Modified:
incubator/pivot/trunk/demos/.classpath
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/demo.js
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/scripting_demo.wtkx
incubator/pivot/trunk/demos/www/scripting.template.html
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
Modified: incubator/pivot/trunk/demos/.classpath
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/.classpath?rev=811444&r1=811443&r2=811444&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/.classpath (original)
+++ incubator/pivot/trunk/demos/.classpath Fri Sep 4 15:27:54 2009
@@ -8,7 +8,5 @@
<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-engine.jar"/>
- <classpathentry kind="lib" path="lib/groovy-all-1.6.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/demo.js
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/demo.js?rev=811444&r1=811443&r2=811444&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/demo.js (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/demo.js Fri Sep 4 15:27:54 2009
@@ -14,4 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+importPackage(org.apache.pivot.collections);
+
var foo = "ABCDE";
+
+var listData = new ArrayList();
+listData.add("One");
+listData.add("Two");
+listData.add("Three");
+
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/scripting_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/scripting_demo.wtkx?rev=811444&r1=811443&r2=811444&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/scripting_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/scripting_demo.wtkx Fri Sep 4 15:27:54 2009
@@ -21,10 +21,9 @@
xmlns:scripting="org.apache.pivot.demos.scripting"
xmlns="org.apache.pivot.wtk">
<wtkx:script src="demo.js"/>
- <wtkx:script src="demo.groovy"/>
<windowStateListeners>
- <wtkx:script language="javascript">
+ <wtkx:script>
<![CDATA[
importPackage(java.lang);
@@ -45,7 +44,7 @@
<BoxPane orientation="vertical" styles="{padding:6}">
<PushButton wtkx:id="pushButton" buttonData="Click Me!">
<buttonPressListeners>
- <wtkx:script language="javascript">
+ <wtkx:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
function buttonPressed(button) {
@@ -53,14 +52,6 @@
}
]]>
</wtkx:script>
-
- <wtkx:script language="groovy">
- <![CDATA[
- buttonPressed = {
- out.println("Hello from Groovy!")
- }
- ]]>
- </wtkx:script>
</buttonPressListeners>
</PushButton>
Modified: incubator/pivot/trunk/demos/www/scripting.template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/scripting.template.html?rev=811444&r1=811443&r2=811444&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/scripting.template.html (original)
+++ incubator/pivot/trunk/demos/www/scripting.template.html Fri Sep 4 15:27:54 2009
@@ -22,14 +22,13 @@
</head>
<body>
<p>This application demonstrates Pivot's scripting capabilities. It uses
-JavaScript and Groovy to implement event handlers and populate a list view
-component with data. It also demonstrates data sharing between script and Java
-code:</p>
+JavaScript to implement event handlers and populate a list view component with data. It also
+demonstrates data sharing between script and Java code:</p>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.signed.jar,lib/@project_name@-wtk-@version@.signed.jar,lib/@project_name@-wtk-@version@.terra.signed.jar,lib/@project_name@-demos-@version@.signed.jar,lib/groovy-engine.signed.jar,lib/groovy-all-1.6.3.signed.jar",
+ archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
width:640,
height:480
};
@@ -39,8 +38,5 @@
var version = "1.6";
deployJava.runApplet(attributes, parameters, version);
</script>
-
-<p>The applet is signed because the Groovy scripting engine relies on bytecode
-generation, which is not allowed in untrusted applets.</p>
</body>
</html>
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=811444&r1=811443&r2=811444&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Fri Sep 4 15:27:54 2009
@@ -208,7 +208,8 @@
display.getContainerMouseListeners().remove(displayMouseListener);
Window owner = window.getOwner();
- if (owner != null) {
+ if (owner != null
+ && owner.isOpen()) {
owner.moveToFront();
}
}
Re: svn commit: r811444 - in /incubator/pivot/trunk: demos/ demos/lib/
demos/src/org/apache/pivot/demos/scripting/ demos/www/
wtk/src/org/apache/pivot/wtk/skin/terra/
Posted by Greg Brown <gk...@mac.com>.
The Groovy examples will no longer be included in the Pivot
distribution, for the reasons we have recently been discussing.
On Sep 4, 2009, at 11:50 AM, Sandro Martini wrote:
> Hi Greg,
> I've sen you have removed the Groovy demo ... is it removed forever
> (licensing, or other problem), or only for some work / fix ?
>
> Sandro
Re: svn commit: r811444 - in /incubator/pivot/trunk: demos/
demos/lib/ demos/src/org/apache/pivot/demos/scripting/ demos/www/
wtk/src/org/apache/pivot/wtk/skin/terra/
Posted by Sandro Martini <sa...@gmail.com>.
Hi Greg,
I've sen you have removed the Groovy demo ... is it removed forever
(licensing, or other problem), or only for some work / fix ?
Sandro