November 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r4106 - trunk/ui/calendar/src/main/templates/org/richfaces.

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

Author: pyaschenko Date: 2007-11-20 09:47:19 -0500 (Tue, 20 Nov 2007) New Revision: 4106 Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: revert from 3641 Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-20 14:35:34 UTC (rev 4105) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-20 14:47:19 UTC (rev 4106) @@ -9,7 +9,7 @@ baseclass="org.richfaces.renderkit.CalendarRendererBase" component="org.richfaces.component.UICalendar"> <f:clientid var="clientId" /> - <h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),new org.ajax4jsf.javascript.AjaxScript(),/org/richfaces/renderkit/html/scripts/events.js,/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js,/org/richfaces/renderkit/html/scripts/scriptaculous/effects.js,/org/richfaces/renderkit/html/scripts/jquery/jquery.js,/org/richfaces/renderkit/html/scripts/jquery.jcarousel.js,/org/richfaces/renderkit/html/scripts/calendar.js</h:scripts> + <h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),new org.ajax4jsf.javascript.AjaxScript(),/org/richfaces/renderkit/html/scripts/events.js,/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js,/org/richfaces/renderkit/html/scripts/scriptaculous/effects.js,/org/richfaces/renderkit/html/scripts/calendar.js</h:scripts> <h:styles>/org/richfaces/renderkit/html/css/calendar.xcss</h:styles>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4105 - branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model.

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

Author: nbelaevski Date: 2007-11-20 09:35:34 -0500 (Tue, 20 Nov 2007) New Revision: 4105 Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java Log: Java 5 stuff removed Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java 2007-11-20 14:26:53 UTC (rev 4104) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java 2007-11-20 14:35:34 UTC (rev 4105) @@ -55,30 +55,29 @@ /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#getRowKey() */ - @Override public Object getRowKey() { return rowKey; } private void setShuttleRowKey(ListShuttleRowKey shuttleRowKey) { - if (shuttleRowKey == null) { - this.sourceModel.setRowKey(null); - this.targetModel.setRowKey(null); - } else { + Object sourceKey = null; + Object targetKey = null; + + if (shuttleRowKey != null) { if (shuttleRowKey.isSource()) { - this.targetModel.setRowKey(null); - this.sourceModel.setRowKey(shuttleRowKey.getRowKey()); + sourceKey = shuttleRowKey.getRowKey(); } else { - this.sourceModel.setRowKey(null); - this.targetModel.setRowKey(shuttleRowKey.getRowKey()); + targetKey = shuttleRowKey.getRowKey(); } } + + this.sourceModel.setRowKey(null); + this.targetModel.setRowKey(null); } /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#setRowKey(java.lang.Object) */ - @Override public void setRowKey(Object key) { this.rowKey = key; @@ -111,11 +110,10 @@ /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) */ - @Override public void walk(final FacesContext context, final DataVisitor visitor, Range range, Object argument) throws IOException { - this.sourceModel.walk(context, new DataVisitor() { @Override + this.sourceModel.walk(context, new DataVisitor() { public void process(FacesContext context, Object rowKey, Object argument) throws IOException { @@ -149,7 +147,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowCount() */ - @Override public int getRowCount() { return sourceModel.getRowCount() + targetModel.getRowCount(); } @@ -157,7 +154,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowData() */ - @Override public Object getRowData() { return sourceModel.isRowAvailable() ? sourceModel.getRowData() : targetModel.getRowData(); } @@ -165,7 +161,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowIndex() */ - @Override public int getRowIndex() { return -1; } @@ -173,7 +168,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getWrappedData() */ - @Override public Object getWrappedData() { // TODO Auto-generated method stub return null; @@ -182,7 +176,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#isRowAvailable() */ - @Override public boolean isRowAvailable() { return sourceModel.isRowAvailable() || targetModel.isRowAvailable(); } @@ -190,14 +183,12 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#setRowIndex(int) */ - @Override public void setRowIndex(int rowIndex) { } /* (non-Javadoc) * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) */ - @Override public void setWrappedData(Object data) { // TODO Auto-generated method stub

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4104 - in branches/3.1.x/ui/orderingList/src/main/java/org/richfaces: component and 1 other directories.

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

Author: nbelaevski Date: 2007-11-20 09:26:53 -0500 (Tue, 20 Nov 2007) New Revision: 4104 Added: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java Removed: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java Log: model refactored Deleted: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java 2007-11-20 13:40:10 UTC (rev 4103) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java 2007-11-20 14:26:53 UTC (rev 4104) @@ -1,109 +0,0 @@ -/** - * - */ -package org.richfaces.component; - -import java.io.IOException; - -import javax.faces.context.FacesContext; -import javax.faces.model.DataModel; - -import org.ajax4jsf.model.DataVisitor; -import org.ajax4jsf.model.Range; -import org.ajax4jsf.model.SequenceDataModel; - -/** - * @author Nick Belaevski - * mailto:nbelaevski@exadel.com - * created 07.11.2007 - * - */ -public class TranslatedSequenceDataModel extends SequenceDataModel { - - protected static final class TranslatedRowKey { - private Integer key; - private String asString; - - public TranslatedRowKey(Integer key, String asString) { - super(); - this.key = key; - this.asString = asString; - } - - public Integer getKey() { - return key; - } - - public String getAsString() { - return asString; - } - - public String toString() { - return getAsString(); - } - }; - - private int[] translationTable; - private boolean translatedModel; - - private Object rowKey; - - public TranslatedSequenceDataModel(DataModel wrapped, - boolean translatedModel, int[] translationTable) { - super(wrapped); - this.translatedModel = translatedModel; - this.translationTable = translationTable; - } - - public TranslatedSequenceDataModel(DataModel wrapped) { - super(wrapped); - } - - private int translate(int i) { - if (translationTable != null) { - return translationTable[i]; - } else { - return i; - } - } - - public Object getTranslatedRowKey() { - return super.getRowKey(); - } - - public Object getRowKey() { - return rowKey; - } - - public void setRowKey(Object key) { - this.rowKey = key; - - if (key instanceof TranslatedRowKey) { - super.setRowKey(((TranslatedRowKey) key).getKey()); - } else { - if (this.translatedModel) { - if (rowKey != null) { - int iKey = ((Integer) key).intValue(); - super.setRowKey(new Integer(translate(iKey))); - } else { - super.setRowKey(null); - } - } else { - super.setRowKey(key); - } - } - } - - public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { - - for (int i = 0; i < getRowCount(); i++) { - if (this.translatedModel) { - visitor.process(context, new TranslatedRowKey( - new Integer(i), String.valueOf(translate(i))), argument); - } else { - visitor.process(context, new Integer(translate(i)), argument); - } - } - } -} Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-20 13:40:10 UTC (rev 4103) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-20 14:26:53 UTC (rev 4104) @@ -19,7 +19,6 @@ import javax.faces.component.UIComponentBase; import javax.faces.component.UIInput; import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.el.EvaluationException; @@ -38,8 +37,7 @@ import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.model.ExtendedDataModel; -import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.renderkit.OrderingListRendererBase; +import org.richfaces.model.TranslatedSequenceDataModel; public abstract class UIOrderingList extends UIOrderingBaseComponent { Copied: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java (from rev 4099, branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java) =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java (rev 0) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java 2007-11-20 14:26:53 UTC (rev 4104) @@ -0,0 +1,109 @@ +/** + * + */ +package org.richfaces.model; + +import java.io.IOException; + +import javax.faces.context.FacesContext; +import javax.faces.model.DataModel; + +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; + +/** + * @author Nick Belaevski + * mailto:nbelaevski@exadel.com + * created 07.11.2007 + * + */ +public class TranslatedSequenceDataModel extends SequenceDataModel { + + protected static final class TranslatedRowKey { + private Integer key; + private String asString; + + public TranslatedRowKey(Integer key, String asString) { + super(); + this.key = key; + this.asString = asString; + } + + public Integer getKey() { + return key; + } + + public String getAsString() { + return asString; + } + + public String toString() { + return getAsString(); + } + }; + + private int[] translationTable; + private boolean translatedModel; + + private Object rowKey; + + public TranslatedSequenceDataModel(DataModel wrapped, + boolean translatedModel, int[] translationTable) { + super(wrapped); + this.translatedModel = translatedModel; + this.translationTable = translationTable; + } + + public TranslatedSequenceDataModel(DataModel wrapped) { + super(wrapped); + } + + private int translate(int i) { + if (translationTable != null) { + return translationTable[i]; + } else { + return i; + } + } + + public Object getTranslatedRowKey() { + return super.getRowKey(); + } + + public Object getRowKey() { + return rowKey; + } + + public void setRowKey(Object key) { + this.rowKey = key; + + if (key instanceof TranslatedRowKey) { + super.setRowKey(((TranslatedRowKey) key).getKey()); + } else { + if (this.translatedModel) { + if (rowKey != null) { + int iKey = ((Integer) key).intValue(); + super.setRowKey(new Integer(translate(iKey))); + } else { + super.setRowKey(null); + } + } else { + super.setRowKey(key); + } + } + } + + public void walk(FacesContext context, DataVisitor visitor, Range range, + Object argument) throws IOException { + + for (int i = 0; i < getRowCount(); i++) { + if (this.translatedModel) { + visitor.process(context, new TranslatedRowKey( + new Integer(i), String.valueOf(translate(i))), argument); + } else { + visitor.process(context, new Integer(translate(i)), argument); + } + } + } +}

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4103 - branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit.

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

Author: sergeyhalipov Date: 2007-11-20 08:40:10 -0500 (Tue, 20 Nov 2007) New Revision: 4103 Modified: branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java Log: Ordering list: JUnit tests for rendering. Modified: branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java =================================================================== --- branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java 2007-11-20 13:31:05 UTC (rev 4102) +++ branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java 2007-11-20 13:40:10 UTC (rev 4103) @@ -69,6 +69,9 @@ imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconDownDisabled"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTopDisabled"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled"); + imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient"); + imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient"); + imageClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient"); } /** @@ -88,10 +91,13 @@ private HtmlOutputText output2 = null; private UIColumn column1 = null; private UIColumn column2 = null; + private HtmlOutputText caption = null; public void setUp() throws Exception { super.setUp(); + application.addComponent("org.richfaces.OrderingList", "org.richfaces.component.html.HtmlOrderingList"); + form = new HtmlForm(); form.setId("form"); facesContext.getViewRoot().getChildren().add(form); @@ -101,6 +107,10 @@ orderingList.setControlsType("link"); orderingList.setVar("item"); + caption = new HtmlOutputText(); + caption.setValue("caption"); + orderingList.getFacets().put("caption", caption); + items = new ArrayList(); items.add(new SimpleItem("Michael", 2000)); items.add(new SimpleItem("John", 500)); @@ -142,7 +152,6 @@ */ public void testRenderScript() throws Exception { HtmlPage page = renderView(); - //System.out.println(page.asXml()); assertNotNull(page); List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); int foundCount = 0; @@ -181,6 +190,7 @@ for (Iterator it = imageClasses.iterator(); it.hasNext(); ) { String clazz = (String) it.next(); + builder.createResource(null, clazz); InternetResource resource = builder.getResource(clazz); assertNotNull(resource); String uri = "http:" + resource.getUri(facesContext, null);

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4102 - in branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces: component and 2 other directories.

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

Author: nbelaevski Date: 2007-11-20 08:31:05 -0500 (Tue, 20 Nov 2007) New Revision: 4102 Added: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleRowKey.java Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java Log: listShuttle uses refactored orderingList base renderer Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-11-20 13:29:51 UTC (rev 4101) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-11-20 13:31:05 UTC (rev 4102) @@ -4,11 +4,20 @@ package org.richfaces.component; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import javax.faces.context.FacesContext; import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; import javax.faces.event.ValueChangeListener; +import org.richfaces.model.ListShuttleRowKey; + /** * JSF component class * @@ -19,6 +28,71 @@ public static final String COMPONENT_FAMILY = "org.richfaces.ListShuttle"; + public static final class SubmittedValue { + //ListShuttleRowKey -> ListShuttleRowKey + private Map translationTable = new LinkedHashMap(); + private Set selectedItems = new HashSet(); + private ListShuttleRowKey[] activeItems; + + public SubmittedValue(String submittedString) { + super(); + fromString(submittedString); + } + + private void fromString(String string) { +// String[] valueOrder = string.split(","); +// permutationOrder = new int[valueOrder.length]; +// for (int i = 0; i < valueOrder.length; i++) { +// Matcher matcher = Pattern.compile("(\\d+)(s?a?)").matcher(valueOrder[i]); +// matcher.matches(); +// +// try { +// permutationOrder[i] = Integer.valueOf(matcher.group(1)).intValue(); +// String group = matcher.group(2); +// for (int j = 0; j < group.length(); j++) { +// char c = group.charAt(j); +// if ('s' == c) { +// selectedItems.add(new Integer(permutationOrder[i])); +// } else if ('a' == c) { +// activeItem = new Integer(permutationOrder[i]); +// } else { +// break ; +// } +// +// } +// } catch (NumberFormatException e) { +// // TODO: handle exception +// } +// } + } + + public String toString() { + StringBuffer result = new StringBuffer(); +// for (int i = 0; i < permutationOrder.length; i++) { +// result.append(permutationOrder[i]); +// +// Integer key = new Integer(i); +// +// if (selectedItems.contains(key)) { +// result.append('s'); +// } +// +// if (key.equals(activeItem)) { +// result.append('a'); +// } +// +// if (i < permutationOrder.length - 1) { +// result.append(','); +// } +// } + return result.toString(); + } + + public Map getTranslationTable() { + return translationTable; + } + } + private Object sourceValue; private boolean sourceValueSet; @@ -57,15 +131,15 @@ } public Object getLocalTargetValue() { - return sourceValue; + return targetValue; } public Object getTargetValue() { - if (sourceValue != null) { - return sourceValue; + if (targetValue != null) { + return targetValue; } - ValueBinding vb = getValueBinding("sourceValue"); + ValueBinding vb = getValueBinding("targetValue"); if (vb != null) { return vb.getValue(FacesContext.getCurrentInstance()); } @@ -110,10 +184,11 @@ public abstract MethodBinding getValueChangeListener(); public ValueChangeListener[] getValueChangeListeners() { - return null; + return (ValueChangeListener[]) getFacesListeners(ValueChangeListener.class); } public void removeValueChangeListener(ValueChangeListener listener) { + removeFacesListener(listener); } } Added: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java (rev 0) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java 2007-11-20 13:31:05 UTC (rev 4102) @@ -0,0 +1,206 @@ +/** + * + */ +package org.richfaces.model; + +import java.io.IOException; +import java.util.Map; + +import javax.faces.context.FacesContext; +import javax.faces.model.DataModel; + +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; +import org.ajax4jsf.model.SequenceRange; + +/** + * @author Nick Belaevski + * + */ +public class ListShuttleDataModel extends ExtendedDataModel { + + private Object rowKey; + + private boolean translatedModel; + private Map translationTable; + private SequenceDataModel sourceModel; + private SequenceDataModel targetModel; + + protected static final class TranslatedRowKey { + private Object rowKey; + + private String asString; + + public TranslatedRowKey(Object key, String asString) { + super(); + this.rowKey = key; + this.asString = asString; + } + + public Object getRowKey() { + return rowKey; + } + + public String getAsString() { + return asString; + } + + public String toString() { + return getAsString(); + } + }; + + /* (non-Javadoc) + * @see org.ajax4jsf.model.ExtendedDataModel#getRowKey() + */ + @Override + public Object getRowKey() { + return rowKey; + } + + private void setShuttleRowKey(ListShuttleRowKey shuttleRowKey) { + if (shuttleRowKey == null) { + this.sourceModel.setRowKey(null); + this.targetModel.setRowKey(null); + } else { + if (shuttleRowKey.isSource()) { + this.targetModel.setRowKey(null); + this.sourceModel.setRowKey(shuttleRowKey.getRowKey()); + } else { + this.sourceModel.setRowKey(null); + this.targetModel.setRowKey(shuttleRowKey.getRowKey()); + } + } + } + + /* (non-Javadoc) + * @see org.ajax4jsf.model.ExtendedDataModel#setRowKey(java.lang.Object) + */ + @Override + public void setRowKey(Object key) { + this.rowKey = key; + + if (key instanceof TranslatedRowKey) { + ListShuttleRowKey shuttleRowKey = (ListShuttleRowKey) ((TranslatedRowKey) key).getRowKey(); + setShuttleRowKey(shuttleRowKey); + } else { + if (this.translatedModel) { + if (rowKey != null) { + setShuttleRowKey((ListShuttleRowKey) this.translationTable.get(key)); + } else { + setShuttleRowKey(null); + } + } else { + setShuttleRowKey((ListShuttleRowKey) key); + } + } + } + + public ListShuttleDataModel(DataModel source, DataModel target, + boolean translatedModel, Map translationTable) { + super(); + this.translatedModel = translatedModel; + this.translationTable = translationTable; + + this.sourceModel = new org.ajax4jsf.model.SequenceDataModel(source); + this.targetModel = new org.ajax4jsf.model.SequenceDataModel(target); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) + */ + @Override + public void walk(final FacesContext context, final DataVisitor visitor, Range range, + Object argument) throws IOException { + + this.sourceModel.walk(context, new DataVisitor() { @Override + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + + ListShuttleRowKey shuttleRowKey = new ListShuttleRowKey(rowKey, true); + + if (translatedModel) { + visitor.process(context, new TranslatedRowKey( + shuttleRowKey, String.valueOf(translationTable.get(shuttleRowKey))), argument); + } else { + visitor.process(context, translationTable.get(shuttleRowKey), argument); + } + } + }, new SequenceRange(0, -1), null); + + this.targetModel.walk(context, new DataVisitor(){ + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + + ListShuttleRowKey shuttleRowKey = new ListShuttleRowKey(rowKey, false); + + if (translatedModel) { + visitor.process(context, new TranslatedRowKey( + shuttleRowKey, String.valueOf(translationTable.get(shuttleRowKey))), argument); + } else { + visitor.process(context, translationTable.get(shuttleRowKey), argument); + } + } + }, new SequenceRange(0, -1), null); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowCount() + */ + @Override + public int getRowCount() { + return sourceModel.getRowCount() + targetModel.getRowCount(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowData() + */ + @Override + public Object getRowData() { + return sourceModel.isRowAvailable() ? sourceModel.getRowData() : targetModel.getRowData(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowIndex() + */ + @Override + public int getRowIndex() { + return -1; + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getWrappedData() + */ + @Override + public Object getWrappedData() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#isRowAvailable() + */ + @Override + public boolean isRowAvailable() { + return sourceModel.isRowAvailable() || targetModel.isRowAvailable(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#setRowIndex(int) + */ + @Override + public void setRowIndex(int rowIndex) { + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) + */ + @Override + public void setWrappedData(Object data) { + // TODO Auto-generated method stub + + } + +} Added: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleRowKey.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleRowKey.java (rev 0) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleRowKey.java 2007-11-20 13:31:05 UTC (rev 4102) @@ -0,0 +1,66 @@ +/** + * + */ +package org.richfaces.model; + +import java.io.Serializable; + +/** + * @author Nick Belaevski + * + */ +public class ListShuttleRowKey implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 3308741255288495879L; + + private boolean source; + + private Object rowKey; + + public boolean isSource() { + return source; + } + + public Object getRowKey() { + return rowKey; + } + + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((rowKey == null) ? 0 : rowKey.hashCode()); + result = prime * result + (source ? 1231 : 1237); + return result; + } + + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ListShuttleRowKey other = (ListShuttleRowKey) obj; + if (rowKey == null) { + if (other.rowKey != null) + return false; + } else if (!rowKey.equals(other.rowKey)) + return false; + if (source != other.source) + return false; + return true; + } + + public String toString() { + return rowKey.toString() + (source ? "y" : "n"); + } + + public ListShuttleRowKey(Object rowKey, boolean source) { + super(); + this.rowKey = rowKey; + this.source = source; + } +} Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-11-20 13:29:51 UTC (rev 4101) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-11-20 13:31:05 UTC (rev 4102) @@ -3,36 +3,83 @@ */ package org.richfaces.renderkit; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + +import javax.faces.component.UIColumn; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.UIListShuttle; /** * @author Nick Belaevski * */ -public abstract class ListShuttleRendererBase extends OrderingListRendererBase { +public abstract class ListShuttleRendererBase extends OrderingComponentRendererBase { + private static final String MESSAGE_BUNDLE_NAME = OrderingListRendererBase.class.getPackage().getName() + "ListShuttle"; + + public ListShuttleRendererBase() { + super(MESSAGE_BUNDLE_NAME); + } + public void encodeTLCaption(FacesContext context, UIListShuttle shuttle) { - + } public void encodeTLHeader(FacesContext context, UIListShuttle shuttle) { - + } public void encodeTLRows(FacesContext context, UIListShuttle shuttle) { - + } public void encodeSLCaption(FacesContext context, UIListShuttle shuttle) { - + } public void encodeSLControlsFacets(FacesContext context, UIListShuttle shuttle) { - + } public void encodeSLHeader(FacesContext context, UIListShuttle shuttle) { - + } public void encodeSLRows(FacesContext context, UIListShuttle shuttle) { - + } + + public void encodeOneRow(FacesContext context, TableHolder holder) + throws IOException { + ResponseWriter writer = context.getResponseWriter(); + UIListShuttle table = (UIListShuttle) holder.getTable(); + String clientId = holder.getTable().getClientId(context); + writer.startElement(HTML.TR_ELEMENT, table); + writer.writeAttribute("id", clientId, null); + + StringBuffer rowClassName = new StringBuffer("ol_normal rich-ordering-list-row"); + StringBuffer cellClassName = new StringBuffer("ol_cell rich-ordering-list-cell"); + + writer.writeAttribute("class", rowClassName.toString(), null); + + List children = table.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + UIComponent component = (UIComponent) iterator.next(); + + if (component instanceof UIColumn && component.isRendered()) { + UIColumn column = (UIColumn) component; + + writer.startElement(HTML.td_ELEM, table); + + writer.writeAttribute("class", cellClassName.toString(), null); + + renderChildren(context, column); + + writer.endElement(HTML.td_ELEM); + } + } + + writer.endElement(HTML.TR_ELEMENT); + } }

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4101 - in branches/3.1.x/ui/orderingList/src/main/java/org/richfaces: renderkit and 1 other directory.

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

Author: nbelaevski Date: 2007-11-20 08:29:51 -0500 (Tue, 20 Nov 2007) New Revision: 4101 Added: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java Log: orderingList refactored Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-20 13:04:33 UTC (rev 4100) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-20 13:29:51 UTC (rev 4101) @@ -102,16 +102,15 @@ } public Object saveState(FacesContext faces) { - Object[] state = new Object[6]; + Object[] state = new Object[5]; state[0] = super.saveState(faces); - state[1] = saveIterationState(); - state[2] = saveAttachedState(faces, validators); - state[3] = saveAttachedState(faces, validator); + state[1] = saveAttachedState(faces, validators); + state[2] = saveAttachedState(faces, validator); - state[4] = this.value; - state[5] = localValueSet ? Boolean.TRUE : Boolean.FALSE; + state[3] = this.value; + state[4] = localValueSet ? Boolean.TRUE : Boolean.FALSE; return state; } @@ -120,13 +119,12 @@ Object[] state = (Object[]) object; super.restoreState(faces, state[0]); - restoreIterationState(state[1]); - validators = (List) restoreAttachedState(faces, state[2]); - validator = (MethodBinding) restoreAttachedState(faces, state[3]); + validators = (List) restoreAttachedState(faces, state[1]); + validator = (MethodBinding) restoreAttachedState(faces, state[2]); - value = state[4]; - localValueSet = ((Boolean) state[5]).booleanValue(); + value = state[3]; + localValueSet = ((Boolean) state[4]).booleanValue(); } protected DataComponentState createComponentState() { Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-20 13:04:33 UTC (rev 4100) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-20 13:29:51 UTC (rev 4101) @@ -1,7 +1,6 @@ package org.richfaces.component; import java.io.IOException; -import java.io.Serializable; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; @@ -20,6 +19,7 @@ import javax.faces.component.UIComponentBase; import javax.faces.component.UIInput; import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.el.EvaluationException; @@ -38,14 +38,12 @@ import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.renderkit.OrderingListRendererBase; public abstract class UIOrderingList extends UIOrderingBaseComponent { - public static final class ValueHolder implements Serializable { - /** - * - */ - private static final long serialVersionUID = 3380476273566115599L; + public static final class ValueHolder { private Collection selection; private boolean selectionSet; @@ -1014,4 +1012,5 @@ public abstract int getListHeight(); public abstract void setListHeight(int listHeight); + } Added: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java (rev 0) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-20 13:29:51 UTC (rev 4101) @@ -0,0 +1,338 @@ +/** + * + */ +package org.richfaces.renderkit; + +import java.io.IOException; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import javax.faces.component.UIComponent; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.UIOrderingBaseComponent; +import org.richfaces.component.UIOrderingList; + +/** + * @author Nick Belaevski + * + */ +public abstract class OrderingComponentRendererBase extends AbstractRowsRenderer { + + protected final static String SHOW_LABELS_ATTRIBUTE_NAME = "showButtonLabels"; + + protected final static String ATTRIBUTE_CE_ONHEADERCLICK = "onheaderclick"; + + protected final static String CONTROL_TYPE_LINK = "link"; + + protected final static String CONTROL_TYPE_BUTTON = "button"; + + protected final static String CONTROL_TYPE_NONE = "none"; + + protected final static String ATTRIBUTE_CONTROLS_TYPE = "controlsType"; + + protected static abstract class ControlsHelper { + private String name; + + private String bundlePropertyName; + + private String imageURI; + + private String facetName; + + private String styleClassName; + + private String idSuffix; + + String customEvent; + + String styleFromAttribute; + + private String buttonStyleClass; + + boolean enable; + + private String defaultText; + + private String labelAttributeName; + + public abstract boolean isRendered(FacesContext context, UIOrderingList list); + + public ControlsHelper(String name, String bundlePropertyName, String defaultText, String imageURI, + String facetName, String styleClassName, String styleFromAttribute, String buttonStyleClass, + String idSuffix, String customEvent, boolean isEnable, String labelAttributeName) { + super(); + this.name = name; + this.bundlePropertyName = bundlePropertyName; + this.defaultText = defaultText; + this.imageURI = imageURI; + this.facetName = facetName; + this.styleClassName = styleClassName; + this.styleFromAttribute = styleFromAttribute; + this.idSuffix = idSuffix; + this.customEvent = customEvent; + this.buttonStyleClass = buttonStyleClass; + this.enable = isEnable; + this.labelAttributeName = labelAttributeName; + } + + public String getName() { + return name; + } + + public String getBundlePropertyName() { + return bundlePropertyName; + } + + public String getImageURI() { + return imageURI; + } + + public String getFacetName() { + return facetName; + } + + public String getStyleClassName() { + return styleClassName; + } + + public String getIdSuffix() { + return idSuffix; + } + + public String getCustomEvent() { + return customEvent; + } + + public String getStyleFromAttribute() { + return styleFromAttribute; + } + + public String getButtonStyleClass() { + return buttonStyleClass; + } + + public boolean isEnable() { + return enable; + } + + public String getDefaultText() { + return defaultText; + } + + public String getLabelAttributeName() { + return labelAttributeName; + } + } + + private final String bundleName; + + public OrderingComponentRendererBase(String bundleName) { + super(); + + this.bundleName = bundleName; + } + + public void encodeCaption(FacesContext context, UIComponent component) + throws IOException { + ResponseWriter writer = context.getResponseWriter(); + UIComponent facetEl = component.getFacet(OrderingListRendererBase.FACET_CAPTION); + boolean renderFacet = ((facetEl != null) && facetEl.isRendered()); + String captionAttr = (String) component.getAttributes().get(OrderingListRendererBase.ATTRIBUTE_CAPTION_LABEL); + + if (renderFacet || (captionAttr != null)) { + writer.startElement(HTML.DIV_ELEM, component); + writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_label ol_out_label rich-ordering-list-caption", null); + if (renderFacet) { + renderChild(context, facetEl); + } else { + writer.write(captionAttr); + } + writer.endElement(HTML.DIV_ELEM); + } + + } + + public void encodeHeader(FacesContext context, UIOrderingBaseComponent component) + throws IOException { + ResponseWriter writer = context.getResponseWriter(); + //UIComponent header = orderingList.getHeader(); + Iterator headers = component.columns(); + + if (headers.hasNext()) { + writer.startElement("thead", component); + String headerClass = (String) component.getAttributes().get("headerClass"); + + writer.startElement("tr", component); + encodeStyleClass(writer, null, "rich-table-header", null, headerClass); + encodeHeaderFacets(context, writer, headers, "ol_col rich-table-header-cell", headerClass, "header", "th", component); + + writer.endElement("tr"); + } + writer.endElement("thead"); + } + + protected void renderDefaultControl(FacesContext context, + UIOrderingList orderingList, ResponseWriter writer, + boolean useFacet, OrderingComponentRendererBase.ControlsHelper helper, String clientId, ResourceBundle bundle, boolean enabled) + throws IOException { + UIComponent facet = orderingList.getFacet(helper.getFacetName()); + String customEvent = null; + Map attributes = orderingList.getAttributes(); + if (helper.customEvent != null) { + customEvent = (String) attributes.get(helper.customEvent); + } + + String styleFromAttribute = (String) attributes + .get(helper.styleFromAttribute); + String currentStyle = helper.getStyleClassName(); + + if (styleFromAttribute != null) { + currentStyle = styleFromAttribute.concat(currentStyle); + } + + writer.startElement(HTML.DIV_ELEM, orderingList); + writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null); //FIXME: + writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden") + currentStyle, null); + if (!useFacet) { + + writer.startElement(HTML.DIV_ELEM, orderingList); + writer.writeAttribute(HTML.class_ATTRIBUTE, helper.getButtonStyleClass(), null); + if (helper.enable) { + writer.writeAttribute(HTML.onmouseover_ATTRIBUTE, "this.className='ol_button_light'", null); + writer.writeAttribute(HTML.onmousedown_ATTRIBUTE, "this.className='ol_button_press'", null); + writer.writeAttribute(HTML.onmouseup_ATTRIBUTE, "this.className='ol_button'", null); + writer.writeAttribute(HTML.onmouseout_ATTRIBUTE, "this.className='ol_button'", null); + } + + writer.startElement(HTML.DIV_ELEM, orderingList); + writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_content", null); + + } + + if (customEvent != null) { + writer.writeAttribute(HTML.onclick_ATTRIBUTE, customEvent,null); + } + + if (useFacet) { + renderChild(context, facet); + } else { + writer.startElement(HTML.IMG_ELEMENT, orderingList); + writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); + writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null); + writer.writeAttribute(HTML.border_ATTRIBUTE, "0", null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, helper.getFacetName(), + null); + writer.writeAttribute(HTML.src_ATTRIBUTE, getResource( + helper.getImageURI()).getUri(context, null), null); + + writer.endElement(HTML.IMG_ELEMENT); + + if (Boolean.TRUE.equals(attributes.get(SHOW_LABELS_ATTRIBUTE_NAME))) { + String label = (String) attributes.get(helper.getLabelAttributeName()); + + if (label == null && bundle != null) { + try { + label = bundle.getString(helper.getBundlePropertyName()); + } catch (MissingResourceException e) { + + } + } + + if (label == null) { + label = helper.getDefaultText(); + } + + writer.writeText(label, null); + } + } + // writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + + // helper.getIdSuffix(), null); + + // writer.writeAttribute(HTML.class_ATTRIBUTE, currentStyle, null); + + if (!useFacet) { + writer.endElement(HTML.DIV_ELEM); + writer.endElement(HTML.DIV_ELEM); + } + writer.endElement(HTML.DIV_ELEM); + } + + protected void encodeHeaderFacets(FacesContext context, ResponseWriter writer, + Iterator headers, String skinCellClass, + String headerClass, String facetName, String element, UIOrderingBaseComponent orderingList) + throws IOException { + while (headers.hasNext()) { + UIComponent column = (UIComponent) headers.next(); + String classAttribute = facetName + "Class"; + String columnHeaderClass = (String) column.getAttributes().get(classAttribute); + + writer.startElement(element, column); + if (!headers.hasNext()) { + skinCellClass = "ol_endcol rich-table-header-cell-end"; + } + encodeStyleClass(writer, null, skinCellClass, headerClass, columnHeaderClass); + getUtils().encodeAttribute(context, column, "colspan"); + writer.startElement("div", column); + writer.writeAttribute("style", "overflow:hidden;white-space: nowrap;", null); + String onHeaderClickEvent = (String) orderingList.getAttributes().get(ATTRIBUTE_CE_ONHEADERCLICK); + if (onHeaderClickEvent != null) { + writer.writeAttribute(HTML.onclick_ATTRIBUTE, onHeaderClickEvent, null); + } + + UIComponent facet = column.getFacet(facetName); + if (facet != null && facet.isRendered()) { + renderChild(context, facet); + } else { + writer.write("&#160"); + } + + writer.endElement("div"); + writer.endElement(element); + } + } + + protected void encodeControlFacet(FacesContext context, + UIOrderingList orderingList, OrderingComponentRendererBase.ControlsHelper helper, + String clientId, ResponseWriter writer, boolean enabled) throws IOException { + Locale locale = null; + + UIViewRoot viewRoot = context.getViewRoot(); + if (viewRoot != null) { + locale = viewRoot.getLocale(); + } + + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + ResourceBundle bundle = null; + + if (locale != null) { + try { + bundle = ResourceBundle.getBundle(bundleName, locale, contextClassLoader); + } catch (MissingResourceException e) { + + } + } + + Map attributes = orderingList.getAttributes(); + UIComponent facet = orderingList.getFacet(helper.getFacetName()); + boolean useFacet = (facet != null && facet.isRendered()); + String controlType = (String) attributes.get(ATTRIBUTE_CONTROLS_TYPE); + + if (CONTROL_TYPE_NONE.equals(controlType)) { + if (useFacet) { + renderChild(context, facet); + } + } else { + renderDefaultControl(context, orderingList, writer, useFacet, + helper, clientId, bundle ,enabled); + } + } + + +} Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-20 13:04:33 UTC (rev 4100) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-20 13:29:51 UTC (rev 4101) @@ -3,14 +3,10 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; -import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; @@ -26,8 +22,12 @@ import org.richfaces.renderkit.html.images.OrderingListIconUp; import org.richfaces.renderkit.html.images.OrderingListIconUpDisabled; -public abstract class OrderingListRendererBase extends AbstractRowsRenderer { +public abstract class OrderingListRendererBase extends OrderingComponentRendererBase { + public OrderingListRendererBase() { + super(MESSAGE_BUNDLE_NAME); + } + private static final String MESSAGE_BUNDLE_NAME = OrderingListRendererBase.class.getPackage().getName() + "OrderingList"; private final static Character ACTIVITY_MARKER = new Character('a'); @@ -52,18 +52,8 @@ private final static String FACET_DIS_DOWN = "downControlDisabled"; - private final static String FACET_CAPTION = "caption"; + public final static String FACET_CAPTION = "caption"; - private final static String CONTROL_TYPE_LINK = "link"; - - private final static String CONTROL_TYPE_BUTTON = "button"; - - private final static String CONTROL_TYPE_NONE = "none"; - - private final static String SHOW_LABELS_ATTRIBUTE_NAME = "showButtonLabels"; - - private final static String ATTRIBUTE_CONTROLS_TYPE = "controlsType"; - private final static String ATTRIBUTE_CE_ONORDERCHANGED = "onorderchanged"; private final static String ATTRIBUTE_CE_ONTOPCLICK = "ontopclick"; @@ -74,10 +64,8 @@ private final static String ATTRIBUTE_CE_ONBOTTOMCLICK = "onbottomclick"; - private final static String ATTRIBUTE_CE_ONHEADERCLICK = "onheaderclick"; + public final static String ATTRIBUTE_CAPTION_LABEL = "captionLabel"; - private final static String ATTRIBUTE_CAPTION_LABEL = "captionLabel"; - private final static String ATTRIBUTE_CLASS_TOP_CONTROL = "topControlClass"; private final static String ATTRIBUTE_CLASS_BOTTOM_CONTROL = "bottomControlClass"; @@ -108,102 +96,8 @@ private final static String ATTRIBUTE_CLASS_BUTTON = "ol_button"; private final static String ATTRIBUTE_CLASS_BUTTON_DISABLED = "ol_button_disabled"; - protected static abstract class ControlsHelper { - private String name; - - private String bundlePropertyName; - - private String imageURI; - - private String facetName; - - private String styleClassName; - - private String idSuffix; - - private String customEvent; - - private String styleFromAttribute; - - private String buttonStyleClass; - - private boolean enable; - - private String defaultText; - - private String labelAttributeName; - - public abstract boolean isRendered(FacesContext context, UIOrderingList list); - - public ControlsHelper(String name, String bundlePropertyName, String defaultText, String imageURI, - String facetName, String styleClassName, String styleFromAttribute, String buttonStyleClass, - String idSuffix, String customEvent, boolean isEnable, String labelAttributeName) { - super(); - this.name = name; - this.bundlePropertyName = bundlePropertyName; - this.defaultText = defaultText; - this.imageURI = imageURI; - this.facetName = facetName; - this.styleClassName = styleClassName; - this.styleFromAttribute = styleFromAttribute; - this.idSuffix = idSuffix; - this.customEvent = customEvent; - this.buttonStyleClass = buttonStyleClass; - this.enable = isEnable; - this.labelAttributeName = labelAttributeName; - } - - public String getName() { - return name; - } - - public String getBundlePropertyName() { - return bundlePropertyName; - } - - public String getImageURI() { - return imageURI; - } - - public String getFacetName() { - return facetName; - } - - public String getStyleClassName() { - return styleClassName; - } - - public String getIdSuffix() { - return idSuffix; - } - - public String getCustomEvent() { - return customEvent; - } - - public String getStyleFromAttribute() { - return styleFromAttribute; - } - - public String getButtonStyleClass() { - return buttonStyleClass; - } - - public boolean isEnable() { - return enable; - } - - public String getDefaultText() { - return defaultText; - } - - public String getLabelAttributeName() { - return labelAttributeName; - } - }; - - protected static final ControlsHelper[] HELPERS = new ControlsHelper[] { - new ControlsHelper("top", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP, + protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] { + new OrderingComponentRendererBase.ControlsHelper("top", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP, " rich-ordering-control-top", ATTRIBUTE_CLASS_TOP_CONTROL, ATTRIBUTE_CLASS_BUTTON, CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true, "topControlLabel") { @@ -212,7 +106,7 @@ } }, - new ControlsHelper("disabledTop", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, + new OrderingComponentRendererBase.ControlsHelper("disabledTop", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false, "topControlLabel") { @@ -221,7 +115,7 @@ } }, - new ControlsHelper("up", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP, + new OrderingComponentRendererBase.ControlsHelper("up", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP, " rich-ordering-control-up", ATTRIBUTE_CLASS_UP_CONTROL, ATTRIBUTE_CLASS_BUTTON, CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "upControlLabel") { @@ -230,7 +124,7 @@ } }, - new ControlsHelper("disabledUp", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, + new OrderingComponentRendererBase.ControlsHelper("disabledUp", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false, "upControlLabel") { @@ -239,7 +133,7 @@ } }, - new ControlsHelper("down", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN, + new OrderingComponentRendererBase.ControlsHelper("down", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN, " rich-ordering-control-down", ATTRIBUTE_CLASS_DOWN_CONTROL, ATTRIBUTE_CLASS_BUTTON, CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "downControlLabel") { @@ -248,7 +142,7 @@ } }, - new ControlsHelper("disabledDown", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, + new OrderingComponentRendererBase.ControlsHelper("disabledDown", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false, "downControlLabel") { @@ -257,7 +151,7 @@ } }, - new ControlsHelper("bottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM, + new OrderingComponentRendererBase.ControlsHelper("bottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM, " rich-ordering-control-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL, ATTRIBUTE_CLASS_BUTTON, CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true, "bottomControlLabel") { @@ -266,7 +160,7 @@ } }, - new ControlsHelper("disabledBottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, + new OrderingComponentRendererBase.ControlsHelper("disabledBottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false, "bottomControlLabel") { @@ -285,45 +179,6 @@ return true; } - public void encodeCaption(FacesContext context, UIOrderingList orderingList) - throws IOException { - ResponseWriter writer = context.getResponseWriter(); - UIComponent facetEl = orderingList.getFacet(FACET_CAPTION); - boolean renderFacet = ((facetEl != null) && facetEl.isRendered()); - String captionAttr = (String) orderingList.getAttributes().get(ATTRIBUTE_CAPTION_LABEL); - - if (renderFacet || (captionAttr != null)) { - writer.startElement(HTML.DIV_ELEM, orderingList); - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_label ol_out_label rich-ordering-list-caption", null); - if (renderFacet) { - renderChild(context, facetEl); - } else { - writer.write(captionAttr); - } - writer.endElement(HTML.DIV_ELEM); - } - - } - - public void encodeHeader(FacesContext context, UIOrderingList orderingList) - throws IOException { - ResponseWriter writer = context.getResponseWriter(); - //UIComponent header = orderingList.getHeader(); - Iterator headers = orderingList.columns(); - - if (headers.hasNext()) { - writer.startElement("thead", orderingList); - String headerClass = (String) orderingList.getAttributes().get("headerClass"); - - writer.startElement("tr", orderingList); - encodeStyleClass(writer, null, "rich-table-header", null, headerClass); - encodeHeaderFacets(context, writer, headers, "ol_col rich-table-header-cell", headerClass, "header", "th", orderingList); - - writer.endElement("tr"); - } - writer.endElement("thead"); - } - private static final ThreadLocal itemStates = new ThreadLocal(); public void encodeBegin(FacesContext context, UIComponent component) @@ -382,162 +237,6 @@ } } - protected void encodeControlFacet(FacesContext context, - UIOrderingList orderingList, ControlsHelper helper, - String clientId, ResponseWriter writer, boolean enabled) throws IOException { - Locale locale = null; - - UIViewRoot viewRoot = context.getViewRoot(); - if (viewRoot != null) { - locale = viewRoot.getLocale(); - } - - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - ResourceBundle bundle = null; - - if (locale != null) { - try { - bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE_NAME, locale, contextClassLoader); - } catch (MissingResourceException e) { - - } - } - - Map attributes = orderingList.getAttributes(); - UIComponent facet = orderingList.getFacet(helper.getFacetName()); - boolean useFacet = (facet != null && facet.isRendered()); - String controlType = (String) attributes.get(ATTRIBUTE_CONTROLS_TYPE); - - if (CONTROL_TYPE_NONE.equals(controlType)) { - if (useFacet) { - renderChild(context, facet); - } - } else { - renderDefaultControl(context, orderingList, writer, useFacet, - helper, clientId, bundle ,enabled); - } - } - - protected void renderDefaultControl(FacesContext context, - UIOrderingList orderingList, ResponseWriter writer, - boolean useFacet, ControlsHelper helper, String clientId, ResourceBundle bundle, boolean enabled) - throws IOException { - UIComponent facet = orderingList.getFacet(helper.getFacetName()); - String customEvent = null; - Map attributes = orderingList.getAttributes(); - if (helper.customEvent != null) { - customEvent = (String) attributes.get(helper.customEvent); - } - - String styleFromAttribute = (String) attributes - .get(helper.styleFromAttribute); - String currentStyle = helper.getStyleClassName(); - - if (styleFromAttribute != null) { - currentStyle = styleFromAttribute.concat(currentStyle); - } - - writer.startElement(HTML.DIV_ELEM, orderingList); - writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null); //FIXME: - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden") + currentStyle, null); - if (!useFacet) { - - writer.startElement(HTML.DIV_ELEM, orderingList); - writer.writeAttribute(HTML.class_ATTRIBUTE, helper.getButtonStyleClass(), null); - if (helper.enable) { - writer.writeAttribute(HTML.onmouseover_ATTRIBUTE, "this.className='ol_button_light'", null); - writer.writeAttribute(HTML.onmousedown_ATTRIBUTE, "this.className='ol_button_press'", null); - writer.writeAttribute(HTML.onmouseup_ATTRIBUTE, "this.className='ol_button'", null); - writer.writeAttribute(HTML.onmouseout_ATTRIBUTE, "this.className='ol_button'", null); - } - - writer.startElement(HTML.DIV_ELEM, orderingList); - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_content", null); - - } - - if (customEvent != null) { - writer.writeAttribute(HTML.onclick_ATTRIBUTE, customEvent,null); - } - - if (useFacet) { - renderChild(context, facet); - } else { - writer.startElement(HTML.IMG_ELEMENT, orderingList); - writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); - writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null); - writer.writeAttribute(HTML.border_ATTRIBUTE, "0", null); - writer.writeAttribute(HTML.alt_ATTRIBUTE, helper.getFacetName(), - null); - writer.writeAttribute(HTML.src_ATTRIBUTE, getResource( - helper.getImageURI()).getUri(context, null), null); - - writer.endElement(HTML.IMG_ELEMENT); - - if (Boolean.TRUE.equals(attributes.get(SHOW_LABELS_ATTRIBUTE_NAME))) { - String label = (String) attributes.get(helper.getLabelAttributeName()); - - if (label == null && bundle != null) { - try { - label = bundle.getString(helper.getBundlePropertyName()); - } catch (MissingResourceException e) { - - } - } - - if (label == null) { - label = helper.getDefaultText(); - } - - writer.writeText(label, null); - } - } - // writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + - // helper.getIdSuffix(), null); - - // writer.writeAttribute(HTML.class_ATTRIBUTE, currentStyle, null); - - if (!useFacet) { - writer.endElement(HTML.DIV_ELEM); - writer.endElement(HTML.DIV_ELEM); - } - writer.endElement(HTML.DIV_ELEM); - } - - protected void encodeHeaderFacets(FacesContext context, ResponseWriter writer, - Iterator headers, String skinCellClass, - String headerClass, String facetName, String element, UIOrderingList orderingList) - throws IOException { - while (headers.hasNext()) { - UIComponent column = (UIComponent) headers.next(); - String classAttribute = facetName + "Class"; - String columnHeaderClass = (String) column.getAttributes().get(classAttribute); - - writer.startElement(element, column); - if (!headers.hasNext()) { - skinCellClass = "ol_endcol rich-table-header-cell-end"; - } - encodeStyleClass(writer, null, skinCellClass, headerClass, columnHeaderClass); - getUtils().encodeAttribute(context, column, "colspan"); - writer.startElement("div", column); - writer.writeAttribute("style", "overflow:hidden;white-space: nowrap;", null); - String onHeaderClickEvent = (String) orderingList.getAttributes().get(ATTRIBUTE_CE_ONHEADERCLICK); - if (onHeaderClickEvent != null) { - writer.writeAttribute(HTML.onclick_ATTRIBUTE, onHeaderClickEvent, null); - } - - UIComponent facet = column.getFacet(facetName); - if (facet != null && facet.isRendered()) { - renderChild(context, facet); - } else { - writer.write("&#160"); - } - - writer.endElement("div"); - writer.endElement(element); - } - } - public void encodeOneRow(FacesContext context, TableHolder holder) throws IOException { ResponseWriter writer = context.getResponseWriter();

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4100 - in trunk/ui/dataTable/src/main: templates/org/richfaces and 1 other directory.

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

Author: abelevich Date: 2007-11-20 08:04:33 -0500 (Tue, 20 Nov 2007) New Revision: 4100 Modified: trunk/ui/dataTable/src/main/config/component/dataGrid.xml trunk/ui/dataTable/src/main/config/component/dataTable.xml trunk/ui/dataTable/src/main/config/component/subTable.xml trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx Log: standard attributes onclick, onmousemove, onmouseover etc.. added Modified: trunk/ui/dataTable/src/main/config/component/dataGrid.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2007-11-20 07:54:58 UTC (rev 4099) +++ trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2007-11-20 13:04:33 UTC (rev 4100) @@ -32,6 +32,7 @@ &html_universal_attributes; &html_table_attributes; &spec_table_attributes; + &html_events; <property disabled="true"> <name>rows</name> </property> Modified: trunk/ui/dataTable/src/main/config/component/dataTable.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/dataTable.xml 2007-11-20 07:54:58 UTC (rev 4099) +++ trunk/ui/dataTable/src/main/config/component/dataTable.xml 2007-11-20 13:04:33 UTC (rev 4100) @@ -31,6 +31,7 @@ &ui_data_attributes; &html_universal_attributes; &html_table_attributes; + &html_events; &spec_table_attributes; <property> <name>ajaxKeys</name> Modified: trunk/ui/dataTable/src/main/config/component/subTable.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/subTable.xml 2007-11-20 07:54:58 UTC (rev 4099) +++ trunk/ui/dataTable/src/main/config/component/subTable.xml 2007-11-20 13:04:33 UTC (rev 4100) @@ -31,6 +31,7 @@ &ui_component_attributes; &ui_data_attributes; &spec_table_attributes; + &html_events; <property> <name>ajaxKeys</name> <classname>java.util.Set</classname> Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx =================================================================== --- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2007-11-20 07:54:58 UTC (rev 4099) +++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2007-11-20 13:04:33 UTC (rev 4100) @@ -16,8 +16,9 @@ <f:clientid var="clientId"/> <table id="#{clientId}" - class="dr-table rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" - > + class="dr-table rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" + x:passThruWithExclusions="value,name,type,class,id,style"> + <f:call name="utils.encodePassThruWithExclusions"> <f:parameter value="value,name,type,id,class,rows" /> </f:call>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4099 - in branches/3.1.x/test-applications/facelets/src/main: java/dataScroller and 42 other directories.

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

Author: ayanul Date: 2007-11-20 02:54:58 -0500 (Tue, 20 Nov 2007) New Revision: 4099 Added: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml Log: Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataScroller/Data.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -31,7 +31,7 @@ public int getData1() { return data1; } - + public String getData2() { return data2; } Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -2,6 +2,18 @@ public class ModalPanel { + private boolean autosized; + private boolean immediate; + private boolean keepVisualState; + private String left; + private String top; + private String rendered; + private boolean required; + private String requiredMessage; + private int shadowDepth; + private int shadowOpacity; + private boolean showWhenRendered; + private int zindex; private int minHeight; private int minWidth; @@ -116,4 +128,100 @@ setMoveable(true); setResizeable(true); } + + public boolean isAutosized() { + return autosized; + } + + public void setAutosized(boolean autosized) { + this.autosized = autosized; + } + + public boolean isImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public boolean isKeepVisualState() { + return keepVisualState; + } + + public void setKeepVisualState(boolean keepVisualState) { + this.keepVisualState = keepVisualState; + } + + public String getLeft() { + return left; + } + + public void setLeft(String left) { + this.left = left; + } + + public String getTop() { + return top; + } + + public void setTop(String top) { + this.top = top; + } + + public String getRendered() { + return rendered; + } + + public void setRendered(String rendered) { + this.rendered = rendered; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public int getShadowDepth() { + return shadowDepth; + } + + public void setShadowDepth(int shadowDepth) { + this.shadowDepth = shadowDepth; + } + + public int getShadowOpacity() { + return shadowOpacity; + } + + public void setShadowOpacity(int shadowOpacity) { + this.shadowOpacity = shadowOpacity; + } + + public boolean isShowWhenRendered() { + return showWhenRendered; + } + + public void setShowWhenRendered(boolean showWhenRendered) { + this.showWhenRendered = showWhenRendered; + } + + public int getZindex() { + return zindex; + } + + public void setZindex(int zindex) { + this.zindex = zindex; + } } Added: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,187 @@ +package orderingList; + +import java.util.ArrayList; +import java.util.Random; + +import dataScroller.Data; + +public class OrderingList { + private ArrayList<Data> list; + private String [] status = {"error", "fatal", "info", "passed", "warn"}; + private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; + private String captionLabel; + private String componentState; + private String listHeight; + private String listWidth; + private String controlsType; + private String controlsVerticalAlign; + private String controlsHorizontalAlign; + private String headerLabel; + private String bottomControlLabel; + private String upControlLabel; + private String topControlLabel; + private String downControlLabel; + private boolean orderControlsVisible; + private boolean fastOrderControlsVisible; + private boolean rendered; + private boolean showButtonLabels; + + public ArrayList<Data> getList() { + return list; + } + + public void setList(ArrayList<Data> list) { + this.list = list; + } + + public OrderingList() { + captionLabel = "captionLabel"; + componentState = "none"; + listHeight = "300"; + listWidth = "400"; + controlsType = "none"; + controlsHorizontalAlign = "0"; + controlsVerticalAlign = "0"; + headerLabel = "headerLabel"; + bottomControlLabel = "bottom label"; + upControlLabel = "up label"; + downControlLabel = "down label"; + topControlLabel = "top label"; + orderControlsVisible = false; + fastOrderControlsVisible = false; + rendered = true; + showButtonLabels = false; + list = new ArrayList<Data>(); + for(int i = 0; i < 10; i++) { + list.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[new Random().nextInt(5)], statusIcon[new Random().nextInt(5)])); + } + } + + public String getListHeight() { + return listHeight; + } + + public void setListHeight(String listHeight) { + this.listHeight = listHeight; + } + + public String getListWidth() { + return listWidth; + } + + public void setListWidth(String listWidth) { + this.listWidth = listWidth; + } + + public String getControlsType() { + return controlsType; + } + + public void setControlsType(String controlsType) { + this.controlsType = controlsType; + } + + public String getBottomControlLabel() { + return bottomControlLabel; + } + + public void setBottomControlLabel(String bottomControlLabel) { + this.bottomControlLabel = bottomControlLabel; + } + + public String getCaptionLabel() { + return captionLabel; + } + + public void setCaptionLabel(String captionLabel) { + this.captionLabel = captionLabel; + } + + public String getUpControlLabel() { + return upControlLabel; + } + + public void setUpControlLabel(String upControlLabel) { + this.upControlLabel = upControlLabel; + } + + public String getTopControlLabel() { + return topControlLabel; + } + + public void setTopControlLabel(String topControlLabel) { + this.topControlLabel = topControlLabel; + } + + public String getComponentState() { + return componentState; + } + + public void setComponentState(String componentState) { + this.componentState = componentState; + } + + public String getControlsVerticalAlign() { + return controlsVerticalAlign; + } + + public void setControlsVerticalAlign(String controlsVerticalAlign) { + this.controlsVerticalAlign = controlsVerticalAlign; + } + + public String getControlsHorizontalAlign() { + return controlsHorizontalAlign; + } + + public void setControlsHorizontalAlign(String controlsHorizontalAlign) { + this.controlsHorizontalAlign = controlsHorizontalAlign; + } + + public String getHeaderLabel() { + return headerLabel; + } + + public void setHeaderLabel(String headerLabel) { + this.headerLabel = headerLabel; + } + + public String getDownControlLabel() { + return downControlLabel; + } + + public void setDownControlLabel(String downControlLabel) { + this.downControlLabel = downControlLabel; + } + + public boolean isOrderControlsVisible() { + return orderControlsVisible; + } + + public void setOrderControlsVisible(boolean orderControlsVisible) { + this.orderControlsVisible = orderControlsVisible; + } + + public boolean isFastOrderControlsVisible() { + return fastOrderControlsVisible; + } + + public void setFastOrderControlsVisible(boolean fastOrderControlsVisible) { + this.fastOrderControlsVisible = fastOrderControlsVisible; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public boolean isShowButtonLabels() { + return showButtonLabels; + } + + public void setShowButtonLabels(boolean showButtonLabels) { + this.showButtonLabels = showButtonLabels; + } +} Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -41,6 +41,7 @@ map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true})); map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); + map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, false})); } public String getSrc() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-11-20 07:54:58 UTC (rev 4099) @@ -8,16 +8,31 @@ public class ScrollableDataTable { private ArrayList<Data> data; - private String [] priority = {"blocker", "critical", "major", "minor", "trivial"}; - private String [] priorityIcon = {"/pics/sdt/priority_blocker.gif", "/pics/sdt/priority_critical.gif", "/pics/sdt/priority_major.gif", "/pics/sdt/priority_minor.gif", "/pics/sdt/priority_trivial.gif"}; + private String [] status = {"error", "fatal", "info", "passed", "warn"}; + private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; + private String width; + private String rows; + private String key; + private boolean hideWhenScrolling; + public boolean isHideWhenScrolling() { + return hideWhenScrolling; + } + + public void setHideWhenScrolling(boolean hideWhenScrolling) { + this.hideWhenScrolling = hideWhenScrolling; + } + public ScrollableDataTable() { + width = "400px"; + rows = "30"; + hideWhenScrolling = false; data = new ArrayList<Data>(); int k; for(int i = 0; i < 10000; i++) { k = new Random().nextInt(5); - data.add(new Data("Bug " + new Random().nextInt(10 + i), i,priority[k], priorityIcon[k])); + data.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[k], statusIcon[k])); } } @@ -28,4 +43,24 @@ public void setData(ArrayList<Data> data) { this.data = data; } + + public String getWidth() { + return width; + } + + public void setWidth(String width) { + this.width = width; + } + + public String getRows() { + return rows; + } + + public void setRows(String rows) { + this.rows = rows; + } + + public void setKey(String key) { + this.key = key; + } } \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="calendarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages /> <rich:messages showDetail="true"></rich:messages> @@ -92,5 +91,4 @@ </h:panelGrid> </rich:calendar> </h:panelGrid> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -7,8 +7,21 @@ <f:view> - <h:form> + <h:form id="test"> +<rich:tabPanel switchType="ajax"> - </h:form> +<rich:tab label="Sample 1"> +<h:outputText value="1"></h:outputText> +<h:inputText value="#{dDMenu.mode}" required="true" /> +</rich:tab> + +<rich:tab label="Sample 2"> +<a4j:support event="ontabenter"></a4j:support> +<h:outputText value="2"></h:outputText> +<h:inputText value="#{dDMenu.mode}"></h:inputText> +</rich:tab> + +</rich:tabPanel> + </h:form> </f:view> -</html> \ No newline at end of file +</html> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,30 +1,14 @@ -<f:subview id="DataFilterSliderSubviewID" - 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" - xmlns:ui="http://java.sun.com/jsf/facelets"> - - <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" - ignoreDupResponses="true" requestDelay="100"> +<f:subview id="dataFilterSliderSubviewID" 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" xmlns:ui="http://java.sun.com/jsf/facelets"> - <a4j:region id="stat1"> - <a4j:outputPanel id="p1"> - <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" - binding="#{inventoryList.dataFilterSlider}" for="carList" - forValRef="inventoryList.carInventory" filterBy="getMileage" - manualInput="true" onSlide="true" onChange="true" - storeResults="true" trackStyleClass="track" width="400px" - styleClass="slider-container" startRange="10000" endRange="60000" - increment="10000" rangeStyleClass="range" trailer="true" - trailerStyleClass="trailer" handleStyleClass="handle" - handleValue="10000" id="slider_1"> - </rich:dataFilterSlider> - </a4j:outputPanel> + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" + for="carList" forValRef="inventoryList.carInventory" filterBy="getMileage" manualInput="true" onSlide="true" onChange="true" + storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000" + increment="10000" rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" handleStyleClass="handle" + handleValue="10000" id="dfsID"> + </rich:dataFilterSlider> - - - <a4j:outputPanel id="list-body" style="border: 1px"> + <h:panelGrid id="list-body"> <h:dataTable id="carIndex" rows="10" binding="#{inventoryList.carMakeIndexUIData}" value="#{inventoryList.carMakeIndex}" var="category" @@ -39,7 +23,6 @@ </a4j:commandLink> </h:column> - </h:dataTable> <h:dataTable id="carList" rows="10" @@ -76,7 +59,8 @@ <h:outputText value="#{category.mileage}" /> </h:column> </h:dataTable> - </a4j:outputPanel> - </a4j:region> - </a4j:form> -</f:subview> + </h:panelGrid> + <h:outputText value="click reRender for update page(RF-1365)" /> + <h:commandButton value="reRender" /> + +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,8 +4,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form dir="DSform"> - <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" var="dT" cellpadding="5px" rows="5" border="1"> <f:facet name="header"> @@ -29,5 +27,4 @@ <h:outputText value="#{dT.data1}" /> </h:column> </h:dataTable> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,9 +1,7 @@ <f:subview id="DataTableSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form dir="DSform"> <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" cellpadding="" - cellspacing="" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" onRowDblClick="print('onRowDblClickInputID', 'onRowDblClick work!')" onRowMouseDown="print('onRowMouseDownInputID', 'onRowMouseDown work!')" @@ -65,5 +63,4 @@ <h:outputText value="#{dataTableID.total}" /> </rich:column> </rich:dataTable> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,8 +1,6 @@ <f:subview id="DtadAndDropSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html"> - <h:form id="form"> - <h:panelGroup id="dragValueText"> <h:outputText value="#{dndBean.dragValue}" /> </h:panelGroup> @@ -193,5 +191,4 @@ <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="DropDownMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> - <h:form> <h:panelGrid columns="2"> <rich:spacer width="400px" height="400px"></rich:spacer> <rich:panel> @@ -62,5 +61,4 @@ </rich:panel> </h:panelGrid> <a4j:log></a4j:log> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,7 +3,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> <rich:panel id="indexID"> <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> @@ -295,5 +294,4 @@ <rich:effect for="frm5" name="showFrm5" type="Appear" /> -</h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -5,7 +5,6 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="" ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" @@ -93,5 +92,4 @@ </script> </a4j:outputPanel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="inputNumberSliderSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:panelGrid columns="1"> <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" @@ -17,5 +16,4 @@ </rich:inputNumberSlider> </h:panelGrid> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="inputNumberSpinnerSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptfree"> - <h:form> <h:messages></h:messages> <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" @@ -19,5 +18,4 @@ onmouseup="print('onmouseupInputID', 'onmouseup work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" onupclick="print('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,12 +4,10 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages /> <rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}"> <rich:insert id="insertID" highlight="#{insert.highlight}" rendered="#{insert.rendered}" src="#{insert.src}"></rich:insert> </rich:panel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="messageSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <h:form> <rich:panel> <h:outputText value="Rich Message Demo:" /> @@ -61,10 +60,4 @@ </h:outputText> </rich:messages> </rich:panel> - - <f:verbatim> - <br /> - </f:verbatim> - - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,27 +1,26 @@ <f:subview id="modalPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - - <h:form id="MPform"> <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" onhide="print('onhideInputID', 'onhide work!')" onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> - + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('MPid');return false;"/> + </f:facet> <h:outputText value="This is Modal Panel example" styleClass="text1" /> <f:verbatim> <br /> <br /> </f:verbatim> - <h:outputLink onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" value="Close"> + <h:outputLink onclick="Richfaces.hideModalPanel('MPid');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> </rich:modalPanel> - <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show MP</a> + <a onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a> + <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('MPid');" /> - <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -6,7 +6,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> <h:panelGrid columns="2"> - <h:outputText value="Width:" /> <h:inputText value="#{modalPanel.width}"> <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,45 @@ +<f:subview id="orderingListSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://labs.jboss.com/jbossrichfaces/ui/orderingList"> + <h:messages showDetail="true"/> + + <rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}" listWidth="#{orderingList.listWidth}" + controlsType="#{orderingList.controlsType}" bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}" + topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}" + controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}" + headerLabel="#{orderingList.headerLabel}" downControlLabel="#{orderingList.downControlLabel}" orderControlsVisible="#{orderingList.orderControlsVisible}" + fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}" rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}"> + <h:column width="100px"> + <f:facet name="header"> + <h:outputText value="Number" /> + </f:facet> + <h:outputText value="#{item.data1}" /> + </h:column> + + <h:column width="100px"> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:outputText value="#{item.data0}" /> + </h:column> + + <h:column width="100px"> + <f:facet name="header"> + <h:outputText value="Status" /> + </f:facet> + <h:selectOneMenu value="#{item.data2}"> + <f:selectItem itemLabel="error" itemValue="error"/> + <f:selectItem itemLabel="fatal" itemValue="fatal"/> + <f:selectItem itemLabel="info" itemValue="info"/> + <f:selectItem itemLabel="passed" itemValue="passed"/> + <f:selectItem itemLabel="warn" itemValue="warn"/> + </h:selectOneMenu> + </h:column> + + <h:column width="30px"> + <f:facet name="header"> + <h:outputText value="Icon" /> + </f:facet> + <h:graphicImage value="#{item.data3}" /> + </h:column> + </rich:orderingList> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,84 @@ +<f:subview id="orderingListPropertySubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <h:panelGrid columns="2"> + + <h:outputText value="controlsType" /> + <h:selectOneRadio value="#{orderingList.controlsType}"> + <f:selectItem itemLabel="none" itemValue="none"/> + <f:selectItem itemLabel="button" itemValue="button"/> + <f:selectItem itemLabel="link" itemValue="link"/> + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="captionLabel" /> + <h:inputText value="#{orderingList.captionLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="headerLabel" /> + <h:inputText value="#{orderingList.headerLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="listHeight:" /> + <h:inputText value="#{orderingList.listHeight}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="listWidth" /> + <h:inputText value="#{orderingList.listWidth}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="controlsVerticalAlign" /> + <h:inputText value="#{orderingList.controlsVerticalAlign}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + + <h:outputText value="controlsHorizontalAlign" /> + <h:inputText value="#{orderingList.controlsHorizontalAlign}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="upControlLabel" /> + <h:inputText value="#{orderingList.upControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="bottomControlLabel" /> + <h:inputText value="#{orderingList.bottomControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="topControlLabel" /> + <h:inputText value="#{orderingList.topControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="downControlLabel" /> + <h:inputText value="#{orderingList.downControlLabel}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:inputText> + + <h:outputText value="showButtonLabels" /> + <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="fastOrderControlsVisible" /> + <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="orderControlsVisible" /> + <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{orderingList.rendered}" > + <a4j:support event="onchange" reRender="orderingListID"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,9 +1,7 @@ <f:subview id="paint2DSubviewID" xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <rich:paint2D id="paint2dID" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}" rendered="#{paint2D.rendered}" /> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="panelSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> - <h:form> <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> @@ -41,6 +40,5 @@ <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> </rich:panel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel2.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,8 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> - <h:panelGrid columnClasses="panel" border="0" columns="3"> + <h:panelGrid columnClasses="panel" border="0" columns="3"> <rich:panel styleClass="top"> <f:facet name="header"> <h:panelGroup> @@ -93,5 +92,4 @@ <h:outputText value="inside the form" /> </h:form> </rich:panel> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="panelBarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages></h:messages> @@ -31,5 +30,4 @@ </rich:panelBar> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="panelMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> - <h:form> <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" @@ -167,10 +166,4 @@ </rich:panelMenuGroup> </rich:panelMenuGroup> </rich:panelMenu> - - <f:verbatim> - <br /> - <br /> - </f:verbatim> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,4 +1,3 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,8 +3,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="30" width="400px" + <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" + hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" reRender="inputID" oncomplete="print('oncompleteInputID', 'oncomplete work!')" onselectionchange="print('onselectionchangeInputID', 'onselectionchange work!')"> <rich:column width="100px" sortable="false"> <f:facet name="header"> @@ -22,19 +22,23 @@ <rich:column width="100px" sortable="false"> <f:facet name="header"> - <h:outputText value="Priority" /> + <h:outputText value="Status" /> </f:facet> - <h:outputText value="#{sdt.data2}" /> + <h:selectOneMenu value="#{sdt.data2}"> + <f:selectItem itemLabel="error" itemValue="error"/> + <f:selectItem itemLabel="fatal" itemValue="fatal"/> + <f:selectItem itemLabel="info" itemValue="info"/> + <f:selectItem itemLabel="passed" itemValue="passed"/> + <f:selectItem itemLabel="warn" itemValue="warn"/> + </h:selectOneMenu> </rich:column> - <rich:column width="100px" sortable="false"> + <rich:column width="30px" sortable="false"> <f:facet name="header"> - <h:outputText value="Name" /> + <h:outputText value="Icon" /> </f:facet> - <h:outputText value="#{sdt.data3}" /> + <h:graphicImage value="#{sdt.data3}" /> </rich:column> </rich:scrollableDataTable> - - - </h:form> + <h:inputText id="inputID" value="#{key}" /> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -4,5 +4,15 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:panelGrid columns="2"> + <h:outputText value="rows" /> + <h:inputText value="#{scrollableDT.rows}" /> + + <h:outputText value="width" /> + <h:inputText value="#{scrollableDT.width}" /> + + <h:outputText value="hideWhenScrolling" /> + <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" /> + </h:panelGrid> <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="separatorSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptfree" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> - <h:form> <h:outputText value="Some text one..." styleClass="text"></h:outputText> <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" @@ -12,5 +11,4 @@ onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,5 @@ <f:subview id="simpleTogglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - - <h:form> <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" @@ -66,5 +64,4 @@ </rich:simpleTogglePanel> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="spacerSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:sql="http://java.sun.com/jsp/jstl/sql"> - <h:form> <style type="text/css"> .text { font-size: 20px; @@ -20,5 +19,4 @@ onmouseup="print('onmouseupInputID', 'onmouseup work!')"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,12 +3,11 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form id="suggestionbox_form"> <h:messages showDetail="true"/> <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter <br /> </f:verbatim> - <h:inputText value="#{suggestionBox.property}" id="text" /> + <h:inputText value="#{sb.property}" id="text" /> <rich:suggestionbox id="suggestionBoxId" for="text" var="result" zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" suggestionAction="#{sb.autocomplete}" @@ -33,5 +32,4 @@ </rich:suggestionbox> <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="tabPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:c="http://java.sun.com/jsp/jstl/core"> - <h:form> <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" @@ -51,5 +50,4 @@ </rich:tabPanel> <rich:spacer height="20px"></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="togglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <h:form id="tooggleTest"> <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" style="width:300px!important; overflow: hidden;" onclick="print('onclickInputID', 'onclick work!')" @@ -13,7 +12,7 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1"> + <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID:panel1"> <h:outputText value="Expand" style="font-weight: bold;" /> <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -26,7 +25,7 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1"> + <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1"> <h:outputText value="Collapse" style="font-weight: bold;" /> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -67,7 +66,7 @@ <f:facet name="header"> <h:panelGroup> <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2"> + <rich:toggleControl id="toggleControl_panel_1" for="togglePanelSubviewID:panel2"> <h:outputText value="Next"></h:outputText> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -95,7 +94,7 @@ <f:facet name="header"> <h:panelGroup> <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2"> + <rich:toggleControl id="toggleControl_panel_2" for="togglePanelSubviewID:panel2"> <h:outputText value="Next"></h:outputText> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -123,7 +122,7 @@ <f:facet name="header"> <h:panelGroup> <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2"> + <rich:toggleControl id="toggleControl_panel_3" for="togglePanelSubviewID:panel2"> <h:outputText value="Next"></h:outputText> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -147,10 +146,5 @@ </f:facet> </rich:togglePanel> - <f:verbatim> - <br /> - <br /> - </f:verbatim> <ui:debug hotkey="L"></ui:debug> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -3,7 +3,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages></h:messages> <rich:toolBar id="toolBarId" width="#{toolBar.width}" @@ -33,5 +32,4 @@ </rich:toolBar> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="tooltipSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <h:form> <h:messages></h:messages> @@ -67,5 +66,4 @@ <br /> </f:verbatim> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,6 +1,5 @@ <f:subview id="treeSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:dnd="http://richfaces.ajax4jsf.org/drag-drop"> - <h:form> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> @@ -108,5 +107,4 @@ </rich:tree> <rich:spacer></rich:spacer> - </h:form> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,7 +1,6 @@ <f:subview id="virtualEarthSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <h:form> <h:panelGrid columns="2"> <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')" @@ -40,5 +39,4 @@ } </script> </a4j:outputPanel> - </h:form> </f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-OrderingList.xml 2007-11-20 07:54:58 UTC (rev 4099) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>orderingList</managed-bean-name> + <managed-bean-class>orderingList.OrderingList</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-20 07:54:58 UTC (rev 4099) @@ -44,7 +44,7 @@ /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml</param-value> + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml</param-value> </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -1,11 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" +<f:subview contentType="text/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + <style> .divSize_1 { width: 150px; @@ -44,12 +44,7 @@ color: #228B22; } </style> - - -<f:view contentType="text/html"> - <body> - <h:form id="form"> - + <h:panelGrid id="panelGridID" columns="2" border="1"> <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> <h:panelGroup> @@ -96,9 +91,5 @@ <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> - - </h:form> - </body> -</f:view> -</html> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -35,8 +35,8 @@ <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;"> <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;"> - <ui:include src="${richBean.pathComponent}" /> <h:form> + <ui:include src="${richBean.pathComponent}" /> <ui:include src="${richBean.pathStraightforward}" /> <ui:include src="${richBean.pathProperty}" /> </h:form> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -33,9 +33,8 @@ <div id="divOpthID" align="right" style="z-index: 200"> <ui:include src="/pages/RichMenu/RichMenu.xhtml" /> </div> - - <ui:include src="${richBean.pathComponent}" /> <h:form> + <ui:include src="${richBean.pathComponent}" /> <ui:include src="${richBean.pathStraightforward}" /> <ui:include src="${richBean.pathProperty}" /> </h:form> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -15,6 +15,7 @@ <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> <f:selectItem itemValue="Blank" itemLabel="Blank" /> + <f:selectItem itemValue="OrderingList" itemLabel="OrderingList" /> <f:selectItem itemValue="Calendar" itemLabel="Calendar" /> <f:selectItem itemValue="DataFilterSlider" itemLabel="Data Filter Slider" /> <f:selectItem itemValue="DataScroller" itemLabel="Date Scroller" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2007-11-20 01:01:11 UTC (rev 4098) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2007-11-20 07:54:58 UTC (rev 4099) @@ -34,8 +34,8 @@ </div> <div id="divPageID" style="position: absolute; background-color:gray; top:60px; left: 10px; z-index: 2"> - <ui:include src="${richBean.pathComponent}" />\ <h:form> + <ui:include src="${richBean.pathComponent}" />\ <ui:include src="${richBean.pathStraightforward}" /> <ui:include src="${richBean.pathProperty}" /> </h:form>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4098 - in tags/3.1.2.GA/ui/message/src/main: java/org/richfaces/component and 2 other directories.

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

Author: alexsmirnov Date: 2007-11-19 20:01:11 -0500 (Mon, 19 Nov 2007) New Revision: 4098 Modified: tags/3.1.2.GA/ui/message/src/main/config/component/message.xml tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java Log: Fix http://jira.jboss.org/jira/browse/RF-1375 Modified: tags/3.1.2.GA/ui/message/src/main/config/component/message.xml =================================================================== --- tags/3.1.2.GA/ui/message/src/main/config/component/message.xml 2007-11-20 00:45:01 UTC (rev 4097) +++ tags/3.1.2.GA/ui/message/src/main/config/component/message.xml 2007-11-20 01:01:11 UTC (rev 4098) @@ -36,6 +36,14 @@ </test> </tag> + <property> + <name>level</name> + <classname>java.lang.String</classname> + <defaultvalue>"ALL"</defaultvalue> + <description> + comma-separated list of messages categoris which should be displayed + </description> + </property> <property attachedstate="true"> <name>passedLabel</name> @@ -292,13 +300,14 @@ Attribute should define the label to be displayed when no message appears </description> </property> - <property> - <name>var</name> + <name>level</name> <classname>java.lang.String</classname> <description> - Name of a request-scope attribute under which the list of the messages should be available + comma-separated list of messages categoris which should be displayed </description> + <defaultvalue>"ALL"</defaultvalue> + </property> <property> Modified: tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java =================================================================== --- tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-11-20 00:45:01 UTC (rev 4097) +++ tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-11-20 01:01:11 UTC (rev 4098) @@ -39,9 +39,19 @@ super.decode(context); } + public void encodeBagin(FacesContext context) throws IOException { + isPassed = true; + super.encodeBegin(context); + } + public void encodeEnd(FacesContext context) throws IOException { super.encodeEnd(context); isPassed = false; } + public abstract String getLevel(); + + public abstract void setLevel(String level); + + } \ No newline at end of file Modified: tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java =================================================================== --- tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-11-20 00:45:01 UTC (rev 4097) +++ tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-11-20 01:01:11 UTC (rev 4098) @@ -15,9 +15,8 @@ public abstract class UIRichMessages extends UIMessages implements AjaxOutput{ - private boolean isPassed = false; - - + private boolean isPassed = true; + public boolean isPassed(){ return isPassed; } @@ -36,5 +35,9 @@ isPassed = true; super.decode(context); } - + + public abstract String getLevel(); + + public abstract void setLevel(String level); + } Modified: tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java =================================================================== --- tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-11-20 00:45:01 UTC (rev 4097) +++ tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-11-20 01:01:11 UTC (rev 4098) @@ -1,8 +1,10 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Set; import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage.Severity; @@ -12,6 +14,7 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.resource.InternetResource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,7 +33,62 @@ public static final String COMPONENT_NOT_FOUND_IN_VIEW_WARN_MESSAGE = "component not found in the view WARNING"; + private static final String ERROR_NAME = "ERROR"; + private static final String WARN_NAME = "WARN"; + + private static final String FATAL_NAME = "FATAL"; + + private static final String INFO_NAME = "INFO"; + + private static final String ALL_NAME = "ALL"; + + protected List acceptLevels = new ArrayList(); + + + private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msg.css"),getResource("/org/richfaces/renderkit/html/css/msgs.css")}; + + private InternetResource[] stylesAll = null; + + + protected InternetResource[] getStyles(){ + synchronized (this){ + if(stylesAll == null){ + + InternetResource[] rsrcs = super.getStyles(); + boolean ignoreSuper = rsrcs == null || rsrcs.length == 0; + boolean ignoreThis = styles == null || styles.length == 0; + + if(ignoreSuper){ + + if (ignoreThis) { + stylesAll = new InternetResource[0]; + } else { + stylesAll = styles; + } + + }else{ + + if(ignoreThis){ + stylesAll = rsrcs; + }else{ + Set rsrcsSet = new java.util.LinkedHashSet(); + for(int i = 0; i < rsrcs.length; i++ ){ + rsrcsSet.add(rsrcs[i]); + } + + for(int i = 0; i < styles.length; i++ ){ + rsrcsSet.add(styles[i]); + } + stylesAll = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]); + } + } + } + } + + return stylesAll; + } + protected Iterator getMessageIterator(FacesContext context, String forClientId, UIComponent component) throws IOException{ Iterator msgIter = null; @@ -94,7 +152,7 @@ markerClass = (String)uiMsg.getAttributes().get("warnMarkerClass"); markerStyle = (String)uiMsg.getAttributes().get("warnMarkerStyle"); - marker = uiMsg.getFacet("infoMarker"); + marker = uiMsg.getFacet("warnMarker"); } @@ -264,6 +322,49 @@ return retComp; }; + protected boolean isAcceptableMessage(FacesMessage message){ + + boolean accept = false; + + if(acceptLevels.contains(ALL_NAME) || message == null){ + return true; + } + + Severity severity = message.getSeverity(); + + if(severity == FacesMessage.SEVERITY_ERROR + && acceptLevels.contains(ERROR_NAME)){ + accept = true; + + }else if(severity == FacesMessage.SEVERITY_FATAL + && acceptLevels.contains(FATAL_NAME)){ + accept = true; + + }else if(severity == FacesMessage.SEVERITY_INFO + && acceptLevels.contains(INFO_NAME)){ + accept = true; + + }else if(severity == FacesMessage.SEVERITY_WARN + && acceptLevels.contains(WARN_NAME)){ + accept = true; + } + + return accept; + } + + protected List creatAcceptLevels(String [] levels){ + + List acceptLevels = new ArrayList(); + + for (int i = 0; i < levels.length; i++) { + acceptLevels.add(levels[i].toUpperCase()); + } + + return acceptLevels; + } + + + public abstract void renderMarkerHtml(UIComponent component, UIComponent markerFacet, FacesContext context, ResponseWriter writer, String markerClass, String markerStyle) throws IOException; Modified: tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java =================================================================== --- tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-11-20 00:45:01 UTC (rev 4097) +++ tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-11-20 01:01:11 UTC (rev 4098) @@ -2,7 +2,6 @@ import java.io.IOException; import java.util.Iterator; -import java.util.Set; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; @@ -11,7 +10,6 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIRichMessage; import org.richfaces.renderkit.RichMessageBaseRenderer; @@ -22,51 +20,7 @@ */ public class HtmlRichMessageRenderer extends RichMessageBaseRenderer{ - private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msg.css")}; - private InternetResource[] stylesAll = null; - - - protected InternetResource[] getStyles(){ - synchronized (this){ - if(stylesAll == null){ - - InternetResource[] rsrcs = super.getStyles(); - boolean ignoreSuper = rsrcs == null || rsrcs.length == 0; - boolean ignoreThis = styles == null || styles.length == 0; - - if(ignoreSuper){ - - if (ignoreThis) { - stylesAll = new InternetResource[0]; - } else { - stylesAll = styles; - } - - }else{ - if(ignoreThis){ - stylesAll = rsrcs; - }else{ - Set rsrcsSet = new java.util.LinkedHashSet(); - - for(int i = 0; i < rsrcs.length; i++ ){ - rsrcsSet.add(rsrcs[i]); - } - - for(int i = 0; i < styles.length; i++ ){ - rsrcsSet.add(styles[i]); - } - - stylesAll = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]); - } - } - } - } - - return stylesAll; - } - - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { Iterator msgIter = null; @@ -105,11 +59,12 @@ ResponseWriter writer = context.getResponseWriter(); - outerStyles(uiMsg, context, writer, facesMsg); - renderMarkerFacet(uiMsg,context, writer,facesMsg); - renderLabel(uiMsg, context, writer, facesMsg); - - + acceptLevels = creatAcceptLevels(uiMsg.getLevel().split(",")); + if(isAcceptableMessage(facesMsg)){ + outerStyles(uiMsg, context, writer, facesMsg); + renderMarkerFacet(uiMsg,context, writer,facesMsg); + renderLabel(uiMsg, context, writer, facesMsg); + } } public void renderOuterStyles(UIComponent component, FacesContext context, ResponseWriter writer,String outerStyle, String outerClass) throws IOException{ Modified: tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java =================================================================== --- tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-11-20 00:45:01 UTC (rev 4097) +++ tags/3.1.2.GA/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-11-20 01:01:11 UTC (rev 4098) @@ -4,17 +4,18 @@ package org.richfaces.renderkit.html; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; -import java.util.Set; +import java.util.List; import javax.faces.application.FacesMessage; +import javax.faces.application.FacesMessage.Severity; import javax.faces.component.UIComponent; import javax.faces.component.UIMessages; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIRichMessages; import org.richfaces.renderkit.RichMessageBaseRenderer; @@ -26,55 +27,6 @@ private boolean isWroteTable = false; - private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msgs.css")}; - - private InternetResource[] stylesAll = null; - - - protected InternetResource[] getStyles(){ - - synchronized (this){ - - if(stylesAll == null){ - - InternetResource[] rsrcs = super.getStyles(); - boolean ignoreSuper = rsrcs == null || rsrcs.length == 0; - boolean ignoreThis = styles == null || styles.length == 0; - - if(ignoreSuper){ - - if (ignoreThis) { - stylesAll = new InternetResource[0]; - } else { - stylesAll = styles; - } - - }else{ - - if(ignoreThis){ - stylesAll = rsrcs; - }else{ - - Set rsrcsSet = new java.util.LinkedHashSet(); - for(int i = 0; i < rsrcs.length; i++ ){ - rsrcsSet.add(rsrcs[i]); - } - - for(int i = 0; i < styles.length; i++ ){ - rsrcsSet.add(styles[i]); - } - - stylesAll = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]); - } - - } - - } - } - - return stylesAll; - } - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { String forIds = null; @@ -101,6 +53,11 @@ boolean isDisplayNone = (!messagesIter.hasNext() && !uiMessages.isPassed()) ? true : false; + if(!isDisplayNone){ + String [] levels = uiMessages.getLevel().split(","); + acceptLevels = creatAcceptLevels(levels); + } + layout = (String)uiMessages.getAttributes().get("layout"); if((layout != null) && (layout.equals("table"))){ @@ -127,6 +84,7 @@ while(messagesIter.hasNext()){ FacesMessage facesMsg = (FacesMessage)(messagesIter.next()); + renderBody(uiMessages, context, writer, facesMsg); } @@ -141,6 +99,8 @@ } + + public void renderLabelHtml(UIComponent component, FacesContext context, ResponseWriter writer, FacesMessage facesMsg, String labelClass, String labelStyle, String passLabel) throws IOException { @@ -274,24 +234,26 @@ if(uiMessages.isPassed()){ - if(isWroteTable){ - writer.startElement(HTML.TR_ELEMENT, uiMessages); - writer.startElement(HTML.td_ELEM, uiMessages); - }else{ - writer.startElement("dt", uiMessages); - } - - outerStyles(uiMessages, context, writer, facesMsg); - renderMarkerFacet(uiMessages, context, writer, facesMsg); - renderLabel(uiMessages, context, writer, facesMsg); - - if(isWroteTable){ - writer.endElement(HTML.td_ELEM); - writer.endElement(HTML.TR_ELEMENT); - }else{ - writer.endElement("dt"); - } + if(isAcceptableMessage(facesMsg)){ + if(isWroteTable){ + writer.startElement(HTML.TR_ELEMENT, uiMessages); + writer.startElement(HTML.td_ELEM, uiMessages); + }else{ + writer.startElement("dt", uiMessages); + } + + outerStyles(uiMessages, context, writer, facesMsg); + renderMarkerFacet(uiMessages, context, writer, facesMsg); + renderLabel(uiMessages, context, writer, facesMsg); + + if(isWroteTable){ + writer.endElement(HTML.td_ELEM); + writer.endElement(HTML.TR_ELEMENT); + }else{ + writer.endElement("dt"); + } + } } }

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4097 - branches/3.1.x/ui/message/src/main/java/org/richfaces/component.

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

Author: alexsmirnov Date: 2007-11-19 19:45:01 -0500 (Mon, 19 Nov 2007) New Revision: 4097 Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java Log: Fix http://jira.jboss.org/jira/browse/RF-1375 Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java =================================================================== --- branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-11-20 00:08:09 UTC (rev 4096) +++ branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-11-20 00:45:01 UTC (rev 4097) @@ -39,6 +39,11 @@ super.decode(context); } + public void encodeBagin(FacesContext context) throws IOException { + isPassed = true; + super.encodeBegin(context); + } + public void encodeEnd(FacesContext context) throws IOException { super.encodeEnd(context); isPassed = false; Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java =================================================================== --- branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-11-20 00:08:09 UTC (rev 4096) +++ branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-11-20 00:45:01 UTC (rev 4097) @@ -15,7 +15,7 @@ public abstract class UIRichMessages extends UIMessages implements AjaxOutput{ - private boolean isPassed = false; + private boolean isPassed = true; public boolean isPassed(){ return isPassed;

18 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits November 2007