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 2012/06/08 09:53:49 UTC
svn commit: r1347917 - in
/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib:
component/SheetTagDeclaration.java declaration/HasVar.java
Author: lofwyr
Date: Fri Jun 8 07:53:49 2012
New Revision: 1347917
URL: http://svn.apache.org/viewvc?rev=1347917&view=rev
Log:
TOBAGO-1152: The "var" attribute must not be a ValueExpression [from revision 1347914]
Merged from trunk
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java (contents, props changed)
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java (contents, props changed)
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java?rev=1347917&r1=1347916&r2=1347917&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java Fri Jun 8 07:53:49 2012
@@ -30,6 +30,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRenderedPartially;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
@@ -50,7 +51,7 @@ import org.apache.myfaces.tobago.interna
allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
public interface SheetTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup,
- HasRenderedPartially {
+ HasRenderedPartially, HasVar {
/**
* LayoutConstraints for column layout.
* Semicolon separated list of layout tokens ('<x>*', '<x>px' or '<x>%').
@@ -92,15 +93,6 @@ public interface SheetTagDeclaration
void setValue(String value);
/**
- * Name of a request-scope attribute under which the model data for the row
- * selected by the current value of the "rowIndex" property
- * (i.e. also the current value of the "rowData" property) will be exposed.
- */
- @TagAttribute(required = true)
- @UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
- void setVar(String var);
-
- /**
* Flag indicating whether or not the paging panel should be display, if it is not needed for paging.<br />
* <ul>
* <li>showPagingAlways="false" which is the default means, that the paging footer should be displayed,
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 8 07:53:49 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java:1341831,1341901,1343719,1347914
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java?rev=1347917&r1=1347916&r2=1347917&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java Fri Jun 8 07:53:49 2012
@@ -17,19 +17,18 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-/**
- * $Id$
- */
public interface HasVar {
/**
- * Name of a request-scope attribute under which the model data for
- * for each subobject is accessible.
+ * Name of a request-scope attribute under which the model data for the row
+ * selected by the current value of the "rowIndex" property
+ * (i.e. also the current value of the "rowData" property) will be exposed.
*/
@TagAttribute(required = true)
- @UIComponentTagAttribute()
+ @UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
void setVar(String var);
}
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 8 07:53:49 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java:1341831,1341901,1343719,1347914