JBoss Rich Faces SVN: r7268 - trunk/ui/treeModel/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-03-26 13:09:56 -0400 (Wed, 26 Mar 2008)
New Revision: 7268
Modified:
trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java
Log:
TreeModel test fixed
Modified: trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java
===================================================================
--- trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2008-03-26 16:50:25 UTC (rev 7267)
+++ trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2008-03-26 17:09:56 UTC (rev 7268)
@@ -201,7 +201,7 @@
assertTrue(handleCell.getAttributeValue("class").contains("dr-tree-h-ic-line-node"));
}
- HtmlElement handleElement = (HtmlElement) handleCell.getFirstChild().getFirstChild().getNextSibling();
+ HtmlElement handleElement = (HtmlElement) handleCell.getFirstChild().getFirstChild();
String handleId = handleElement.getAttributeValue("id");
if (element.getChildNodes().getLength() == 0) {
16 years, 9 months
JBoss Rich Faces SVN: r7267 - trunk/ui/tree/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-03-26 12:50:25 -0400 (Wed, 26 Mar 2008)
New Revision: 7267
Modified:
trunk/ui/tree/src/test/java/org/richfaces/component/ListRowKeyTest.java
trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java
Log:
Unit tests for tree fixed
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/ListRowKeyTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/ListRowKeyTest.java 2008-03-26 16:37:43 UTC (rev 7266)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/ListRowKeyTest.java 2008-03-26 16:50:25 UTC (rev 7267)
@@ -41,19 +41,19 @@
public class ListRowKeyTest extends TestCase {
public void testConstructors() {
- ListRowKey key = new ListRowKey();
+ ListRowKey<Long> key = new ListRowKey<Long>();
assertEquals(0, key.depth());
assertEquals(0, key.getPath().length());
- List list = new LinkedList();
+ List<Long> list = new LinkedList<Long>();
list.add(new Long(2));
list.add(new Long(4));
- key = new ListRowKey(list);
+ key = new ListRowKey<Long>(list);
assertEquals(2, key.depth());
- Iterator iterator = key.iterator();
+ Iterator<Long> iterator = key.iterator();
assertTrue(iterator.hasNext());
assertEquals(new Long(2), iterator.next());
@@ -62,7 +62,7 @@
assertFalse(iterator.hasNext());
- key = new ListRowKey(new Long(5));
+ key = new ListRowKey<Long>(new Long(5));
assertEquals(1, key.depth());
iterator = key.iterator();
assertTrue(iterator.hasNext());
@@ -70,7 +70,7 @@
assertFalse(iterator.hasNext());
- key = new ListRowKey(new ListRowKey(new Long(6)), new Long(7));
+ key = new ListRowKey<Long>(new ListRowKey<Long>(new Long(6)), new Long(7));
assertEquals(2, key.depth());
iterator = key.iterator();
assertTrue(iterator.hasNext());
@@ -81,7 +81,7 @@
assertFalse(iterator.hasNext());
- key = new ListRowKey(key);
+ key = new ListRowKey<Long>(key);
assertEquals(2, key.depth());
iterator = key.iterator();
assertTrue(iterator.hasNext());
@@ -91,29 +91,6 @@
assertEquals(new Long(7), iterator.next());
assertFalse(iterator.hasNext());
-
- key = new ListRowKey("12_:34:56__78_:9");
- assertEquals(2, key.depth());
- iterator = key.iterator();
- assertTrue(iterator.hasNext());
- assertEquals("12:34", iterator.next());
-
- assertTrue(iterator.hasNext());
- assertEquals("56_78:9", iterator.next());
-
- assertFalse(iterator.hasNext());
-
-
- key = new ListRowKey("12_:34:56__78_:9:");
- assertEquals(2, key.depth());
- iterator = key.iterator();
- assertTrue(iterator.hasNext());
- assertEquals("12:34", iterator.next());
-
- assertTrue(iterator.hasNext());
- assertEquals("56_78:9", iterator.next());
-
- assertFalse(iterator.hasNext());
}
public void testObjectMethods() {
@@ -121,13 +98,13 @@
"test1", "test:2", "test3"
};
- ListRowKey key1 = new ListRowKey(Arrays.asList(data));
+ ListRowKey<String> key1 = new ListRowKey<String>(Arrays.asList(data));
- ListRowKey key2 = new ListRowKey();
+ ListRowKey<String> key2 = new ListRowKey<String>();
for (int i = 0; i < data.length; i++) {
String string = data[i];
- key2 = new ListRowKey(key2, string);
+ key2 = new ListRowKey<String>(key2, string);
}
assertTrue(key1.hashCode() == key2.hashCode());
@@ -136,23 +113,23 @@
}
public void testEqualsAndHash() {
- List keyBase = new ArrayList();
+ List<Object> keyBase = new ArrayList<Object>();
keyBase.add(new Long(12));
keyBase.add("string");
- List keyBase1 = new ArrayList();
+ List<Object> keyBase1 = new ArrayList<Object>();
keyBase1.add(keyBase);
keyBase1.add(new Double(23.56));
keyBase1.add("moreStrings");
- List keyBase2 = new ArrayList();
+ List<Object> keyBase2 = new ArrayList<Object>();
keyBase2.add(keyBase);
keyBase2.add(new Double(23.56));
keyBase2.add("moreStrings");
- ListRowKey rowKey = new ListRowKey(keyBase);
- ListRowKey rowKey1 = new ListRowKey(keyBase1);
- ListRowKey rowKey2 = new ListRowKey(keyBase2);
+ ListRowKey<Object> rowKey = new ListRowKey<Object>(keyBase);
+ ListRowKey<Object> rowKey1 = new ListRowKey<Object>(keyBase1);
+ ListRowKey<Object> rowKey2 = new ListRowKey<Object>(keyBase2);
assertTrue(rowKey.equals(rowKey));
assertTrue(rowKey1.equals(rowKey1));
@@ -170,7 +147,7 @@
assertFalse(rowKey1.equals(null));
assertFalse(rowKey2.equals(null));
- TreeRowKey treeKey = new TreeRowKey() {
+ TreeRowKey<Object> treeKey = new TreeRowKey<Object>() {
/**
*
@@ -181,7 +158,7 @@
throw new UnsupportedOperationException();
}
- public int getCommonPathLength(TreeRowKey otherRowKey) {
+ public int getCommonPathLength(TreeRowKey<Object> otherRowKey) {
throw new UnsupportedOperationException();
}
@@ -189,11 +166,11 @@
throw new UnsupportedOperationException();
}
- public Iterator getSubPathIterator(int fromIndex) {
+ public Iterator<Object> getSubPathIterator(int fromIndex) {
throw new UnsupportedOperationException();
}
- public Iterator iterator() {
+ public Iterator<Object> iterator() {
throw new UnsupportedOperationException();
}
@@ -210,12 +187,12 @@
}
public void testSubPathIterator() throws Exception {
- List keyBase = new ArrayList();
+ List<Object> keyBase = new ArrayList<Object>();
keyBase.add(new Long(13));
keyBase.add("string");
- ListRowKey listRowKey = new ListRowKey(keyBase);
- Iterator iterator = listRowKey.getSubPathIterator(0);
+ ListRowKey<Object> listRowKey = new ListRowKey<Object>(keyBase);
+ Iterator<Object> iterator = listRowKey.getSubPathIterator(0);
assertTrue(iterator.hasNext());
assertEquals(new Long(13), iterator.next());
assertTrue(iterator.hasNext());
@@ -232,19 +209,19 @@
}
public void testIsSubkey() throws Exception {
- List keyBase = new ArrayList();
+ List<Object> keyBase = new ArrayList<Object>();
keyBase.add(new Long(12));
- ListRowKey listRowKey = new ListRowKey(keyBase);
+ ListRowKey<Object> listRowKey = new ListRowKey<Object>(keyBase);
keyBase.add("string");
- ListRowKey listRowKey1 = new ListRowKey(keyBase);
+ ListRowKey<Object> listRowKey1 = new ListRowKey<Object>(keyBase);
- assertTrue(new ListRowKey().isSubKey(listRowKey1));
- assertTrue(new ListRowKey().isSubKey(listRowKey));
- assertFalse(listRowKey.isSubKey(new ListRowKey()));
- assertFalse(listRowKey1.isSubKey(new ListRowKey()));
+ assertTrue(new ListRowKey<Object>().isSubKey(listRowKey1));
+ assertTrue(new ListRowKey<Object>().isSubKey(listRowKey));
+ assertFalse(listRowKey.isSubKey(new ListRowKey<Object>()));
+ assertFalse(listRowKey1.isSubKey(new ListRowKey<Object>()));
assertTrue(listRowKey.isSubKey(listRowKey1));
assertFalse(listRowKey1.isSubKey(listRowKey));
@@ -255,7 +232,7 @@
assertFalse(listRowKey.isSubKey(null));
assertFalse(listRowKey1.isSubKey(null));
- TreeRowKey treeRowKey = new TreeRowKey() {
+ TreeRowKey<Object> treeRowKey = new TreeRowKey<Object>() {
/**
*
@@ -272,7 +249,7 @@
return 3;
}
- public int getCommonPathLength(TreeRowKey otherRowKey) {
+ public int getCommonPathLength(TreeRowKey<Object> otherRowKey) {
throw new UnsupportedOperationException();
}
@@ -280,11 +257,11 @@
return "12:string:3.14159265";
}
- public Iterator getSubPathIterator(int fromIndex) {
+ public Iterator<Object> getSubPathIterator(int fromIndex) {
throw new UnsupportedOperationException();
}
- public Iterator iterator() {
+ public Iterator<Object> iterator() {
return new ArrayIterator(data);
}
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java 2008-03-26 16:37:43 UTC (rev 7266)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeModelTest.java 2008-03-26 16:50:25 UTC (rev 7267)
@@ -112,29 +112,42 @@
}
}, null, null);
- model.setRowKey(new ListRowKey<String>("testId:displayName"));
+ List<String> list = new ArrayList<String>();
+ list.add("testId");
+ list.add("displayName");
+ model.setRowKey(new ListRowKey<String>(list));
assertEquals("tree-demo", ((XmlNodeData) model.getRowData()).getText());
- model.setRowKey(new ListRowKey<String>("testId:1:1"));
+ List<String> list1 = new ArrayList<String>();
+ list1.add("testId");
+ list1.add("1");
+ list1.add("1");
+ model.setRowKey(new ListRowKey<String>(list1));
assertEquals(".xhtml", ((XmlNodeData) model.getRowData()).getText());
}
public void testWalkConstrained() throws Exception {
model.setWrappedData(node);
+ List<String> list = new ArrayList<String>();
+ list.add("testId");
+ list.add("4");
+
+ ListRowKey<String> key = new ListRowKey<String>(list);
+
Walker2 walker = new Walker2(model);
- model.walk(null, walker, null, new ListRowKey("testId:4"), null, false);
+ model.walk(null, walker, null, key, null, false);
List walked = walker.getWalked();
assertEquals(3, walked.size());
- model.setRowKey(new ListRowKey("testId:4"));
+ model.setRowKey(key);
assertSame(walked.get(0), model.getTreeNode());
- model.setRowKey(new ListRowKey("testId:4:0"));
+ model.setRowKey(new ListRowKey<String>(key, "0"));
assertSame(walked.get(1), model.getTreeNode());
- model.setRowKey(new ListRowKey("testId:4:1"));
+ model.setRowKey(new ListRowKey<String>(key, "1"));
assertSame(walked.get(2), model.getTreeNode());
}
16 years, 9 months
JBoss Rich Faces SVN: r7266 - trunk/ui/scrollableDataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vbaranov
Date: 2008-03-26 12:37:43 -0400 (Wed, 26 Mar 2008)
New Revision: 7266
Modified:
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
Log:
http://jira.jboss.com/jira/browse/RF-1880
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-03-26 15:43:00 UTC (rev 7265)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-03-26 16:37:43 UTC (rev 7266)
@@ -40,7 +40,7 @@
<superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
</test>
</tag>
-
+
<property>
<name>frozenColCount</name>
<classname>int</classname>
@@ -254,7 +254,7 @@
&ui_data_attributes;
&spec_table_attributes;
&html_style_attributes;
-
+
<property hidden="true">
<name>limitToList</name>
<classname>boolean</classname>
@@ -263,6 +263,14 @@
<name>ajaxSingle</name>
<classname>boolean</classname>
</property>
+
+ <property hidden="true">
+ <name>focus</name>
+ <classname>java.lang.String</classname>
+ <description>
+ id of element to set focus after request completed on client side
+ </description>
+ </property>
</component>
<renderer generate="true">
16 years, 9 months
JBoss Rich Faces SVN: r7265 - trunk/ui/scrollableDataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-03-26 11:43:00 -0400 (Wed, 26 Mar 2008)
New Revision: 7265
Modified:
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
Log:
RF-2052
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-03-26 15:39:55 UTC (rev 7264)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-03-26 15:43:00 UTC (rev 7265)
@@ -112,14 +112,8 @@
<name>footerClass</name>
<classname>java.lang.String</classname>
</property>
-
+
<property>
- <name>captionClass</name>
- <classname>java.lang.String</classname>
- <description>Space-separated list of CSS style class(es) that are be applied to caption for this component</description>
- </property>
-
- <property>
<name>headerClass</name>
<classname>java.lang.String</classname>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r7264 - trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-26 11:39:55 -0400 (Wed, 26 Mar 2008)
New Revision: 7264
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
fix IE6 script error if facet "controls" is defined
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-03-26 15:22:55 UTC (rev 7263)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-03-26 15:39:55 UTC (rev 7264)
@@ -378,7 +378,7 @@
show : function(inpWidth, inpHeight) {
this.positioning(inpWidth, inpHeight);
- if (Richfaces.browser.isIE6) {
+ if (Richfaces.browser.isIE6 && this.buttonsShadow) {
this.buttonsShadow.style.visibility = "hidden";
}
this.bar.show();
16 years, 9 months
JBoss Rich Faces SVN: r7263 - trunk/ui/listShuttle/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vbaranov
Date: 2008-03-26 11:22:55 -0400 (Wed, 26 Mar 2008)
New Revision: 7263
Modified:
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
Log:
http://jira.jboss.com/jira/browse/RF-2531
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-03-26 14:55:32 UTC (rev 7262)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-03-26 15:22:55 UTC (rev 7263)
@@ -262,7 +262,7 @@
<classname>java.lang.String</classname>
<description>The attribute provides access to a row key in a Request scope</description>
</property>
- <property el="false">
+ <property hidden="true" el="false">
<name>stateVar</name>
<classname>java.lang.String</classname>
<description>
16 years, 9 months
JBoss Rich Faces SVN: r7262 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-03-26 10:55:32 -0400 (Wed, 26 Mar 2008)
New Revision: 7262
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
Log:
RF-1876
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2008-03-26 14:40:45 UTC (rev 7261)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2008-03-26 14:55:32 UTC (rev 7262)
@@ -247,12 +247,11 @@
restoreState: function() {
this.selectionFlag = null;
var selStrAr = $(this.inputElement).value.split(";");
- if(selStrAr.length != 0) {
- var activeRowStr = selStrAr[selStrAr.length - 1];
- if(activeRowStr.indexOf(";") == -1) {
- this.setActiveRow(activeRowStr);
- selStrAr.pop();
- }
+ var activeRow = NaN;
+ while (selStrAr.length != 0 && selStrAr[selStrAr.length - 1].indexOf(",") == -1 &&
+ isNaN(activeRow = Number(selStrAr.pop())));
+ if (!isNaN(activeRow)) {
+ this.setActiveRow(activeRow);
}
this.selection.initRanges(selStrAr);
// this.firstIndex = Number($(this.prefix + ":f").rows[0].id.split(this.prefix)[1].split(":")[2]);;
16 years, 9 months
JBoss Rich Faces SVN: r7261 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-03-26 10:40:45 -0400 (Wed, 26 Mar 2008)
New Revision: 7261
Added:
trunk/docs/userguide/en/src/main/resources/images/panelMenuGroupSC.png
trunk/docs/userguide/en/src/main/resources/images/panelMenuItemSC.png
trunk/docs/userguide/en/src/main/resources/images/toolBarSC.png
Modified:
trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
trunk/docs/userguide/en/src/main/resources/images/tabPanel4.png
Log:
RF-2181 - added screens for panelMenuGroup, panelMenuItem, toolBar; updated screen for tabPanel
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2008-03-26 14:19:11 UTC (rev 7260)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2008-03-26 14:40:45 UTC (rev 7261)
@@ -428,6 +428,16 @@
<para>On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Classes names</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/panelMenuGroupSC.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <figure>
+ <title>Classes names</title>
<mediaobject>
<imageobject>
@@ -435,7 +445,6 @@
</imageobject>
</mediaobject>
</figure>
-
<table id="panelMenuC">
<title>Classes names that define an upper level groups</title>
@@ -545,6 +554,7 @@
</tgroup>
</table>
+
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:panelMenuGroup></property>
</emphasis> components on a page using CSS, it's enough to create classes with the
@@ -556,7 +566,8 @@
role="bold">
<property><rich:panelMenuGroup></property>
</emphasis>attributes.</para>
- </section>
+ </section>
+
<section>
<title>Relevant resources links</title>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2008-03-26 14:19:11 UTC (rev 7260)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2008-03-26 14:40:45 UTC (rev 7261)
@@ -340,6 +340,14 @@
<para>On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Classes names</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/panelMenuItemSC.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <figure>
+ <title>Classes names</title>
<mediaobject>
<imageobject>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2008-03-26 14:19:11 UTC (rev 7260)
+++ trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2008-03-26 14:40:45 UTC (rev 7261)
@@ -209,7 +209,14 @@
</tbody>
</tgroup>
</table>
-
+ <figure>
+ <title>Classes names</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/toolBarSC.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:toolBar></property>
</emphasis> components on a page using CSS, it's enough to create classes with the
Added: trunk/docs/userguide/en/src/main/resources/images/panelMenuGroupSC.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/panelMenuGroupSC.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/panelMenuItemSC.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/panelMenuItemSC.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/userguide/en/src/main/resources/images/tabPanel4.png
===================================================================
(Binary files differ)
Added: trunk/docs/userguide/en/src/main/resources/images/toolBarSC.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/toolBarSC.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Rich Faces SVN: r7260 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-03-26 10:19:11 -0400 (Wed, 26 Mar 2008)
New Revision: 7260
Added:
trunk/docs/userguide/en/src/main/resources/images/progressBar_classes.png
Removed:
trunk/docs/userguide/en/src/main/resources/images/progressbarClasses.png
Log:
http://jira.jboss.com/jira/browse/RF-1690 - screenshot was changed according to the dev project
Added: trunk/docs/userguide/en/src/main/resources/images/progressBar_classes.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/progressBar_classes.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/docs/userguide/en/src/main/resources/images/progressbarClasses.png
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Rich Faces SVN: r7259 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-03-26 10:18:32 -0400 (Wed, 26 Mar 2008)
New Revision: 7259
Modified:
trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml
Log:
http://jira.jboss.com/jira/browse/RF-1690 - review done
Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml 2008-03-26 14:11:52 UTC (rev 7258)
+++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml 2008-03-26 14:18:32 UTC (rev 7259)
@@ -23,10 +23,10 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Customization of informational part of the component</listitem>
- <listitem>Status polling frequency adjustment</listitem>
- <listitem>Ajax or Client modes</listitem>
- <listitem>Option to display some numeric data along side with graphical presentation.</listitem>
+ <listitem><para>Highly customizable look and feel</para></listitem>
+ <listitem><para>Status polling frequency and timeout adjustment</para></listitem>
+ <listitem><para>Ajax or Client modes</para></listitem>
+ <listitem><para>Option to display some numeric data along side with graphical presentation</para></listitem>
</itemizedlist>
</section>
</section>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-03-26 14:11:52 UTC (rev 7258)
+++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-03-26 14:18:32 UTC (rev 7259)
@@ -64,7 +64,7 @@
<section>
<title>Details of Usage</title>
<para>
- As it was mentioned above, the <emphasis role="bold"><property><rich:progressBar></property> </emphasis>
+ As it was mentioned above, the <emphasis role="bold"><property><rich:progressBar></property></emphasis>
component displays the status of the ongoing process.
</para>
<para>
@@ -77,13 +77,13 @@
</listitem>
<listitem>
<para>
- <emphasis><property>"minValue"</property></emphasis> (default value – "0") sets minimal value for
+ <emphasis><property>"minValue"</property></emphasis> (default value is "0") sets minimal value for
the <emphasis role="bold"><property><rich:progressBar></property></emphasis> to start rendering
</para>
</listitem>
<listitem>
<para>
- <emphasis><property>"minValue"</property></emphasis> (default value – "0") sets maximum value for
+ <emphasis><property>"maxValue"</property></emphasis> (default value is "100") sets maximum value for
the <emphasis role="bold"><property><rich:progressBar></property></emphasis> to finish rendering
</para>
</listitem>
@@ -232,7 +232,7 @@
<h:outputText value="Min value is {minValue}, current value is {value}, max value is {maxValue}"/>
</rich:progressBar>
...]]> </programlisting>
- <para>This is a result:</para>
+ <para>This is the result:</para>
<figure>
<title>Macrosubstitution</title>
<mediaobject>
@@ -397,184 +397,137 @@
<section>
<title>Skin Parameters Redefinition</title>
+ <table>
+ <title>Skin parameters redefinition for the progressBar without a label</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>controlBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>panelBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for the completed progress area of the progressBar without a label</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>selectControlColor</entry>
+ <entry>background-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
<table>
- <title>Skin parameters redefinition for the "completed" part of the bar with no label</title>
-
+ <title>Skin parameters redefinition for the progressBar with a label</title>
<tgroup cols="2">
<thead>
<row>
<entry>Skin parameters</entry>
-
<entry>CSS properties</entry>
</row>
</thead>
-
<tbody>
<row>
- <entry>selectControlColor</entry>
-
- <entry>background-color</entry>
- </row>
-
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for the "completed" part of the bar with a label used</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
-
- <entry>CSS properties</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
<entry>panelBorderColor</entry>
-
<entry>border-color</entry>
</row>
-
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for the “completed” part of the bar with a label used</title>
-
- <tgroup cols="2">
- <thead>
<row>
- <entry>Skin parameters</entry>
-
- <entry>CSS properties</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>selectControlColor</entry>
-
- <entry>background-color</entry>
- </row>
-
- <row>
- <entry>controlBackgroundColor</entry>
-
- <entry>color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for the "remained" part of the bar</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
-
- <entry>CSS properties</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>controlBackgroundColor</entry>
-
- <entry>background-color</entry>
- </row>
-
- <row>
- <entry>controlTextColor</entry>
-
- <entry>color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for the bar itself with a label used</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
-
- <entry>CSS properties</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>panelBorderColor</entry>
-
- <entry>border-color</entry>
- </row>
-
- <row>
<entry>generalFamilyFont</entry>
-
<entry>font-family</entry>
</row>
-
<row>
- <entry>headerFamilyFont</entry>
-
- <entry>font-family</entry>
- </row>
-
- <row>
<entry>generalSizeFont</entry>
-
<entry>font-size</entry>
</row>
-
<row>
<entry>controlTextColor</entry>
-
<entry>color</entry>
</row>
-
</tbody>
</tgroup>
</table>
- <table>
- <title>Skin parameters redefinition for the bar itself with no label used</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
-
- <entry>CSS properties</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>controlBackgroundColor</entry>
-
- <entry>background-color</entry>
- </row>
-
- <row>
- <entry>panelBorderColor</entry>
-
- <entry>border-color</entry>
- </row>
-
- </tbody>
- </tgroup>
- </table>
-
+ <table>
+ <title>Skin parameters redefinition for the label of the progressBar</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>panelBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for the completed progress area of the progressBar with a label</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>selectControlColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>controlBackgroundColor</entry>
+ <entry>color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for the remained progress area of the progressBar with a label</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>controlBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>controlTextColor</entry>
+ <entry>color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
</section>
<!-- END Skin Parameters Redefinition-->
@@ -589,13 +542,13 @@
<title>Classes names</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/progressbarClasses.png"/>
+ <imagedata fileref="images/progressBar_classes.png"/>
</imageobject>
</mediaobject>
</figure>
- <table>
- <title>Classes names for the bar</title>
+ <table id="pBclasses">
+ <title>Classes names for the progressBar without a label</title>
<tgroup cols="2">
<thead>
<row>
@@ -606,19 +559,26 @@
<tbody>
<row>
<entry>rich-progress-bar-shell</entry>
- <entry>Defines styles for the background and the borders of the bar when label is not used</entry>
+ <entry>Defines styles for a wrapper <div> element of a progressBar</entry>
</row>
-
<row>
- <entry>rich-progress-bar-shell-dig</entry>
- <entry>Defines styles for background, font and border settings when label is used</entry>
+ <entry>rich-progress-bar-uploaded</entry>
+ <entry>Defines styles for the completed progress area</entry>
</row>
+ <row>
+ <entry>rich-progress-bar-height</entry>
+ <entry>Defines height for a progressBar</entry>
+ </row>
+ <row>
+ <entry>rich-progress-bar-width</entry>
+ <entry>Defines width for a progressBar</entry>
+ </row>
</tbody>
</tgroup>
</table>
<table>
- <title>Classes names that define "completed" part of the bar</title>
+ <title>Classes names for the progressBar with a label</title>
<tgroup cols="2">
<thead>
<row>
@@ -627,53 +587,39 @@
</row>
</thead>
<tbody>
-
<row>
- <entry>rich-progress-bar-uploaded</entry>
- <entry>Defines styles for of "completed" progress area with no labels used</entry>
- </row>
+ <entry>rich-progress-bar-shell-dig</entry>
+ <entry>Defines styles for a wrapper <div> element of a progressBar</entry>
+ </row>
<row>
<entry>rich-progress-bar-uploaded-dig</entry>
- <entry>Defines styles for that "completed" progress area with labels used </entry>
+ <entry>Defines styles for the label</entry>
</row>
-
<row>
+ <entry>rich-progress-bar-remained</entry>
+ <entry>Defines styles for the remained progress area</entry>
+ </row>
+ <row>
<entry>rich-progress-bar-completed</entry>
- <entry>Defines styles for the "completed" progress area with a label used</entry>
+ <entry>Defines styles for the completed progress area</entry>
</row>
-
-
- </tbody>
- </tgroup>
- </table>
-
-
-
- <table>
- <title>Classes names that define "remained" part of the progress area</title>
- <tgroup cols="2">
- <thead>
<row>
- <entry>Class name</entry>
- <entry>Description</entry>
+ <entry>rich-progress-bar-height-dig</entry>
+ <entry>Defines height for a progressBar</entry>
</row>
- </thead>
- <tbody>
-
<row>
- <entry>rich-progress-bar-remained</entry>
- <entry>Defines styles for the "remained" part of the bar</entry>
+ <entry>rich-progress-bar-width</entry>
+ <entry>Defines width for a progressBar</entry>
</row>
-
-
-
</tbody>
</tgroup>
</table>
+
+
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:progressBar></property>
</emphasis> components on a page using CSS, it's enough to create classes with the
- same names (possible classes could be found in the tables <link linkend="tab_cn3"> above</link>) and define necessary properties in them. </para>
+ same names (possible classes could be found in the tables <link linkend="pBclasses">above</link>) and define necessary properties in them. </para>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -694,10 +640,11 @@
</imageobject>
</mediaobject>
</figure>
- <para>In the example the "remained" part of progress area is modified with a background-color CSS property.</para>
+ <para>In the example above background color of the remained part of progress area was changed.</para>
<para>It's aslo possible to change styles of a particular
- <emphasis role="bold"> <property><rich:progressBar></property></emphasis> component. In this case you should create own style classes and use them in corresponding <emphasis role="bold"><property><rich:progressBar></property></emphasis> <property>styleClass</property> attributes. An example is placed below:</para>
+ <emphasis role="bold"> <property><rich:progressBar></property></emphasis> component. In this case you should create own style classes and use them in corresponding
+ <emphasis role="bold"><property><rich:progressBar></property></emphasis> <property>styleClass</property> attributes. An example is placed below:</para>
<para>
<emphasis role="bold">Example:</emphasis>
</para>
@@ -706,16 +653,16 @@
background-color: #ebf3fd;
}
...]]></programlisting>
- <para>The <emphasis><property>"styleClass"</property></emphasis> attribute for <emphasis role="bold"
+ <para>The <emphasis><property>"remainClass"</property></emphasis> attribute for <emphasis role="bold"
><property><rich:progressBar> </property></emphasis> is defined as it’s shown in the example below:</para>
<para>
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="XML"><![CDATA[<rich:progressBar value="#{bean.incValue1}" styleClass="myClass"/>
+ <programlisting role="XML"><![CDATA[<rich:progressBar value="#{bean.incValue1}" styleClass="remainClass"/>
]]></programlisting>
- <para>This is a result:</para>
+ <para>This is the result:</para>
<figure>
<title>Modificaton of a look and feel with own classes and <emphasis><property>styleClass</property></emphasis> attributes</title>
@@ -726,7 +673,7 @@
</mediaobject>
</figure>
- <para>As it could be seen on the picture above, the font style for output text was changed.</para>
+ <para>As it could be seen on the picture above, background color of the remained part of progress area was changed.</para>
</section>
16 years, 9 months