From adffaces-commits-return-653-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Wed Aug 16 07:01:17 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 1558 invoked from network); 16 Aug 2006 07:01:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Aug 2006 07:01:17 -0000 Received: (qmail 67040 invoked by uid 500); 16 Aug 2006 07:01:17 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 67027 invoked by uid 500); 16 Aug 2006 07:01:17 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 67018 invoked by uid 99); 16 Aug 2006 07:01:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2006 00:01:17 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2006 00:01:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ADDDE1A9827; Wed, 16 Aug 2006 00:00:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r431848 [6/6] - in /incubator/adffaces/trunk/trinidad: ./ trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ trinidad-api/src/main/java/org/apache/myfaces... Date: Wed, 16 Aug 2006 07:00:19 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060816070031.ADDDE1A9827@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java Wed Aug 16 00:00:16 2006 @@ -1,303 +1,314 @@ - -/* - * Copyright 2005,2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ -package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - -import javax.faces.context.ResponseWriter; - -import org.apache.myfaces.trinidad.bean.FacesBean; -import org.apache.myfaces.trinidad.bean.PropertyKey; - - -import org.apache.myfaces.trinidad.component.core.input.CoreInputNumberSpinbox; - -import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; -import org.apache.myfaces.trinidadinternal.skin.icon.Icon; - -/** - * overrides SimpleInputListOfValuesRenderer because like that class, - * we need an 'icon' after the text field. -- - * the 'icon' is really two icons: the up/down buttons - */ -public class SimpleInputNumberSpinboxRenderer extends SimpleInputListOfValuesRenderer -{ - public SimpleInputNumberSpinboxRenderer() - { - super(CoreInputNumberSpinbox.TYPE); - } - - protected void findTypeConstants(FacesBean.Type type) - { - super.findTypeConstants(type); - _minimumKey = type.findKey("minimum"); - _maximumKey = type.findKey("maximum"); - _stepSizeKey = type.findKey("stepSize"); - } - // - - - // - // ENCODE BEHAVIOR - // - - // - // Overrides disabling all the things you can't do on - // an InputNumberSpinbox - // - - public boolean isTextArea( - FacesBean bean) - { - return false; - } - - protected boolean getSecret(FacesBean bean) - { - return false; - } - - protected Number getMaximumLength(FacesBean bean) - { - return null; - } - - protected boolean shouldRenderInputOnclick() - { - // keep the onclick on the input. selectInputText moves it to the button. - return false; - } - - protected String getRootStyleClass(FacesBean bean) - { - return "af|inputNumberSpinbox"; - } - - protected String getContentStyleClass(FacesBean bean) - { - return "af|inputNumberSpinbox::content"; - } - - protected Integer getDefaultColumns( - RenderingContext arc, - FacesBean bean) - { - return new Integer(1); - } - - protected void renderTextField( - FacesContext context, - RenderingContext arc, - UIComponent component, - FacesBean bean) throws IOException - { - // render - ResponseWriter rw = context.getResponseWriter(); - rw.startElement("table", component); - OutputUtils.renderLayoutTableAttributes(context, arc, "0", "0", "0", null); - rw.startElement("tr", component); - rw.startElement("td", component); - // this renders the inputText. This will call getContentStyleClass to put - // our styleclass on it. (af|inputNumberSpinbox::content) - super.renderTextField(context, arc, component, bean); - rw.endElement("td"); - } - - /** - * render the spinboxes after the text field. Render these even if - * they are disabled. - * @param context - * @param arc - * @param component - * @param bean - * @throws IOException - */ - protected void renderAfterTextField( - FacesContext context, - RenderingContext arc, - UIComponent component, - FacesBean bean) throws IOException - { - - ResponseWriter rw = context.getResponseWriter(); - rw.startElement("td", component); - rw.writeAttribute("align", "center", null); - rw.writeAttribute("valign", "middle", null); - - renderStyleClass(context, arc, "af|inputNumberSpinbox::spinbox-cell"); - // use css to put in a space.??? - renderIcon(context, arc, component, bean); - rw.endElement("td"); - rw.endElement("tr"); - rw.endElement("table"); - - } - - /** - * render the spinbox icons.
img
img
- */ - protected void renderIcon( - FacesContext context, - RenderingContext arc, - UIComponent component, - FacesBean bean) throws IOException - { - ResponseWriter rw = context.getResponseWriter(); - // render increment spinbox image - rw.startElement("div", component); - _renderSpinboxIcon(context, arc, component, bean, rw, true); - rw.endElement("div"); - - // render decrement spinbox image - rw.startElement("div", component); - _renderSpinboxIcon(context, arc, component, bean, rw, false); - rw.endElement("div"); - - } - - /** - * render one of the spinbox icons: either the increment or decrement icon. - * The renders within tags with onmousedown and onmouseup event - * handlers which will call javascript to increment/decrement the input - * value. If disabled, then do not render the tags. - */ - private void _renderSpinboxIcon( - FacesContext context, - RenderingContext arc, - UIComponent component, - FacesBean bean, - ResponseWriter rw, - boolean increment) throws IOException - { - boolean disabled = getDisabled(bean); - - String styleClass = - (increment) ? - XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_INCREMENT_CELL : - XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_DECREMENT_CELL; - renderStyleClass(context, arc, styleClass); - - String iconName; - - if (!disabled) - { - iconName = - (increment) ? - XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_INCREMENT_ICON_NAME : - XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_DECREMENT_ICON_NAME; - } - else - { - iconName = - (increment) ? - XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_INCREMENT_DISABLED_ICON_NAME : - XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_DECREMENT_DISABLED_ICON_NAME; - } - - Icon icon = arc.getIcon(iconName); - if ((icon != null) && !icon.isNull()) - { - // Render Link with onmousedown and onmouseup event handlers - if (!disabled) - { - rw.startElement("a", component); - rw.writeURIAttribute("href", "#", null); - // this will keep the href from being executed. - rw.writeAttribute("onclick", "return false;", null); - - String mouseDownScript = - _getSpinboxScript(context, arc, component, bean, increment); - - rw.writeAttribute("onmousedown", mouseDownScript, null); - rw.writeAttribute("onmouseup", _CLEAR_SPINBOX_JS, null); - } - - // TODO resource bundle - String altText; - if (!disabled) - altText = (increment) ? "increment" : "decrement"; - else - altText = (increment) ? "increment disabled" : "decrement disabled"; - OutputUtils.renderIcon(context, arc, icon, altText, null); - - if (!disabled) - rw.endElement("a"); - } - } - - private String _getSpinboxScript( - FacesContext context, - RenderingContext arc, - UIComponent component, - FacesBean bean, - boolean increment) - { - StringBuffer js = new StringBuffer(); - js.append(_SPINBOX_REPEAT_JS); - js.append("('"); - js.append(component.getClientId(context)); - js.append("',"); - js.append(increment); - js.append(","); - js.append(_getStepSizeOrDefault(bean)); - js.append(","); - js.append(_getMinimumOrDefault(bean)); - js.append(","); - js.append(_getMaximumOrDefault(bean)); - js.append(");"); - - return js.toString(); - } - - private int _getMinimumOrDefault(FacesBean bean) - { - Number minimum = (Number) bean.getProperty(_minimumKey); - if (minimum == null) - minimum = (Number)_minimumKey.getDefault(); - assert(minimum != null); - return minimum.intValue(); - } - - private int _getMaximumOrDefault(FacesBean bean) - { - Number maximum = (Number) bean.getProperty(_maximumKey); - if (maximum == null) - maximum = (Number)_maximumKey.getDefault(); - assert(maximum != null); - return maximum.intValue(); - } - - private int _getStepSizeOrDefault(FacesBean bean) - { - Number stepSize = (Number) bean.getProperty(_stepSizeKey); - if (stepSize == null) - stepSize = (Number) _stepSizeKey.getDefault(); - assert(stepSize != null); - return stepSize.intValue(); - } - - private PropertyKey _minimumKey; - private PropertyKey _maximumKey; - private PropertyKey _stepSizeKey; - - - private static String _SPINBOX_REPEAT_JS = "_spinboxRepeat"; - private static String _CLEAR_SPINBOX_JS = "_clearSpinbox();"; -} + +/* + * Copyright 2005,2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ +package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml; + +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +import javax.faces.context.ResponseWriter; + +import org.apache.myfaces.trinidad.bean.FacesBean; +import org.apache.myfaces.trinidad.bean.PropertyKey; + + +import org.apache.myfaces.trinidad.component.core.input.CoreInputNumberSpinbox; + +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; +import org.apache.myfaces.trinidadinternal.skin.icon.Icon; + +/** + * overrides SimpleInputListOfValuesRenderer because like that class, + * we need an 'icon' after the text field. -- + * the 'icon' is really two icons: the up/down buttons + */ +public class SimpleInputNumberSpinboxRenderer extends SimpleInputListOfValuesRenderer +{ + public SimpleInputNumberSpinboxRenderer() + { + super(CoreInputNumberSpinbox.TYPE); + } + + @Override + protected void findTypeConstants(FacesBean.Type type) + { + super.findTypeConstants(type); + _minimumKey = type.findKey("minimum"); + _maximumKey = type.findKey("maximum"); + _stepSizeKey = type.findKey("stepSize"); + } + // + + + // + // ENCODE BEHAVIOR + // + + // + // Overrides disabling all the things you can't do on + // an InputNumberSpinbox + // + + @Override + public boolean isTextArea( + FacesBean bean) + { + return false; + } + + @Override + protected boolean getSecret(FacesBean bean) + { + return false; + } + + @Override + protected Number getMaximumLength(FacesBean bean) + { + return null; + } + + @Override + protected boolean shouldRenderInputOnclick() + { + // keep the onclick on the input. selectInputText moves it to the button. + return false; + } + + @Override + protected String getRootStyleClass(FacesBean bean) + { + return "af|inputNumberSpinbox"; + } + + @Override + protected String getContentStyleClass(FacesBean bean) + { + return "af|inputNumberSpinbox::content"; + } + + @Override + protected Integer getDefaultColumns( + RenderingContext arc, + FacesBean bean) + { + return new Integer(1); + } + + @Override + protected void renderTextField( + FacesContext context, + RenderingContext arc, + UIComponent component, + FacesBean bean) throws IOException + { + // render
, then text field,
+ ResponseWriter rw = context.getResponseWriter(); + rw.startElement("table", component); + OutputUtils.renderLayoutTableAttributes(context, arc, "0", "0", "0", null); + rw.startElement("tr", component); + rw.startElement("td", component); + // this renders the inputText. This will call getContentStyleClass to put + // our styleclass on it. (af|inputNumberSpinbox::content) + super.renderTextField(context, arc, component, bean); + rw.endElement("td"); + } + + /** + * render the spinboxes after the text field. Render these even if + * they are disabled. + * @param context + * @param arc + * @param component + * @param bean + * @throws IOException + */ + @Override + protected void renderAfterTextField( + FacesContext context, + RenderingContext arc, + UIComponent component, + FacesBean bean) throws IOException + { + + ResponseWriter rw = context.getResponseWriter(); + rw.startElement("td", component); + rw.writeAttribute("align", "center", null); + rw.writeAttribute("valign", "middle", null); + + renderStyleClass(context, arc, "af|inputNumberSpinbox::spinbox-cell"); + // use css to put in a space.??? + renderIcon(context, arc, component, bean); + rw.endElement("td"); + rw.endElement("tr"); + rw.endElement("table"); + + } + + /** + * render the spinbox icons.
img
img
+ */ + @Override + protected void renderIcon( + FacesContext context, + RenderingContext arc, + UIComponent component, + FacesBean bean) throws IOException + { + ResponseWriter rw = context.getResponseWriter(); + // render increment spinbox image + rw.startElement("div", component); + _renderSpinboxIcon(context, arc, component, bean, rw, true); + rw.endElement("div"); + + // render decrement spinbox image + rw.startElement("div", component); + _renderSpinboxIcon(context, arc, component, bean, rw, false); + rw.endElement("div"); + + } + + /** + * render one of the spinbox icons: either the increment or decrement icon. + * The renders within tags with onmousedown and onmouseup event + * handlers which will call javascript to increment/decrement the input + * value. If disabled, then do not render the tags. + */ + private void _renderSpinboxIcon( + FacesContext context, + RenderingContext arc, + UIComponent component, + FacesBean bean, + ResponseWriter rw, + boolean increment) throws IOException + { + boolean disabled = getDisabled(bean); + + String styleClass = + (increment) ? + XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_INCREMENT_CELL : + XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_DECREMENT_CELL; + renderStyleClass(context, arc, styleClass); + + String iconName; + + if (!disabled) + { + iconName = + (increment) ? + XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_INCREMENT_ICON_NAME : + XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_DECREMENT_ICON_NAME; + } + else + { + iconName = + (increment) ? + XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_INCREMENT_DISABLED_ICON_NAME : + XhtmlConstants.AF_INPUT_NUMBER_SPINBOX_DECREMENT_DISABLED_ICON_NAME; + } + + Icon icon = arc.getIcon(iconName); + if ((icon != null) && !icon.isNull()) + { + // Render Link with onmousedown and onmouseup event handlers + if (!disabled) + { + rw.startElement("a", component); + rw.writeURIAttribute("href", "#", null); + // this will keep the href from being executed. + rw.writeAttribute("onclick", "return false;", null); + + String mouseDownScript = + _getSpinboxScript(context, arc, component, bean, increment); + + rw.writeAttribute("onmousedown", mouseDownScript, null); + rw.writeAttribute("onmouseup", _CLEAR_SPINBOX_JS, null); + } + + // TODO resource bundle + String altText; + if (!disabled) + altText = (increment) ? "increment" : "decrement"; + else + altText = (increment) ? "increment disabled" : "decrement disabled"; + OutputUtils.renderIcon(context, arc, icon, altText, null); + + if (!disabled) + rw.endElement("a"); + } + } + + private String _getSpinboxScript( + FacesContext context, + RenderingContext arc, + UIComponent component, + FacesBean bean, + boolean increment) + { + StringBuffer js = new StringBuffer(); + js.append(_SPINBOX_REPEAT_JS); + js.append("('"); + js.append(component.getClientId(context)); + js.append("',"); + js.append(increment); + js.append(","); + js.append(_getStepSizeOrDefault(bean)); + js.append(","); + js.append(_getMinimumOrDefault(bean)); + js.append(","); + js.append(_getMaximumOrDefault(bean)); + js.append(");"); + + return js.toString(); + } + + private int _getMinimumOrDefault(FacesBean bean) + { + Number minimum = (Number) bean.getProperty(_minimumKey); + if (minimum == null) + minimum = (Number)_minimumKey.getDefault(); + assert(minimum != null); + return minimum.intValue(); + } + + private int _getMaximumOrDefault(FacesBean bean) + { + Number maximum = (Number) bean.getProperty(_maximumKey); + if (maximum == null) + maximum = (Number)_maximumKey.getDefault(); + assert(maximum != null); + return maximum.intValue(); + } + + private int _getStepSizeOrDefault(FacesBean bean) + { + Number stepSize = (Number) bean.getProperty(_stepSizeKey); + if (stepSize == null) + stepSize = (Number) _stepSizeKey.getDefault(); + assert(stepSize != null); + return stepSize.intValue(); + } + + private PropertyKey _minimumKey; + private PropertyKey _maximumKey; + private PropertyKey _stepSizeKey; + + + private static String _SPINBOX_REPEAT_JS = "_spinboxRepeat"; + private static String _CLEAR_SPINBOX_JS = "_clearSpinbox();"; +} Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java Wed Aug 16 00:00:16 2006 @@ -204,8 +204,8 @@ Object value = parameters.get(XhtmlConstants.VALUE_PARAM); if (value != null) { - RowKeySet old = table.getDisclosedRowKeys(); - RowKeySet newset = old.clone(); + RowKeySet old = table.getDisclosedRowKeys(); + RowKeySet newset = old.clone(); if ("all".equals(value)) { if (doExpand) Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java Wed Aug 16 00:00:16 2006 @@ -219,8 +219,7 @@ * Gets the selection state for this table. * This is overwritten in HGridRenderingContext */ - @SuppressWarnings("unchecked") - public RowKeySet getSelectedRowKeys() + public RowKeySet getSelectedRowKeys() { return ((UIXTable) getCollectionComponent()).getSelectedRowKeys(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java Wed Aug 16 00:00:16 2006 @@ -78,7 +78,7 @@ parameters.get(tableId+NamingContainer.SEPARATOR_CHAR+SELECTED_KEY); // must work with both table and hgrid: - final RowKeySet selectionModel; + final RowKeySet selectionModel; if (table instanceof UIXTable) selectionModel = ((UIXTable) table).getSelectedRowKeys(); else @@ -102,9 +102,9 @@ // // have clicked select-all and then deselected some rows before submitting: // } - RowKeySet selectedDelta = selectionModel.clone(); + RowKeySet selectedDelta = selectionModel.clone(); selectedDelta.clear(); - RowKeySet unselectedDelta = selectedDelta.clone(); + RowKeySet unselectedDelta = selectedDelta.clone(); _setDeltas(table, selectedBoxes, unselectedBoxes, selectionModel, selectedDelta, unselectedDelta); @@ -119,9 +119,9 @@ private void _setDeltas(UIXCollection table, String[] selectedBoxes, String[] unselectedBoxes, - RowKeySet current, - RowKeySet selectedDelta, - RowKeySet unselectedDelta) + RowKeySet current, + RowKeySet selectedDelta, + RowKeySet unselectedDelta) { Map deltas = new HashMap(unselectedBoxes.length); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java Wed Aug 16 00:00:16 2006 @@ -82,7 +82,7 @@ if (selection != null) { - final RowKeySet state; + final RowKeySet state; if (table instanceof UIXTable) state = ((UIXTable) table).getSelectedRowKeys(); else @@ -91,14 +91,14 @@ table.setCurrencyString(selection); if (!state.isContained()) { - RowKeySet unselected = state.clone(); + RowKeySet unselected = state.clone(); // TODO : do not mutate the selectedRowKeys here. // instead, mutate when event is broadcast: state.clear(); state.add(); // clone, so that subsequent mutations of "state" will // not affect the parameters of this event: bug 4733858: - RowKeySet selected = state.clone(); + RowKeySet selected = state.clone(); FacesEvent event = new SelectionEvent(table, unselected, selected); event.queue(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java Wed Aug 16 00:00:16 2006 @@ -34,7 +34,6 @@ public class TreeNodeColumnRenderer extends ColumnRenderer { - @SuppressWarnings("unchecked") @Override protected void renderKids(FacesContext context, RenderingContext arc, @@ -48,7 +47,7 @@ final String onclick; if (hGrid.isContainer()) { - RowKeySet treeState = hGrid.getDisclosedRowKeys(); + RowKeySet treeState = hGrid.getDisclosedRowKeys(); String jsVarName = ttrc.getJSVarName(); if (treeState.isContained()) { Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java Wed Aug 16 00:00:16 2006 @@ -87,9 +87,8 @@ * Gets the selection state for this table. * This is overwritten in HGridRenderingContext */ - @SuppressWarnings("unchecked") @Override - public RowKeySet getSelectedRowKeys() + public RowKeySet getSelectedRowKeys() { return ((UIXTree) getCollectionComponent()).getSelectedRowKeys(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java Wed Aug 16 00:00:16 2006 @@ -286,8 +286,8 @@ else { tree.setRowKey(focusRowKey); - RowKeySet old = _getExpandedRowKeys(tree); - RowKeySet newset = old.clone(); + RowKeySet old = _getExpandedRowKeys(tree); + RowKeySet newset = old.clone(); if (expand) newset.addAll(); else @@ -298,8 +298,8 @@ else // expand/collapse event { _restorePathFromParam(parameters, tree); - RowKeySet old = _getExpandedRowKeys(tree); - RowKeySet newset = old.clone(); + RowKeySet old = _getExpandedRowKeys(tree); + RowKeySet newset = old.clone(); newset.setContained(expand); event = new RowDisclosureEvent(old, newset, tree); } @@ -310,8 +310,7 @@ preserve.run((UIXHierarchy) tree); } - @SuppressWarnings("unchecked") - private static RowKeySet _getExpandedRowKeys(UIXHierarchy tree) + private static RowKeySet _getExpandedRowKeys(UIXHierarchy tree) { if (tree instanceof UIXTree) return ((UIXTree) tree).getDisclosedRowKeys(); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/NavigationTreeRenderer.java Wed Aug 16 00:00:16 2006 @@ -52,7 +52,7 @@ if (!component.getClientId(context).equals(source)) return; - TreeUtils.decodeExpandEvents(parameters, component, Collections.EMPTY_LIST); + TreeUtils.decodeExpandEvents(parameters, component, Collections.emptyList()); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java Wed Aug 16 00:00:16 2006 @@ -57,7 +57,7 @@ if ( treeId.equals(source)) { - TreeUtils.decodeExpandEvents(parameters, page, Collections.EMPTY_LIST); + TreeUtils.decodeExpandEvents(parameters, page, Collections.emptyList()); RequestContext afContext = RequestContext.getCurrentInstance(); if (afContext != null) afContext.addPartialTarget(component); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java Wed Aug 16 00:00:16 2006 @@ -49,7 +49,7 @@ * @return a List of javax.faces.model.SelectItem Objects that we get or * create from the component's children. * OR - * java.util.Collections.EMPTY_LIST if component has no children or + * java.util.Collections.emptyList if component has no children or * the component isn't a javax.faces.component.ValueHolder. else */ @SuppressWarnings("unchecked") @@ -60,12 +60,12 @@ int childCount = component.getChildCount(); if (childCount == 0) - return Collections.EMPTY_LIST; + return Collections.emptyList(); // Make sure we haven't accidentally stumbled outside of // the UIXSelectXXX world. if (!(component instanceof ValueHolder)) - return Collections.EMPTY_LIST; + return Collections.emptyList(); FacesContext context = FacesContext.getCurrentInstance(); List items = null; @@ -106,7 +106,7 @@ } if (items == null) - return Collections.EMPTY_LIST; + return Collections.emptyList(); return items; } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java Wed Aug 16 00:00:16 2006 @@ -203,7 +203,7 @@ List valueItemsList; if (value == null) { - valueItemsList = Collections.EMPTY_LIST; + valueItemsList = Collections.emptyList(); } else if (value.getClass().isArray()) { Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java Wed Aug 16 00:00:16 2006 @@ -53,7 +53,7 @@ if (!component.getClientId(context).equals(source)) return; - TreeUtils.decodeExpandEvents(parameters, component, Collections.EMPTY_LIST); + TreeUtils.decodeExpandEvents(parameters, component, Collections.emptyList()); String currencyStrParam = source + NamingContainer.SEPARATOR_CHAR + SELECTED_PARAM; String currencyStr = parameters.get(currencyStrParam); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java Wed Aug 16 00:00:16 2006 @@ -158,6 +158,7 @@ /** * Returns the DateFormatContext containing all date format parameters. */ + @Override protected DateFormatContext getDateFormatContextImpl() { return _dateFormatContext; @@ -175,6 +176,7 @@ /** * Returns the DecimalFormatContext containing all number format parameters. */ + @Override protected DecimalFormatContext getDecimalFormatContextImpl() { return _decimalFormatContext; Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java Wed Aug 16 00:00:16 2006 @@ -514,7 +514,7 @@ } if (keys.isEmpty()) - keys = Collections.EMPTY_MAP; + keys = Collections.emptyMap(); else keys = Collections.unmodifiableMap(keys); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorSchemeNode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorSchemeNode.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorSchemeNode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorSchemeNode.java Wed Aug 16 00:00:16 2006 @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; @@ -68,7 +69,6 @@ /** * Returns an Iterator of ColorNodes contained by this ColorSchemeNode */ - @SuppressWarnings("unchecked") public Iterator getColors() { if(_colors!=null) @@ -77,7 +77,8 @@ } else { - return (Collections.EMPTY_LIST).iterator(); + List list = Collections.emptyList(); + return list.iterator(); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/CompoundPropertyNode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/CompoundPropertyNode.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/CompoundPropertyNode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/CompoundPropertyNode.java Wed Aug 16 00:00:16 2006 @@ -62,7 +62,6 @@ * Returns an Iterator of values - which can be either Strings or * IncludePropertyNodes. */ - @SuppressWarnings("unchecked") public Iterator getValues() { if (_values!=null) @@ -71,7 +70,7 @@ } else { - return (Collections.EMPTY_LIST).iterator(); + return (Collections.emptyList()).iterator(); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java Wed Aug 16 00:00:16 2006 @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; @@ -136,12 +137,12 @@ /** * Implementation of StyleNode.getProperties(). */ - @SuppressWarnings("unchecked") public Iterator getProperties() { if (_properties == null) { - return (Collections.EMPTY_LIST).iterator(); + List list = Collections.emptyList(); + return list.iterator(); } else return (Arrays.asList(_properties)).iterator(); @@ -150,12 +151,12 @@ /** * Returns an Iterator containing Strings and IncludePropertyNodes. */ - @SuppressWarnings("unchecked") public Iterator getCompoundProperties() { if (_compoundProperties == null) { - return (Collections.EMPTY_LIST).iterator(); + List list = Collections.emptyList(); + return list.iterator(); } else return (Arrays.asList(_compoundProperties)).iterator(); @@ -164,26 +165,28 @@ /** * Returns an Iterator of IncludeStyleNodes. */ - @SuppressWarnings("unchecked") public Iterator getIncludedStyles() { if (_includedStyles == null) { - return (Collections.EMPTY_LIST).iterator(); + List list = Collections.emptyList(); + return list.iterator(); } else - return (Arrays.asList(_includedStyles)).iterator(); + { + return (Arrays.asList(_includedStyles)).iterator(); + } } /** * Returns an Iterator of IncludePropertyNodes. */ - @SuppressWarnings("unchecked") public Iterator getIncludedProperties() { if(_includedProperties == null) { - return (Collections.EMPTY_LIST).iterator(); + List list = Collections.emptyList(); + return list.iterator(); } else return (Arrays.asList(_includedProperties)).iterator(); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java Wed Aug 16 00:00:16 2006 @@ -142,7 +142,7 @@ if(_styleSheets==null) { // -= Simon Lessard =- - // TODO: Collections.EMPTY_LIST maybe? + // TODO: Collections.emptyList() maybe? return (Arrays.asList(new StyleSheetNode[0])).iterator(); } else @@ -157,7 +157,7 @@ public Iterator getColorSchemes() { // -= Simon Lessard =- - // TODO: Wouldn't Collections.EMPTY_LIST be better? + // TODO: Wouldn't Collections.emptyList() be better? return (Arrays.asList(new ColorSchemeNode[0])).iterator(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java?rev=431848&r1=431847&r2=431848&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java Wed Aug 16 00:00:16 2006 @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; import java.util.Locale; @@ -86,15 +87,17 @@ /** * Implementation of StyleSheetNode.getStyles(). */ - @SuppressWarnings("unchecked") public Iterator getStyles() { - if(_styles!=null) - { - return (Arrays.asList(_styles)).iterator(); - } - else - return (Collections.EMPTY_LIST).iterator(); + if(_styles!=null) + { + return (Arrays.asList(_styles)).iterator(); + } + else + { + List list = Collections.emptyList(); + return list.iterator(); + } } /** @@ -113,15 +116,17 @@ /** * Implementation of StyleSheetNode.getLocales(). */ - @SuppressWarnings("unchecked") public Iterator getLocales() { - if (_locales==null) + if (_locales == null) { - return (Collections.EMPTY_LIST).iterator(); + List list = Collections.emptyList(); + return list.iterator(); } else + { return (Arrays.asList(_locales)).iterator(); + } } /**
, then text field,