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 2006/11/16 11:24:03 UTC
svn commit: r475672 - in /myfaces/tobago/trunk:
example/sandbox/src/main/webapp/
sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/
Author: lofwyr
Date: Thu Nov 16 02:24:02 2006
New Revision: 475672
URL: http://svn.apache.org/viewvc?view=rev&rev=475672
Log:
optimize imports
remove warnings
define body content elements
Modified:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp?view=diff&rev=475672&r1=475671&r2=475672
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp Thu Nov 16 02:24:02 2006
@@ -50,7 +50,6 @@
<%@ taglib uri="http://myfaces.apache.org/tobago/sandbox" prefix="tcs" %>
<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
<f:view>
<tc:loadBundle basename="demo" var="bundle"/>
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?view=diff&rev=475672&r1=475671&r2=475672
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Thu Nov 16 02:24:02 2006
@@ -28,7 +28,7 @@
* Creates a tree node.
*/
@Tag(name = "treeNode")
-@BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?") // fixme
+@BodyContentDescription(anyTagOf = "<tcs:treeNode>* <tcs:treeNodes>*")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
rendererType = "TreeNode")
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java?view=diff&rev=475672&r1=475671&r2=475672
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java Thu Nov 16 02:24:02 2006
@@ -30,10 +30,12 @@
private String value;
private String var;
+ @Override
public String getComponentType() {
return UITreeNodes.COMPONENT_TYPE;
}
+ @Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
@@ -41,6 +43,7 @@
ComponentUtil.setStringProperty(component, ATTR_VAR, var);
}
+ @Override
public void release() {
super.release();
value = null;
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java?view=diff&rev=475672&r1=475671&r2=475672
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java Thu Nov 16 02:24:02 2006
@@ -30,7 +30,7 @@
* Describes a subtree of nodes.
*/
@Tag(name = "treeNodes")
-@BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?") // fixme
+@BodyContentDescription(anyTagOf = "<tcs:treeNode>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNodes",
rendererType = "TreeNodes")
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java?view=diff&rev=475672&r1=475671&r2=475672
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java Thu Nov 16 02:24:02 2006
@@ -33,20 +33,12 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UITree;
import org.apache.myfaces.tobago.taglib.component.TobagoTag;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
-/**
- * XXX: Warning: This code is under construction. If you want to use the "old"
- * XXX: tree, please use the tc:treeOld Tag.
- */
public class TreeTag extends TobagoTag implements TreeTagDeclaration {
- private static final Log LOG = LogFactory.getLog(TreeTag.class);
-
private String value;
private String state;
@@ -68,10 +60,12 @@
private String mode;
+ @Override
public String getComponentType() {
return UITree.COMPONENT_TYPE;
}
+ @Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
@@ -94,6 +88,7 @@
ComponentUtil.setStringProperty(component, ATTR_MODE, mode);
}
+ @Override
public void release() {
super.release();
value = null;
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java?view=diff&rev=475672&r1=475671&r2=475672
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java Thu Nov 16 02:24:02 2006
@@ -41,7 +41,7 @@
* Renders a tree view.
*/
@Tag(name = "tree")
-@BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?") // fixme
+@BodyContentDescription(anyTagOf = "<tcs:treeNode>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITree",
rendererType = "Tree")