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/06/24 00:40:13 UTC
svn commit: r957385 - in /pivot/trunk: core/src/org/apache/pivot/beans/
tests/src/org/apache/pivot/tests/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/skin/
Author: gbrown
Date: Wed Jun 23 22:40:12 2010
New Revision: 957385
URL: http://svn.apache.org/viewvc?rev=957385&view=rev
Log:
Additional updates related to PIVOT-545.
Added:
pivot/trunk/tests/src/org/apache/pivot/tests/size_limits_test.bxml
Modified:
pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Skin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/GridPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
Modified: pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java Wed Jun 23 22:40:12 2010
@@ -148,8 +148,10 @@ public class BeanAdapter implements Map<
public static final String SET_PREFIX = "set";
public static final String FIELD_PREFIX = "~";
- private static final String PROPERTY_EXCEPTION_MESSAGE_FORMAT =
+ private static final String ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT =
"Unable to access property \"%s\" for type %s.";
+ private static final String INVOCATION_TARGET_EXCEPTION_MESSAGE_FORMAT =
+ "Error getting or setting property \"%s\" for type %s.";
/**
* Creates a new bean dictionary.
@@ -211,7 +213,7 @@ public class BeanAdapter implements Map<
try {
value = field.get(bean);
} catch (IllegalAccessException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
}
}
@@ -222,10 +224,10 @@ public class BeanAdapter implements Map<
try {
value = getterMethod.invoke(bean, new Object[] {});
} catch (IllegalAccessException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
} catch (InvocationTargetException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(INVOCATION_TARGET_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception.getCause());
}
}
@@ -279,7 +281,7 @@ public class BeanAdapter implements Map<
try {
field.set(bean, value);
} catch (IllegalAccessException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
}
} else {
@@ -305,10 +307,10 @@ public class BeanAdapter implements Map<
try {
setterMethod.invoke(bean, new Object[] {value});
} catch (IllegalAccessException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
} catch (InvocationTargetException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(INVOCATION_TARGET_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception.getCause());
}
}
@@ -741,7 +743,7 @@ public class BeanAdapter implements Map<
} catch (NoSuchFieldException exception) {
// No-op
} catch (IllegalAccessException exception) {
- throw new RuntimeException(String.format(PROPERTY_EXCEPTION_MESSAGE_FORMAT,
+ throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, beanClass.getName()), exception);
}
}
Added: pivot/trunk/tests/src/org/apache/pivot/tests/size_limits_test.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/size_limits_test.bxml?rev=957385&view=auto
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/size_limits_test.bxml (added)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/size_limits_test.bxml Wed Jun 23 22:40:12 2010
@@ -0,0 +1,47 @@
+<?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="Size Limits Test" maximized="true"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns="org.apache.pivot.wtk">
+ <BoxPane orientation="vertical">
+ <Label text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
+ maximumWidth="320" styles="{wrapText:true}"/>
+ <FlowPane maximumWidth="240" styles="{backgroundColor:'#ffcccc'}">
+ <PushButton buttonData="One"/>
+ <PushButton buttonData="Two"/>
+ <PushButton buttonData="Three"/>
+ <PushButton buttonData="Four"/>
+ <PushButton buttonData="Five"/>
+ <PushButton buttonData="Six"/>
+ <PushButton buttonData="Seven"/>
+ <PushButton buttonData="Eight"/>
+ <PushButton buttonData="Nine"/>
+ <PushButton buttonData="Ten"/>
+ </FlowPane>
+ <FlowPane minimumWidth="240" styles="{backgroundColor:'#ccffcc'}">
+ <PushButton buttonData="One"/>
+ <PushButton buttonData="Two"/>
+ <PushButton buttonData="Three"/>
+ </FlowPane>
+ <Border>
+ <TextArea text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
+ maximumWidth="320"/>
+ </Border>
+ </BoxPane>
+</Window>
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Wed Jun 23 22:40:12 2010
@@ -205,11 +205,6 @@ public class TerraListViewSkin extends C
}
@Override
- public Orientation getDisposition() {
- return Orientation.VERTICAL;
- }
-
- @Override
@SuppressWarnings("unchecked")
public void layout() {
ListView listView = (ListView)getComponent();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java Wed Jun 23 22:40:12 2010
@@ -125,11 +125,6 @@ public class TerraMenuBarSkin extends Co
}
@Override
- public Orientation getDisposition() {
- return Orientation.HORIZONTAL;
- }
-
- @Override
public void layout() {
MenuBar menuBar = (MenuBar)getComponent();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Wed Jun 23 22:40:12 2010
@@ -164,11 +164,6 @@ public class TerraMenuSkin extends Conta
}
@Override
- public Orientation getDisposition() {
- return Orientation.VERTICAL;
- }
-
- @Override
public void layout() {
Menu menu = (Menu)getComponent();
Menu.SectionSequence sections = menu.getSections();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Wed Jun 23 22:40:12 2010
@@ -583,11 +583,6 @@ public class TerraTreeViewSkin extends C
}
@Override
- public Orientation getDisposition() {
- return Orientation.VERTICAL;
- }
-
- @Override
public void layout() {
if (validateSelection) {
// Ensure that the selection is visible
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Skin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Skin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Skin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Skin.java Wed Jun 23 22:40:12 2010
@@ -64,7 +64,8 @@ public interface Skin extends Constraine
public Component getComponent();
/**
- * Returns the skin's layout disposition.
+ * Returns the skin's layout disposition. The layout disposition defines the
+ * direction in which the skin lays out content before wrapping.
*
* @return
* The skin's layout disposition, or <tt>null</tt> if the skin does not
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java Wed Jun 23 22:40:12 2010
@@ -308,12 +308,6 @@ public class BoxPaneSkin extends Contain
}
@Override
- public Orientation getDisposition() {
- BoxPane boxPane = (BoxPane)getComponent();
- return boxPane.getOrientation();
- }
-
- @Override
public void layout() {
BoxPane boxPane = (BoxPane)getComponent();
int n = boxPane.getLength();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/GridPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/GridPaneSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/GridPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/GridPaneSkin.java Wed Jun 23 22:40:12 2010
@@ -291,11 +291,6 @@ public class GridPaneSkin extends Contai
}
@Override
- public Orientation getDisposition() {
- return Orientation.HORIZONTAL;
- }
-
- @Override
public void layout() {
GridPane gridPane = (GridPane)getComponent();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=957385&r1=957384&r2=957385&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Wed Jun 23 22:40:12 2010
@@ -510,11 +510,6 @@ public class TablePaneSkin extends Conta
}
@Override
- public Orientation getDisposition() {
- return Orientation.HORIZONTAL;
- }
-
- @Override
public void layout() {
TablePane tablePane = (TablePane)getComponent();