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 2011/10/17 23:38:55 UTC
svn commit: r1185386 - in /pivot/trunk: tests/src/org/apache/pivot/tests/
tests/src/org/apache/pivot/tests/issues/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
Author: smartini
Date: Mon Oct 17 21:38:54 2011
New Revision: 1185386
URL: http://svn.apache.org/viewvc?rev=1185386&view=rev
Log:
trim-whitespace
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/dialog_test.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_511.bxml
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_798.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java?rev=1185386&r1=1185385&r2=1185386&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java Mon Oct 17 21:38:54 2011
@@ -44,38 +44,38 @@ import org.apache.pivot.wtk.skin.terra.T
public class FileBrowserWithCharsetTest extends FileBrowserSheet implements Application
{
- private ArrayList<String> choices = new ArrayList<String>();
- private ListButton lb = new ListButton();
+ private ArrayList<String> choices = new ArrayList<String>();
+ private ListButton lb = new ListButton();
- public FileBrowserWithCharsetTest() {
- this(Mode.OPEN);
- }
-
- public FileBrowserWithCharsetTest(Mode mode) {
- super(mode);
- TerraFileBrowserSheetSkin skin = (TerraFileBrowserSheetSkin)getSkin();
- BoxPane box = new BoxPane();
- box.getStyles().put("verticalAlignment", VerticalAlignment.CENTER);
- box.add(new Label("Character set:"));
- Charset defaultCS = Charset.defaultCharset();
- choices.add("US-ASCII");
- choices.add(defaultCS.name());
- choices.add("ISO-8859-1");
- if (!"UTF-8".equals(defaultCS.name()))
- choices.add("UTF-8");
-
- lb.setListData(choices);
- lb.setSelectedIndex(1);
- box.add(lb);
- skin.addComponent(box);
- }
-
- public String getCharsetName() {
- return (String)lb.getSelectedItem();
- }
+ public FileBrowserWithCharsetTest() {
+ this(Mode.OPEN);
+ }
+
+ public FileBrowserWithCharsetTest(Mode mode) {
+ super(mode);
+ TerraFileBrowserSheetSkin skin = (TerraFileBrowserSheetSkin)getSkin();
+ BoxPane box = new BoxPane();
+ box.getStyles().put("verticalAlignment", VerticalAlignment.CENTER);
+ box.add(new Label("Character set:"));
+ Charset defaultCS = Charset.defaultCharset();
+ choices.add("US-ASCII");
+ choices.add(defaultCS.name());
+ choices.add("ISO-8859-1");
+ if (!"UTF-8".equals(defaultCS.name()))
+ choices.add("UTF-8");
+
+ lb.setListData(choices);
+ lb.setSelectedIndex(1);
+ box.add(lb);
+ skin.addComponent(box);
+ }
+
+ public String getCharsetName() {
+ return (String)lb.getSelectedItem();
+ }
- private Frame frame = null;
+ private Frame frame = null;
@Override
public void startup(Display display, Map<String, String> properties) throws Exception
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/dialog_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/dialog_test.bxml?rev=1185386&r1=1185385&r2=1185386&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/dialog_test.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/dialog_test.bxml Mon Oct 17 21:38:54 2011
@@ -24,7 +24,7 @@ limitations under the License.
<Label text="Modeless dialog"/>
</Dialog>
</bxml:define>
-
+
<BoxPane orientation="vertical">
<Checkbox bxml:id="modalCheckbox" buttonData="Modal"/>
<PushButton buttonData="Open Dialog">
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_511.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_511.bxml?rev=1185386&r1=1185385&r2=1185386&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_511.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_511.bxml Mon Oct 17 21:38:54 2011
@@ -19,11 +19,11 @@ limitations under the License.
<Window title="PIVOT-652" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns="org.apache.pivot.wtk">
- <BoxPane
- orientation="vertical"
+ <BoxPane
+ orientation="vertical"
styles="{padding:10, horizontalAlignment:'center', verticalAlignment:'center'}"
>
- <Label text="Test Label" styles="{font:'Arial bold 24', color:'#ff0000'}" />
- <Label text="Print from the Browser and seen what is printed" />
+ <Label text="Test Label" styles="{font:'Arial bold 24', color:'#ff0000'}" />
+ <Label text="Print from the Browser and seen what is printed" />
</BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_798.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_798.bxml?rev=1185386&r1=1185385&r2=1185386&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_798.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_798.bxml Mon Oct 17 21:38:54 2011
@@ -17,19 +17,19 @@ limitations under the License.
-->
<Window maximized="true"
- xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:bxml="http://pivot.apache.org/bxml"
xmlns="org.apache.pivot.wtk">
- <BoxPane orientation="vertical" styles="{padding:6, spacing:8, fill:true}">
- <Checkbox buttonData="Enable Magic">
- <buttonStateListeners>
- function stateChanged(button, previousState) {
- paneMagic.setEnabled(button.isSelected());
- }
+ <BoxPane orientation="vertical" styles="{padding:6, spacing:8, fill:true}">
+ <Checkbox buttonData="Enable Magic">
+ <buttonStateListeners>
+ function stateChanged(button, previousState) {
+ paneMagic.setEnabled(button.isSelected());
+ }
</buttonStateListeners>
- </Checkbox>
- <TablePane bxml:id="paneMagic" enabled="false"
- styles="{verticalSpacing:4, horizontalSpacing:4, padding:{left:20}}">
- <columns>
+ </Checkbox>
+ <TablePane bxml:id="paneMagic" enabled="false"
+ styles="{verticalSpacing:4, horizontalSpacing:4, padding:{left:20}}">
+ <columns>
<TablePane.Column width="-1" />
<TablePane.Column width="1*" />
</columns>
@@ -40,8 +40,8 @@ limitations under the License.
<TablePane.Row>
<Label text="Wand supplier:"/>
<TextInput bxml:id="textSupplier" />
- </TablePane.Row>
- </TablePane>
+ </TablePane.Row>
+ </TablePane>
<Checkbox buttonData="Enable Kindness">
<buttonStateListeners>
function stateChanged(button, previousState) {
@@ -54,5 +54,5 @@ limitations under the License.
<ListButton bxml:id="listActs" enabled="false"
listData="['Wash dishes', 'Run errands', 'Carry groceries']" selectedIndex="0"/>
</BoxPane>
- </BoxPane>
+ </BoxPane>
</Window>
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=1185386&r1=1185385&r2=1185386&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Mon Oct 17 21:38:54 2011
@@ -79,8 +79,8 @@ public class TerraDialogSkin extends Ter
private boolean isMouseOverOwner(Container display, int x, int y) {
boolean mouseOverOwner = false;
-
- Dialog dialog = (Dialog)getComponent();
+
+ Dialog dialog = (Dialog)getComponent();
if (dialog.isModal()) {
Component descendant = display.getDescendantAt(x, y);