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/07/18 11:31:12 UTC
svn commit: r1611572 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/
tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/
tobago-theme/tobago-the...
Author: lofwyr
Date: Fri Jul 18 09:31:12 2014
New Revision: 1611572
URL: http://svn.apache.org/r1611572
Log:
Merged from trunk
TOBAGO-1203: Sheet-Header: Support for input components in header-cells [from revision 1610942]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1610942
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilter.java?rev=1611572&r1=1611571&r2=1611572&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilter.java Fri Jul 18 09:31:12 2014
@@ -58,8 +58,8 @@ public class SheetFilter {
public SheetFilter() {
distanceRangeList = Arrays.asList(
- new DistanceRange(0, Integer.MAX_VALUE),
- new DistanceRange(0, 10),
+ new DistanceRange(-1, Integer.MAX_VALUE),
+ new DistanceRange(-1, 10),
new DistanceRange(10, 100),
new DistanceRange(100, 1000),
new DistanceRange(1000, 10000),
@@ -83,12 +83,20 @@ public class SheetFilter {
public String filter() {
filtered.clear();
+ if (name == null) {
+ name = "";
+ }
+ if (orbit == null) {
+ orbit = "";
+ }
+ if (discoverer == null) {
+ discoverer = "";
+ }
for (final SolarObject solarObject : demo.getSolarArray()) {
- if (solarObject.getName().toLowerCase().contains(name.toLowerCase())
- && solarObject.getOrbit().toLowerCase().contains(orbit.toLowerCase())
- && distance.getMin() < solarObject.getDistance()
- && solarObject.getDistance() <= distance.getMax()
- && solarObject.getDiscoverer().toLowerCase().contains(discoverer.toLowerCase())) {
+ if (StringUtils.containsIgnoreCase(solarObject.getName(), name)
+ && StringUtils.containsIgnoreCase(solarObject.getOrbit(), orbit)
+ && distance.getMin() < solarObject.getDistance() && solarObject.getDistance() <= distance.getMax()
+ && StringUtils.containsIgnoreCase(solarObject.getDiscoverer(), discoverer)) {
filtered.add(solarObject);
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml?rev=1611572&r1=1611571&r2=1611572&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml Fri Jul 18 09:31:12 2014
@@ -39,25 +39,30 @@
<f:facet name="header">
<tc:form>
+
<tc:out value="Name"/>
- <tc:out value="of"/>
+ <tc:out value="Orbit of"/>
<tc:out value="#{overviewBundle.solarArrayDistance} [1000 km]"/>
<tc:out value="Discoverer"/>
<tc:in value="#{sheetFilter.name}">
- <!-- a change facet works, but is not nice to use in most cases
+ <!-- a change facet works, but is not nice to use in most cases -->
+<!--
<f:facet name="change">
<tc:command action="#{sheetFilter.filter}" renderedPartially="sheet"/>
</f:facet>
- -->
+-->
</tc:in>
<tc:in value="#{sheetFilter.orbit}"/>
<tc:selectOneChoice value="#{sheetFilter.distance}" converter="#{sheetFilter.converter}">
<tc:selectItems value="#{sheetFilter.distanceItems}"/>
</tc:selectOneChoice>
- <tc:in value="#{sheetFilter.discoverer}"/>
- <tc:button action="#{sheetFilter.filter}" renderedPartially="sheet" defaultCommand="true"/>
+ <!-- XXX workaround -->
+ <tc:panel>
+ <tc:in value="#{sheetFilter.discoverer}"/>
+ <tc:button action="#{sheetFilter.filter}" label="Filter" renderedPartially="sheet" defaultCommand="true"/>
+ </tc:panel>
</tc:form>
</f:facet>
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/SheetRenderer.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/SheetRenderer.java?rev=1611572&r1=1611571&r2=1611572&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/SheetRenderer.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/SheetRenderer.java Fri Jul 18 09:31:12 2014
@@ -846,7 +846,8 @@ public class SheetRenderer extends Layou
String sorterImage = null;
Markup markup = Markup.NULL;
String tip = (String) column.getAttributes().get(Attributes.TIP);
- if (cell.getColumnSpan() == 1) {
+ // sorter icons should only displayed when there is only 1 column and not input
+ if (cell.getColumnSpan() == 1 && cellComponent instanceof UIOut) {
final boolean sortable = ComponentUtils.getBooleanAttribute(column, Attributes.SORTABLE);
if (sortable) {
UICommand sortCommand = (UICommand) column.getFacet(Facets.SORTER);