You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/08/24 20:20:25 UTC
svn commit: r434456 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component:
BoxTag.java CellTag.java FormTag.java MenuBarTag.java PageTag.java
PanelTag.java PopupTag.java TabTag.java TobagoBodyTag.java
Author: bommel
Date: Thu Aug 24 11:20:21 2006
New Revision: 434456
URL: http://svn.apache.org/viewvc?rev=434456&view=rev
Log:
TOBAGO-117
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoBodyTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTag.java Thu Aug 24 11:20:21 2006
@@ -18,12 +18,14 @@
import org.apache.myfaces.tobago.component.UIPanel;
+import javax.servlet.jsp.tagext.BodyTag;
+
/**
* Renders a panel with border and title.
*/
public class BoxTag extends TobagoBodyTag
- implements BoxTagDeclaration {
+ implements BodyTag, BoxTagDeclaration {
public String getComponentType() {
return UIPanel.COMPONENT_TYPE;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTag.java Thu Aug 24 11:20:21 2006
@@ -26,6 +26,7 @@
import org.apache.myfaces.tobago.component.UICell;
import javax.faces.component.UIComponent;
+import javax.servlet.jsp.tagext.BodyTag;
/*
* Created 29.07.2003 at 15:09:53.
@@ -33,7 +34,7 @@
*/
-public class CellTag extends TobagoBodyTag implements CellTagDeclaration {
+public class CellTag extends TobagoBodyTag implements BodyTag, CellTagDeclaration {
private static final Log LOG = LogFactory.getLog(CellTag.class);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTag.java Thu Aug 24 11:20:21 2006
@@ -18,8 +18,10 @@
import org.apache.myfaces.tobago.component.UIForm;
+import javax.servlet.jsp.tagext.BodyTag;
-public class FormTag extends TobagoBodyTag implements FormTagDeclaration {
+
+public class FormTag extends TobagoBodyTag implements BodyTag, FormTagDeclaration {
public String getComponentType() {
return UIForm.COMPONENT_TYPE;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTag.java Thu Aug 24 11:20:21 2006
@@ -17,10 +17,11 @@
*/
import javax.faces.component.UIPanel;
+import javax.servlet.jsp.tagext.BodyTag;
public class MenuBarTag extends TobagoBodyTag
- implements MenuBarTagDeclaration {
+ implements BodyTag, MenuBarTagDeclaration {
public String getComponentType() {
return UIPanel.COMPONENT_TYPE;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java Thu Aug 24 11:20:21 2006
@@ -29,10 +29,11 @@
import javax.faces.component.UIComponent;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTag;
import java.util.List;
public class PageTag extends TobagoBodyTag
- implements PageTagDeclaration {
+ implements BodyTag, PageTagDeclaration {
private String doctype = "loose";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTag.java Thu Aug 24 11:20:21 2006
@@ -24,8 +24,10 @@
import org.apache.myfaces.tobago.component.UIPanel;
+import javax.servlet.jsp.tagext.BodyTag;
+
public class PanelTag extends TobagoBodyTag
- implements PanelTagDeclaration {
+ implements BodyTag, PanelTagDeclaration {
public String getComponentType() {
return UIPanel.COMPONENT_TYPE;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java Thu Aug 24 11:20:21 2006
@@ -24,9 +24,10 @@
import org.apache.myfaces.tobago.component.UIPopup;
import javax.faces.component.UIComponent;
+import javax.servlet.jsp.tagext.BodyTag;
public class PopupTag extends TobagoBodyTag
- implements PopupTagDeclaration {
+ implements BodyTag, PopupTagDeclaration {
private String width;
private String height;
private String left;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java Thu Aug 24 11:20:21 2006
@@ -24,11 +24,11 @@
import org.apache.myfaces.tobago.component.UIPanel;
import javax.faces.component.UIComponent;
+import javax.servlet.jsp.tagext.BodyTag;
public class TabTag extends TobagoBodyTag
- implements TabTagDeclaration {
+ implements BodyTag, TabTagDeclaration {
private static final Log LOG = LogFactory.getLog(TabTag.class);
-
private String label;
private String tip;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoBodyTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoBodyTag.java?rev=434456&r1=434455&r2=434456&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoBodyTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoBodyTag.java Thu Aug 24 11:20:21 2006
@@ -27,6 +27,7 @@
import javax.faces.component.UIComponent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
+import javax.servlet.jsp.tagext.BodyTag;
public abstract class TobagoBodyTag extends TobagoTag implements TobagoBodyTagDeclaration {
@@ -34,11 +35,11 @@
private BodyContent bodyContent;
- public void doInitBody() throws JspException {
+ public int doAfterBody() throws JspException {
+ return getDoAfterBodyValue();
}
- public int doAfterBody() throws JspException {
- return SKIP_BODY;
+ public void doInitBody() throws JspException {
}
@@ -67,7 +68,11 @@
}
protected int getDoStartValue() throws JspException {
- return EVAL_BODY_BUFFERED;
+ return BodyTag.EVAL_BODY_BUFFERED;
+ }
+
+ protected int getDoAfterBodyValue() throws JspException {
+ return BodyTag.SKIP_BODY;
}
public void release() {