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/07/10 02:22:17 UTC
svn commit: r962729 - in /pivot/trunk: core/src/org/apache/pivot/beans/
demos/src/org/apache/pivot/demos/displays/
demos/src/org/apache/pivot/demos/itunes/
demos/src/org/apache/pivot/demos/json/
demos/src/org/apache/pivot/demos/xml/ examples/src/org/ap...
Author: gbrown
Date: Sat Jul 10 00:22:16 2010
New Revision: 962729
URL: http://svn.apache.org/viewvc?rev=962729&view=rev
Log:
Remove unnecessary <bxml:script> blocks from listener list elements; add support for <wtkx:script> blocks in listener list elements for backwards compatibility with WTKX (to be removed in a future update).
Modified:
pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
pivot/trunk/demos/src/org/apache/pivot/demos/displays/multiple_display_demo.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.bxml
pivot/trunk/examples/src/org/apache/pivot/examples/keyboard/component_key_listener_example.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/application_handler_test.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/include_test.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/pivot_507.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/pivot_552.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/print_dialog_test.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/text/text_area_test.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/colorchoosers/color_choosers.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/table_view.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/hello_javascript.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/split_panes.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/localization.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/scripting.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/custom_table_view.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/json_table_view.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/frame.bxml
Modified: pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Sat Jul 10 00:22:16 2010
@@ -550,12 +550,23 @@ public class BXMLSerializer implements S
}
case WRITABLE_PROPERTY:
- case LISTENER_LIST_PROPERTY:
- case SCRIPT: {
+ case LISTENER_LIST_PROPERTY: {
element.value = text;
break;
}
+ case SCRIPT: {
+ // TODO This is for WTKX compatibility; remove when WTKX support is dropped
+ // and move SCRIPT up to the previous block
+ if (element.parent.type == Element.Type.LISTENER_LIST_PROPERTY) {
+ element.parent.value = text;
+ } else {
+ element.value = text;
+ }
+
+ break;
+ }
+
default: {
throw new SerializationException("Unexpected characters in "
+ element.type + " element.");
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/displays/multiple_display_demo.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/displays/multiple_display_demo.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/displays/multiple_display_demo.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/displays/multiple_display_demo.bxml Sat Jul 10 00:22:16 2010
@@ -25,16 +25,16 @@ limitations under the License.
<Label text="I am a secondary display!"/>
<PushButton buttonData="Close">
<buttonPressListeners>
- function buttonPressed(button) {
- button.display.hostWindow.dispose();
- }
+ function buttonPressed(button) {
+ button.display.hostWindow.dispose();
+ }
</buttonPressListeners>
</PushButton>
<PushButton buttonData="Set Title">
<buttonPressListeners>
- function buttonPressed(button) {
- secondaryDisplayWindow.title = "New Secondary Window Title";
- }
+ function buttonPressed(button) {
+ secondaryDisplayWindow.title = "New Secondary Window Title";
+ }
</buttonPressListeners>
</PushButton>
</BoxPane>
@@ -44,28 +44,28 @@ limitations under the License.
<BoxPane orientation="vertical" styles="{padding:8}">
<PushButton buttonData="Open Secondary Display">
<buttonPressListeners>
- importClass(org.apache.pivot.wtk.DesktopApplicationContext);
+ importClass(org.apache.pivot.wtk.DesktopApplicationContext);
- function buttonPressed(button) {
- var display = DesktopApplicationContext.createDisplay(640, 480, 100, 100, true,
- true, false, button.getDisplay().getHostWindow(),
- new DesktopApplicationContext.DisplayListener() {
- hostWindowOpened: function(display) {
- secondaryDisplayWindow.open(display);
- },
+ function buttonPressed(button) {
+ var display = DesktopApplicationContext.createDisplay(640, 480, 100, 100, true,
+ true, false, button.getDisplay().getHostWindow(),
+ new DesktopApplicationContext.DisplayListener() {
+ hostWindowOpened: function(display) {
+ secondaryDisplayWindow.open(display);
+ },
- hostWindowClosed: function(display) {
- secondaryDisplayWindow.close();
- }
- });
- }
+ hostWindowClosed: function(display) {
+ secondaryDisplayWindow.close();
+ }
+ });
+ }
</buttonPressListeners>
</PushButton>
<PushButton buttonData="Set Title">
<buttonPressListeners>
- function buttonPressed(button) {
- primaryDisplayWindow.title = "New Primary Window Title";
- }
+ function buttonPressed(button) {
+ primaryDisplayWindow.title = "New Primary Window Title";
+ }
</buttonPressListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.bxml Sat Jul 10 00:22:16 2010
@@ -37,60 +37,60 @@ limitations under the License.
<BoxPane styles="{verticalAlignment:'center'}">
<TextInput textSize="18" bxml:id="termTextInput">
<componentKeyListeners>
- <![CDATA[
- importPackage(org.apache.pivot.wtk);
- function keyPressed(component, keyCode, keyLocation) {
- var term = termTextInput.getText();
-
- if (keyCode == Keyboard.KeyCode.ENTER) {
- if (!application.isQueryExecuting()
- && term.length() > 0) {
- searchButton.press();
+ <![CDATA[
+ importPackage(org.apache.pivot.wtk);
+ function keyPressed(component, keyCode, keyLocation) {
+ var term = termTextInput.getText();
+
+ if (keyCode == Keyboard.KeyCode.ENTER) {
+ if (!application.isQueryExecuting()
+ && term.length() > 0) {
+ searchButton.press();
+ }
}
- }
- return false;
- }
- ]]>
+ return false;
+ }
+ ]]>
</componentKeyListeners>
<textInputTextListeners>
- <![CDATA[
- function textChanged(textInput) {
- var term = termTextInput.getText();
- searchButton.setEnabled(term.length() > 0);
- }
- ]]>
+ <![CDATA[
+ function textChanged(textInput) {
+ var term = termTextInput.getText();
+ searchButton.setEnabled(term.length() > 0);
+ }
+ ]]>
</textInputTextListeners>
</TextInput>
<PushButton bxml:id="searchButton" enabled="false"
styles="{toolbar:true, padding:1}">
<buttonPressListeners>
- <![CDATA[
- function buttonPressed(button) {
- if (application.isQueryExecuting()) {
- application.abortQuery();
- } else {
- application.executeQuery(termTextInput.getText());
+ <![CDATA[
+ function buttonPressed(button) {
+ if (application.isQueryExecuting()) {
+ application.abortQuery();
+ } else {
+ application.executeQuery(termTextInput.getText());
+ }
}
- }
- ]]>
+ ]]>
</buttonPressListeners>
<componentKeyListeners>
- <![CDATA[
- importPackage(org.apache.pivot.wtk);
- function keyPressed(component, keyCode, keyLocation) {
- if (keyCode == Keyboard.KeyCode.ESCAPE) {
- if (application.isQueryExecuting()) {
- application.abortQuery();
+ <![CDATA[
+ importPackage(org.apache.pivot.wtk);
+ function keyPressed(component, keyCode, keyLocation) {
+ if (keyCode == Keyboard.KeyCode.ESCAPE) {
+ if (application.isQueryExecuting()) {
+ application.abortQuery();
+ }
}
- }
- return false;
- }
- ]]>
+ return false;
+ }
+ ]]>
</componentKeyListeners>
</PushButton>
</BoxPane>
@@ -119,47 +119,47 @@ limitations under the License.
</columns>
<componentMouseButtonListeners>
- <![CDATA[
- importClass(java.awt.Desktop);
- importClass(java.net.URL);
- var selectedResult;
-
- function mouseClick(component, button, x, y, count) {
- if (count == 1) {
- selectedResult = resultsTableView.getSelectedRow();
- } else if (count == 2) {
- if (selectedResult == resultsTableView.getSelectedRow()) {
- var url = new URL(selectedResult.get("previewUrl"));
- Desktop.getDesktop().browse(url.toURI());
+ <![CDATA[
+ importClass(java.awt.Desktop);
+ importClass(java.net.URL);
+ var selectedResult;
+
+ function mouseClick(component, button, x, y, count) {
+ if (count == 1) {
+ selectedResult = resultsTableView.getSelectedRow();
+ } else if (count == 2) {
+ if (selectedResult == resultsTableView.getSelectedRow()) {
+ var url = new URL(selectedResult.get("previewUrl"));
+ Desktop.getDesktop().browse(url.toURI());
+ }
}
}
- }
- ]]>
+ ]]>
</componentMouseButtonListeners>
<tableViewSelectionListeners>
- <![CDATA[
- function selectedRangeAdded(tableView, rangeStart, rangeEnd) {
- application.updateArtwork();
- }
+ <![CDATA[
+ function selectedRangeAdded(tableView, rangeStart, rangeEnd) {
+ application.updateArtwork();
+ }
- function selectedRangeRemoved(tableView, rangeStart, rangeEnd) {
- application.updateArtwork();
- }
+ function selectedRangeRemoved(tableView, rangeStart, rangeEnd) {
+ application.updateArtwork();
+ }
- function selectedRangesChanged(tableView, previousSelectedRanges) {
- application.updateArtwork();
- }
- ]]>
+ function selectedRangesChanged(tableView, previousSelectedRanges) {
+ application.updateArtwork();
+ }
+ ]]>
</tableViewSelectionListeners>
<tableViewSortListeners>
- <![CDATA[
- function sortChanged(tableView) {
- var tableData = tableView.getTableData();
- tableData.setComparator(new org.apache.pivot.wtk.content.TableViewRowComparator(tableView));
- }
- ]]>
+ <![CDATA[
+ function sortChanged(tableView) {
+ var tableData = tableView.getTableData();
+ tableData.setComparator(new org.apache.pivot.wtk.content.TableViewRowComparator(tableView));
+ }
+ ]]>
</tableViewSortListeners>
</TableView>
@@ -184,15 +184,15 @@ limitations under the License.
<BoxPane styles="{horizontalAlignment:'center'}">
<PushButton bxml:id="previewButton" buttonData="Preview" enabled="false">
<buttonPressListeners>
- <![CDATA[
- importClass(java.awt.Desktop);
- importClass(java.net.URL);
- function buttonPressed(button) {
- var selectedResult = resultsTableView.getSelectedRow();
- var url = new URL(selectedResult.get("previewUrl"));
- Desktop.getDesktop().browse(url.toURI());
- }
- ]]>
+ <![CDATA[
+ importClass(java.awt.Desktop);
+ importClass(java.net.URL);
+ function buttonPressed(button) {
+ var selectedResult = resultsTableView.getSelectedRow();
+ var url = new URL(selectedResult.get("previewUrl"));
+ Desktop.getDesktop().browse(url.toURI());
+ }
+ ]]>
</buttonPressListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.bxml Sat Jul 10 00:22:16 2010
@@ -30,15 +30,15 @@ limitations under the License.
<content:TreeViewNodeRenderer showIcon="false"/>
</nodeRenderer>
<componentKeyListeners>
- <![CDATA[
- importPackage(org.apache.pivot.wtk);
- function keyPressed(component, keyCode, keyLocation) {
- if (keyCode == Keyboard.KeyCode.V
- && Keyboard.isPressed(Platform.getCommandModifier())) {
- application.paste();
+ <![CDATA[
+ importPackage(org.apache.pivot.wtk);
+ function keyPressed(component, keyCode, keyLocation) {
+ if (keyCode == Keyboard.KeyCode.V
+ && Keyboard.isPressed(Platform.getCommandModifier())) {
+ application.paste();
+ }
}
- }
- ]]>
+ ]]>
</componentKeyListeners>
</TreeView>
</ScrollPane>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.bxml Sat Jul 10 00:22:16 2010
@@ -34,23 +34,23 @@ limitations under the License.
</nodeRenderer>
<componentKeyListeners>
- <![CDATA[
- importPackage(org.apache.pivot.wtk);
- function keyPressed(component, keyCode, keyLocation) {
- if (keyCode == Keyboard.KeyCode.V
- && Keyboard.isPressed(Platform.getCommandModifier())) {
- application.paste();
+ <![CDATA[
+ importPackage(org.apache.pivot.wtk);
+ function keyPressed(component, keyCode, keyLocation) {
+ if (keyCode == Keyboard.KeyCode.V
+ && Keyboard.isPressed(Platform.getCommandModifier())) {
+ application.paste();
+ }
}
- }
- ]]>
+ ]]>
</componentKeyListeners>
<treeViewSelectionListeners>
- <![CDATA[
- function selectedPathsChanged(treeView, previousSelectedPaths) {
- application.updateProperties();
- }
- ]]>
+ <![CDATA[
+ function selectedPathsChanged(treeView, previousSelectedPaths) {
+ application.updateProperties();
+ }
+ ]]>
</treeViewSelectionListeners>
</TreeView>
</ScrollPane>
Modified: pivot/trunk/examples/src/org/apache/pivot/examples/keyboard/component_key_listener_example.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/keyboard/component_key_listener_example.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/keyboard/component_key_listener_example.bxml (original)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/keyboard/component_key_listener_example.bxml Sat Jul 10 00:22:16 2010
@@ -23,17 +23,17 @@ limitations under the License.
<BoxPane styles="{padding:8}">
<TextInput bxml:id="textInput">
<componentKeyListeners>
- <![CDATA[
- importPackage(java.lang);
- importPackage(org.apache.pivot.wtk);
+ <![CDATA[
+ importPackage(java.lang);
+ importPackage(org.apache.pivot.wtk);
- function keyPressed(component, keyCode, keyLocation) {
- if (keyCode == Keyboard.KeyCode.S
- && Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
- System.out.println("You pressed Control-S!");
+ function keyPressed(component, keyCode, keyLocation) {
+ if (keyCode == Keyboard.KeyCode.S
+ && Keyboard.isPressed(Keyboard.Modifier.CTRL)) {
+ System.out.println("You pressed Control-S!");
+ }
}
- }
- ]]>
+ ]]>
</componentKeyListeners>
</TextInput>
</BoxPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/application_handler_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/application_handler_test.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/application_handler_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/application_handler_test.bxml Sat Jul 10 00:22:16 2010
@@ -22,13 +22,11 @@ limitations under the License.
<BoxPane>
<PushButton buttonData="Throw Exception">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
function buttonPressed(button) {
throw new java.lang.RuntimeException("Button pressed");
}
]]>
- </bxml:script>
</buttonPressListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/include_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/include_test.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/include_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/include_test.bxml Sat Jul 10 00:22:16 2010
@@ -20,13 +20,11 @@ limitations under the License.
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns="org.apache.pivot.wtk">
<windowStateListeners>
- <bxml:script>
<![CDATA[
function windowOpened(window) {
java.lang.System.out.println(label.getText());
}
]]>
- </bxml:script>
</windowStateListeners>
<bxml:include src="include_test.content.bxml" text="Hello, World!" inline="true"/>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/pivot_507.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/pivot_507.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/pivot_507.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/pivot_507.bxml Sat Jul 10 00:22:16 2010
@@ -36,11 +36,9 @@ limitations under the License.
<PushButton buttonData="Set Title">
<buttonPressListeners>
- <bxml:script>
function buttonPressed(button) {
window.setTitle("New Title");
}
- </bxml:script>
</buttonPressListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/pivot_552.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/pivot_552.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/pivot_552.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/pivot_552.bxml Sat Jul 10 00:22:16 2010
@@ -22,21 +22,17 @@ limitations under the License.
<BoxPane>
<ListButton bxml:id="listButton" listData="['One', 'Three', 'Four']" selectedIndex="1">
<listButtonSelectionListeners>
- <bxml:script>
function selectedIndexChanged(listButton, previousSelectedIndex) {
java.lang.System.out.println(previousSelectedIndex + ", " + listButton.selectedIndex);
}
- </bxml:script>
</listButtonSelectionListeners>
</ListButton>
<PushButton buttonData="Add Two">
<buttonPressListeners>
- <bxml:script>
function buttonPressed(button) {
listButton.listData.insert("Two", 1);
}
- </bxml:script>
</buttonPressListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/print_dialog_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/print_dialog_test.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/print_dialog_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/print_dialog_test.bxml Sat Jul 10 00:22:16 2010
@@ -22,7 +22,6 @@ limitations under the License.
<BoxPane styles="{padding:8}">
<PushButton buttonData="Show Print Dialog">
<buttonPressListeners>
- <bxml:script>
importPackage(java.awt.print);
function buttonPressed(button) {
@@ -35,7 +34,6 @@ limitations under the License.
printerJob.printDialog();
}
- </bxml:script>
</buttonPressListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.bxml Sat Jul 10 00:22:16 2010
@@ -30,7 +30,6 @@ limitations under the License.
<Label bxml:id="barLabel"/>
<PushButton buttonData="Click Me">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
function buttonPressed(button) {
testFrame.open(window);
@@ -38,11 +37,11 @@ limitations under the License.
java.lang.System.out.println(label2.getText());
}
]]>
- </bxml:script>
- <bxml:define>
- <Label bxml:id="label2" text="World"/>
- </bxml:define>
</buttonPressListeners>
+
+ <bxml:define>
+ <Label bxml:id="label2" text="World"/>
+ </bxml:define>
</PushButton>
</BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/text/text_area_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/text/text_area_test.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/text/text_area_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/text/text_area_test.bxml Sat Jul 10 00:22:16 2010
@@ -69,7 +69,6 @@ limitations under the License.
<TablePane.Row height="-1">
<Checkbox buttonData="Wrap Text">
<buttonStateListeners>
- <bxml:script>
<![CDATA[
importClass(org.apache.pivot.wtk.ScrollPane);
function stateChanged(button, previousState) {
@@ -85,7 +84,6 @@ limitations under the License.
textAreaScrollPane.setHorizontalScrollBarPolicy(horizontalScrollBarPolicy);
}
]]>
- </bxml:script>
</buttonStateListeners>
</Checkbox>
</TablePane.Row>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.bxml Sat Jul 10 00:22:16 2010
@@ -30,7 +30,6 @@ limitations under the License.
<BoxPane styles="{padding:10}">
<PushButton buttonData="Toggle Watermark" toggleButton="true">
<buttonStateListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk.effects);
@@ -42,7 +41,6 @@ limitations under the License.
}
}
]]>
- </bxml:script>
</buttonStateListeners>
</PushButton>
</BoxPane>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.bxml Sat Jul 10 00:22:16 2010
@@ -28,13 +28,11 @@ limitations under the License.
<content:ButtonData text="Next" icon="@resultset_next.png"/>
<buttonPressListeners>
- <bxml:script>
<![CDATA[
function buttonPressed(button) {
cardPane.setSelectedIndex(1);
}
]]>
- </bxml:script>
</buttonPressListeners>
</LinkButton>
</BoxPane>
@@ -45,13 +43,11 @@ limitations under the License.
<content:ButtonData text="Previous" icon="@resultset_previous.png"/>
<buttonPressListeners>
- <bxml:script>
<![CDATA[
function buttonPressed(button) {
cardPane.setSelectedIndex(0);
}
]]>
- </bxml:script>
</buttonPressListeners>
</LinkButton>
</BoxPane>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.bxml Sat Jul 10 00:22:16 2010
@@ -22,14 +22,12 @@ limitations under the License.
<bxml:script src="clipboard.js"/>
<windowStateListeners>
- <bxml:script>
<![CDATA[
function windowOpened(window) {
sourceImageButtonGroup.setSelection(sourceImageButton1);
sourceImageButton1.requestFocus();
}
]]>
- </bxml:script>
</windowStateListeners>
<TablePane styles="{horizontalSpacing:4, verticalSpacing:4}">
@@ -60,7 +58,6 @@ limitations under the License.
<bxml:define>
<ButtonGroup bxml:id="sourceImageButtonGroup">
<buttonGroupListeners>
- <bxml:script>
<![CDATA[
function selectionChanged(buttonGroup, previousSelection) {
var selection = buttonGroup.getSelection();
@@ -71,7 +68,6 @@ limitations under the License.
}
}
]]>
- </bxml:script>
</buttonGroupListeners>
</ButtonGroup>
</bxml:define>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/colorchoosers/color_choosers.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/colorchoosers/color_choosers.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/colorchoosers/color_choosers.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/colorchoosers/color_choosers.bxml Sat Jul 10 00:22:16 2010
@@ -40,19 +40,17 @@ limitations under the License.
<TextInput bxml:id="hexInput" Form.label="HTML Notation" textSize="6"
ComponentStateListener.focusedChanged="onInputFocusChange()">
<componentKeyListeners>
- <bxml:script>
- <![CDATA[
- importClass(org.apache.pivot.wtk.Component);
- importClass(org.apache.pivot.wtk.Keyboard);
+ <![CDATA[
+ importClass(org.apache.pivot.wtk.Component);
+ importClass(org.apache.pivot.wtk.Keyboard);
- function keyPressed(component, keyCode, keyLocation) {
- if (keyCode == Keyboard.KeyCode.TAB ||
- keyCode == Keyboard.KeyCode.ENTER) {
- Component.clearFocus();
- }
+ function keyPressed(component, keyCode, keyLocation) {
+ if (keyCode == Keyboard.KeyCode.TAB ||
+ keyCode == Keyboard.KeyCode.ENTER) {
+ Component.clearFocus();
}
- ]]>
- </bxml:script>
+ }
+ ]]>
</componentKeyListeners>
</TextInput>
</Form.Section>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.bxml Sat Jul 10 00:22:16 2010
@@ -38,7 +38,6 @@ limitations under the License.
<bxml:define>
<ButtonGroup bxml:id="decoratorButtonGroup">
<buttonGroupListeners>
- <bxml:script>
<![CDATA[
function selectionChanged(buttonGroup) {
var selection = buttonGroup.getSelection();
@@ -53,7 +52,6 @@ limitations under the License.
}
}
]]>
- </bxml:script>
</buttonGroupListeners>
</ButtonGroup>
</bxml:define>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/table_view.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/table_view.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/table_view.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/table_view.bxml Sat Jul 10 00:22:16 2010
@@ -26,7 +26,6 @@ limitations under the License.
<TableView.Column name="d" width="1*"/>
</columns>
<componentListeners>
- <bxml:script>
<![CDATA[
importClass(org.apache.pivot.collections.ArrayList);
importClass(org.apache.pivot.collections.HashMap);
@@ -48,6 +47,5 @@ limitations under the License.
}
}
]]>
- </bxml:script>
</componentListeners>
</TableView>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/hello_javascript.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/hello_javascript.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/hello_javascript.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/hello_javascript.bxml Sat Jul 10 00:22:16 2010
@@ -20,7 +20,6 @@ limitations under the License.
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns="org.apache.pivot.wtk">
<windowStateListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
@@ -35,6 +34,5 @@ limitations under the License.
window.setContent(label);
}
]]>
- </bxml:script>
</windowStateListeners>
</Window>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/split_panes.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/split_panes.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/split_panes.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/split_panes.bxml Sat Jul 10 00:22:16 2010
@@ -41,7 +41,6 @@ limitations under the License.
<bxml:define>
<ButtonGroup bxml:id="orientation">
<buttonGroupListeners>
- <bxml:script>
<![CDATA[
function selectionChanged(buttonGroup, previousSelection) {
var selection = buttonGroup.getSelection();
@@ -52,7 +51,6 @@ limitations under the License.
}
}
]]>
- </bxml:script>
</buttonGroupListeners>
</ButtonGroup>
</bxml:define>
@@ -67,13 +65,11 @@ limitations under the License.
<Checkbox buttonData="Use Shadow">
<buttonStateListeners>
- <bxml:script>
<![CDATA[
function stateChanged(button, previousState) {
splitPane.getStyles().put("useShadow", button.isSelected());
}
]]>
- </bxml:script>
</buttonStateListeners>
</Checkbox>
</BoxPane>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes.bxml Sat Jul 10 00:22:16 2010
@@ -99,27 +99,23 @@ limitations under the License.
<Form.Section>
<Checkbox Form.label="Show horizontal grid lines" selected="true">
<buttonStateListeners>
- <bxml:script>
<![CDATA[
function stateChanged(button, previousState) {
tablePane.getStyles().put("showHorizontalGridLines",
button.isSelected());
}
]]>
- </bxml:script>
</buttonStateListeners>
</Checkbox>
<Checkbox Form.label="Show vertical grid lines" selected="true">
<buttonStateListeners>
- <bxml:script>
<![CDATA[
function stateChanged(button, previousState) {
tablePane.getStyles().put("showVerticalGridLines",
button.isSelected());
}
]]>
- </bxml:script>
</buttonStateListeners>
</Checkbox>
@@ -130,14 +126,12 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
tablePane.getStyles().put("horizontalSpacing",
spinner.getSelectedItem());
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
@@ -148,14 +142,12 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
tablePane.getStyles().put("verticalSpacing",
spinner.getSelectedItem());
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
@@ -166,14 +158,12 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
tablePane.getStyles().put("padding",
spinner.getSelectedItem());
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
</Form.Section>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml Sat Jul 10 00:22:16 2010
@@ -39,13 +39,11 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
TablePane.setRowSpan(component, spinner.getSelectedItem());
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
@@ -56,13 +54,11 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
TablePane.setColumnSpan(component, spinner.getSelectedItem());
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
@@ -77,14 +73,12 @@ limitations under the License.
</itemRenderer>
<listButtonSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(listButton, previousSelectedIndex) {
var colorItem = backgroundColorListButton.getSelectedItem();
component.getStyles().put("backgroundColor", colorItem.getColor());
}
]]>
- </bxml:script>
</listButtonSelectionListeners>
<content:ColorItem color="0x00000000" name="Transparent"/>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml Sat Jul 10 00:22:16 2010
@@ -23,13 +23,11 @@ limitations under the License.
<bxml:define>
<ButtonGroup bxml:id="columnWidthGroup">
<buttonGroupListeners>
- <bxml:script>
<![CDATA[
function selectionChanged(group, previousSelection) {
setColumnWidth();
}
]]>
- </bxml:script>
</buttonGroupListeners>
</ButtonGroup>
</bxml:define>
@@ -92,13 +90,11 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
setColumnWidth();
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
</TablePane.Row>
@@ -113,13 +109,11 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
setColumnWidth();
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
</TablePane.Row>
@@ -140,19 +134,19 @@ limitations under the License.
</BoxPane>
<bxml:script>
- <![CDATA[
- relativeWidthSpinner.setSelectedIndex(0);
- absoluteWidthSpinner.setSelectedIndex(0);
-
- if (column.isRelative()) {
- relativeWidthSpinner.setSelectedIndex(column.getWidth() - 1);
- relativeWidthButton.setSelected(true);
- } else if (column.getWidth() == -1) {
- defaultWidthButton.setSelected(true);
- } else {
- absoluteWidthSpinner.setSelectedIndex(column.getWidth() - 50);
- absoluteWidthButton.setSelected(true);
- }
- ]]>
+ <![CDATA[
+ relativeWidthSpinner.setSelectedIndex(0);
+ absoluteWidthSpinner.setSelectedIndex(0);
+
+ if (column.isRelative()) {
+ relativeWidthSpinner.setSelectedIndex(column.getWidth() - 1);
+ relativeWidthButton.setSelected(true);
+ } else if (column.getWidth() == -1) {
+ defaultWidthButton.setSelected(true);
+ } else {
+ absoluteWidthSpinner.setSelectedIndex(column.getWidth() - 50);
+ absoluteWidthButton.setSelected(true);
+ }
+ ]]>
</bxml:script>
</Sheet>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml Sat Jul 10 00:22:16 2010
@@ -23,13 +23,11 @@ limitations under the License.
<bxml:define>
<ButtonGroup bxml:id="rowHeightGroup">
<buttonGroupListeners>
- <bxml:script>
<![CDATA[
function selectionChanged(group, previousSelection) {
setRowHeight();
}
]]>
- </bxml:script>
</buttonGroupListeners>
</ButtonGroup>
</bxml:define>
@@ -87,13 +85,11 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
setRowHeight();
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
</TablePane.Row>
@@ -107,13 +103,11 @@ limitations under the License.
</spinnerData>
<spinnerSelectionListeners>
- <bxml:script>
<![CDATA[
function selectedIndexChanged(spinner, previousSelectedIndex) {
setRowHeight();
}
]]>
- </bxml:script>
</spinnerSelectionListeners>
</Spinner>
</TablePane.Row>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/localization.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/localization.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/localization.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/localization.bxml Sat Jul 10 00:22:16 2010
@@ -20,13 +20,11 @@ limitations under the License.
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns="org.apache.pivot.wtk">
<windowStateListeners>
- <bxml:script>
<![CDATA[
function windowOpened(window) {
window.requestFocus();
}
]]>
- </bxml:script>
</windowStateListeners>
<Border styles="{padding:6}">
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/scripting.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/scripting.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/scripting.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/scripting.bxml Sat Jul 10 00:22:16 2010
@@ -45,12 +45,12 @@ limitations under the License.
<BoxPane orientation="vertical" styles="{padding:6}">
<PushButton buttonData="Click Me!">
<buttonPressListeners>
- <![CDATA[
- importPackage(org.apache.pivot.wtk);
- function buttonPressed(button) {
- Prompt.prompt("x = " + x, button.getWindow());
- }
- ]]>
+ <![CDATA[
+ importPackage(org.apache.pivot.wtk);
+ function buttonPressed(button) {
+ Prompt.prompt("x = " + x, button.getWindow());
+ }
+ ]]>
</buttonPressListeners>
</PushButton>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/custom_table_view.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/custom_table_view.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/custom_table_view.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/custom_table_view.bxml Sat Jul 10 00:22:16 2010
@@ -38,14 +38,12 @@ limitations under the License.
</columns>
<tableViewSortListeners>
- <bxml:script>
<![CDATA[
function sortChanged(tableView) {
var tableData = tableView.getTableData();
tableData.setComparator(new org.apache.pivot.wtk.content.TableViewRowComparator(tableView));
}
]]>
- </bxml:script>
</tableViewSortListeners>
<!-- Source: http://en.wikipedia.org/wiki/2008_Summer_Olympics_medal_table -->
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/json_table_view.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/json_table_view.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/json_table_view.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tableviews/json_table_view.bxml Sat Jul 10 00:22:16 2010
@@ -31,14 +31,12 @@ limitations under the License.
</columns>
<tableViewSortListeners>
- <bxml:script>
<![CDATA[
function sortChanged(tableView) {
var tableData = tableView.getTableData();
tableData.setComparator(new org.apache.pivot.wtk.content.TableViewRowComparator(tableView));
}
]]>
- </bxml:script>
</tableViewSortListeners>
<tableData>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/frame.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/frame.bxml?rev=962729&r1=962728&r2=962729&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/frame.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/frame.bxml Sat Jul 10 00:22:16 2010
@@ -33,59 +33,50 @@ limitations under the License.
<BoxPane orientation="vertical">
<PushButton buttonData="Show Alert">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
function buttonPressed(button) {
Alert.alert("This is an Alert.", frame);
}
]]>
- </bxml:script>
</buttonPressListeners>
</PushButton>
<PushButton buttonData="Show Prompt">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
function buttonPressed(button) {
Prompt.prompt("This is a Prompt.", frame);
}
]]>
- </bxml:script>
</buttonPressListeners>
</PushButton>
<PushButton buttonData="Show Dialog">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
function buttonPressed(button) {
dialog.open(frame, null);
}
]]>
- </bxml:script>
</buttonPressListeners>
</PushButton>
<PushButton buttonData="Show Sheet">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
function buttonPressed(button) {
sheet.open(frame, null);
}
]]>
- </bxml:script>
</buttonPressListeners>
</PushButton>
<PushButton buttonData="Show Palette">
<buttonPressListeners>
- <bxml:script>
<![CDATA[
importPackage(org.apache.pivot.wtk);
function buttonPressed(button) {
@@ -97,7 +88,6 @@ limitations under the License.
palette.open(frame);
}
]]>
- </bxml:script>
</buttonPressListeners>
</PushButton>
</BoxPane>