JBoss Rich Faces SVN: r16066 - in management/design-4x/tree: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2009-12-04 14:28:29 -0500 (Fri, 04 Dec 2009)
New Revision: 16066
Added:
management/design-4x/tree/images/cross.gif
management/design-4x/tree/images/file.gif
management/design-4x/tree/images/folder.gif
Removed:
management/design-4x/tree/images/icon.gif
Modified:
management/design-4x/tree/images/last.gif
management/design-4x/tree/tree.html
Log:
Added: management/design-4x/tree/images/cross.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/tree/images/cross.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/tree/images/file.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/tree/images/file.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/tree/images/folder.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/tree/images/folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: management/design-4x/tree/images/icon.gif
===================================================================
(Binary files differ)
Modified: management/design-4x/tree/images/last.gif
===================================================================
(Binary files differ)
Modified: management/design-4x/tree/tree.html
===================================================================
--- management/design-4x/tree/tree.html 2009-12-03 19:01:07 UTC (rev 16065)
+++ management/design-4x/tree/tree.html 2009-12-04 19:28:29 UTC (rev 16066)
@@ -6,17 +6,26 @@
<style>
.tree_size{width : 170px;}
-.tree_item{background : url(images/last.gif) no-repeat center left;cursor : default; font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; color : #000000 /*generalTextColor*/; padding : 1px 0px 1px 0px; overflow : hidden; width : 100%; white-space : nowrap; text-overflow: ellipsis;}
-.tree_item_name{padding : 0px 2px 0px 2px; vertical-align : middle; cursor : pointer;}
+.tree_item{background : url(images/last.gif) no-repeat center left; cursor : default; font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; color : #000000 /*generalTextColor*/; padding : 1px 0px 1px 0px; overflow : hidden; width : 100%; white-space : nowrap; text-overflow: ellipsis;}
+.tree_item_name{padding : 0px 2px 0px 2px; vertical-align : middle; cursor : pointer; text-overflow: ellipsis;}
-
-.tree_select{background : #C7D7EC /*additionalBackgroundColor*/;}
+.tree_selected{background : url(images/cross.gif) no-repeat center left #C7D7EC /*additionalBackgroundColor*/;}
.tree_level{background : url(images/line.gif) repeat-y;}
.tree_level_last{background : none;}
.tree_level .tree_level{margin-left : 16px;}
-.tree_icon {vertical-align : middle; margin : 0px; cursor : pointer;}
+.tree_icon {vertical-align : middle; margin : 0px; cursor : pointer; width : 16px; height : 16px; display : inline-block;}
+
+.tree_status_plus {background : url(images/plus.gif) no-repeat center;}
+.tree_status_minus {background : url(images/minus.gif) no-repeat center;}
+
+.tree_status_blank {background : url(images/spacer.gif) no-repeat center;}
+
+.tree_node {background : url(images/folder.gif) no-repeat center;}
+.tree_child {background : url(images/file.gif) no-repeat center;}
+.tree_selarea {display : inline-block;}
+
.tree_level.tree_collapse .tree_level{display : none;}
</style>
@@ -29,62 +38,62 @@
<div class="tree_size">
<div class="tree_level tree_level_last">
- <div class="tree_item">
- <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_minus"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
<div class="tree_level">
- <div class="tree_item">
- <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
</div>
<div class="tree_level">
- <div class="tree_item">
- <img src="images/minus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_minus"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
<div class="tree_level">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name Node name Node name Node name Node name </span>
+ <div class="tree_item tree_selected">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Very long node name</span>
</div>
</div>
<div class="tree_level tree_collapse">
- <div class="tree_item tree_select">
- <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_plus"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
<div class="tree_level">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
</div>
<div class="tree_level tree_level_last">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_minus"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
<div class="tree_level tree_level_last">
- <div class="tree_item">
- <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_minus"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
<div class="tree_level">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Node name</span>
</div>
</div>
<div class="tree_level tree_level_last">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item tree_selected">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_node"></div><span class="tree_item_name">Very long node name</span>
</div>
</div>
</div>
</div>
</div>
<div class="tree_level tree_level_last">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_child"></div><span class="tree_item_name">File name</span>
</div>
</div>
</div>
<div class="tree_level tree_level_last">
- <div class="tree_item">
- <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon tree_level_last"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ <div class="tree_item" onmouseover="this.className='tree_item tree_selected'" onmouseout="this.className='tree_item'">
+ <div class="tree_icon tree_status_blank"></div><div class="tree_icon tree_child"></div><span class="tree_item_name">File name</span>
</div>
</div>
</div>
14 years, 5 months
JBoss Rich Faces SVN: r16065 - root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-03 14:01:07 -0500 (Thu, 03 Dec 2009)
New Revision: 16065
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
Log:
move SubTableState resolve code to the createComponentState method
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-03 18:59:41 UTC (rev 16064)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-03 19:01:07 UTC (rev 16065)
@@ -107,11 +107,6 @@
return true;
}
- @Override
- protected DataComponentState createComponentState() {
- return new SubTableState(getClientId(), getFirst(), getRows());
- }
-
public void setBreakBefore(boolean newBreakBefore) {
throw new IllegalStateException("Property 'breakBefore' for subtable is read-only");
}
@@ -142,18 +137,19 @@
public SubTableState getCurrentComponentState() {
DataComponentState dataComponentState = getComponentState();
if(dataComponentState instanceof SubTableState) {
- return (SubTableState)dataComponentState;
+ DataTableState parentState = getParentState();
+ parentState.addSubTableState((SubTableState)dataComponentState);
+
+ return (SubTableState) dataComponentState;
}
- return null;
+ return null;
}
public DataTableState getParentState() {
-
DataTableState dataTableState = null;
-
+
UIComponent component = getParent();
if(component instanceof UIDataTable) {
-
UIDataTable dataTable = (UIDataTable)component;
DataComponentState state = dataTable.getComponentState();
@@ -161,36 +157,24 @@
dataTableState = (DataTableState)state;
}
}
+
return dataTableState;
}
@Override
- public DataComponentState getComponentState() {
+ protected DataComponentState createComponentState() {
+ DataComponentState state = null;
+ DataTableState parentState = getParentState();
- DataTableState dataTableState = getParentState();
-
- if(componentState == null) {
- ELContext elContext = getFacesContext().getELContext();
+ if(parentState != null) {
+ state = parentState.getChildState(getClientId());
+ }
- ValueExpression expression = getValueExpression("componentState");
- if(expression != null) {
- componentState = (SubTableState)expression.getValue(elContext);
- }
-
- if(componentState == null) {
- componentState = dataTableState.getChildState(getClientId());
- }
-
- if(componentState == null) {
- componentState = createComponentState();
- }
-
- if(expression != null && !expression.isReadOnly(elContext)) {
- expression.setValue(elContext, componentState);
- }
+ if(state == null) {
+ state = new SubTableState(getClientId(), getFirst(), getRows());
}
- dataTableState.addChildState(componentState);
- return componentState;
+
+ return state;
}
public void setExpanded(boolean expanded) {
14 years, 5 months
JBoss Rich Faces SVN: r16064 - root/framework/trunk/impl/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-03 13:59:41 -0500 (Thu, 03 Dec 2009)
New Revision: 16064
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java
Log:
componentState private
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java 2009-12-03 18:00:39 UTC (rev 16063)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java 2009-12-03 18:59:41 UTC (rev 16064)
@@ -133,7 +133,7 @@
};
private Object ajaxRowKey = null;
- protected DataComponentState componentState = null;
+ private DataComponentState componentState = null;
private ExtendedDataModel<?> extendedDataModel = null;
private Object rowKey = null;
14 years, 5 months
JBoss Rich Faces SVN: r16063 - in management/design-4x/tree: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2009-12-03 13:00:39 -0500 (Thu, 03 Dec 2009)
New Revision: 16063
Added:
management/design-4x/tree/images/last.gif
management/design-4x/tree/images/line.gif
Modified:
management/design-4x/tree/images/minus.gif
management/design-4x/tree/images/plus.gif
management/design-4x/tree/tree.html
Log:
Added: management/design-4x/tree/images/last.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/tree/images/last.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/tree/images/line.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/tree/images/line.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: management/design-4x/tree/images/minus.gif
===================================================================
(Binary files differ)
Modified: management/design-4x/tree/images/plus.gif
===================================================================
(Binary files differ)
Modified: management/design-4x/tree/tree.html
===================================================================
--- management/design-4x/tree/tree.html 2009-12-03 16:48:13 UTC (rev 16062)
+++ management/design-4x/tree/tree.html 2009-12-03 18:00:39 UTC (rev 16063)
@@ -6,21 +6,19 @@
<style>
.tree_size{width : 170px;}
-.tree_item{cursor : default; font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; color : #000000 /*generalTextColor*/; padding : 1px; overflow : hidden; width : 100%; white-space : nowrap; text-overflow: ellipsis;}
-.tree_item_name{padding : 10px 2px 10px 2px; vertical-align : middle;}
+.tree_item{background : url(images/last.gif) no-repeat center left;cursor : default; font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; color : #000000 /*generalTextColor*/; padding : 1px 0px 1px 0px; overflow : hidden; width : 100%; white-space : nowrap; text-overflow: ellipsis;}
+.tree_item_name{padding : 0px 2px 0px 2px; vertical-align : middle; cursor : pointer;}
- a .tree_item_name{font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; color : #000000 /*generalTextColor*/; text-decoration : none;}
- a:hover .tree_item_name{font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; color : #0078D0 /*generalLinkColor*/; text-decoration : underline;}
.tree_select{background : #C7D7EC /*additionalBackgroundColor*/;}
-.tree_level .tree_level{margin-left : 20px; }
-.tree_icon {vertical-align : middle; margin-right : 3px; border : 0px}
-.tree_status {vertical-align : middle; margin : 0px 7px 0px 4px; cursor : pointer;}
-.tree_collapse{display : none;}
-.tree_item_container{position : relative;}
+.tree_level{background : url(images/line.gif) repeat-y;}
+.tree_level_last{background : none;}
-.tree_tip{position : absolute; top : 0px; left : 40px; padding : 0px 2px 0px 2px; border : 1px solid #E5973E /*tipBorderColor*/; background : #FAE6B0 /*tipBackgroundColor*/; line-height : 100%;}
-.tree_tip_content{font-size : 11px /*generalSizeFont*/; font-family : verdana /*generalFamilyFont*/; white-space : nowrap; color : #000000 /*generalTextColor*/;}
+.tree_level .tree_level{margin-left : 16px;}
+.tree_icon {vertical-align : middle; margin : 0px; cursor : pointer;}
+
+.tree_level.tree_collapse .tree_level{display : none;}
+
</style>
</head>
@@ -30,91 +28,72 @@
<div class="tree_size">
- <div class="tree_item_container">
- <div class="tree_item">
- <a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Root name</span></a>
- </div>
+ <div class="tree_level tree_level_last">
+ <div class="tree_item">
+ <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
-
- <div class="tree_level">
- <div class="tree_item_container">
+ <div class="tree_level">
<div class="tree_item">
- <img src="images/plus.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span></a>
+ <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
</div>
-
- <div class="tree_level tree_collapse">
- <div class="tree_item_container">
- <div class="tree_item">
- <img src="images/spacer.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
- </div>
- </div>
- <div class="tree_item_container">
- <div class="tree_item">
- <img src="images/spacer.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
- </div>
- </div>
- </div>
-
- <div class="tree_item_container">
+ <div class="tree_level">
<div class="tree_item">
- <img src="images/spacer.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name tree_select">Very very long item name</span></a>
+ <img src="images/minus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
- <div class="tree_tip tree_collapse">
- <span class="tree_tip_content">Very very long item name</span>
- </div>
- </div>
-
- <div class="tree_item_container">
- <div class="tree_item">
- <img src="images/minus.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span></a>
- </div>
- </div>
-
- <div class="tree_level">
- <div class="tree_item_container">
+ <div class="tree_level">
<div class="tree_item">
- <img src="images/minus.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name Node name Node name Node name Node name </span>
</div>
</div>
- <div class="tree_level">
- <div class="tree_item_container">
+ <div class="tree_level tree_collapse">
+ <div class="tree_item tree_select">
+ <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ </div>
+ <div class="tree_level">
<div class="tree_item">
- <img src="images/plus.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span></a>
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
</div>
- <div class="tree_level tree_collapse">
- <div class="tree_item_container">
- <div class="tree_item">
- <img src="images/plus.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
- </div>
+ <div class="tree_level tree_level_last">
+ <div class="tree_item">
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
- <div class="tree_item_container">
+ <div class="tree_level tree_level_last">
<div class="tree_item">
- <img src="images/spacer.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
+ <img src="images/plus.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
+ <div class="tree_level">
+ <div class="tree_item">
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ </div>
+ </div>
+ <div class="tree_level tree_level_last">
+ <div class="tree_item">
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ </div>
+ </div>
</div>
</div>
-
- <div class="tree_item_container">
- <div class="tree_item">
- <img src="images/spacer.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
- </div>
- </div>
</div>
-
-
- <div class="tree_item_container">
+ <div class="tree_level tree_level_last">
<div class="tree_item">
- <img src="images/spacer.gif" width="9" height="9" alt="" border="0" class="tree_status"><a href="#"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Item name</span></a>
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
</div>
</div>
</div>
- </div>
+ <div class="tree_level tree_level_last">
+ <div class="tree_item">
+ <img src="images/spacer.gif" width="16" height="16" alt="" border="0" class="tree_icon tree_level_last"><img src="images/icon.gif" width="16" height="16" class="tree_icon"><span class="tree_item_name">Node name</span>
+ </div>
+ </div>
</div>
+</div>
+
+
14 years, 5 months
JBoss Rich Faces SVN: r16062 - root/framework/trunk/impl/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-03 11:48:13 -0500 (Thu, 03 Dec 2009)
New Revision: 16062
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java
Log:
made componentState protected to use it in the UISubTable
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java 2009-12-03 16:46:51 UTC (rev 16061)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java 2009-12-03 16:48:13 UTC (rev 16062)
@@ -133,7 +133,7 @@
};
private Object ajaxRowKey = null;
- private DataComponentState componentState = null;
+ protected DataComponentState componentState = null;
private ExtendedDataModel<?> extendedDataModel = null;
private Object rowKey = null;
14 years, 5 months
JBoss Rich Faces SVN: r16061 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component: state and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-03 11:46:51 -0500 (Thu, 03 Dec 2009)
New Revision: 16061
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java
Log:
use componentState from parent class
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-03 16:14:50 UTC (rev 16060)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-03 16:46:51 UTC (rev 16061)
@@ -61,7 +61,7 @@
private SubTableVisualModel visualModel;
- private SubTableState componentState;
+// private SubTableState componentState;
enum PropertyKeys {
switchType, expanded, toggleExpression, childState, visualModel
@@ -178,93 +178,21 @@
}
if(componentState == null) {
- componentState = dataTableState.getSubTableState(getClientId());
+ componentState = dataTableState.getChildState(getClientId());
}
if(componentState == null) {
- Object state = createComponentState();
- if(state instanceof SubTableState) {
- componentState = (SubTableState)state;
- }
+ componentState = createComponentState();
}
if(expression != null && !expression.isReadOnly(elContext)) {
expression.setValue(elContext, componentState);
}
}
-
- dataTableState.addSubTableState(componentState);
+ dataTableState.addChildState(componentState);
return componentState;
}
- @Override
- public Object getIterationState() {
- return new Object [] { super.getIterationState(), this.componentState};
- }
-
- @Override
- public void setIterationState(Object stateObject) {
- Object [] state = (Object [])stateObject;
- if(state != null) {
- super.setIterationState(state[0]);
- this.componentState = (SubTableState)state[1];
- } else {
- super.setIterationState(state);
- this.componentState = null;
- }
- }
-
-/* @Override
- public Object saveState(FacesContext context) {
-
- // TODO handle model serialization - "execute" model
- Boolean componentStateIsStateHolder = null;
- Object savedComponentState = null;
-
- // TODO - partial state saving handling
- if (componentState instanceof StateHolder) {
- componentStateIsStateHolder = Boolean.TRUE;
-
- StateHolder stateHolder = (StateHolder) componentState;
-
- if (!stateHolder.isTransient()) {
- savedComponentState = stateHolder.saveState(context);
- }
- } else {
- componentStateIsStateHolder = Boolean.FALSE;
-
- if (componentState instanceof Serializable) {
- savedComponentState = componentState;
- }
- }
-
- return new Object[] {super.saveState(context), savedComponentState, componentStateIsStateHolder};
- }
-
-
- @Override
- public void restoreState(FacesContext context, Object stateObject) {
- Object[] state = (Object[]) stateObject;
-
- // TODO Auto-generated method stub
- super.restoreState(context, state[0]);
-
- Object savedComponentState = state[1];
-
- if (savedComponentState != null) {
- boolean componentStateIsStateHolder = ((Boolean) state[2]).booleanValue();
-
- if (componentStateIsStateHolder) {
- componentState = (SubTableState)createComponentState();
- ((StateHolder) componentState).restoreState(context, savedComponentState);
- } else {
- componentState = (SubTableState) restoreAttachedState(context, savedComponentState);
- }
-
- // TODO update state model binding
- }
- }
- */
public void setExpanded(boolean expanded) {
this.expanded = expanded;
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java 2009-12-03 16:14:50 UTC (rev 16060)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java 2009-12-03 16:46:51 UTC (rev 16061)
@@ -6,6 +6,7 @@
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
+import org.ajax4jsf.model.DataComponentState;
import org.ajax4jsf.model.RepeatState;
import org.richfaces.model.visual.DataTableVisualModel;
@@ -74,4 +75,14 @@
return this.subTableStates.get(id);
}
+ public void addChildState(DataComponentState childState) {
+ if(childState instanceof SubTableState) {
+ addSubTableState((SubTableState)childState);
+ }
+ }
+
+ public DataComponentState getChildState(String id) {
+ DataComponentState state = getSubTableState(id);
+ return state;
+ }
}
14 years, 5 months
JBoss Rich Faces SVN: r16060 - root.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-03 11:14:50 -0500 (Thu, 03 Dec 2009)
New Revision: 16060
Modified:
root/pom.xml
Log:
RFPL-195 Code style policy
Add checkstyle module
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2009-12-03 15:54:53 UTC (rev 16059)
+++ root/pom.xml 2009-12-03 16:14:50 UTC (rev 16060)
@@ -31,6 +31,7 @@
</distributionManagement>
<modules>
+ <module>checkstyle</module>
<module>framework/${framework.svn.dir}</module>
<module>cdk/${cdk.svn.dir}</module>
<module>ui/${ui.svn.dir}</module>
14 years, 5 months
JBoss Rich Faces SVN: r16059 - root/ui/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-03 10:54:53 -0500 (Thu, 03 Dec 2009)
New Revision: 16059
Modified:
root/ui/trunk/pom.xml
Log:
RFPL-195 Code style policy
Rename checkstyle file and folder
Modified: root/ui/trunk/pom.xml
===================================================================
--- root/ui/trunk/pom.xml 2009-12-03 15:53:58 UTC (rev 16058)
+++ root/ui/trunk/pom.xml 2009-12-03 15:54:53 UTC (rev 16059)
@@ -56,7 +56,7 @@
<execution>
<id>richfaces-checkstyle-report</id>
<configuration>
- <configLocation>exadel-richfaces-checkstyle/exadel+sun-checkstyle.xml</configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
<failOnViolation>false</failOnViolation>
@@ -80,7 +80,7 @@
<version>2.3</version>
<configuration>
- <configLocation>exadel-richfaces-checkstyle/exadel+sun-checkstyle.xml</configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
</configuration>
</plugin>
14 years, 5 months
JBoss Rich Faces SVN: r16058 - root/framework/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-03 10:53:58 -0500 (Thu, 03 Dec 2009)
New Revision: 16058
Modified:
root/framework/trunk/pom.xml
Log:
RFPL-195 Code style policy
Rename checkstyle file and folder
Modified: root/framework/trunk/pom.xml
===================================================================
--- root/framework/trunk/pom.xml 2009-12-03 15:53:05 UTC (rev 16057)
+++ root/framework/trunk/pom.xml 2009-12-03 15:53:58 UTC (rev 16058)
@@ -107,7 +107,7 @@
<execution>
<id>richfaces-checkstyle-report</id>
<configuration>
- <configLocation>exadel-richfaces-checkstyle/exadel+sun-checkstyle.xml</configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
<failOnViolation>false</failOnViolation>
@@ -131,7 +131,7 @@
<version>2.3</version>
<configuration>
- <configLocation>exadel-richfaces-checkstyle/exadel+sun-checkstyle.xml</configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
</configuration>
</plugin>
14 years, 5 months
JBoss Rich Faces SVN: r16057 - root/examples/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-03 10:53:05 -0500 (Thu, 03 Dec 2009)
New Revision: 16057
Modified:
root/examples/trunk/pom.xml
Log:
RFPL-195 Code style policy
Rename checkstyle file and folder
Modified: root/examples/trunk/pom.xml
===================================================================
--- root/examples/trunk/pom.xml 2009-12-03 15:51:56 UTC (rev 16056)
+++ root/examples/trunk/pom.xml 2009-12-03 15:53:05 UTC (rev 16057)
@@ -177,7 +177,7 @@
<execution>
<id>richfaces-checkstyle-report</id>
<configuration>
- <configLocation>exadel-richfaces-checkstyle/exadel+sun-checkstyle.xml</configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
<failOnViolation>false</failOnViolation>
@@ -201,7 +201,7 @@
<version>2.3</version>
<configuration>
- <configLocation>exadel-richfaces-checkstyle/exadel+sun-checkstyle.xml</configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
</configuration>
</plugin>
14 years, 5 months