You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/11/18 14:22:39 UTC
svn commit: r718575 - in
/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree:
Node.java ViewUtils.java
Author: simoneg
Date: Tue Nov 18 05:22:39 2008
New Revision: 718575
URL: http://svn.apache.org/viewvc?rev=718575&view=rev
Log:
LABS-229 : not considering zone settings when laying out a list
Modified:
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/Node.java
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java
Modified: labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/Node.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/Node.java?rev=718575&r1=718574&r2=718575&view=diff
==============================================================================
--- labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/Node.java (original)
+++ labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/Node.java Tue Nov 18 05:22:39 2008
@@ -47,12 +47,16 @@
public Node(String id, ViewSettings settings) {
this(id);
if (settings != null) {
- this.ordinal = settings.getOrdinal();
- if (ordinal != null) {
- this.givenOrdinal = ordinal.getOrder();
- }
- this.zone = settings.getZone();
+ setSettings(settings);
+ }
+ }
+
+ public void setSettings(ViewSettings settings) {
+ this.ordinal = settings.getOrdinal();
+ if (ordinal != null) {
+ this.givenOrdinal = ordinal.getOrder();
}
+ this.zone = settings.getZone();
}
public boolean addSubnode(Node node) {
@@ -190,4 +194,6 @@
public void setRelatedTo(Node relatedTo) {
this.relatedTo = relatedTo;
}
+
+
}
Modified: labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java?rev=718575&r1=718574&r2=718575&view=diff
==============================================================================
--- labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java (original)
+++ labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/tree/ViewUtils.java Tue Nov 18 05:22:39 2008
@@ -90,6 +90,7 @@
public static ViewSettings createListSettings(Method method, ViewSettings fieldSettings) {
if (method != null) {
ViewSettings setting = new ViewSettings(fieldSettings);
+ setting.setZone(null);
boolean atlo = false;
Listed view = method.getAnnotation(Listed.class);
if (view != null) {
@@ -305,6 +306,8 @@
ViewSettings settings = property.getViewListSettings();
if (settings == null) continue;
Node node = new FieldNode(property);
+ node.setSettings(settings);
+
if (filter.hide(parent, node)) continue;
if (filter.expand(parent, node)) {
node = new ContainerProperty(property, settings);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org