You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2013/03/08 11:45:18 UTC
svn commit: r1454316 [1/2] - in /pivot/branches/2.0.x:
examples/src/org/apache/pivot/examples/scripting/
examples/src/org/apache/pivot/examples/svg/
tests/src/org/apache/pivot/tests/ tests/src/org/apache/pivot/tests/issues/
tests/src/org/apache/pivot/t...
Author: smartini
Date: Fri Mar 8 10:45:17 2013
New Revision: 1454316
URL: http://svn.apache.org/r1454316
Log:
Set svn props
Modified:
pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/scripting/README.txt (contents, props changed)
pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/logo-64x64.png (props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/logo.svg (props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml (contents, props changed)
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml (contents, props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigDecimalValidator.java (contents, props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigIntegerValidator.java (contents, props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableRangeValidator.java (contents, props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableValidator.java (contents, props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/EmptyTextValidator.java (contents, props changed)
Modified: pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/scripting/README.txt
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/scripting/README.txt?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/scripting/README.txt (original)
+++ pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/scripting/README.txt Fri Mar 8 10:45:17 2013
@@ -1,9 +1,9 @@
-//
-// README for org.apache.pivot.examples.scripting Samples
-//
-
-In this package there are some Groovy sources and even some Scala sources, but in our ant builds they are not compiled.
-To run those examples from an IDE (like Eclipse), you must enable support for those languages for the project containing them (examples).
-
-Note that in case of problems, for example a configured Nature for that project but the related Plugin is not installed,
-it will not be possible to run even Java examples because nothing in that project will be compiled.
+//
+// README for org.apache.pivot.examples.scripting Samples
+//
+
+In this package there are some Groovy sources and even some Scala sources, but in our ant builds they are not compiled.
+To run those examples from an IDE (like Eclipse), you must enable support for those languages for the project containing them (examples).
+
+Note that in case of problems, for example a configured Nature for that project but the related Plugin is not installed,
+it will not be possible to run even Java examples because nothing in that project will be compiled.
Propchange: pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/scripting/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/logo-64x64.png
------------------------------------------------------------------------------
origination-name = image/png
Propchange: pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/logo-64x64.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 8 10:45:17 2013
@@ -1 +1 @@
-application/octet-stream
+image/png
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java Fri Mar 8 10:45:17 2013
@@ -1,118 +1,118 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.tests;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
-import java.awt.geom.AffineTransform;
-
-import org.apache.pivot.collections.Map;
-import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.DesktopApplicationContext;
-import org.apache.pivot.wtk.Display;
-import org.apache.pivot.wtk.HorizontalAlignment;
-import org.apache.pivot.wtk.Label;
-import org.apache.pivot.wtk.VerticalAlignment;
-import org.apache.pivot.wtk.Window;
-
-public class LabelAntialiasTest extends Application.Adapter {
- private Window window = null;
-
- private Label buildLabel(double rotation) {
- Label label = new Label();
-
- Font font = new Font("Arial", Font.BOLD, 64);
-
- AffineTransform fontAT = new AffineTransform();
- // Derive a new font using a rotation transform
- fontAT.rotate(rotation * java.lang.Math.PI / 180.0d);
- Font fontDerived = font.deriveFont(fontAT);
-
- label.setText("Hello at " + rotation + " degree.");
- label.getStyles().put("color", Color.RED);
- label.getStyles().put("font", fontDerived);
- label.getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
- label.getStyles().put("verticalAlignment", VerticalAlignment.TOP);
-
- return label;
- }
-
- /**
- * Write to console some details of Desktop Hints, for Font Rendering.
- *
- * @see org.apache.pivot.wtk.Platform#initializeFontRenderContext
- */
- private void showFontDesktopHints() {
- System.out.println("Show Font Desktop Hints:");
-
- Toolkit toolkit = Toolkit.getDefaultToolkit();
- java.util.Map<?, ?> fontDesktopHints =
- (java.util.Map<?, ?>)toolkit.getDesktopProperty("awt.font.desktophints");
-
- System.out.println(fontDesktopHints);
- }
-
- /**
- * Write to console the list of Font families found in the System.
- */
- private void showFontFamilies() {
- System.out.println("Show Font Families:");
-
- GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
- String []fontFamilies = ge.getAvailableFontFamilyNames();
- int fontFamiliesNumber = fontFamilies.length;
- StringBuffer fontFamilyNames = new StringBuffer(1024);
- for (int i=0; i < fontFamiliesNumber; i++) {
- if (i > 0) {
- fontFamilyNames.append(", ");
- }
- fontFamilyNames.append(fontFamilies[i]);
- }
- System.out.println(fontFamilyNames);
- }
-
- @Override
- public void startup(Display display, Map<String, String> properties) {
- window = new Window();
-
- showFontDesktopHints();
- showFontFamilies();
-
- Label label = buildLabel(45);
- window.setContent(label);
-
- window.setTitle("Label Antialiasing Test");
- window.setMaximized(true);
- window.open(display);
- }
-
- @Override
- public boolean shutdown(boolean optional) {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(LabelAntialiasTest.class, args);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.tests;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
+
+import org.apache.pivot.collections.Map;
+import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.DesktopApplicationContext;
+import org.apache.pivot.wtk.Display;
+import org.apache.pivot.wtk.HorizontalAlignment;
+import org.apache.pivot.wtk.Label;
+import org.apache.pivot.wtk.VerticalAlignment;
+import org.apache.pivot.wtk.Window;
+
+public class LabelAntialiasTest extends Application.Adapter {
+ private Window window = null;
+
+ private Label buildLabel(double rotation) {
+ Label label = new Label();
+
+ Font font = new Font("Arial", Font.BOLD, 64);
+
+ AffineTransform fontAT = new AffineTransform();
+ // Derive a new font using a rotation transform
+ fontAT.rotate(rotation * java.lang.Math.PI / 180.0d);
+ Font fontDerived = font.deriveFont(fontAT);
+
+ label.setText("Hello at " + rotation + " degree.");
+ label.getStyles().put("color", Color.RED);
+ label.getStyles().put("font", fontDerived);
+ label.getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
+ label.getStyles().put("verticalAlignment", VerticalAlignment.TOP);
+
+ return label;
+ }
+
+ /**
+ * Write to console some details of Desktop Hints, for Font Rendering.
+ *
+ * @see org.apache.pivot.wtk.Platform#initializeFontRenderContext
+ */
+ private void showFontDesktopHints() {
+ System.out.println("Show Font Desktop Hints:");
+
+ Toolkit toolkit = Toolkit.getDefaultToolkit();
+ java.util.Map<?, ?> fontDesktopHints =
+ (java.util.Map<?, ?>)toolkit.getDesktopProperty("awt.font.desktophints");
+
+ System.out.println(fontDesktopHints);
+ }
+
+ /**
+ * Write to console the list of Font families found in the System.
+ */
+ private void showFontFamilies() {
+ System.out.println("Show Font Families:");
+
+ GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ String []fontFamilies = ge.getAvailableFontFamilyNames();
+ int fontFamiliesNumber = fontFamilies.length;
+ StringBuffer fontFamilyNames = new StringBuffer(1024);
+ for (int i=0; i < fontFamiliesNumber; i++) {
+ if (i > 0) {
+ fontFamilyNames.append(", ");
+ }
+ fontFamilyNames.append(fontFamilies[i]);
+ }
+ System.out.println(fontFamilyNames);
+ }
+
+ @Override
+ public void startup(Display display, Map<String, String> properties) {
+ window = new Window();
+
+ showFontDesktopHints();
+ showFontFamilies();
+
+ Label label = buildLabel(45);
+ window.setContent(label);
+
+ window.setTitle("Label Antialiasing Test");
+ window.setMaximized(true);
+ window.open(display);
+ }
+
+ @Override
+ public boolean shutdown(boolean optional) {
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
+ }
+
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(LabelAntialiasTest.class, args);
+ }
+
+}
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml Fri Mar 8 10:45:17 2013
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<Window title="ImageView Test" maximized="true"
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns="org.apache.pivot.wtk">
- <ImageView image="@logo.svg"
- styles="{fill:false, preserveAspectRatio:false,
- horizontalAlignment:'left', verticalAlignment:'bottom'}"/>
-</Window>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<Window title="ImageView Test" maximized="true"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns="org.apache.pivot.wtk">
+ <ImageView image="@logo.svg"
+ styles="{fill:false, preserveAspectRatio:false,
+ horizontalAlignment:'left', verticalAlignment:'bottom'}"/>
+</Window>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/image_view_svg_test.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java Fri Mar 8 10:45:17 2013
@@ -1,151 +1,151 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.tests.issues.pivot894;
-
-import java.awt.EventQueue;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.pivot.beans.BXMLSerializer;
-import org.apache.pivot.collections.Map;
-import org.apache.pivot.util.concurrent.TaskExecutionException;
-import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.CardPane;
-import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.DesktopApplicationContext;
-import org.apache.pivot.wtk.Display;
-import org.apache.pivot.wtk.GridPane;
-import org.apache.pivot.wtk.GridPane.Row;
-import org.apache.pivot.wtk.PushButton;
-import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.content.ButtonData;
-import org.apache.pivot.wtk.media.Image;
-import org.apache.pivot.wtk.skin.CardPaneSkin;
-
-public class Pivot894 extends Application.Adapter {
- // global counter, just to know how many iterations the application is doing
- static int num = 0;
-
- @Override
- public void startup(Display display, Map<String, String> properties) throws Exception {
- System.out.println("public startup(...)");
- System.out.println("\n"
- + "Attention: now the application will go in an infinite loop, to be able to see the memory leak.\n"
- + "Note that probably you'll have to kill the application from outside (kill the Java process).\n"
- + "\n"
- );
-
- // add some sleep to let users see the warning messages in console ...
- Thread.sleep(2000);
-
-
- final CardPane cardPane = new CardPane();
- cardPane.getStyles().put("selectionChangeEffect", CardPaneSkin.SelectionChangeEffect.HORIZONTAL_SLIDE);
-
- final Window window = new Window(cardPane);
- window.open(display);
-
- DesktopApplicationContext.scheduleRecurringCallback(new Runnable() {
- @Override
- public void run() {
- Thread.currentThread().setName("switcher-thread");
-
- System.out.println("Run num " + num++); // temp
-
-
- /*
- //
- // method 1:
- //
- // Seems to be working just fine
- final GridPane grid = new GridPane(3);
- grid.getRows().add(createGridRow());
- grid.getRows().add(createGridRow());
- grid.getRows().add(createGridRow());
- */
-
-
- //
- // method 2:
- //
- try {
- // Before the fixes for PIVOT-861 (part two) it was causing out of memory ...
- //
- // Note that this has been moved to another issue, but the problem is due to the usage
- // of dataRenderer tags (and then instancing ButtonDataRenderer) in the loaded bxml,
- // so probably even this test will be updated ...
- //
- final GridPane grid = (GridPane) new BXMLSerializer().readObject(Pivot894.class, "btn_grid.bxml");
-
- EventQueue.invokeLater(new Runnable() {
- @Override
- public void run() {
- Iterator<Component> iterator = cardPane.iterator();
- List<Component> deprecated = new ArrayList<Component>();
- while (iterator.hasNext()) {
- Component card = iterator.next();
- if (!card.isShowing()) {
- deprecated.add(card);
- }
- }
-
- for (Component card : deprecated) {
- cardPane.remove(card);
- }
-
- cardPane.setSelectedIndex(cardPane.add(grid));
-
- System.out.println(cardPane.getSelectedIndex());
- }
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- @SuppressWarnings("unused")
- private Row createGridRow() {
- Row row = new Row();
- try {
- // note that this method doesn't use ApplicationContext cache for images ...
- row.add(new PushButton(new ButtonData(Image.load(new File("clock_icon.png").toURI().toURL()), "Clock")));
- row.add(new PushButton(new ButtonData(Image.load(new File("clock_icon.png").toURI().toURL()), "Clock")));
- row.add(new PushButton(new ButtonData(Image.load(new File("clock_icon.png").toURI().toURL()), "Clock")));
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (TaskExecutionException e) {
- e.printStackTrace();
- }
- return row;
- }
- }, 100);
- }
-
- @Override
- public boolean shutdown(boolean optional) throws Exception {
- return false;
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(Pivot894.class, args);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.tests.issues.pivot894;
+
+import java.awt.EventQueue;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.pivot.beans.BXMLSerializer;
+import org.apache.pivot.collections.Map;
+import org.apache.pivot.util.concurrent.TaskExecutionException;
+import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.CardPane;
+import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.DesktopApplicationContext;
+import org.apache.pivot.wtk.Display;
+import org.apache.pivot.wtk.GridPane;
+import org.apache.pivot.wtk.GridPane.Row;
+import org.apache.pivot.wtk.PushButton;
+import org.apache.pivot.wtk.Window;
+import org.apache.pivot.wtk.content.ButtonData;
+import org.apache.pivot.wtk.media.Image;
+import org.apache.pivot.wtk.skin.CardPaneSkin;
+
+public class Pivot894 extends Application.Adapter {
+ // global counter, just to know how many iterations the application is doing
+ static int num = 0;
+
+ @Override
+ public void startup(Display display, Map<String, String> properties) throws Exception {
+ System.out.println("public startup(...)");
+ System.out.println("\n"
+ + "Attention: now the application will go in an infinite loop, to be able to see the memory leak.\n"
+ + "Note that probably you'll have to kill the application from outside (kill the Java process).\n"
+ + "\n"
+ );
+
+ // add some sleep to let users see the warning messages in console ...
+ Thread.sleep(2000);
+
+
+ final CardPane cardPane = new CardPane();
+ cardPane.getStyles().put("selectionChangeEffect", CardPaneSkin.SelectionChangeEffect.HORIZONTAL_SLIDE);
+
+ final Window window = new Window(cardPane);
+ window.open(display);
+
+ DesktopApplicationContext.scheduleRecurringCallback(new Runnable() {
+ @Override
+ public void run() {
+ Thread.currentThread().setName("switcher-thread");
+
+ System.out.println("Run num " + num++); // temp
+
+
+ /*
+ //
+ // method 1:
+ //
+ // Seems to be working just fine
+ final GridPane grid = new GridPane(3);
+ grid.getRows().add(createGridRow());
+ grid.getRows().add(createGridRow());
+ grid.getRows().add(createGridRow());
+ */
+
+
+ //
+ // method 2:
+ //
+ try {
+ // Before the fixes for PIVOT-861 (part two) it was causing out of memory ...
+ //
+ // Note that this has been moved to another issue, but the problem is due to the usage
+ // of dataRenderer tags (and then instancing ButtonDataRenderer) in the loaded bxml,
+ // so probably even this test will be updated ...
+ //
+ final GridPane grid = (GridPane) new BXMLSerializer().readObject(Pivot894.class, "btn_grid.bxml");
+
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ Iterator<Component> iterator = cardPane.iterator();
+ List<Component> deprecated = new ArrayList<Component>();
+ while (iterator.hasNext()) {
+ Component card = iterator.next();
+ if (!card.isShowing()) {
+ deprecated.add(card);
+ }
+ }
+
+ for (Component card : deprecated) {
+ cardPane.remove(card);
+ }
+
+ cardPane.setSelectedIndex(cardPane.add(grid));
+
+ System.out.println(cardPane.getSelectedIndex());
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @SuppressWarnings("unused")
+ private Row createGridRow() {
+ Row row = new Row();
+ try {
+ // note that this method doesn't use ApplicationContext cache for images ...
+ row.add(new PushButton(new ButtonData(Image.load(new File("clock_icon.png").toURI().toURL()), "Clock")));
+ row.add(new PushButton(new ButtonData(Image.load(new File("clock_icon.png").toURI().toURL()), "Clock")));
+ row.add(new PushButton(new ButtonData(Image.load(new File("clock_icon.png").toURI().toURL()), "Clock")));
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (TaskExecutionException e) {
+ e.printStackTrace();
+ }
+ return row;
+ }
+ }, 100);
+ }
+
+ @Override
+ public boolean shutdown(boolean optional) throws Exception {
+ return false;
+ }
+
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(Pivot894.class, args);
+ }
+
+}
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml Fri Mar 8 10:45:17 2013
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<GridPane
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns:content="org.apache.pivot.wtk.content"
- xmlns="org.apache.pivot.wtk"
- columnCount="3"
- styles="{horizontalSpacing:1, verticalSpacing:1,
- showHorizontalGridLines:true, showVerticalGridLines:true}"
->
- <GridPane.Row>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- </GridPane.Row>
- <GridPane.Row>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- </GridPane.Row>
- <GridPane.Row>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- <PushButton >
- <dataRenderer>
- <content:ButtonDataRenderer/>
- </dataRenderer>
- <content:ButtonData text="BXML" icon="@../../clock.png" />
- </PushButton>
- </GridPane.Row>
-</GridPane>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<GridPane
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:content="org.apache.pivot.wtk.content"
+ xmlns="org.apache.pivot.wtk"
+ columnCount="3"
+ styles="{horizontalSpacing:1, verticalSpacing:1,
+ showHorizontalGridLines:true, showVerticalGridLines:true}"
+>
+ <GridPane.Row>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ </GridPane.Row>
+ <GridPane.Row>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ </GridPane.Row>
+ <GridPane.Row>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ <PushButton >
+ <dataRenderer>
+ <content:ButtonDataRenderer/>
+ </dataRenderer>
+ <content:ButtonData text="BXML" icon="@../../clock.png" />
+ </PushButton>
+ </GridPane.Row>
+</GridPane>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/btn_grid.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml Fri Mar 8 10:45:17 2013
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<Window title="Pivot-880" maximized="true"
- bxml:id="window"
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns="org.apache.pivot.wtk"
->
- <bxml:script>
- <![CDATA[
- importPackage(java.lang); // required to use System.out and System.err
- // importPackage(org.apache.pivot.collections); // for collections
- importPackage(org.apache.pivot.beans); // for BXMLSerializer
- importPackage(org.apache.pivot.util); // for some useful stuff
- importPackage(org.apache.pivot.wtk); // for application and other wtk classes
-
- System.out.println("inline script 1 - start");
- System.out.println("current window = " + window);
-
- // JS variables for (remote) resources
- var bxmlSerializer = new BXMLSerializer(); // trick, create a new instance of BXMLSerializer ...
- System.out.println("bxmlSerializer is " + bxmlSerializer);
-
-function openFileBrowser(root) {
- System.out.println("Opening FileBrowserSheet with the given folder \"" + root + "\" as root");
-
- var fileBrowser = null;
- if (root == undefined || root == null || root.length < 1)
- fileBrowser = new FileBrowserSheet();
- else {
- // fileBrowser = new FileBrowserSheet(FileBrowserSheet.Mode.OPEN, root); // ok in Java, but not from JavaScript ...
- // fileBrowser = new FileBrowserSheet();
- // fileBrowser.setRootFolder(root);
- // using the new constructor in FileBrowserSheet
- fileBrowser = new FileBrowserSheet(root);
- }
-
- fileBrowser.open(window, null);
-}
-
- System.out.println("inline script 1 - end");
- ]]>
- </bxml:script>
-
- <Border styles="{padding:6}">
- <TablePane>
- <columns>
- <TablePane.Column width="1*"/>
- </columns>
- <TablePane.Row height="-1">
- <FlowPane styles="{padding:2, alignToBaseline:true}">
- <TextInput bxml:id="textInput" prompt="Write here the \\server\share to open" textSize="30"/>
- <Label text=" "/>
- <PushButton bxml:id="selectFolderButton" buttonData="Open Folder">
- <buttonPressListeners>
- function buttonPressed(button) {
- if (textInput.text.length() > 0)
- openFileBrowser(textInput.text);
- }
- </buttonPressListeners>
- </PushButton>
- </FlowPane>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <FlowPane styles="{padding:2, alignToBaseline:true}">
- <TextArea editable="false" preferredWidth="400" styles="{}"
- text="Note: for this test you have to select a network folder, using the UNC format (typical of a Windows environment)"
- />
- </FlowPane>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <Label text=" "/> <!-- spacer -->
- </TablePane.Row>
- </TablePane>
- </Border>
-</Window>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<Window title="Pivot-880" maximized="true"
+ bxml:id="window"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns="org.apache.pivot.wtk"
+>
+ <bxml:script>
+ <![CDATA[
+ importPackage(java.lang); // required to use System.out and System.err
+ // importPackage(org.apache.pivot.collections); // for collections
+ importPackage(org.apache.pivot.beans); // for BXMLSerializer
+ importPackage(org.apache.pivot.util); // for some useful stuff
+ importPackage(org.apache.pivot.wtk); // for application and other wtk classes
+
+ System.out.println("inline script 1 - start");
+ System.out.println("current window = " + window);
+
+ // JS variables for (remote) resources
+ var bxmlSerializer = new BXMLSerializer(); // trick, create a new instance of BXMLSerializer ...
+ System.out.println("bxmlSerializer is " + bxmlSerializer);
+
+function openFileBrowser(root) {
+ System.out.println("Opening FileBrowserSheet with the given folder \"" + root + "\" as root");
+
+ var fileBrowser = null;
+ if (root == undefined || root == null || root.length < 1)
+ fileBrowser = new FileBrowserSheet();
+ else {
+ // fileBrowser = new FileBrowserSheet(FileBrowserSheet.Mode.OPEN, root); // ok in Java, but not from JavaScript ...
+ // fileBrowser = new FileBrowserSheet();
+ // fileBrowser.setRootFolder(root);
+ // using the new constructor in FileBrowserSheet
+ fileBrowser = new FileBrowserSheet(root);
+ }
+
+ fileBrowser.open(window, null);
+}
+
+ System.out.println("inline script 1 - end");
+ ]]>
+ </bxml:script>
+
+ <Border styles="{padding:6}">
+ <TablePane>
+ <columns>
+ <TablePane.Column width="1*"/>
+ </columns>
+ <TablePane.Row height="-1">
+ <FlowPane styles="{padding:2, alignToBaseline:true}">
+ <TextInput bxml:id="textInput" prompt="Write here the \\server\share to open" textSize="30"/>
+ <Label text=" "/>
+ <PushButton bxml:id="selectFolderButton" buttonData="Open Folder">
+ <buttonPressListeners>
+ function buttonPressed(button) {
+ if (textInput.text.length() > 0)
+ openFileBrowser(textInput.text);
+ }
+ </buttonPressListeners>
+ </PushButton>
+ </FlowPane>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <FlowPane styles="{padding:2, alignToBaseline:true}">
+ <TextArea editable="false" preferredWidth="400" styles="{}"
+ text="Note: for this test you have to select a network folder, using the UNC format (typical of a Windows environment)"
+ />
+ </FlowPane>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <Label text=" "/> <!-- spacer -->
+ </TablePane.Row>
+ </TablePane>
+ </Border>
+</Window>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_880.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml Fri Mar 8 10:45:17 2013
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<Window title="Pivot-880" maximized="true"
- bxml:id="window"
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns="org.apache.pivot.wtk"
->
-
-<Form>
- <Form.Section>
- <TextInput bxml:id="textInput" text="${textArea.text}"/>
- <Border>
- <FillPane minimumWidth="300" minimumHeight="100">
- <TextArea bxml:id="textArea" text="${textInput.text}"/>
- </FillPane>
- </Border>
- </Form.Section>
-</Form>
-
-</Window>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<Window title="Pivot-880" maximized="true"
+ bxml:id="window"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns="org.apache.pivot.wtk"
+>
+
+<Form>
+ <Form.Section>
+ <TextInput bxml:id="textInput" text="${textArea.text}"/>
+ <Border>
+ <FillPane minimumWidth="300" minimumHeight="100">
+ <TextArea bxml:id="textArea" text="${textInput.text}"/>
+ </FillPane>
+ </Border>
+ </Form.Section>
+</Form>
+
+</Window>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot_888.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/logo.svg
------------------------------------------------------------------------------
origination-name = image/svg+xml
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/logo.svg
------------------------------------------------------------------------------
svn:mime-type = image/svg+xml
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml Fri Mar 8 10:45:17 2013
@@ -1,121 +1,121 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<Window bxml:id="window"
- title="TablePane Test2, with variable row height" maximized="true"
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns:collections="org.apache.pivot.collections"
- xmlns:content="org.apache.pivot.wtk.content"
- xmlns="org.apache.pivot.wtk"
->
- <bxml:script>
- <![CDATA[
- importPackage(java.net);
- importPackage(org.apache.pivot.util);
- importPackage(org.apache.pivot.wtk);
- importPackage(org.apache.pivot.wtk.media);
-
- var s = "ABCDE ABCDE ABCDE ABCDE";
- var s2 = "First Line.\nSecond Line.";
- var b = true;
- var n = 100.25;
- var d = new CalendarDate();
- var location = new java.io.File("bin/" // add this to run from inside eclipse ...
- + "org/apache/pivot/tests" // current package, view as folders
- // + "/go-home.png" // image name
- ).toURI().toURL();
- java.lang.System.out.println("location for the image to load = \"" + location + "\"");
- var i = Image.load(new URL(location, "go-home.png"));
- java.lang.System.out.println("image = " + i);
- ]]>
- </bxml:script>
-
- <TablePane
- styles="{padding:6, verticalSpacing:8}"
- >
- <columns>
- <TablePane.Column width="1*" />
- </columns>
-
- <TablePane.Row height="-1">
- <PushButton buttonData="Start"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
-
- <TableView>
- <columns>
- <TableView.Column name="value" width="-1">
- <cellRenderer>
- <content:TableViewMultiCellRenderer>
- <bxml:define>
-<!-- // multiline
- <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
-//-->
-<!-- // no multiline
- <content:TableViewMultiCellRenderer bxml:id="multilineCellRenderer"/>
-//-->
- <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
-
- <content:TableViewBooleanCellRenderer bxml:id="booleanCellRenderer"/>
- <content:TableViewNumberCellRenderer bxml:id="numberCellRenderer"/>
- <content:TableViewDateCellRenderer bxml:id="dateCellRenderer"/>
- <content:TableViewImageCellRenderer bxml:id="imageCellRenderer" preferredHeight="40"/>
- </bxml:define>
-
- <rendererMappings>
-<!-- // no multiline
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.TextArea"
- cellRenderer="$multilineCellRenderer"/>
-//-->
-<!-- // multiline
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
- cellRenderer="$multilineCellRenderer"/>
-//-->
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
- cellRenderer="$multilineCellRenderer"/>
-
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
- cellRenderer="$booleanCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
- cellRenderer="$numberCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
- cellRenderer="$dateCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
- cellRenderer="$imageCellRenderer"/>
- </rendererMappings>
- </content:TableViewMultiCellRenderer>
- </cellRenderer>
- </TableView.Column>
-
- <TableView.Column width="1*"/>
- </columns>
-
- <collections:HashMap value="$s"/>
- <collections:HashMap value="$s2"/>
- <collections:HashMap value="$b"/>
- <collections:HashMap value="$n"/>
- <collections:HashMap value="$d"/>
- <collections:HashMap value="$i"/>
- </TableView>
-
- </TablePane.Row>
- <TablePane.Row height="-1">
- <PushButton buttonData="End"/>
- </TablePane.Row>
- </TablePane>
-</Window>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<Window bxml:id="window"
+ title="TablePane Test2, with variable row height" maximized="true"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:collections="org.apache.pivot.collections"
+ xmlns:content="org.apache.pivot.wtk.content"
+ xmlns="org.apache.pivot.wtk"
+>
+ <bxml:script>
+ <![CDATA[
+ importPackage(java.net);
+ importPackage(org.apache.pivot.util);
+ importPackage(org.apache.pivot.wtk);
+ importPackage(org.apache.pivot.wtk.media);
+
+ var s = "ABCDE ABCDE ABCDE ABCDE";
+ var s2 = "First Line.\nSecond Line.";
+ var b = true;
+ var n = 100.25;
+ var d = new CalendarDate();
+ var location = new java.io.File("bin/" // add this to run from inside eclipse ...
+ + "org/apache/pivot/tests" // current package, view as folders
+ // + "/go-home.png" // image name
+ ).toURI().toURL();
+ java.lang.System.out.println("location for the image to load = \"" + location + "\"");
+ var i = Image.load(new URL(location, "go-home.png"));
+ java.lang.System.out.println("image = " + i);
+ ]]>
+ </bxml:script>
+
+ <TablePane
+ styles="{padding:6, verticalSpacing:8}"
+ >
+ <columns>
+ <TablePane.Column width="1*" />
+ </columns>
+
+ <TablePane.Row height="-1">
+ <PushButton buttonData="Start"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+
+ <TableView>
+ <columns>
+ <TableView.Column name="value" width="-1">
+ <cellRenderer>
+ <content:TableViewMultiCellRenderer>
+ <bxml:define>
+<!-- // multiline
+ <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
+//-->
+<!-- // no multiline
+ <content:TableViewMultiCellRenderer bxml:id="multilineCellRenderer"/>
+//-->
+ <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
+
+ <content:TableViewBooleanCellRenderer bxml:id="booleanCellRenderer"/>
+ <content:TableViewNumberCellRenderer bxml:id="numberCellRenderer"/>
+ <content:TableViewDateCellRenderer bxml:id="dateCellRenderer"/>
+ <content:TableViewImageCellRenderer bxml:id="imageCellRenderer" preferredHeight="40"/>
+ </bxml:define>
+
+ <rendererMappings>
+<!-- // no multiline
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.TextArea"
+ cellRenderer="$multilineCellRenderer"/>
+//-->
+<!-- // multiline
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
+ cellRenderer="$multilineCellRenderer"/>
+//-->
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
+ cellRenderer="$multilineCellRenderer"/>
+
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
+ cellRenderer="$booleanCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
+ cellRenderer="$numberCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
+ cellRenderer="$dateCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
+ cellRenderer="$imageCellRenderer"/>
+ </rendererMappings>
+ </content:TableViewMultiCellRenderer>
+ </cellRenderer>
+ </TableView.Column>
+
+ <TableView.Column width="1*"/>
+ </columns>
+
+ <collections:HashMap value="$s"/>
+ <collections:HashMap value="$s2"/>
+ <collections:HashMap value="$b"/>
+ <collections:HashMap value="$n"/>
+ <collections:HashMap value="$d"/>
+ <collections:HashMap value="$i"/>
+ </TableView>
+
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <PushButton buttonData="End"/>
+ </TablePane.Row>
+ </TablePane>
+</Window>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_pane_test2.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml Fri Mar 8 10:45:17 2013
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<Window bxml:id="window"
- title="Table View Test4, with renderer for multi-line texts" maximized="true"
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns:collections="org.apache.pivot.collections"
- xmlns:content="org.apache.pivot.wtk.content"
- xmlns="org.apache.pivot.wtk"
->
- <bxml:script>
- <![CDATA[
- importPackage(java.net);
- importPackage(org.apache.pivot.util);
- importPackage(org.apache.pivot.wtk);
- importPackage(org.apache.pivot.wtk.media);
-
- var s = "ABCDE ABCDE ABCDE ABCDE";
- var s2 = "First Line.\nSecond Line.";
- var b = true;
- var n = 100.25;
- var d = new CalendarDate();
- var location = new java.io.File("bin/" // add this to run from inside eclipse ...
- + "org/apache/pivot/tests" // current package, view as folders
- // + "/go-home.png" // image name
- ).toURI().toURL();
- java.lang.System.out.println("location for the image to load = \"" + location + "\"");
- var i = Image.load(new URL(location, "go-home.png"));
- java.lang.System.out.println("image = " + i);
- ]]>
- </bxml:script>
-
- <TableView>
- <columns>
- <TableView.Column name="value" width="-1">
- <cellRenderer>
- <content:TableViewMultiCellRenderer>
- <bxml:define>
-<!-- // multiline
- <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
-//-->
-<!-- // no multiline
- <content:TableViewMultiCellRenderer bxml:id="multilineCellRenderer"/>
-//-->
- <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
-
- <content:TableViewBooleanCellRenderer bxml:id="booleanCellRenderer"/>
- <content:TableViewNumberCellRenderer bxml:id="numberCellRenderer"/>
- <content:TableViewDateCellRenderer bxml:id="dateCellRenderer"/>
- <content:TableViewImageCellRenderer bxml:id="imageCellRenderer" preferredHeight="40"/>
- </bxml:define>
-
- <rendererMappings>
-<!-- // no multiline
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.TextArea"
- cellRenderer="$multilineCellRenderer"/>
-//-->
-<!-- // multiline
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
- cellRenderer="$multilineCellRenderer"/>
-//-->
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
- cellRenderer="$multilineCellRenderer"/>
-
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
- cellRenderer="$booleanCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
- cellRenderer="$numberCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
- cellRenderer="$dateCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
- cellRenderer="$imageCellRenderer"/>
- </rendererMappings>
- </content:TableViewMultiCellRenderer>
- </cellRenderer>
- </TableView.Column>
-
- <TableView.Column width="1*"/>
- </columns>
-
- <collections:HashMap value="$s"/>
- <collections:HashMap value="$s2"/>
- <collections:HashMap value="$b"/>
- <collections:HashMap value="$n"/>
- <collections:HashMap value="$d"/>
- <collections:HashMap value="$i"/>
- </TableView>
-</Window>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<Window bxml:id="window"
+ title="Table View Test4, with renderer for multi-line texts" maximized="true"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:collections="org.apache.pivot.collections"
+ xmlns:content="org.apache.pivot.wtk.content"
+ xmlns="org.apache.pivot.wtk"
+>
+ <bxml:script>
+ <![CDATA[
+ importPackage(java.net);
+ importPackage(org.apache.pivot.util);
+ importPackage(org.apache.pivot.wtk);
+ importPackage(org.apache.pivot.wtk.media);
+
+ var s = "ABCDE ABCDE ABCDE ABCDE";
+ var s2 = "First Line.\nSecond Line.";
+ var b = true;
+ var n = 100.25;
+ var d = new CalendarDate();
+ var location = new java.io.File("bin/" // add this to run from inside eclipse ...
+ + "org/apache/pivot/tests" // current package, view as folders
+ // + "/go-home.png" // image name
+ ).toURI().toURL();
+ java.lang.System.out.println("location for the image to load = \"" + location + "\"");
+ var i = Image.load(new URL(location, "go-home.png"));
+ java.lang.System.out.println("image = " + i);
+ ]]>
+ </bxml:script>
+
+ <TableView>
+ <columns>
+ <TableView.Column name="value" width="-1">
+ <cellRenderer>
+ <content:TableViewMultiCellRenderer>
+ <bxml:define>
+<!-- // multiline
+ <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
+//-->
+<!-- // no multiline
+ <content:TableViewMultiCellRenderer bxml:id="multilineCellRenderer"/>
+//-->
+ <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
+
+ <content:TableViewBooleanCellRenderer bxml:id="booleanCellRenderer"/>
+ <content:TableViewNumberCellRenderer bxml:id="numberCellRenderer"/>
+ <content:TableViewDateCellRenderer bxml:id="dateCellRenderer"/>
+ <content:TableViewImageCellRenderer bxml:id="imageCellRenderer" preferredHeight="40"/>
+ </bxml:define>
+
+ <rendererMappings>
+<!-- // no multiline
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.TextArea"
+ cellRenderer="$multilineCellRenderer"/>
+//-->
+<!-- // multiline
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
+ cellRenderer="$multilineCellRenderer"/>
+//-->
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
+ cellRenderer="$multilineCellRenderer"/>
+
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
+ cellRenderer="$booleanCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
+ cellRenderer="$numberCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
+ cellRenderer="$dateCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
+ cellRenderer="$imageCellRenderer"/>
+ </rendererMappings>
+ </content:TableViewMultiCellRenderer>
+ </cellRenderer>
+ </TableView.Column>
+
+ <TableView.Column width="1*"/>
+ </columns>
+
+ <collections:HashMap value="$s"/>
+ <collections:HashMap value="$s2"/>
+ <collections:HashMap value="$b"/>
+ <collections:HashMap value="$n"/>
+ <collections:HashMap value="$d"/>
+ <collections:HashMap value="$i"/>
+ </TableView>
+</Window>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test4.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml Fri Mar 8 10:45:17 2013
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<Window bxml:id="window"
- title="Table View Test, without data" maximized="true"
- xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns:collections="org.apache.pivot.collections"
- xmlns:content="org.apache.pivot.wtk.content"
- xmlns="org.apache.pivot.wtk"
->
- <bxml:script>
- <![CDATA[
- importPackage(java.net);
- importPackage(org.apache.pivot.util);
- importPackage(org.apache.pivot.wtk);
- importPackage(org.apache.pivot.wtk.media);
-
- var s = "ABCDE ABCDE ABCDE ABCDE";
- var s2 = "First Line.\nSecond Line.";
- var b = true;
- var n = 100.25;
- var d = new CalendarDate();
- var location = new java.io.File("bin/" // add this to run from inside eclipse ...
- + "org/apache/pivot/tests" // current package, view as folders
- // + "/go-home.png" // image name
- ).toURI().toURL();
- java.lang.System.out.println("location for the image to load = \"" + location + "\"");
- var i = Image.load(new URL(location, "go-home.png"));
- java.lang.System.out.println("image = " + i);
- ]]>
- </bxml:script>
-
- <TableView>
- <columns>
- <TableView.Column name="value" width="-1">
- <cellRenderer>
- <content:TableViewMultiCellRenderer>
- <bxml:define>
-<!-- // multiline
- <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
-//-->
-<!-- // no multiline
- <content:TableViewMultiCellRenderer bxml:id="multilineCellRenderer"/>
-//-->
- <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
-
- <content:TableViewBooleanCellRenderer bxml:id="booleanCellRenderer"/>
- <content:TableViewNumberCellRenderer bxml:id="numberCellRenderer"/>
- <content:TableViewDateCellRenderer bxml:id="dateCellRenderer"/>
- <content:TableViewImageCellRenderer bxml:id="imageCellRenderer"/>
- </bxml:define>
-
- <rendererMappings>
-<!-- // no multiline
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.TextArea"
- cellRenderer="$multilineCellRenderer"/>
-//-->
-<!-- // multiline
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
- cellRenderer="$multilineCellRenderer"/>
-//-->
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
- cellRenderer="$multilineCellRenderer"/>
-
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
- cellRenderer="$booleanCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
- cellRenderer="$numberCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
- cellRenderer="$dateCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
- cellRenderer="$imageCellRenderer"/>
- </rendererMappings>
- </content:TableViewMultiCellRenderer>
- </cellRenderer>
- </TableView.Column>
-
- <TableView.Column width="1*"/>
- </columns>
-
- </TableView>
-</Window>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<Window bxml:id="window"
+ title="Table View Test, without data" maximized="true"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:collections="org.apache.pivot.collections"
+ xmlns:content="org.apache.pivot.wtk.content"
+ xmlns="org.apache.pivot.wtk"
+>
+ <bxml:script>
+ <![CDATA[
+ importPackage(java.net);
+ importPackage(org.apache.pivot.util);
+ importPackage(org.apache.pivot.wtk);
+ importPackage(org.apache.pivot.wtk.media);
+
+ var s = "ABCDE ABCDE ABCDE ABCDE";
+ var s2 = "First Line.\nSecond Line.";
+ var b = true;
+ var n = 100.25;
+ var d = new CalendarDate();
+ var location = new java.io.File("bin/" // add this to run from inside eclipse ...
+ + "org/apache/pivot/tests" // current package, view as folders
+ // + "/go-home.png" // image name
+ ).toURI().toURL();
+ java.lang.System.out.println("location for the image to load = \"" + location + "\"");
+ var i = Image.load(new URL(location, "go-home.png"));
+ java.lang.System.out.println("image = " + i);
+ ]]>
+ </bxml:script>
+
+ <TableView>
+ <columns>
+ <TableView.Column name="value" width="-1">
+ <cellRenderer>
+ <content:TableViewMultiCellRenderer>
+ <bxml:define>
+<!-- // multiline
+ <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
+//-->
+<!-- // no multiline
+ <content:TableViewMultiCellRenderer bxml:id="multilineCellRenderer"/>
+//-->
+ <content:TableViewTextAreaCellRenderer bxml:id="multilineCellRenderer"/>
+
+ <content:TableViewBooleanCellRenderer bxml:id="booleanCellRenderer"/>
+ <content:TableViewNumberCellRenderer bxml:id="numberCellRenderer"/>
+ <content:TableViewDateCellRenderer bxml:id="dateCellRenderer"/>
+ <content:TableViewImageCellRenderer bxml:id="imageCellRenderer"/>
+ </bxml:define>
+
+ <rendererMappings>
+<!-- // no multiline
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.TextArea"
+ cellRenderer="$multilineCellRenderer"/>
+//-->
+<!-- // multiline
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
+ cellRenderer="$multilineCellRenderer"/>
+//-->
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.String"
+ cellRenderer="$multilineCellRenderer"/>
+
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
+ cellRenderer="$booleanCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
+ cellRenderer="$numberCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
+ cellRenderer="$dateCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
+ cellRenderer="$imageCellRenderer"/>
+ </rendererMappings>
+ </content:TableViewMultiCellRenderer>
+ </cellRenderer>
+ </TableView.Column>
+
+ <TableView.Column width="1*"/>
+ </columns>
+
+ </TableView>
+</Window>
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/table_view_test_empty.bxml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigDecimalValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigDecimalValidator.java?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigDecimalValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigDecimalValidator.java Fri Mar 8 10:45:17 2013
@@ -1,32 +1,32 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.validation;
-
-import java.math.BigDecimal;
-import java.util.Locale;
-
-/**
- * A validator for a BigDecimal value.
- */
-public class BigDecimalValidator extends ComparableValidator<BigDecimal> {
-
- public BigDecimalValidator() {
- super();
- }
-
- public BigDecimalValidator(Locale locale) {
- super(locale);
- }
-
-}
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.validation;
+
+import java.math.BigDecimal;
+import java.util.Locale;
+
+/**
+ * A validator for a BigDecimal value.
+ */
+public class BigDecimalValidator extends ComparableValidator<BigDecimal> {
+
+ public BigDecimalValidator() {
+ super();
+ }
+
+ public BigDecimalValidator(Locale locale) {
+ super(locale);
+ }
+
+}
Propchange: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigDecimalValidator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigIntegerValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigIntegerValidator.java?rev=1454316&r1=1454315&r2=1454316&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigIntegerValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigIntegerValidator.java Fri Mar 8 10:45:17 2013
@@ -1,32 +1,32 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.pivot.wtk.validation;
-
-import java.math.BigInteger;
-import java.util.Locale;
-
-/**
- * A validator for a BigInteger value.
- */
-public class BigIntegerValidator extends ComparableValidator<BigInteger> {
-
- public BigIntegerValidator() {
- super();
- }
-
- public BigIntegerValidator(Locale locale) {
- super(locale);
- }
-
-}
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk.validation;
+
+import java.math.BigInteger;
+import java.util.Locale;
+
+/**
+ * A validator for a BigInteger value.
+ */
+public class BigIntegerValidator extends ComparableValidator<BigInteger> {
+
+ public BigIntegerValidator() {
+ super();
+ }
+
+ public BigIntegerValidator(Locale locale) {
+ super(locale);
+ }
+
+}
Propchange: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/BigIntegerValidator.java
------------------------------------------------------------------------------
svn:eol-style = native