January 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r5545 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-01-22 14:00:14 -0500 (Tue, 22 Jan 2008) New Revision: 5545 Modified: trunk/docs/userguide/en/src/main/docbook/included/columns.desc.xml Log: http://jira.jboss.com/jira/browse/RF-1199 - add Key Features Modified: trunk/docs/userguide/en/src/main/docbook/included/columns.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/columns.desc.xml 2008-01-22 18:59:59 UTC (rev 5544) +++ trunk/docs/userguide/en/src/main/docbook/included/columns.desc.xml 2008-01-22 19:00:14 UTC (rev 5545) @@ -26,7 +26,8 @@ <itemizedlist> <listitem>Highly customizable look and feel</listitem> <listitem>Dynamic tables creation</listitem> - + <listitem>Possibility to combine columns with the help of <emphasis ><property>"colspan"</property></emphasis> and <emphasis ><property>"breakBefore"</property></emphasis></listitem> + <listitem>Possibility to combine rows with the help of <emphasis ><property>"rowspan"</property></emphasis> </listitem> </itemizedlist> </section> </section>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5544 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-01-22 13:59:59 -0500 (Tue, 22 Jan 2008) New Revision: 5544 Modified: trunk/docs/userguide/en/src/main/docbook/included/columns.xml Log: http://jira.jboss.com/jira/browse/RF-1199 - add 'var', 'value' attributes Modified: trunk/docs/userguide/en/src/main/docbook/included/columns.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/columns.xml 2008-01-22 18:59:11 UTC (rev 5543) +++ trunk/docs/userguide/en/src/main/docbook/included/columns.xml 2008-01-22 18:59:59 UTC (rev 5544) @@ -73,8 +73,12 @@ It is possible to use <emphasis><property>"header"</property></emphasis> and <emphasis><property>"footer" </property></emphasis> facets with <emphasis role="bold"><property><rich:columns></property></emphasis> component. </para> - <para>The simple example is placed below</para> <para> + The <emphasis><property>"value"</property></emphasis> and <emphasis><property>"var"</property></emphasis>attributes + are used to access the values of collection. + </para> + <para>The simple example is placed below.</para> + <para> <emphasis role="bold">Example:</emphasis> </para> <programlisting role="XML"><![CDATA[... @@ -150,7 +154,8 @@ ...]]></programlisting> <para>In order to group columns with text information into one row, use - the <emphasis ><property>"colspan"</property></emphasis> attribute, which is similar to an HTML one, specifying that the first column contains 3 columns. + the <emphasis ><property>"colspan"</property></emphasis> attribute, which is similar to an HTML one. + In the following example the third column contains 3 columns. In addition, it's necessary to specify that the next column begins from the first row with the help of the <emphasis ><property>"breakBefore"</property></emphasis> attribute = true. </para> @@ -186,8 +191,7 @@ </figure--> <para>The same way is used for <property>columns</property> grouping with the <emphasis ><property>"rowspan"</property></emphasis> - attribute that is similar to an HTML one responsible for rows quantity definition occupied with the - current one. The only thing to add in the example is an instruction to move onto the next row for each next after the second column. + attribute that is similar to an HTML. The only thing to add in the example is an instruction to move onto the next row for each next after the second column. </para> <para> <emphasis role="bold">Example:</emphasis> @@ -209,6 +213,7 @@ </rich:dataTable> ... ]]></programlisting> + <!--para>As a result:</para> <figure> <title><rich:column> generated with rowspan attribute</title>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5543 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-01-22 13:59:11 -0500 (Tue, 22 Jan 2008) New Revision: 5543 Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml Log: http://jira.jboss.com/jira/browse/RF-920 - add Classes names that define a popup element during timing selection Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-01-22 18:17:16 UTC (rev 5542) +++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-01-22 18:59:11 UTC (rev 5543) @@ -315,7 +315,7 @@ red colored.</para> <para> - It is possible to show and manage date. Except scrolling controls you can use quick year selection feature. + It is possible to show and manage date. Except scrolling controls you can use quick month and year selection feature. It's necessary to click on its field, i.e. current month control, and choose required month and year. </para> <figure> @@ -1131,7 +1131,7 @@ </row> <row> <entry>rich-calendar-editor-layout-shadow</entry> - <entry>Defines styles for a wrapper <div> element for a shadow</entry> + <entry>Defines styles for a shadow</entry> </row> <row> <entry>rich-calendar-editor-btn</entry> @@ -1161,6 +1161,62 @@ </tgroup> </table> + <table> + <title>Classes names that define a popup element during timing selection</title> + + <tgroup cols="2"> + <thead> + <row> + <entry>Class name</entry> + <entry>Description</entry> + </row> + </thead> + + <tbody> + <row> + <entry>rich-calendar-time-layout</entry> + <entry>Defines styles for a popup element during timing selection</entry> + </row> + <row> + <entry>rich-calendar-editor-layout-shadow</entry> + <entry>Defines styles for a shadow</entry> + </row> + <row> + <entry>rich-calendar-time-layout-fields</entry> + <entry>Defines styles for a wrapper <td> element for input fields and buttons</entry> + </row> + <row> + <entry>rich-calendar-spinner-input-container</entry> + <entry>Defines styles for a wrapper <td> element for an input field</entry> + </row> + <row> + <entry>rich-calendar-spinner-input</entry> + <entry>Defines styles for an input field</entry> + </row> + <row> + <entry>rich-calendar-spinner-buttons</entry> + <entry>Defines styles for a wrapper <td> element for spinner buttons</entry> + </row> + <row> + <entry>rich-calendar-spinner-up</entry> + <entry>Defines styles for a Up button</entry> + </row> + <row> + <entry>rich-calendar-spinner-down</entry> + <entry>Defines styles for a Down button</entry> + </row> + <row> + <entry>rich-calendar-time-layout-ok</entry> + <entry>Defines styles for a submit button</entry> + </row> + <row> + <entry>rich-calendar-time-layout-cancel</entry> + <entry>Defines styles for a cancel button</entry> + </row> + </tbody> + </tgroup> + </table> + <para>In order to redefine styles for all <emphasis role="bold"> <property><rich:calendar></property> </emphasis> components on a page using CSS, it's enough to create classes with the

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5542 - in trunk/framework/test/src: test/java/org/richfaces/model and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-01-22 13:17:16 -0500 (Tue, 22 Jan 2008) New Revision: 5542 Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java trunk/framework/test/src/test/java/org/richfaces/model/FilterFieldTest.java trunk/framework/test/src/test/java/org/richfaces/model/ModifiableModelTest.java trunk/framework/test/src/test/java/org/richfaces/model/SortField2Test.java trunk/framework/test/src/test/java/org/richfaces/model/impl/expressive/WrappedBeanFilterTest.java Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java Log: RF-1743 Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2008-01-22 17:39:58 UTC (rev 5541) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -44,6 +44,7 @@ private int maxRow = ROWS; + private Object wrappedData; /** * @return the maxRow */ @@ -141,7 +142,7 @@ */ public Object getWrappedData() { // TODO Auto-generated method stub - return null; + return wrappedData; } /* (non-Javadoc) @@ -163,8 +164,7 @@ * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) */ public void setWrappedData(Object data) { - // TODO Auto-generated method stub - + wrappedData = data; } } Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java (rev 0) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -0,0 +1,23 @@ +/** + * + */ +package org.ajax4jsf.tests; + +import javax.faces.model.DataModelEvent; +import javax.faces.model.DataModelListener; + +/** + * @author Konstantin Mishin + * + */ +public class MockDataModelListener implements DataModelListener { + + /* (non-Javadoc) + * @see javax.faces.model.DataModelListener#rowSelected(javax.faces.model.DataModelEvent) + */ + public void rowSelected(DataModelEvent event) { + // TODO Auto-generated method stub + + } + +} Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java 2008-01-22 17:39:58 UTC (rev 5541) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -72,33 +72,40 @@ } /* (non-Javadoc) - * @see javax.el.Expression#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) * @see javax.el.Expression#getExpressionString() */ @Override public String getExpressionString() { // TODO Auto-generated method stub - return null; + return o.toString(); } - /* (non-Javadoc) - * @see javax.el.Expression#hashCode() - */ @Override - public int hashCode() { - // TODO Auto-generated method stub - return 0; - } + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((o == null) ? 0 : o.hashCode()); + return result; + } - /* (non-Javadoc) + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + MockValueExpression other = (MockValueExpression) obj; + if (o == null) { + if (other.o != null) + return false; + } else if (!o.equals(other.o)) + return false; + return true; + } + + /* (non-Javadoc) * @see javax.el.Expression#isLiteralText() */ @Override @@ -106,5 +113,4 @@ // TODO Auto-generated method stub return true; } - } Added: trunk/framework/test/src/test/java/org/richfaces/model/FilterFieldTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/model/FilterFieldTest.java (rev 0) +++ trunk/framework/test/src/test/java/org/richfaces/model/FilterFieldTest.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -0,0 +1,87 @@ +/** + * + */ +package org.richfaces.model; + +import javax.el.ValueExpression; + +import org.ajax4jsf.tests.MockValueExpression; + +import junit.framework.TestCase; + +/** + * @author Konstantin Mishin + * + */ +public class FilterFieldTest extends TestCase { + + private Field field; + private ValueExpression expression; + + /** + * @param name + */ + public FilterFieldTest(String name) { + super(name); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); + expression = new MockValueExpression(null); + field = new FilterField(expression); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#tearDown() + */ + protected void tearDown() throws Exception { + field = null; + expression = null; + super.tearDown(); + } + + /** + * Test method for {@link org.richfaces.model.FilterField#FilterField(javax.el.ValueExpression)}. + */ + public final void testFilterField() { + Field filterField = new FilterField(expression); + assertEquals(filterField, field); + } + + /** + * Test method for {@link org.richfaces.model.Field#hashCode()}. + */ + public final void testHashCode() { + Field filterField = new FilterField(expression); + assertEquals(filterField.hashCode(), field.hashCode()); + } + + /** + * Test method for {@link org.richfaces.model.Field#equals(java.lang.Object)}. + */ + public final void testEqualsObject() { + Field filterField = new FilterField(null); + assertFalse(filterField.equals(field)); + filterField.setExpression(expression); + assertTrue(filterField.equals(field)); + } + + /** + * Test method for {@link org.richfaces.model.Field#getExpression()}. + */ + public final void testGetExpression() { + assertSame(field.getExpression(), expression); + } + + /** + * Test method for {@link org.richfaces.model.Field#setExpression(javax.el.ValueExpression)}. + */ + public final void testSetExpression() { + field.setExpression(null); + assertNull(field.getExpression()); + } + +} Added: trunk/framework/test/src/test/java/org/richfaces/model/ModifiableModelTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/model/ModifiableModelTest.java (rev 0) +++ trunk/framework/test/src/test/java/org/richfaces/model/ModifiableModelTest.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -0,0 +1,192 @@ +/** + * + */ +package org.richfaces.model; + +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.tests.MockDataModel; +import org.ajax4jsf.tests.MockDataModelListener; +import org.ajax4jsf.tests.MockRange; +import org.apache.commons.digester.SetRootRule; + +import junit.framework.TestCase; + +/** + * @author Konstantin Mishin + * + */ +public class ModifiableModelTest extends TestCase { + + private ModifiableModel model; + private ExtendedDataModel originalModel; + private String var; + private List<FilterField> filterFields; + private List<SortField2> sortFields; + + /** + * @param name + */ + public ModifiableModelTest(String name) { + super(name); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); + originalModel = new MockDataModel(); + var = "var"; + filterFields = new LinkedList<FilterField>(); + sortFields = new LinkedList<SortField2>(); + model = new ModifiableModel(originalModel, var, filterFields, sortFields); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#tearDown() + */ + protected void tearDown() throws Exception { + model = null; + var = null; + filterFields = null; + sortFields = null; + originalModel = null; + super.tearDown(); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#isRowAvailable()}. + */ + public final void testIsRowAvailable() { + assertEquals(model.isRowAvailable(), originalModel.isRowAvailable()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getRowCount()}. + */ + public final void testGetRowCount() { + assertEquals(model.getRowCount(), originalModel.getRowCount()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getRowIndex()}. + */ + public final void testGetRowIndex() { + assertEquals(model.getRowIndex(), originalModel.getRowIndex()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#setRowIndex(int)}. + */ + public final void testSetRowIndex() { + model.setRowIndex(5); + assertEquals(model.getRowIndex(), originalModel.getRowIndex()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#setRowKey(java.lang.Object)}. + */ + public final void testSetRowKey() { + model.setRowKey(new Integer(5)); + assertEquals(model.getRowKey(), originalModel.getRowKey()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getRowKey()}. + */ + public final void testGetRowKey() { + assertEquals(model.getRowKey(), originalModel.getRowKey()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getSerializableModel(org.ajax4jsf.model.Range)}. + */ + public final void testGetSerializableModel() { + assertEquals(model.getSerializableModel(null), originalModel.getSerializableModel(null)); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object)}. + */ + public final void testWalk() { + MockRange range = new MockRange(5); + try { + model.walk(null, new DataVisitor(){ + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + Object key = model.getRowKey(); + model.setRowKey(rowKey); + assertEquals(model.getRowData(), originalModel.getRowData()); + model.setRowKey(key); + } + }, range, null); + } catch (IOException e) { + fail(e.getMessage()); + } + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#ModifiableModel(org.ajax4jsf.model.ExtendedDataModel, java.lang.String, java.util.List, java.util.List)}. + */ + public final void testModifiableModel() { + ModifiableModel modifiableModel = new ModifiableModel(originalModel, var, filterFields, sortFields);; + assertNotNull(modifiableModel); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#addDataModelListener(javax.faces.model.DataModelListener)}. + */ + public final void testAddDataModelListenerDataModelListener() { + MockDataModelListener listener = new MockDataModelListener(); + model.addDataModelListener(listener); + assertEquals(model.getDataModelListeners()[0], listener); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getDataModelListeners()}. + */ + public final void testGetDataModelListeners() { + assertEquals(model.getDataModelListeners().length, 0); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getRowData()}. + */ + public final void testGetRowData() { + assertEquals(model.getRowData(), originalModel.getRowData()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#getWrappedData()}. + */ + public final void testGetWrappedData() { + assertEquals(model.getWrappedData(), originalModel.getWrappedData()); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#removeDataModelListener(javax.faces.model.DataModelListener)}. + */ + public final void testRemoveDataModelListenerDataModelListener() { + MockDataModelListener listener = new MockDataModelListener(); + model.addDataModelListener(listener); + assertEquals(model.getDataModelListeners()[0], listener); + model.removeDataModelListener(listener); + assertEquals(model.getDataModelListeners().length, 0); + } + + /** + * Test method for {@link org.richfaces.model.ModifiableModel#setWrappedData(java.lang.Object)}. + */ + public final void testSetWrappedDataObject() { + model.setWrappedData(var); + assertEquals(originalModel.getWrappedData(), var); + } + +} Added: trunk/framework/test/src/test/java/org/richfaces/model/SortField2Test.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/model/SortField2Test.java (rev 0) +++ trunk/framework/test/src/test/java/org/richfaces/model/SortField2Test.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -0,0 +1,99 @@ +/** + * + */ +package org.richfaces.model; + +import javax.el.ValueExpression; + +import org.ajax4jsf.tests.MockValueExpression; + +import junit.framework.TestCase; + +/** + * @author Konstantin Mishin + * + */ +public class SortField2Test extends TestCase { + + private SortField2 field; + private ValueExpression expression; + private Ordering ordering; + /** + * @param name + */ + public SortField2Test(String name) { + super(name); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); + expression = new MockValueExpression(null); + ordering = Ordering.ASCENDING; + field = new SortField2(expression, ordering); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#tearDown() + */ + protected void tearDown() throws Exception { + field = null; + ordering = null; + expression = null; + super.tearDown(); + } + + /** + * Test method for {@link org.richfaces.model.SortField2#hashCode()}. + */ + public final void testHashCode() { + Field sortField = new SortField2(expression, ordering); + assertEquals(sortField.hashCode(), field.hashCode()); + } + + /** + * Test method for {@link org.richfaces.model.SortField2#equals(java.lang.Object)}. + */ + public final void testEqualsObject() { + SortField2 sortField = new SortField2(null); + assertFalse(sortField.equals(field)); + sortField.setExpression(expression); + sortField.setOrdering(ordering); + assertTrue(sortField.equals(field)); + } + + /** + * Test method for {@link org.richfaces.model.SortField2#SortField2(javax.el.ValueExpression)}. + */ + public final void testSortField2ValueExpression() { + SortField2 sortField2 = new SortField2(expression); + field.setOrdering(null); + assertEquals(sortField2, field); + } + + /** + * Test method for {@link org.richfaces.model.SortField2#SortField2(javax.el.ValueExpression, org.richfaces.model.Ordering)}. + */ + public final void testSortField2ValueExpressionOrdering() { + SortField2 sortField2 = new SortField2(expression, ordering); + assertEquals(sortField2, field); + } + + /** + * Test method for {@link org.richfaces.model.SortField2#getOrdering()}. + */ + public final void testGetOrdering() { + assertEquals(field.getOrdering(), ordering); + } + + /** + * Test method for {@link org.richfaces.model.SortField2#setOrdering(org.richfaces.model.Ordering)}. + */ + public final void testSetOrdering() { + field.setOrdering(null); + assertNull(field.getOrdering()); + } + +} Added: trunk/framework/test/src/test/java/org/richfaces/model/impl/expressive/WrappedBeanFilterTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/model/impl/expressive/WrappedBeanFilterTest.java (rev 0) +++ trunk/framework/test/src/test/java/org/richfaces/model/impl/expressive/WrappedBeanFilterTest.java 2008-01-22 18:17:16 UTC (rev 5542) @@ -0,0 +1,72 @@ +/** + * + */ +package org.richfaces.model.impl.expressive; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.ajax4jsf.tests.MockValueExpression; +import org.richfaces.model.FilterField; + +import junit.framework.TestCase; + +/** + * @author Konstantin Mishin + * + */ +public class WrappedBeanFilterTest extends TestCase { + + private List<FilterField> filterFields; + private WrappedBeanFilter filter; + /** + * @param name + */ + public WrappedBeanFilterTest(String name) { + super(name); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); + filterFields = new LinkedList<FilterField>(); + filterFields.add(new FilterField(new MockValueExpression("keyTrue"))); + filter = new WrappedBeanFilter(filterFields); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#tearDown() + */ + protected void tearDown() throws Exception { + super.tearDown(); + filter = null; + filterFields = null; + } + + /** + * Test method for {@link org.richfaces.model.impl.expressive.WrappedBeanFilter#WrappedBeanFilter(java.util.List)}. + */ + public final void testWrappedBeanFilter() { + WrappedBeanFilter beanFilter = new WrappedBeanFilter(filterFields); + assertNotNull(beanFilter); + } + + /** + * Test method for {@link org.richfaces.model.impl.expressive.WrappedBeanFilter#accept(org.richfaces.model.impl.expressive.JavaBeanWrapper)}. + */ + public final void testAccept() { + TestObj obj = new TestObj("TestObj"); + Map<String, Object> props = new HashMap<String, Object>(); + props.put("keyTrue", Boolean.TRUE); + props.put("keyFalse", Boolean.FALSE); + JavaBeanWrapper wrapper = new JavaBeanWrapper(obj, props); + assertTrue(filter.accept(wrapper)); + filterFields.add(new FilterField(new MockValueExpression("keyFalse"))); + assertFalse(filter.accept(wrapper)); + } + +}

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5541 - trunk/framework/api/src/main/java/org/richfaces/model.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-01-22 12:39:58 -0500 (Tue, 22 Jan 2008) New Revision: 5541 Modified: trunk/framework/api/src/main/java/org/richfaces/model/Field.java Log: RF-1741 Modified: trunk/framework/api/src/main/java/org/richfaces/model/Field.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/model/Field.java 2008-01-22 17:27:36 UTC (rev 5540) +++ trunk/framework/api/src/main/java/org/richfaces/model/Field.java 2008-01-22 17:39:58 UTC (rev 5541) @@ -33,8 +33,9 @@ if (expression == null) { if (other.expression != null) return false; - } else if (!expression.getExpressionString().equals(other.expression.getExpressionString())) - return false; + } else { + return expression.equals(other.expression); + } return true; }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5540 - in trunk/test-applications/facelets/src/main: java/message and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2008-01-22 12:27:36 -0500 (Tue, 22 Jan 2008) New Revision: 5540 Modified: trunk/test-applications/facelets/src/main/java/gmap/Gmap.java trunk/test-applications/facelets/src/main/java/message/Message.java trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml Log: http://jira.jboss.com/jira/browse/RF-1863 Modified: trunk/test-applications/facelets/src/main/java/gmap/Gmap.java =================================================================== --- trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2008-01-22 17:27:36 UTC (rev 5540) @@ -1,26 +1,41 @@ package gmap; +/** + * @author user + * + */ public class Gmap { - private String zoom; private String continuousZoom; private String doubleClickZoom; private String dragging; + private String enableInfoWindow; + private String lat; + private String lng; + private String mapType; + private String showGLargeMapControl; + private String showGMapTypeControl; + private String showGScaleControl; + private String warningMessage; + private String zoom; + private boolean rendered; public Gmap() { + zoom = "17"; + mapType ="G_NORMAL_MAP"; + lng = "44.44"; + lat = "37.37"; + warningMessage = "warning!!!"; + showGLargeMapControl = "true"; + showGMapTypeControl = "true"; + showGScaleControl = "true"; + enableInfoWindow = "true"; + rendered = true; continuousZoom = "false"; doubleClickZoom = "false"; dragging = "false"; } - public String getZoom() { - return zoom; - } - - public void setZoom(String zoom) { - this.zoom = zoom; - } - public String act() { zoom = "17"; System.out.println("zoom=" + zoom); @@ -44,11 +59,90 @@ } public String getDragging() { - return dragging; } public void setDragging(String dragging) { - this.dragging = dragging; + this.dragging = dragging; } + + public String getEnableInfoWindow() { + return enableInfoWindow; + } + + public void setEnableInfoWindow(String enableInfoWindow) { + this.enableInfoWindow = enableInfoWindow; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getMapType() { + return mapType; + } + + public void setMapType(String mapType) { + this.mapType = mapType; + } + + public String getShowGLargeMapControl() { + return showGLargeMapControl; + } + + public void setShowGLargeMapControl(String showGLargeMapControl) { + this.showGLargeMapControl = showGLargeMapControl; + } + + public String getShowGMapTypeControl() { + return showGMapTypeControl; + } + + public void setShowGMapTypeControl(String showGMapTypeControl) { + this.showGMapTypeControl = showGMapTypeControl; + } + + public String getShowGScaleControl() { + return showGScaleControl; + } + + public void setShowGScaleControl(String showGScaleControl) { + this.showGScaleControl = showGScaleControl; + } + + public String getWarningMessage() { + return warningMessage; + } + + public void setWarningMessage(String warningMessage) { + this.warningMessage = warningMessage; + } + + public String getZoom() { + return zoom; + } + + public void setZoom(String zoom) { + this.zoom = zoom; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } } Modified: trunk/test-applications/facelets/src/main/java/message/Message.java =================================================================== --- trunk/test-applications/facelets/src/main/java/message/Message.java 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/java/message/Message.java 2008-01-22 17:27:36 UTC (rev 5540) @@ -7,6 +7,7 @@ private boolean showDetail; private boolean showSummary; private boolean tooltip; + private boolean globalOnly; private String select1; private String select2; private String select3; @@ -20,6 +21,7 @@ showDetail = true; showSummary = false; tooltip = true; + globalOnly = false; select1 = "error"; select2 = "error"; select3 = "error"; @@ -184,4 +186,12 @@ setSelect4("passed"); setSelect5("warn"); } + + public boolean isGlobalOnly() { + return globalOnly; + } + + public void setGlobalOnly(boolean globalOnly) { + this.globalOnly = globalOnly; + } } Modified: trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java =================================================================== --- trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java 2008-01-22 17:27:36 UTC (rev 5540) @@ -3,7 +3,69 @@ public class VirtualEarth { private String zoom; private String version; + private String lat; + private String lng; + private boolean rendered; + private String dashboardSize; + private String mapStyle; + public VirtualEarth() { + version = "6"; + zoom = "17"; + version = "6"; + lat = "37.37"; + lng = "44.44"; + dashboardSize = "Normal"; + mapStyle = "Hybrid"; + rendered = true; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + double d = Double.parseDouble(lat); + if(-97 < d && d < 97) + this.lat = lat; + else this.lat = "0"; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + double d = Double.parseDouble(lng); + if(-180 < d && d < 180) + this.lng = lng; + else this.lng = "0"; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getDashboardSize() { + return dashboardSize; + } + + public void setDashboardSize(String dashboardSize) { + this.dashboardSize = dashboardSize; + } + + public String getMapStyle() { + return mapStyle; + } + + public void setMapStyle(String mapStyle) { + this.mapStyle = mapStyle; + } + public String getVersion() { return version; } Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-01-22 17:27:36 UTC (rev 5540) @@ -1,51 +1,44 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapSubviewID"> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + <rich:gmap id="gMapID" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}" + warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}" + enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}" + gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" + showGScaleControl="#{gmap.showGScaleControl}" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" - style="width:500px;height:400px" - enableContinuousZoom="#{gmap.continuousZoom}" - enableDoubleClickZoom="#{gmap.doubleClickZoom}" - enableDragging="#{gmap.dragging}" /> + gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" /> - <h:panelGroup> - <f:verbatim> + <h:panelGroup> + <f:verbatim> Controls:<br /> - <a href="javascript:void(0);" - onclick="map.hideControls();return false;">Remove</a> - <a href="javascript:void(0);" - onclick="map.showControls();return false;">Show</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.hideControls();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.showControls();return false;">Show</a> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" - onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> - <a href="javascript:void(0);" - onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a> - <a href="javascript:void(0);" - onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> + <a href="javascript:void(0);" onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a> + <a href="javascript:void(0);" onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show - Exadel Office</a> - <br /> - <a href="javascript:void(0);" - onclick="showExadelInMinsk();return false;">Show Exadel in - Belarus</a> - </f:verbatim> - </h:panelGroup> + <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> - <a4j:outputPanel> - <script> + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); @@ -77,6 +70,6 @@ var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-01-22 17:27:36 UTC (rev 5540) @@ -1,6 +1,34 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapPropertySubviewID"> <h:panelGrid columns="2"> + <h:outputText value="mapType"></h:outputText> + <h:selectOneMenu value="#{gmap.mapType}" onchange="submit();"> + <f:selectItem itemLabel="G_NORMAL_MAP" itemValue="G_NORMAL_MAP"/> + <f:selectItem itemLabel="G_SATELLITE_MAP" itemValue="G_SATELLITE_MAP"/> + <f:selectItem itemLabel="G_HYBRID_MAP" itemValue="G_HYBRID_MAP"/> + </h:selectOneMenu> + + <h:outputText value="enableInfoWindow:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.enableInfoWindow}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGLargeMapControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGLargeMapControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGMapTypeControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGMapTypeControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGScaleControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGScaleControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="warningMessage:"></h:outputText> + <h:inputText value="#{gmap.warningMessage}" onclick="submit()" ></h:inputText> + + <h:outputText value="lng:"></h:outputText> + <h:inputText value="#{gmap.lng}" onclick="submit()" ></h:inputText> + + <h:outputText value="lat:"></h:outputText> + <h:inputText value="#{gmap.lat}" onclick="submit()" ></h:inputText> + <h:outputText value="Dragging:" /> <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> @@ -9,5 +37,8 @@ <h:outputText value="Double Click Zoom:" /> <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" onclick="submit()" /> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.rendered}" onchange="submit();"></h:selectBooleanCheckbox> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-01-22 17:27:36 UTC (rev 5540) @@ -36,7 +36,7 @@ <rich:separator></rich:separator> <h:outputText value="Rich Messages Demo" /> - <rich:messages layout="#{message.layout}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" + <rich:messages layout="#{message.layout}" globalOnly="#{message.globalOnly}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel" infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo" errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass" Modified: trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-01-22 17:27:36 UTC (rev 5540) @@ -63,6 +63,9 @@ <h:outputText value="Title:" /> <h:inputText value="#{message.title}" /> + + <h:outputText value="globalOnly"></h:outputText> + <h:selectBooleanCheckbox value="#{message.globalOnly}"></h:selectBooleanCheckbox> <h:outputText value="Show Detail:" /> <h:selectBooleanCheckbox value="#{message.showDetail}" /> Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-01-22 17:27:36 UTC (rev 5540) @@ -1,18 +1,20 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthSubviewID"> - <h:panelGrid columns="2"> - <rich:virtualEarth style="width:800px;" version="#{virtualEarth.version}" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" - mapStyle="Hybrid" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"/> + <h:panelGrid columns="2"> - </h:panelGrid> + <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" + dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" /> - <a4j:outputPanel> - <script> + </h:panelGrid> + + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); GEvent.addListener(marker, "click", function() { @@ -26,10 +28,10 @@ map.SetMapStyle(VEMapStyle.Birdseye); } function showExadelInMinsk() { - var point = new VELatLong(53.92316,27.510737, 53.92316,27.510737); + var point = new VELatLong(53.92316,27.510737); map.SetCenterAndZoom(point, 16); map.SetMapStyle(VEMapStyle.Birdseye); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-01-22 17:27:01 UTC (rev 5539) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-01-22 17:27:36 UTC (rev 5540) @@ -1,27 +1,52 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthPropertySubviewID"> - <h:panelGroup> - <f:verbatim> + <h:panelGrid columns="2"> + <h:outputText value="lat(-97 < x < 97):"></h:outputText> + <h:inputText value="#{virtualEarth.lat}" onchange="submit();"></h:inputText> + + <h:outputText value="lng(-180 < x < 180):"></h:outputText> + <h:inputText value="#{virtualEarth.lng}" onchange="submit();"></h:inputText> + + <h:outputText value="dashboardSize"></h:outputText> + <h:selectOneMenu value="#{virtualEarth.dashboardSize}" onchange="submit();"> + <f:selectItem itemLabel="Normal" itemValue="Normal" /> + <f:selectItem itemLabel="Small" itemValue="Small" /> + <f:selectItem itemLabel="Tiny" itemValue="Tiny" /> + </h:selectOneMenu> + + <h:outputText value="mapStyle"></h:outputText> + <h:selectOneMenu value="#{virtualEarth.mapStyle}" onchange="submit();"> + <f:selectItem itemLabel="Birdseye" itemValue="Birdseye" /> + <f:selectItem itemLabel="Hybrid" itemValue="Hybrid" /> + <f:selectItem itemLabel="Aerial" itemValue="Aerial" /> + <f:selectItem itemLabel="Road" itemValue="Road" /> + </h:selectOneMenu> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{virtualEarth.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + </h:panelGrid> + <h:panelGroup> + <f:verbatim> Dashboard:<br /> - <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> - <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> - <br /> - <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> - </f:verbatim> - </h:panelGroup> + <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> </f:subview> \ No newline at end of file

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5539 - in trunk/test-applications/jsp/src/main: java/virtualEarth and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2008-01-22 12:27:01 -0500 (Tue, 22 Jan 2008) New Revision: 5539 Removed: trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp Modified: trunk/test-applications/jsp/src/main/java/gmap/Gmap.java trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp Log: http://jira.jboss.com/jira/browse/RF-1863 Modified: trunk/test-applications/jsp/src/main/java/gmap/Gmap.java =================================================================== --- trunk/test-applications/jsp/src/main/java/gmap/Gmap.java 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/java/gmap/Gmap.java 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,26 +1,41 @@ package gmap; +/** + * @author user + * + */ public class Gmap { - private String zoom; private String continuousZoom; private String doubleClickZoom; private String dragging; + private String enableInfoWindow; + private String lat; + private String lng; + private String mapType; + private String showGLargeMapControl; + private String showGMapTypeControl; + private String showGScaleControl; + private String warningMessage; + private String zoom; + private boolean rendered; public Gmap() { + zoom = "17"; + mapType ="G_NORMAL_MAP"; + lng = "44.44"; + lat = "37.37"; + warningMessage = "warning!!!"; + showGLargeMapControl = "true"; + showGMapTypeControl = "true"; + showGScaleControl = "true"; + enableInfoWindow = "true"; + rendered = true; continuousZoom = "false"; doubleClickZoom = "false"; dragging = "false"; } - public String getZoom() { - return zoom; - } - - public void setZoom(String zoom) { - this.zoom = zoom; - } - public String act() { zoom = "17"; System.out.println("zoom=" + zoom); @@ -44,11 +59,90 @@ } public String getDragging() { - return dragging; } public void setDragging(String dragging) { - this.dragging = dragging; + this.dragging = dragging; } + + public String getEnableInfoWindow() { + return enableInfoWindow; + } + + public void setEnableInfoWindow(String enableInfoWindow) { + this.enableInfoWindow = enableInfoWindow; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getMapType() { + return mapType; + } + + public void setMapType(String mapType) { + this.mapType = mapType; + } + + public String getShowGLargeMapControl() { + return showGLargeMapControl; + } + + public void setShowGLargeMapControl(String showGLargeMapControl) { + this.showGLargeMapControl = showGLargeMapControl; + } + + public String getShowGMapTypeControl() { + return showGMapTypeControl; + } + + public void setShowGMapTypeControl(String showGMapTypeControl) { + this.showGMapTypeControl = showGMapTypeControl; + } + + public String getShowGScaleControl() { + return showGScaleControl; + } + + public void setShowGScaleControl(String showGScaleControl) { + this.showGScaleControl = showGScaleControl; + } + + public String getWarningMessage() { + return warningMessage; + } + + public void setWarningMessage(String warningMessage) { + this.warningMessage = warningMessage; + } + + public String getZoom() { + return zoom; + } + + public void setZoom(String zoom) { + this.zoom = zoom; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } } Modified: trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java =================================================================== --- trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java 2008-01-22 17:27:01 UTC (rev 5539) @@ -3,7 +3,69 @@ public class VirtualEarth { private String zoom; private String version; + private String lat; + private String lng; + private boolean rendered; + private String dashboardSize; + private String mapStyle; + public VirtualEarth() { + version = "6"; + zoom = "17"; + version = "6"; + lat = "37.37"; + lng = "44.44"; + dashboardSize = "Normal"; + mapStyle = "Hybrid"; + rendered = true; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + double d = Double.parseDouble(lat); + if(-97 < d && d < 97) + this.lat = lat; + else this.lat = "0"; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + double d = Double.parseDouble(lng); + if(-180 < d && d < 180) + this.lng = lng; + else this.lng = "0"; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getDashboardSize() { + return dashboardSize; + } + + public void setDashboardSize(String dashboardSize) { + this.dashboardSize = dashboardSize; + } + + public String getMapStyle() { + return mapStyle; + } + + public void setMapStyle(String mapStyle) { + this.mapStyle = mapStyle; + } + public String getVersion() { return version; } Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,50 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="calendarJSAPIID"> - <f:verbatim> - <br /> - <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a> - <br /> - <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a> - <br /> - <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a> - <br /> - <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a> - <br /> - <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a> - <br /> - <a href="#" id="doTodayCalendarID">Calendar (today)</a> - <br /> - <a href="#" id="doEnableCalendarID">Calendar (enable)</a> - <br /> - <a href="#" id="doDisableCalendarID">Calendar (disable)</a> - <br /> - <a href="#" id="doCurrentYearCalendarID">Calendar (currentYear)</a> - </f:verbatim> - - <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" /> - <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" /> - <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" /> - <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" /> - <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" /> - <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" /> - <rich:componentControl attachTo="doEnableCalendarID" for="ccCalendarID" event="onclick" operation="enable" /> - <rich:componentControl attachTo="doDisableCalendarID" for="ccCalendarID" event="onclick" operation="disable" /> - <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="disable" /> - <rich:componentControl attachTo="doCurrentYearCalendarID" for="ccCalendarID" event="onclick" operation="getCurrentYear" /> - <f:verbatim> -selectDate(date) Selects the date specified. If the date isn't in current month - performs request to select -isDateEnabled(date) Checks if given date is selectable -enableDate(date) Enables date cell control on the calendar -disableDate(date) Disables date cell control on the calendar -enableDates(date[]) Enables dates cell controls set on the calendar -disableDates(date[]) Disables dates cell controls set on the calendar -getSelectedDate() Returns currently selected date -Object getData() Returns additional data for the date -getCurrentMonth() Returns number of the month currently being viewed -getCurrentYear() Returns number of the year currently being viewed -</f:verbatim> -</f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,60 +4,92 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="componentControlSubviewID"> - <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> - <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> - <f:verbatim>Close 1</f:verbatim> - </h:outputLink> - <f:verbatim> - <br /> - </f:verbatim> - <h:outputLink id="hideButton2ID" onclick="return false;" value="#"> - <f:verbatim>Close 2</f:verbatim> - </h:outputLink> - </rich:modalPanel> - - <h:commandButton id="showButtonID" value="show ModalPanel" > - <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" params="show:'componentControl work(show)'" /> - </h:commandButton> - <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" - params="hide:'componentControl work(hide)'" /> + <h:inputText value="test"> + <rich:componentControl name="controlMe" event="onclick" attachTiming="onload" for="ccToltipID" operation="show" /> + </h:inputText> + <rich:panel> + <rich:toolTip id="ccToltipID" followMouse="false" direction="top-right" value="Help me, help!"> + </rich:toolTip> + </rich:panel> + + <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> + <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> + <f:verbatim>Close 1</f:verbatim> + </h:outputLink> <f:verbatim> <br /> - <br /> </f:verbatim> + <h:outputLink id="hideButton2ID" onclick="return false;" value="#"> + <f:verbatim>Close 2</f:verbatim> + </h:outputLink> + </rich:modalPanel> - <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" mode="ajax" /> - <h:panelGrid columns="2"> - <h:outputText value="popup calendar" /> - <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> - </h:panelGrid> -<a onclick="$('j_id_jsp_362828066_1:componentControlSubviewID:ccCalendarID').component.Expand()" href="#">Show</a> + <h:commandButton id="showButtonID" value="show ModalPanel"> + <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" + params="show:'componentControl work(show)'" /> + </h:commandButton> + <rich:componentControl attachTiming="onload" attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" + operation="hide" params="hide:'componentControl work(hide)'" /> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - <rich:panelMenu id="ccContextMenuPanelMenuID"> - <h:outputText value="click text" /> - </rich:panelMenu> + <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" /> + <h:panelGrid columns="2"> + <h:outputText value="popup calendar" /> + <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> + </h:panelGrid> - <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> - <rich:menuItem icon="/pics/header.png" value="tab1"> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="/pics/info.gif" value="a"> - </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="b"> - </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="c"> - </rich:menuItem> - </rich:contextMenu> - <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" - operation="show" params="expand:'show work'" /> - - <jsp:include page="CalendarJSAPI.jsp" /> + <f:verbatim> + <br /> + <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a> + <br /> + <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a> + <br /> + <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a> + <br /> + <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a> + <br /> + <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a> + <br /> + <a href="#" id="doTodayCalendarID">Calendar (today)</a> + <br /> + <a href="#" id="doTodayCalendarRenderedID">Calendar (today) rendered="false"</a> + </f:verbatim> + + <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" /> + <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" /> + <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" /> + <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" /> + <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" /> + <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" /> + <rich:componentControl attachTo="doTodayCalendarRenderedID" for="ccCalendarID" rendered="false" event="onclick" operation="today" /> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + + <rich:panelMenu id="ccContextMenuPanelMenuID"> + <h:outputText value="click text" /> + </rich:panelMenu> + + <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> + <rich:menuItem icon="/pics/header.png" value="tab1"> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="/pics/info.gif" value="a"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="b"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="c"> + </rich:menuItem> + </rich:contextMenu> + <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="show" + params="expand:'show work'" /> </f:subview> \ No newline at end of file Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="contextMenuJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="ListShuttleJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="modalPanelJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="orderinJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="PanelMenuJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="scrollableDataTableJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="toolTipJSAPIID"> -</f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,52 +4,45 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="GmapSubviewID"> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + <rich:gmap id="gMapID" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}" + warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}" + enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}" + gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" + showGScaleControl="#{gmap.showGScaleControl}" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" - style="width:500px;height:400px" - enableContinuousZoom="#{gmap.continuousZoom}" - enableDoubleClickZoom="#{gmap.doubleClickZoom}" - enableDragging="#{gmap.dragging}" /> + gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" /> - <h:panelGroup> - <f:verbatim> + <h:panelGroup> + <f:verbatim> Controls:<br /> - <a href="javascript:void(0);" - onclick="map.hideControls();return false;">Remove</a> - <a href="javascript:void(0);" - onclick="map.showControls();return false;">Show</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.hideControls();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.showControls();return false;">Show</a> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" - onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> - <a href="javascript:void(0);" - onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a> - <a href="javascript:void(0);" - onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> + <a href="javascript:void(0);" onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a> + <a href="javascript:void(0);" onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show - Exadel Office</a> - <br /> - <a href="javascript:void(0);" - onclick="showExadelInMinsk();return false;">Show Exadel in - Belarus</a> - </f:verbatim> - </h:panelGroup> + <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> - <a4j:outputPanel> - <script> + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); @@ -81,6 +74,6 @@ var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -5,6 +5,34 @@ <f:subview id="GmapPropertySubviewID"> <h:panelGrid columns="2"> + <h:outputText value="mapType"></h:outputText> + <h:selectOneMenu value="#{gmap.mapType}" onchange="submit();"> + <f:selectItem itemLabel="G_NORMAL_MAP" itemValue="G_NORMAL_MAP"/> + <f:selectItem itemLabel="G_SATELLITE_MAP" itemValue="G_SATELLITE_MAP"/> + <f:selectItem itemLabel="G_HYBRID_MAP" itemValue="G_HYBRID_MAP"/> + </h:selectOneMenu> + + <h:outputText value="enableInfoWindow:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.enableInfoWindow}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGLargeMapControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGLargeMapControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGMapTypeControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGMapTypeControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGScaleControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGScaleControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="warningMessage:"></h:outputText> + <h:inputText value="#{gmap.warningMessage}" onclick="submit()" ></h:inputText> + + <h:outputText value="lng:"></h:outputText> + <h:inputText value="#{gmap.lng}" onclick="submit()" ></h:inputText> + + <h:outputText value="lat:"></h:outputText> + <h:inputText value="#{gmap.lat}" onclick="submit()" ></h:inputText> + <h:outputText value="Dragging:" /> <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> @@ -13,5 +41,8 @@ <h:outputText value="Double Click Zoom:" /> <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" onclick="submit()" /> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.rendered}" onchange="submit();"></h:selectBooleanCheckbox> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,19 +4,21 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="virtualEarthSubviewID"> - <h:panelGrid columns="2"> - <rich:virtualEarth style="width:800px;" version="#{virtualEarth.version}" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" - mapStyle="Hybrid" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"/> + <h:panelGrid columns="2"> - </h:panelGrid> + <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" + dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" /> - <a4j:outputPanel> - <script> + </h:panelGrid> + + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); GEvent.addListener(marker, "click", function() { @@ -30,10 +32,10 @@ map.SetMapStyle(VEMapStyle.Birdseye); } function showExadelInMinsk() { - var point = new VELatLong(53.92316,27.510737, 53.92316,27.510737); + var point = new VELatLong(53.92316,27.510737); map.SetCenterAndZoom(point, 16); map.SetMapStyle(VEMapStyle.Birdseye); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,28 +4,53 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="virtualEarthPropertySubviewID"> - <h:panelGroup> - <f:verbatim> + <h:panelGrid columns="2"> + <h:outputText value="lat(-97 < x < 97):"></h:outputText> + <h:inputText value="#{virtualEarth.lat}" onchange="submit();"></h:inputText> + + <h:outputText value="lng(-180 < x < 180):"></h:outputText> + <h:inputText value="#{virtualEarth.lng}" onchange="submit();"></h:inputText> + + <h:outputText value="dashboardSize"></h:outputText> + <h:selectOneMenu value="#{virtualEarth.dashboardSize}" onchange="submit();"> + <f:selectItem itemLabel="Normal" itemValue="Normal" /> + <f:selectItem itemLabel="Small" itemValue="Small" /> + <f:selectItem itemLabel="Tiny" itemValue="Tiny" /> + </h:selectOneMenu> + + <h:outputText value="mapStyle"></h:outputText> + <h:selectOneMenu value="#{virtualEarth.mapStyle}" onchange="submit();"> + <f:selectItem itemLabel="Birdseye" itemValue="Birdseye" /> + <f:selectItem itemLabel="Hybrid" itemValue="Hybrid" /> + <f:selectItem itemLabel="Aerial" itemValue="Aerial" /> + <f:selectItem itemLabel="Road" itemValue="Road" /> + </h:selectOneMenu> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{virtualEarth.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + </h:panelGrid> + <h:panelGroup> + <f:verbatim> Dashboard:<br /> - <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> - <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> - <br /> - <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> - </f:verbatim> - </h:panelGroup> + <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> </f:subview> \ No newline at end of file

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5538 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: vmolotkov Date: 2008-01-22 12:01:45 -0500 (Tue, 22 Jan 2008) New Revision: 5538 Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx Log: strict template is added Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss =================================================================== --- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-22 16:49:45 UTC (rev 5537) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-22 17:01:45 UTC (rev 5538) @@ -13,14 +13,21 @@ } .rich-combobox-input { - position : absolute; + /*position : absolute; top : 0px; left : 0; padding-right :20px; padding-left :3px; margin : 0px; border : 1px solid; background-position:left top; - background-repeat:repeat-x; + background-repeat:repeat-x;*/ + width : 240px; + position : absolute; + top : 0px; + left : 0; + padding-left :3px; + margin : 0px; + border : 1px solid #c0c0c0; } .rich-combobox-input-disabled { @@ -35,7 +42,7 @@ } .rich-combobox-input-inactive { - position : absolute; + /*position : absolute; top : 0px; left : 0px; padding-right :20px; @@ -43,7 +50,17 @@ margin : 0px; border : 1px solid; background-position:left top; - background-repeat:repeat-x; + background-repeat:repeat-x;*/ + + width : 240px; + position : absolute; + top : 0px; + left : 0; + padding-left :3px; + margin : 0px; + border : 1px solid #c0c0c0; + /*background-image: url(SpinnerFieldGradient.gif); + */ background-position:left top; } .rich-combobox-list-position { position : absolute; @@ -90,12 +107,23 @@ } .rich-combobox-button { - position : absolute; + /*position : absolute; top : 0px; right : 0px; //left: fullWidth - 17px; width : 17px; margin : 0px; - border : 1px solid; + border : 1px solid;*/ + + position : absolute; + top : 0px; + right : 0; + width : 17px; + padding-left : 0px; + padding-right : 0px; + margin : 0px; + border : 1px solid #c0c0c0; + /*border-color: #BED6F8 rgb(190, 214, 248) #BED6F8 rgb(190, 214, 248);*/ + /*panelBorderColor*/ } .rich-combobox-button-disabled { @@ -108,12 +136,23 @@ } .rich-combobox-button-inactive { - position : absolute; + /*position : absolute; top : 0px; right : 0px; //left: fullWidth - 17px; width : 17px; margin : 0px; - border : 1px solid; + border : 1px solid;*/ + + position : absolute; + top : 0px; + right : 0; + width : 17px; + padding-left : 0px; + padding-right : 0px; + margin : 0px; + border : 1px solid #c0c0c0; + /*border-color: #BED6F8 rgb(190, 214, 248) #BED6F8 rgb(190, 214, 248);*/ + /*panelBorderColor*/ } .rich-combobox-button-background { @@ -149,6 +188,12 @@ background : center no-repeat; cursor : pointer; } + +.cb_shadow{ top:10; left:0; position : absolute;} +.cb_shadow_tl{ background : url(images/bg_shadow.png) repeat-x top left;} +.cb_shadow_tr{ background : url(images/bg_shadow.png) repeat-x top right;} +.cb_shadow_bl{ background : url(images/bg_shadow.png) repeat-x bottom left;} +.cb_shadow_br{ background : url(images/bg_shadow.png) repeat-x bottom right;} ]]> </f:verbatim> Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js =================================================================== --- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-22 16:49:45 UTC (rev 5537) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-22 17:01:45 UTC (rev 5538) @@ -485,7 +485,7 @@ }, setWidth : function(width) { - var positionElem = this.listParent.childNodes[0]; + var positionElem = this.listParent.childNodes[2]; var combobox = this.listParent.parentNode; combobox.style.width = width; @@ -600,7 +600,7 @@ resetState : function() { var tempList = this.list.cloneNode(false); - this.listParent.childNodes[0].firstChild.replaceChild(tempList, this.list); + this.listParent.childNodes[2].firstChild.replaceChild(tempList, this.list); this.list = $(tempList.id); this.activeItem = null; this.isList = false; Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-22 16:49:45 UTC (rev 5537) +++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-22 17:01:45 UTC (rev 5538) @@ -181,12 +181,26 @@ ]]> </jsp:scriptlet> - - <div id="#{clientId}"> - <div id="control#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth}; z-index:1;#{style}" - x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange"> - <div class="rich-combobox-font rich-combobox-shell" style="width:#{width};z-index:1;"> - <input id="comboboxField#{clientId}" + <jsp:scriptlet> + <![CDATA[ + if (listWidth == null) { + ]]> + </jsp:scriptlet> + <style> + + </style> + <jsp:scriptlet> + <![CDATA[ + } + ]]> + </jsp:scriptlet> + <f:resource var="spacer" name="images/spacer.gif"/> + +<div id="control#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth};#{style}" + x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange"> + <div class="rich-combobox-list-cord"></div> + <div class="rich-combobox-font rich-combobox-shell" style="width:#{width};"> + <input id="comboboxField#{clientId}" name="comboboxField#{clientId}" disabled="#{disabled}" class="rich-combobox-font-inactive rich-combobox-input-inactive #{inputDisabledClass}" type="text" @@ -195,30 +209,44 @@ onchange="#{component.attributes['onchange']}" onselect="#{component.attributes['onselect']}" onblur="#{component.attributes['onblur']}" - style="width:#{width}; #{inputStyle}"> - </input> - <input id="comboBoxButtonBG#{clientId}" readonly="readonly" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"> - </input> - <input id="comboboxButton#{clientId}" readonly="readonly" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" - class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"> - </input> - - <input type="text" class="rich-combobox-strut rich-combobox-font" style="width:#{width}"> - </input> - </div> + style="width:#{width}; #{inputStyle}" + /> + <input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/> + <input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" + class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/> + <div class="rich-combobox-strut rich-combobox-fon" style="width:#{width}">Strut</div> + </div> + <div id="listParent#{clientId}" class="rich-combobox-list-cord #{listClass}" style="display:none; #{listStyle};"> + <iframe id="iframe#{clientId}" class="rich-combobox-list-scroll rich-combobox-list-position" frameborder="0" style="display:none; width:#{listWidth};"/> + <div class="cb_shadow"> + <table cellpadding="0" cellspacing="0" border="0" width="255" height="109"> + <tr> + <td class="cb_shadow_tl"> + <img src="#{spacer}" width="10" height="1" alt="" border="0"></img><br></br> + </td> + <td class="cb_shadow_tr"> + <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br> + </td> + </tr> + <tr> + <td class="cb_shadow_bl"> + <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br> + </td> + <td class="cb_shadow_br"> + <img src="#{spacer}" width="10" height="10" alt="" border="0"></img><br></br> + </td> + </tr> + </table> </div> - <iframe id="iframe#{clientId}" class="rich-combobox-list-scroll rich-combobox-list-position" frameborder="0" style="display:none; width:#{listWidth};z-index:2;"/> - <div id="listParent#{clientId}" class="rich-combobox-list-cord #{listClass}" style="display:none; #{listStyle};z-index:3;"> - <div id="listPosition#{clientId}" class="rich-combobox-list-position" style="width:#{listWidth};"> - <div id="listDecoration#{clientId}" class="rich-combobox-list-decoration"> - <div id="list#{clientId}" class="rich-combobox-list-scroll" style="width:#{listWidth};"> - <f:call name="encodeItems"/> - </div> + <div id="listPosition#{clientId}" class="rich-combobox-list-position"> + <div id="listDecoration#{clientId}" class="rich-combobox-list-decoration"> + <div id="list#{clientId}" class="rich-combobox-list-scroll" style="width:#{listWidth};"> + <f:call name="encodeItems"/> </div> </div> </div> </div> - +</div> <script type="text/javascript"> Richfaces.ComboBox.CLASSES = {

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5537 - trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: akushunin Date: 2008-01-22 11:49:45 -0500 (Tue, 22 Jan 2008) New Revision: 5537 Modified: trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js Log: http://jira.jboss.com/jira/browse/RF-1916 Modified: trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js =================================================================== --- trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-01-22 16:45:13 UTC (rev 5536) +++ trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-01-22 16:49:45 UTC (rev 5537) @@ -22,6 +22,7 @@ this.options = options; this.onitemchange = options.onitemchange; this.onclick = options.onclick; + this.items = options.items; this._attachBehaviors(); @@ -32,8 +33,8 @@ this.mouseover = options.mouseover; this.mouseout = options.mouseout; - this.mousemove = options.mousemove; - this.items = options.items; + this.mousemove = options.mousemove; + if (this.mouseover && this.mouseover != ""){ Event.observe(this.panel,'mouseover',new Function("event",this.mouseover)); @@ -108,14 +109,31 @@ }, _attachBehaviors: function() { - var rows=this._getDirectChildrenByTag(this.panel,'DIV'); + var rows=this._getItems(this.panel); for(var i=0; i<rows.length; i++) { var subrows=this._getDirectChildrenByTag(rows[i],'DIV'); this.slides.push(new Richfaces.PanelBar.Slide(this,rows[i],subrows[0],subrows[1],subrows[2],i,this.onclick)); //index } }, + _getItems: function( e ) { + var kids = new Array(); + var item = e.firstChild; + var index=0; + var id = this.items[index].id; + do + { + if (item.id == id) + { + kids.push(item); + index++; + if (index<this.items.length) id = this.items[index].id; else break; + } + } while (item=item.nextSibling) + return kids; + }, + _getDirectChildrenByTag: function( e, tagName ) { var kids = new Array();

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r5536 - branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-01-22 11:45:13 -0500 (Tue, 22 Jan 2008) New Revision: 5536 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java Log: RF-1763 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-01-22 14:51:49 UTC (rev 5535) +++ branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-01-22 16:45:13 UTC (rev 5536) @@ -72,7 +72,7 @@ int width = 0; - String widthPx = (String)column.getAttributes().get("width"); + String widthPx = getColumnWidth(column); widthPx = getFormattedWidth(widthPx); prevWidth = state.getSumWidth(); width = prevWidth + Integer.parseInt(widthPx); @@ -86,7 +86,7 @@ public void renderContent(FacesContext context, UIComponent column, ResponseWriter writer, ScrollableDataTableRendererState state) throws IOException { writer.startElement("col", column); - getUtils().writeAttribute(writer, "width", column.getAttributes().get("width")); + getUtils().writeAttribute(writer, "width", getColumnWidth(column)); getUtils().writeAttribute(writer, "style", column.getAttributes().get("style")); //int cell_index = state.getCellIndex(); //Object columnClass = state.getColumnClass(cell_index); @@ -108,7 +108,7 @@ ComponentVariables variables = ComponentsVariableResolver.getVariables(headerCellTemplate, column); - String widthPx = (String)column.getAttributes().get("width"); + String widthPx = getColumnWidth(column); widthPx = getFormattedWidth(widthPx); int width = Integer.parseInt(widthPx); @@ -885,4 +885,11 @@ return sorting; } + private String getColumnWidth(UIComponent column) { + String width = (String) column.getAttributes().get("width"); + if (width == null) { + width = "100px"; + } + return width; + } }

16 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2008