You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/02/26 10:09:17 UTC
svn commit: r1571969 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/
tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tob...
Author: lofwyr
Date: Wed Feb 26 09:09:17 2014
New Revision: 1571969
URL: http://svn.apache.org/r1571969
Log:
Merged from trunk
TOBAGO-1362: Support dynamic list of objects for f:selectItems
- clean up [from revision 1571804]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuCommandRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1571804
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuCommandRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuCommandRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuCommandRenderer.java Wed Feb 26 09:09:17 2014
@@ -87,7 +87,7 @@ public class MenuCommandRenderer extends
final String clientId = command.getClientId(facesContext);
final UISelectOne radio = (UISelectOne) command.getFacet(Facets.RADIO);
final String hiddenId = radio.getClientId(facesContext);
- for (final SelectItem item : SelectItemUtils.iterator(facesContext, radio)) {
+ for (final SelectItem item : SelectItemUtils.getItems(facesContext, radio)) {
final boolean checked = item.getValue().equals(radio.getValue());
final String image = checked ? "image/MenuRadioChecked.gif" : null;
final String labelText = item.getLabel();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java Wed Feb 26 09:09:17 2014
@@ -31,6 +31,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
+import org.apache.myfaces.tobago.renderkit.util.SelectItemUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -39,7 +40,6 @@ import javax.faces.component.UISelectMan
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import java.io.IOException;
-import java.util.List;
public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
@@ -56,7 +56,6 @@ public class SelectManyCheckboxRenderer
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
- final List<SelectItem> items = RenderUtils.getItemsToRender(select);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
final boolean disabled = select.isDisabled();
final boolean readonly = select.isReadonly();
@@ -75,7 +74,7 @@ public class SelectManyCheckboxRenderer
}
boolean first = true;
final Object[] values = select.getSelectedValues();
- for (final SelectItem item : items) {
+ for (final SelectItem item : SelectItemUtils.getItems(facesContext, select)) {
final String itemId = id + ComponentUtils.SUB_SEPARATOR + item.getValue().toString();
writer.startElement(HtmlElements.LI, select);
writer.startElement(HtmlElements.INPUT, select);
@@ -124,8 +123,11 @@ public class SelectManyCheckboxRenderer
if (select.isInline()) {
return heightOfOne;
} else {
- final List<SelectItem> items = RenderUtils.getItemsToRender((UISelectMany) component);
- return heightOfOne.multiply(items.size());
+ int count = 0;
+ for(SelectItem ignored : SelectItemUtils.getItems(facesContext, (UISelectMany) component)) {
+ count++;
+ }
+ return heightOfOne.multiply(count);
}
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java Wed Feb 26 09:09:17 2014
@@ -56,7 +56,7 @@ public class SelectManyListboxRenderer e
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
- final Iterable<SelectItem> items = SelectItemUtils.iterator(facesContext, select);
+ final Iterable<SelectItem> items = SelectItemUtils.getItems(facesContext, select);
final boolean readonly = select.isReadonly();
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || readonly;
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java Wed Feb 26 09:09:17 2014
@@ -72,7 +72,7 @@ public class SelectManyShuttleRenderer e
style.setHeight(style.getHeight().subtract(labelHeight));
style.setTop(style.getTop().add(labelHeight));
}
- final Iterable<SelectItem> items = SelectItemUtils.iterator(facesContext, select);
+ final Iterable<SelectItem> items = SelectItemUtils.getItems(facesContext, select);
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || select.isReadonly();
final String unselectedLabel = select.getUnselectedLabel();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java Wed Feb 26 09:09:17 2014
@@ -57,7 +57,7 @@ public class SelectOneChoiceRenderer ext
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
- final Iterable<SelectItem> items = SelectItemUtils.iterator(facesContext, select);
+ final Iterable<SelectItem> items = SelectItemUtils.getItems(facesContext, select);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || select.isReadonly();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java Wed Feb 26 09:09:17 2014
@@ -56,7 +56,7 @@ public class SelectOneListboxRenderer ex
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
- final Iterable<SelectItem> items = SelectItemUtils.iterator(facesContext, select);
+ final Iterable<SelectItem> items = SelectItemUtils.getItems(facesContext, select);
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || select.isReadonly();
writer.startElement(HtmlElements.SELECT, select);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java Wed Feb 26 09:09:17 2014
@@ -56,7 +56,7 @@ public class SelectOneRadioRenderer exte
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
- final Iterable<SelectItem> items = SelectItemUtils.iterator(facesContext, select);
+ final Iterable<SelectItem> items = SelectItemUtils.getItems(facesContext, select);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
final boolean disabled = select.isDisabled();
final boolean readonly = select.isReadonly();
@@ -124,9 +124,8 @@ public class SelectOneRadioRenderer exte
if (select.isInline()) {
return heightOfOne;
} else {
- final Iterable<SelectItem> items = SelectItemUtils.iterator(facesContext, (UISelectOne) component);
int count = 0;
- for(SelectItem ignored : items) {
+ for(SelectItem ignored : SelectItemUtils.getItems(facesContext, (UISelectOne) component)) {
count++;
}
return heightOfOne.multiply(count);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java Wed Feb 26 09:09:17 2014
@@ -125,11 +125,11 @@ public abstract class ToolBarRendererBas
UIMenuSelectOne radio = (UIMenuSelectOne) command.getFacet(Facets.RADIO);
if (radio == null) {
- items = SelectItemUtils.iterator(facesContext, command);
+ items = SelectItemUtils.getItems(facesContext, command);
radio = CreateComponentUtils.createUIMenuSelectOneFacet(facesContext, command);
radio.setId(facesContext.getViewRoot().createUniqueId());
} else {
- items = SelectItemUtils.iterator(facesContext, radio);
+ items = SelectItemUtils.getItems(facesContext, radio);
}
if (radio != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java Wed Feb 26 09:09:17 2014
@@ -221,14 +221,26 @@ public class RenderUtils {
return Measure.valueOf(width);
}
+ /**
+ * @deprecated Since Tobago 2.0.0. Please use SelectItemUtils
+ */
+ @Deprecated
public static List<SelectItem> getItemsToRender(final javax.faces.component.UISelectOne component) {
return getItems(component);
}
+ /**
+ * @deprecated Since Tobago 2.0.0. Please use SelectItemUtils
+ */
+ @Deprecated
public static List<SelectItem> getItemsToRender(final javax.faces.component.UISelectMany component) {
return getItems(component);
}
+ /**
+ * @deprecated Since Tobago 2.0.0. Please use SelectItemUtils
+ */
+ @Deprecated
public static List<SelectItem> getItems(final javax.faces.component.UIInput component) {
final List<SelectItem> selectItems = getSelectItems(component);
@@ -288,8 +300,9 @@ public class RenderUtils {
}
/**
- * @deprecated Please use this method with facesContext parameter
+ * @deprecated Since Tobago 2.0.0. Please use SelectItemUtils
*/
+ @Deprecated
public static List<SelectItem> getSelectItems(final UIComponent component) {
final ArrayList<SelectItem> list = new ArrayList<SelectItem>();
@@ -363,6 +376,10 @@ public class RenderUtils {
return list;
}
+ /**
+ * @deprecated Since Tobago 2.0.0. Please use SelectItemUtils
+ */
+ @Deprecated
private static SelectItem getSelectItem(final org.apache.myfaces.tobago.component.UISelectItem component) {
return
new org.apache.myfaces.tobago.model.SelectItem(component.getItemValue() == null ? "" : component.getItemValue(),
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java?rev=1571969&r1=1571968&r2=1571969&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/SelectItemUtils.java Wed Feb 26 09:09:17 2014
@@ -41,7 +41,7 @@ import java.util.NoSuchElementException;
*/
public class SelectItemUtils {
- public static Iterable<SelectItem> iterator(final FacesContext facesContext, final UIComponent selector) {
+ public static Iterable<SelectItem> getItems(final FacesContext facesContext, final UIComponent selector) {
if (selector.getChildCount() == 0) {
return Collections.emptyList();
} else {