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 2008/04/02 21:37:18 UTC
svn commit: r644014 [6/10] - in /myfaces/tobago/trunk: ./ core/
core/src/main/faces-config/
core/src/main/java/org/apache/myfaces/tobago/ajax/api/
core/src/main/java/org/apache/myfaces/tobago/application/
core/src/main/java/org/apache/myfaces/tobago/co...
Copied: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java (from r638966, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/LayoutTokensUnitTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java?p2=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/LayoutTokensUnitTest.java&r1=638966&r2=644014&rev=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/LayoutTokensUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java Wed Apr 2 12:36:26 2008
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.component;
+package org.apache.myfaces.tobago.layout;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,5 +37,12 @@
assertTrue(LayoutTokens.isNumberAndSuffix("34cm", "cm"));
assertFalse(LayoutTokens.isNumberAndSuffix("acm", "cm"));
assertFalse(LayoutTokens.isNumberAndSuffix("cm", "cm"));
+ }
+
+ public void testParseToken() {
+ assertEquals(RelativeLayoutToken.DEFAULT_INSTANCE, LayoutTokens.parseToken("*"));
+ assertEquals(new RelativeLayoutToken(3), LayoutTokens.parseToken("3*"));
+ assertEquals(new PercentLayoutToken(33), LayoutTokens.parseToken("33%"));
+ assertEquals(new PixelLayoutToken(120), LayoutTokens.parseToken("120px"));
}
}
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LayoutInfoUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LayoutInfoUnitTest.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LayoutInfoUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LayoutInfoUnitTest.java Wed Apr 2 12:36:26 2008
@@ -18,7 +18,7 @@
*/
import junit.framework.TestCase;
-import org.apache.myfaces.tobago.component.LayoutTokens;
+import org.apache.myfaces.tobago.layout.LayoutTokens;
/*
* Date: Mar 22, 2007
Modified: myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Wed Apr 2 12:36:26 2008
@@ -26,6 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.UIColumn;
+import org.apache.myfaces.tobago.component.UIData;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.Theme;
@@ -124,7 +125,7 @@
SortActionEvent sortEvent = (SortActionEvent) event;
UIColumn column = (UIColumn) sortEvent.getColumn();
- SheetState sheetState = sortEvent.getSheet().getSheetState(FacesContext.getCurrentInstance());
+ SheetState sheetState = ((UIData) sortEvent.getComponent()).getSheetState(FacesContext.getCurrentInstance());
currentAddressList = addressDao.findAddresses(searchCriterion, column.getId(), sheetState.isAscending());
}
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Wed Apr 2 12:36:26 2008
@@ -25,8 +25,10 @@
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_IN;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtil;
import org.apache.myfaces.tobago.component.UIInput;
+import org.apache.myfaces.tobago.component.UIToolBar;
+import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.event.SheetStateChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
@@ -34,7 +36,6 @@
import org.apache.myfaces.tobago.example.demo.model.solar.SolarObject;
import org.apache.myfaces.tobago.model.SheetState;
import org.apache.myfaces.tobago.model.TreeState;
-import org.apache.myfaces.tobago.taglib.component.ToolBarTag;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIColumn;
@@ -202,14 +203,14 @@
solar = new Solar();
String[] toolbarIconKeys
- = {ToolBarTag.ICON_OFF, ToolBarTag.ICON_SMALL, ToolBarTag.ICON_BIG};
+ = {UIToolBar.ICON_OFF, UIToolBar.ICON_SMALL, UIToolBar.ICON_BIG};
toolbarIconItems = getSelectItems(toolbarIconKeys, "demo");
- toolbarIconSize = ToolBarTag.ICON_SMALL;
+ toolbarIconSize = UIToolBar.ICON_SMALL;
String[] toolbarTextKeys =
- {ToolBarTag.LABEL_OFF, ToolBarTag.LABEL_BOTTOM, ToolBarTag.LABEL_RIGHT};
+ {UIToolBar.LABEL_OFF, UIToolBar.LABEL_BOTTOM, UIToolBar.LABEL_RIGHT};
toolbarTextItems = getSelectItems(toolbarTextKeys, "demo");
- toolbarTextPosition = ToolBarTag.LABEL_BOTTOM;
+ toolbarTextPosition = UIToolBar.LABEL_BOTTOM;
}
@@ -244,16 +245,16 @@
List<UIColumn> columns = new ArrayList<UIColumn>(3);
UIInput textbox = (UIInput)
- ComponentUtil.createComponent(UIInput.COMPONENT_TYPE, RENDERER_TYPE_IN);
+ CreateComponentUtils.createComponent(UIInput.COMPONENT_TYPE, RENDERER_TYPE_IN);
ComponentUtil.setStringProperty(
textbox, ATTR_VALUE, "#{luminary.population}");
- columns.add(ComponentUtil.createColumn(
+ columns.add(CreateComponentUtils.createColumn(
"#{overviewBundle.solarArrayPopulation}", "true", null, textbox));
- columns.add(ComponentUtil.createTextColumn(
+ columns.add(CreateComponentUtils.createTextColumn(
"#{overviewBundle.solarArrayDistance}", "true", "right", "#{luminary.distance}"));
- columns.add(ComponentUtil.createTextColumn(
+ columns.add(CreateComponentUtils.createTextColumn(
"#{overviewBundle.solarArrayPeriod}", "true", "right", "#{luminary.period}"));
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Wed Apr 2 12:36:26 2008
@@ -20,20 +20,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.UIData;
+import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.event.SortActionEvent;
-import org.apache.myfaces.tobago.example.demo.model.solar.SolarObject;
import org.apache.myfaces.tobago.example.demo.model.Salutation;
+import org.apache.myfaces.tobago.example.demo.model.solar.SolarObject;
+import org.apache.myfaces.tobago.model.SelectItem;
import org.apache.myfaces.tobago.model.SheetState;
-import org.apache.myfaces.tobago.taglib.component.ToolBarTag;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-import javax.faces.model.SelectItem;
-import javax.faces.component.UIComponent;
import javax.faces.validator.ValidatorException;
-import javax.faces.application.FacesMessage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -105,20 +105,20 @@
treeTabsState = 0;
sheetConfig = new SheetConfig();
String[] toolbarIconKeys
- = {ToolBarTag.ICON_OFF, ToolBarTag.ICON_SMALL, ToolBarTag.ICON_BIG};
+ = {UIToolBar.ICON_OFF, UIToolBar.ICON_SMALL, UIToolBar.ICON_BIG};
toolbarIconItems = new SelectItem[toolbarIconKeys.length];
for (int i = 0; i < toolbarIconKeys.length; i++) {
toolbarIconItems[i] = new SelectItem(toolbarIconKeys[i], toolbarIconKeys[i]);
}
- toolbarIconSize = ToolBarTag.ICON_SMALL;
+ toolbarIconSize = UIToolBar.ICON_SMALL;
String[] toolbarTextKeys =
- {ToolBarTag.LABEL_OFF, ToolBarTag.LABEL_BOTTOM, ToolBarTag.LABEL_RIGHT};
+ {UIToolBar.LABEL_OFF, UIToolBar.LABEL_BOTTOM, UIToolBar.LABEL_RIGHT};
toolbarTextItems = new SelectItem[toolbarTextKeys.length];
for (int i = 0; i < toolbarTextKeys.length; i++) {
toolbarTextItems[i] = new SelectItem(toolbarTextKeys[i], toolbarTextKeys[i]);
}
- toolbarTextPosition = ToolBarTag.LABEL_BOTTOM;
+ toolbarTextPosition = UIToolBar.LABEL_BOTTOM;
}
private static SelectItem[] getSalutationSelectItems(ResourceManager resourceManager, String resource) {
@@ -163,7 +163,7 @@
public void sheetSorter(ActionEvent event) {
if (event instanceof SortActionEvent) {
SortActionEvent sortEvent = (SortActionEvent) event;
- UIData sheet = sortEvent.getSheet();
+ UIData sheet = (UIData) sortEvent.getComponent();
SheetState sheetState
= sheet.getSheetState(FacesContext.getCurrentInstance());
String columnId = sheetState.getSortedColumnId();
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java Wed Apr 2 12:36:26 2008
@@ -19,8 +19,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.taglib.component.ButtonTag;
-import org.apache.myfaces.tobago.taglib.component.LinkTag;
+import org.apache.myfaces.tobago.internal.taglib.ButtonTag;
+import org.apache.myfaces.tobago.internal.taglib.LinkTag;
import org.apache.myfaces.tobago.taglib.extension.InExtensionTag;
import javax.servlet.jsp.tagext.TagSupport;
Modified: myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java (original)
+++ myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java Wed Apr 2 12:36:26 2008
@@ -17,22 +17,47 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.component.UISelectOne;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.model.SelectItem;
import javax.faces.event.ActionEvent;
import javax.faces.event.ValueChangeEvent;
+import javax.faces.component.UISelectOne;
/**
* Date: Sep 22, 2007
* Time: 8:47:48 AM
*/
public class BindingRequestBean {
+ private static final Log LOG = LogFactory.getLog(BindingRequestBean.class);
private String selectOne;
private UISelectOne uiSelectOne;
+ private UIPanel uiPanel;
+ private String input;
private SelectItem [] items = {new SelectItem("Test1", "Test1"), new SelectItem("Test2", "Test2")};
+
+ public UIPanel getUiPanel() {
+ LOG.error("getUiPanel " + uiPanel);
+ return uiPanel;
+ }
+
+ public void setUiPanel(UIPanel uiPanel) {
+ LOG.error("setUiPanel " + uiPanel);
+ this.uiPanel = uiPanel;
+ }
+
+ public String getInput() {
+ return input;
+ }
+
+ public void setInput(String input) {
+ this.input = input;
+ }
+
public String getSelectOne() {
return selectOne;
}
@@ -58,8 +83,10 @@
}
public void processValueChange(ValueChangeEvent e) {
+ LOG.error(e);
}
public void actionListener(ActionEvent e) {
+ LOG.error(e);
}
}
Modified: myfaces/tobago/trunk/example/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/pom.xml Wed Apr 2 12:36:26 2008
@@ -137,7 +137,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
Modified: myfaces/tobago/trunk/example/seam/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/seam/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/seam/pom.xml (original)
+++ myfaces/tobago/trunk/example/seam/pom.xml Wed Apr 2 12:36:26 2008
@@ -186,6 +186,6 @@
<seam.version>2.0.0.GA</seam.version>
<openjpa.version>1.0.1</openjpa.version>
<richfaces.version>3.1.2.GA</richfaces.version>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.2</spring.version>
</properties>
</project>
Modified: myfaces/tobago/trunk/example/security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/security/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/security/pom.xml (original)
+++ myfaces/tobago/trunk/example/security/pom.xml Wed Apr 2 12:36:26 2008
@@ -82,7 +82,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Wed Apr 2 12:36:26 2008
@@ -97,7 +97,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/ExportUIDataToWorkbookUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/ExportUIDataToWorkbookUtil.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/ExportUIDataToWorkbookUtil.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/ExportUIDataToWorkbookUtil.java Wed Apr 2 12:36:26 2008
@@ -23,7 +23,7 @@
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.myfaces.tobago.component.UIColumnSelector;
import org.apache.myfaces.tobago.component.UICommand;
-import org.apache.myfaces.tobago.renderkit.RenderUtil;
+import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.commons.lang.StringUtils;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java Wed Apr 2 12:36:26 2008
@@ -18,7 +18,7 @@
*/
import org.apache.myfaces.tobago.component.UIInput;
-import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
Modified: myfaces/tobago/trunk/extension/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/pom.xml Wed Apr 2 12:36:26 2008
@@ -180,7 +180,7 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<!--
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Wed Apr 2 12:36:26 2008
@@ -36,9 +36,9 @@
import com.sun.facelets.tag.TagHandler;
import com.sun.facelets.tag.jsf.ComponentSupport;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.ComponentUtil;
-import org.apache.myfaces.tobago.component.UICommand;
+import org.apache.myfaces.tobago.util.ComponentUtil;
import org.apache.myfaces.tobago.component.SupportsMarkup;
+import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -70,9 +70,15 @@
} else {
ELAdaptor.setExpression(parent, nameValue, value.getValueExpression(faceletContext, Object.class));
}
- } else if (TobagoConstants.ATTR_RENDERED_PARTIALLY.equals(nameValue) && parent instanceof UICommand) {
- // TODO expression
- ComponentUtil.setRenderedPartially((UICommand) parent, value.getValue());
+ } else if (TobagoConstants.ATTR_RENDERED_PARTIALLY.equals(nameValue)
+ && parent instanceof SupportsRenderedPartially) {
+
+ if (value.isLiteral()) {
+ String[] components = ComponentUtil.splitList(value.getValue());
+ ((SupportsRenderedPartially) parent).setRenderedPartially(components);
+ } else {
+ ELAdaptor.setExpression(parent, nameValue, value.getValueExpression(faceletContext, Object.class));
+ }
} else if (TobagoConstants.ATTR_STYLE_CLASS.equals(nameValue)) {
// TODO expression
ComponentUtil.setStyleClasses(parent, value.getValue());
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java Wed Apr 2 12:36:26 2008
@@ -24,7 +24,7 @@
import com.sun.facelets.FaceletContext;
import com.sun.facelets.el.LegacyValueBinding;
import org.apache.myfaces.tobago.component.UIPage;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtil;
import org.apache.myfaces.tobago.TobagoConstants;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java Wed Apr 2 12:36:26 2008
@@ -30,7 +30,7 @@
import java.io.IOException;
import java.util.Iterator;
-import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.component.AbstractUIPage;
/*
* User: bommel
@@ -49,8 +49,8 @@
public void apply(FaceletContext faceletContext, UIComponent parent)
throws IOException, FacesException, ELException {
- if (parent instanceof UIPage) {
- UIPage page = (UIPage) parent;
+ if (parent instanceof AbstractUIPage) {
+ AbstractUIPage page = (AbstractUIPage) parent;
if (style != null) {
page.getStyleFiles().add(style.getValue(faceletContext));
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java Wed Apr 2 12:36:26 2008
@@ -23,7 +23,7 @@
import com.sun.facelets.tag.MetaRule;
import com.sun.facelets.FaceletContext;
import com.sun.facelets.el.ELAdaptor;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtil;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.TobagoConstants;
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Wed Apr 2 12:36:26 2008
@@ -22,9 +22,9 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import com.sun.facelets.tag.jsf.ComponentHandler;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.OnComponentCreated;
+import org.apache.myfaces.tobago.OnComponentCreated;
import org.apache.myfaces.tobago.component.SupportsMarkup;
-import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.component.AbstractUIPage;
import org.apache.myfaces.tobago.component.InputSuggest;
import org.apache.myfaces.tobago.event.SheetStateChangeSource;
import org.apache.myfaces.tobago.event.SortActionSource;
@@ -47,7 +47,7 @@
if (SortActionSource.class.isAssignableFrom(aClass)) {
metaRuleset.addRule(SortActionSourceRule.INSTANCE);
}
- if (UIPage.class.isAssignableFrom(aClass)) {
+ if (AbstractUIPage.class.isAssignableFrom(aClass)) {
metaRuleset.addRule(PageRule.INSTANCE);
}
if (TabChangeSource.class.isAssignableFrom(aClass)) {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.AbstractFileInput;
+import org.apache.myfaces.tobago.component.UIFileInput;
/*
* Date: Aug 8, 2007
@@ -32,7 +32,7 @@
}
protected String getSubComponentType() {
- return AbstractFileInput.COMPONENT_TYPE;
+ return UIFileInput.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.UISelectBoolean;
+import org.apache.myfaces.tobago.component.AbstractUISelectBoolean;
/*
* Date: Aug 10, 2007
@@ -31,6 +31,6 @@
}
protected String getSubComponentType() {
- return UISelectBoolean.COMPONENT_TYPE;
+ return AbstractUISelectBoolean.COMPONENT_TYPE;
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.UISelectOne;
+import org.apache.myfaces.tobago.component.UISelectOneRadio;
/*
* Date: Aug 10, 2007
@@ -31,7 +31,7 @@
}
protected String getSubComponentType() {
- return UISelectOne.COMPONENT_TYPE;
+ return UISelectOneRadio.COMPONENT_TYPE;
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.UISelectBoolean;
+import org.apache.myfaces.tobago.component.AbstractUISelectBoolean;
/*
* Date: Aug 9, 2007
@@ -32,7 +32,7 @@
}
protected String getSubComponentType() {
- return UISelectBoolean.COMPONENT_TYPE;
+ return AbstractUISelectBoolean.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.UISelectMany;
+import org.apache.myfaces.tobago.component.UISelectManyCheckbox;
public class SelectManyCheckboxExtensionHandler extends TobagoLabelExtensionHandler {
@@ -28,7 +28,7 @@
}
protected String getSubComponentType() {
- return UISelectMany.COMPONENT_TYPE;
+ return UISelectManyCheckbox.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.UISelectMany;
+import org.apache.myfaces.tobago.component.UISelectManyListbox;
/*
* Date: Aug 9, 2007
@@ -32,7 +32,7 @@
}
protected String getSubComponentType() {
- return UISelectMany.COMPONENT_TYPE;
+ return UISelectManyListbox.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.UISelectOne;
+import org.apache.myfaces.tobago.component.UISelectOneChoice;
/*
* Date: Aug 9, 2007
@@ -32,7 +32,7 @@
}
protected String getSubComponentType() {
- return UISelectOne.COMPONENT_TYPE;
+ return UISelectOneChoice.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,9 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.UISelectOne;
+import org.apache.myfaces.tobago.component.UISelectOneListbox;
+
+import javax.faces.component.UISelectOne;
/*
* Date: Aug 9, 2007
@@ -32,7 +34,7 @@
}
protected String getSubComponentType() {
- return UISelectOne.COMPONENT_TYPE;
+ return UISelectOneListbox.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.UISelectOne;
+import org.apache.myfaces.tobago.component.UISelectOneRadio;
public class SelectOneRadioExtensionHandler extends TobagoLabelExtensionHandler {
@@ -28,7 +28,7 @@
}
protected String getSubComponentType() {
- return UISelectOne.COMPONENT_TYPE;
+ return UISelectOneRadio.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.AbstractFileInput;
+import org.apache.myfaces.tobago.component.UIFileInput;
/*
* Date: Aug 10, 2007
@@ -32,7 +32,7 @@
}
protected String getSubComponentType() {
- return AbstractFileInput.COMPONENT_TYPE;
+ return UIFileInput.COMPONENT_TYPE;
}
protected String getSubRendererType() {
Modified: myfaces/tobago/trunk/extension/security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/security/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/security/pom.xml (original)
+++ myfaces/tobago/trunk/extension/security/pom.xml Wed Apr 2 12:36:26 2008
@@ -48,7 +48,7 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml Wed Apr 2 12:36:26 2008
@@ -45,7 +45,7 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
- <excludes>org/apache/myfaces/tobago/taglib/extension/**/*</excludes>
+ <includes>org/apache/myfaces/tobago/taglib/decl/**/*,org/apache/myfaces/tobago/taglib/component/**/*</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/tobago-core-sources</outputDirectory>
@@ -151,7 +151,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -64,7 +64,7 @@
* </pre>
*/
@Tag(name = "date")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.DateTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.DateTag")
public class DateExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasOnchange, IsRequired, HasTip,
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.internal.taglib.FileTag;
-import org.apache.myfaces.tobago.taglib.component.InputTagDeclaration;
+import org.apache.myfaces.tobago.taglib.decl.InputTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.taglib.decl.HasLabelWidth;
@@ -50,7 +50,7 @@
*/
@Tag(name = "file")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.FileTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.FileTag")
public class FileExtensionTag extends BodyTagSupport
implements InputTagDeclaration, HasIdBindingAndRendered, IsDisabled,
HasTip, HasLabel, HasLabelWidth, IsRequired {
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -60,7 +60,7 @@
*/
@Tag(name = "in")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.InTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.InTag")
public class InExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasOnchange, HasMarkup, IsRequired,
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -36,7 +36,7 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
@Tag(name = "label")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.LabelTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.LabelTag")
public class LabelExtensionTag extends BodyTagSupport
implements HasValue, HasLabelWidth, HasTip {
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.taglib.component.AbstractCommandTagDeclaration;
+import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
import org.apache.myfaces.tobago.taglib.decl.HasBooleanValue;
@@ -59,6 +59,7 @@
private String label;
private String immediate;
private String transition;
+ private String renderedPartially;
@Override
public int doStartTag() throws JspException {
@@ -96,6 +97,9 @@
if (transition != null) {
menuCommandTag.setTransition(transition);
}
+ if (renderedPartially != null) {
+ menuCommandTag.setRenderedPartially(renderedPartially);
+ }
menuCommandTag.doStartTag();
facetTag = new FacetTag();
@@ -166,6 +170,10 @@
this.transition = transition;
}
+ public void setRenderedPartially(String renderedPartially) {
+ this.renderedPartially = renderedPartially;
+ }
+
public void release() {
super.release();
rendered = null;
@@ -179,9 +187,9 @@
label = null;
immediate = null;
transition = null;
+ renderedPartially = null;
menuCommandTag = null;
facetTag = null;
selectBooleanCheckbox = null;
}
-
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.taglib.component.AbstractCommandTagDeclaration;
+import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag;
import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
@@ -42,7 +42,7 @@
*/
@Tag(name = "menuRadio", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.MenuRadioTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.MenuRadioTag")
public class MenuRadioExtensionTag extends BodyTagSupport implements AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabel, IsDisabled, HasValue, HasConverter {
@@ -62,6 +62,7 @@
private String immediate;
private String transition;
private String converter;
+ private String renderedPartially;
@Override
public int doStartTag() throws JspException {
@@ -100,6 +101,9 @@
if (transition != null) {
menuCommandTag.setTransition(transition);
}
+ if (renderedPartially != null) {
+ menuCommandTag.setRenderedPartially(renderedPartially);
+ }
menuCommandTag.doStartTag();
facetTag = new FacetTag();
@@ -179,6 +183,10 @@
this.converter = converter;
}
+ public void setRenderedPartially(String renderedPartially) {
+ this.renderedPartially = renderedPartially;
+ }
+
public void release() {
super.release();
rendered = null;
@@ -193,6 +201,7 @@
immediate = null;
transition = null;
converter = null;
+ renderedPartially = null;
menuCommandTag = null;
facetTag = null;
selectOneRadio = null;
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -20,7 +20,6 @@
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
-import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasBooleanValue;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
@@ -47,8 +46,8 @@
* Renders a checkbox.
*/
@Tag(name = "selectBooleanCheckbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectBooleanCheckboxTag")
-public class SelectBooleanCheckboxExtensionTag extends BodyTagSupport implements TobagoTagDeclaration,
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag")
+public class SelectBooleanCheckboxExtensionTag extends BodyTagSupport implements
HasValidator, HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabel,
HasBooleanValue, HasLabelWidth, IsDisabled, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired,
IsFocus {
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -21,7 +21,6 @@
import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
-import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedHeight;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.taglib.decl.HasLabelWidth;
@@ -48,9 +47,9 @@
* Render a group of checkboxes.
*/
@Tag(name = "selectManyCheckbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectManyCheckboxTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyCheckboxTag")
public class SelectManyCheckboxExtensionTag extends BodyTagSupport
- implements HasId, HasValue, HasValueChangeListener, IsDisabled, HasDeprecatedHeight, IsInline,
+ implements HasId, HasValue, HasValueChangeListener, IsDisabled, IsInline, //HasDeprecatedHeight,
HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange,
IsReadonly, HasMarkup, IsFocus, IsRequired, HasTabIndex, HasRenderRange {
@@ -65,7 +64,7 @@
private String rendered;
private String binding;
private String tip;
- private String height;
+ //private String height;
private String converter;
private String validator;
private String labelWidth;
@@ -137,9 +136,9 @@
if (id != null) {
selectManyCheckboxTag.setId(id);
}
- if (height != null) {
+ /*if (height != null) {
selectManyCheckboxTag.setHeight(height);
- }
+ }*/
if (readonly != null) {
selectManyCheckboxTag.setReadonly(readonly);
}
@@ -177,7 +176,7 @@
inline = null;
label = null;
labelWidth = null;
- height = null;
+ //height = null;
readonly = null;
rendered = null;
converter = null;
@@ -226,9 +225,9 @@
this.label = label;
}
- public void setHeight(String height) {
+ /*public void setHeight(String height) {
this.height = height;
- }
+ } */
public void setValidator(String validator) {
this.validator = validator;
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -53,7 +53,7 @@
*/
@Tag(name = "selectManyListbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectManyListboxTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyListboxTag")
public class SelectManyListboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled, HasDeprecatedHeight, IsInline,
HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange,
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -47,7 +47,7 @@
*/
@Tag(name = "selectOneChoice")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectOneChoiceTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneChoiceTag")
public class SelectOneChoiceExtensionTag
extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -45,7 +45,7 @@
* Render a single selection option listbox.
*/
@Tag(name = "selectOneListbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectOneListboxTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneListboxTag")
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, HasValueChangeListener, IsDisabled,
HasLabel, HasLabelWidth, IsReadonly, HasOnchange, IsRendered,
@@ -56,7 +56,7 @@
private String disabled;
private String readonly;
private String onchange;
- private String inline;
+ //private String inline;
private String label;
private String rendered;
private String binding;
@@ -115,9 +115,9 @@
if (disabled != null) {
selectOneListboxTag.setDisabled(disabled);
}
- if (inline != null) {
+ /*if (inline != null) {
selectOneListboxTag.setInline(inline);
- }
+ }*/
if (focus != null) {
selectOneListboxTag.setFocus(focus);
}
@@ -155,7 +155,7 @@
binding = null;
onchange = null;
disabled = null;
- inline = null;
+ //inline = null;
labelWidth = null;
label = null;
height = null;
@@ -197,9 +197,9 @@
this.onchange = onchange;
}
- public void setInline(String inline) {
+/* public void setInline(String inline) {
this.inline = inline;
- }
+ }*/
public void setLabel(String label) {
this.label = label;
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -48,7 +48,7 @@
*/
@Tag(name = "selectOneRadio")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectOneRadioTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag")
public class SelectOneRadioExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -58,7 +58,7 @@
*/
@Tag(name = "textarea")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.TextAreaTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.TextAreaTag")
public class TextAreaExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasIdBindingAndRendered,
HasConverter, HasValidator, IsReadonly, IsDisabled, HasMarkup, IsRequired,
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java Wed Apr 2 12:36:26 2008
@@ -57,7 +57,7 @@
* </pre>
*/
@Tag(name = "time")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.TimeTag")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag")
public class TimeExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasOnchange, IsRequired, HasTip,
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Apr 2 12:36:26 2008
@@ -425,7 +425,7 @@
<version>${sunjsf.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
@@ -540,7 +540,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<archive>
<manifest>
Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Wed Apr 2 12:36:26 2008
@@ -45,6 +45,7 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+ <includes>org/apache/myfaces/tobago/taglib/decl/**/*</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/tobago-core-sources</outputDirectory>
@@ -82,20 +83,45 @@
</configuration>
</execution>
<execution>
- <id>tobago-faces-config</id>
+ <id>tobago-components</id>
<goals><goal>execute</goal></goals>
<phase>compile</phase>
<configuration>
+ <excludes>
+ <exclude>org/apache/myfaces/tobago/util/CommonsLoggingLogger.java</exclude>
+ <exclude>org/apache/myfaces/tobago/application/FopConverter.java</exclude>
+ <exclude>org/apache/myfaces/tobago/taglib/extension/*</exclude>
+ <exclude>org/apache/myfaces/tobago/taglib/component/*</exclude>
+ <exclude>org/apache/myfaces/tobago/taglib/sandbox/package-info.java</exclude>
+ </excludes>
+ <aptSourceRoots>
+ <aptSourceRoot>${project.build.directory}/tobago-core-sources</aptSourceRoot>
+ </aptSourceRoots>
+ <resourceTargetPath>META-INF</resourceTargetPath>
+ <generated>target/generated-component</generated>
+ <factory>org.apache.myfaces.tobago.apt.CreateComponentAnnotationProcessorFactory</factory>
+ <fork>true</fork>
+ <nocompile>true</nocompile>
+ <encoding>UTF-8</encoding>
+ <force>true</force>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tobago-faces-config</id>
+ <goals><goal>execute</goal></goals>
+ <phase>process-classes</phase>
+ <configuration>
<targetFiles>
<targetFile>target/generated-faces-config/faces-config.xml</targetFile>
</targetFiles>
<excludes>
<exclude>org/apache/myfaces/tobago/util/CommonsLoggingLogger.java</exclude>
- <exclude>org/apache/myfaces/tobago/application/FopConverter.java</exclude>
+ <exclude>org/apache/myfaces/tobago/application/*</exclude>
<exclude>org/apache/myfaces/tobago/taglib/component/*</exclude>
<exclude>org/apache/myfaces/tobago/taglib/extension/*</exclude>
<exclude>org/apache/myfaces/tobago/validator/*</exclude>
<exclude>org/apache/myfaces/tobago/convert/*</exclude>
+ <exclude>org/apache/myfaces/tobago/taglib/sandbox/package-info.java</exclude>
</excludes>
<aptSourceRoots>
<aptSourceRoot>${project.build.directory}/tobago-core-sources</aptSourceRoot>
@@ -113,6 +139,24 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <goals><goal>compile</goal></goals>
+ <configuration>
+ <includes>
+ <include>org/apache/myfaces/tobago/internal/taglib/*</include>
+ <include>org/apache/myfaces/tobago/component/*</include>
+ </includes>
+ <excludes>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -184,7 +228,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java?rev=644014&r1=644013&r2=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java Wed Apr 2 12:36:26 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.webapp.TobagoResponse;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.util.DebugUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -89,7 +89,7 @@
}
if (LOG.isDebugEnabled()) {
LOG.debug("VIEW");
- LOG.debug(ComponentUtil.toString(facesContext.getViewRoot(), 0));
+ LOG.debug(DebugUtils.toString(facesContext.getViewRoot(), 0));
}
}
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java (from r638966, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java&r1=638966&r2=644014&rev=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java Wed Apr 2 12:36:26 2008
@@ -17,109 +17,21 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.TobagoConstants;
-
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.validator.LongRangeValidator;
import javax.faces.validator.ValidatorException;
-public class UIInputNumberSlider extends javax.faces.component.UIInput {
-
- public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.InputNumberSlider";
-
- private Boolean readonly;
- private Boolean disabled;
- private Integer min;
- private Integer max;
-
- public Boolean isReadonly() {
- if (readonly != null) {
- return readonly;
- }
- ValueBinding vb = getValueBinding(TobagoConstants.ATTR_READONLY);
- if (vb == null) {
- return false;
- } else {
- return (Boolean.TRUE.equals(vb.getValue(getFacesContext())));
- }
- }
-
- public void setReadonly(Boolean readonly) {
- this.readonly = readonly;
- }
-
- public Boolean isDisabled() {
- if (disabled != null) {
- return disabled;
- }
- ValueBinding vb = getValueBinding(TobagoConstants.ATTR_DISABLED);
- if (vb == null) {
- return false;
- } else {
- return (Boolean.TRUE.equals(vb.getValue(getFacesContext())));
- }
- }
-
- public void setDisabled(Boolean disabled) {
- this.disabled = disabled;
- }
-
- public Integer getMin() {
- if (min != null) {
- return min;
- }
- ValueBinding vb = getValueBinding("min");
- if (vb != null) {
- return (Integer) vb.getValue(getFacesContext());
- } else {
- return 0;
- }
- }
-
- public void setMin(Integer min) {
- this.min = min;
- }
-
- public Integer getMax() {
- if (max != null) {
- return max;
- }
- ValueBinding vb = getValueBinding("max");
- if (vb != null) {
- return (Integer) vb.getValue(getFacesContext());
- } else {
- return 100;
- }
- }
+public abstract class AbstractUIInputNumberSlider extends javax.faces.component.UIInput {
- public void setMax(Integer max) {
- this.max = max;
- }
+ public abstract Integer getMin();
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
- super.restoreState(context, values[0]);
- readonly = (Boolean) values[1];
- min = (Integer) values[2];
- max = (Integer) values[3];
- disabled = (Boolean) values[4];
- }
+ public abstract Integer getMax();
- public Object saveState(FacesContext context) {
- Object[] values = new Object[5];
- values[0] = super.saveState(context);
- values[1] = readonly;
- values[2] = min;
- values[3] = max;
- values[4] = disabled;
- return values;
- }
public void validate(FacesContext context) {
super.validate(context);
try {
- new LongRangeValidator(max, min).validate(context, this, getValue());
+ new LongRangeValidator(getMax(), getMin()).validate(context, this, getValue());
} catch (ValidatorException e) {
context.addMessage(getClientId(context), e.getFacesMessage());
}
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java (from r638966, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java&r1=638966&r2=644014&rev=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java Wed Apr 2 12:36:26 2008
@@ -17,20 +17,15 @@
* limitations under the License.
*/
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_MODE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTABLE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_ICONS;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_JUNCTIONS;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_ROOT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_ROOT_JUNCTION;
import org.apache.myfaces.tobago.model.MixedTreeModel;
+import org.apache.myfaces.tobago.util.ComponentUtil;
import javax.faces.application.FacesMessage;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
import java.io.IOException;
@@ -38,7 +33,7 @@
import java.util.Iterator;
import java.util.List;
-public class UITree extends UIInput implements NamingContainer {
+public abstract class AbstractUITree extends UIInput implements NamingContainer {
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Tree";
public static final String MESSAGE_NOT_LEAF = "tobago.tree.MESSAGE_NOT_LEAF";
@@ -52,38 +47,19 @@
public static final String FACET_TREE_NODE_COMMAND = "treeNodeCommand";
public static final String PARAMETER_TREE_NODE_ID = "treeNodeId";
- private boolean showJunctions = true;
- private boolean showJunctionsSet = false;
- private boolean showIcons = true;
- private boolean showIconsSet = false;
- private boolean showRoot = true;
- private boolean showRootSet = false;
- private boolean showRootJunction = true;
- private boolean showRootJunctionSet = false;
+ /* private Boolean showJunctions = true;
+ private Boolean showIcons = true;
+ private Boolean showRoot = true;
+ private Boolean showRootJunction = true;
- private String mode;
+ private String mode;*/
private MixedTreeModel model;
- public String getMode() {
- if (mode != null) {
- return mode;
- }
- ValueBinding vb = getValueBinding(ATTR_MODE);
- if (vb != null) {
- return (String) vb.getValue(getFacesContext());
- } else {
- return "tree";
- }
- }
-
- public void setMode(String mode) {
- this.mode = mode;
- }
public UIComponent getRoot() {
// find the UITreeNode in the childen.
for (UIComponent child : (List<UIComponent>) getChildren()) {
- if (child instanceof UITreeNode) {
+ if (child instanceof AbstractUITreeNode) {
return child;
}
if (child instanceof UITreeData) {
@@ -194,106 +170,101 @@
// TODO: updateing the model here and *NOT* in the decode phase
}
- public Object saveState(FacesContext context) {
- Object[] state = new Object[6];
- state[0] = super.saveState(context);
- state[1] = showJunctionsSet ? showJunctions : null;
- state[2] = showIconsSet ? showIcons : null;
- state[3] = showRootSet ? showRoot : null;
- state[4] = showRootJunctionSet ? showRootJunction : null;
- state[5] = mode;
- return state;
- }
-
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
- super.restoreState(context, values[0]);
- if (values[1] != null) {
- showJunctions = (Boolean) values[1];
- showJunctionsSet = true;
- }
- if (values[2] != null) {
- showIcons = (Boolean) values[2];
- showIconsSet = true;
- }
- if (values[3] != null) {
- showRoot = (Boolean) values[3];
- showRootSet = true;
- }
- if (values[4] != null) {
- showRootJunction = (Boolean) values[4];
- showRootJunctionSet = true;
- }
- mode = (String) values[5];
- }
-
- public boolean isShowJunctions() {
- if (showJunctionsSet) {
- return (showJunctions);
- }
- ValueBinding vb = getValueBinding(ATTR_SHOW_JUNCTIONS);
- if (vb != null) {
- return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
- } else {
- return (this.showJunctions);
- }
- }
-
- public void setShowJunctions(boolean showJunctions) {
- this.showJunctions = showJunctions;
- this.showJunctionsSet = true;
- }
+ public abstract String getMode();
- public boolean isShowIcons() {
- if (showIconsSet) {
- return (showIcons);
- }
- ValueBinding vb = getValueBinding(ATTR_SHOW_ICONS);
- if (vb != null) {
- return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
- } else {
- return (this.showIcons);
- }
- }
+ public abstract boolean isShowIcons();
- public void setShowIcons(boolean showIcons) {
- this.showIcons = showIcons;
- this.showIconsSet = true;
- }
+ public abstract boolean isShowJunctions();
- public boolean isShowRoot() {
- if (showRootSet) {
- return (showRoot);
- }
- ValueBinding vb = getValueBinding(ATTR_SHOW_ROOT);
- if (vb != null) {
- return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
- } else {
- return (this.showRoot);
- }
- }
-
- public void setShowRoot(boolean showRoot) {
- this.showRoot = showRoot;
- this.showRootSet = true;
- }
-
- public boolean isShowRootJunction() {
- if (showRootJunctionSet) {
- return (showRootJunction);
- }
- ValueBinding vb = getValueBinding(ATTR_SHOW_ROOT_JUNCTION);
- if (vb != null) {
- return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
- } else {
- return (this.showRootJunction);
- }
- }
-
- public void setShowRootJunction(boolean showRootJunction) {
- this.showRootJunction = showRootJunction;
- this.showRootJunctionSet = true;
- }
+ public abstract boolean isShowRootJunction();
+
+ public abstract boolean isShowRoot();
+
+ /*public Object saveState(FacesContext context) {
+ Object[] state = new Object[6];
+ state[0] = super.saveState(context);
+ state[1] = showJunctions;
+ state[2] = showIcons;
+ state[3] = showRoot;
+ state[4] = showRootJunction;
+ state[5] = mode;
+ return state;
+ }
+
+ public void restoreState(FacesContext context, Object state) {
+ Object[] values = (Object[]) state;
+ super.restoreState(context, values[0]);
+ showJunctions = (Boolean) values[1];
+ showIcons = (Boolean) values[2];
+ showRoot = (Boolean) values[3];
+ showRootJunction = (Boolean) values[4];
+ mode = (String) values[5];
+ }
+
+ public boolean isShowJunctions() {
+ if (showJunctions != null) {
+ return (showJunctions);
+ }
+ ValueBinding vb = getValueBinding(ATTR_SHOW_JUNCTIONS);
+ if (vb != null) {
+ return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
+ } else {
+ return (this.showJunctions);
+ }
+ }
+
+ public void setShowJunctions(boolean showJunctions) {
+ this.showJunctions = showJunctions;
+ }
+
+ public boolean isShowIcons() {
+ if (showIcons != null) {
+ return (showIcons);
+ }
+ ValueBinding vb = getValueBinding(ATTR_SHOW_ICONS);
+ if (vb != null) {
+ return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
+ } else {
+ return (this.showIcons);
+ }
+ }
+
+ public void setShowIcons(boolean showIcons) {
+ this.showIcons = showIcons;
+ }
+
+ public boolean isShowRoot() {
+ if (showRoot != null) {
+ return (showRoot);
+ }
+ ValueBinding vb = getValueBinding(ATTR_SHOW_ROOT);
+ if (vb != null) {
+ return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
+ } else {
+ return (this.showRoot);
+ }
+ }
+
+ public void setShowRoot(boolean showRoot) {
+ this.showRoot = showRoot;
+
+ }
+
+ public boolean isShowRootJunction() {
+ if (showRootJunction != null) {
+ return (showRootJunction);
+ }
+ ValueBinding vb = getValueBinding(ATTR_SHOW_ROOT_JUNCTION);
+ if (vb != null) {
+ return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
+ } else {
+ return (this.showRootJunction);
+ }
+ }
+
+ public void setShowRootJunction(boolean showRootJunction) {
+ this.showRootJunction = showRootJunction;
+ } */
public static class Command implements Serializable {
private String command;
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java (from r638966, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java&r1=638966&r2=644014&rev=644014&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java Wed Apr 2 12:36:26 2008
@@ -20,36 +20,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.model.MixedTreeModel;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.swing.tree.DefaultMutableTreeNode;
-public class UITreeNode extends UICommand implements SupportsMarkup, TreeModelBuilder {
-
- private static final Log LOG = LogFactory.getLog(UITreeNode.class);
-
- public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TreeNode";
-
- private String[] markup;
-
- private Boolean marked;
- private static final boolean DEFAULT_MARKED = false;
+public abstract class AbstractUITreeNode extends AbstractUICommand implements SupportsMarkup, TreeModelBuilder {
- private Boolean expanded;
- private static final boolean DEFAULT_EXPANDED = false;
+ private static final Log LOG = LogFactory.getLog(AbstractUITreeNode.class);
- public String[] getMarkup() {
- if (markup != null) {
- return markup;
- }
- return ComponentUtil.getMarkupBinding(getFacesContext(), this);
- }
-
- public void setMarkup(String[] markup) {
- this.markup = markup;
- }
@Override
public boolean getRendersChildren() {
@@ -90,68 +68,31 @@
public String nodeStateId(FacesContext facesContext) {
// this must do the same as nodeStateId() in tree.js
String clientId = getClientId(facesContext);
- UITree tree = findTree(this);
+ AbstractUITree tree = findTree(this);
String treeId = tree.getClientId(facesContext);
return clientId.substring(treeId.length() + 1);
}
- public UITree findTree() {
+ public AbstractUITree findTree() {
return findTree(this);
}
- private UITree findTree(UIComponent component) {
+ private AbstractUITree findTree(UIComponent component) {
while (component != null) {
- if (component instanceof UITree) {
- return (UITree) component;
+ if (component instanceof AbstractUITree) {
+ return (AbstractUITree) component;
}
component = component.getParent();
}
return null;
}
- @Override
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
- super.restoreState(context, values[0]);
- markup = (String[]) values[1];
- marked = (Boolean) values[2];
- expanded = (Boolean) values[3];
- }
- @Override
- public Object saveState(FacesContext context) {
- Object[] values = new Object[4];
- values[0] = super.saveState(context);
- values[1] = markup;
- values[2] = marked;
- values[3] = expanded;
- return values;
- }
-
- public void setMarked(boolean marked) {
- this.marked = marked;
- }
-
- public boolean isMarked() {
- if (marked != null) {
- return marked;
- }
- ValueBinding valueBinding = getValueBinding("marked");
- Boolean value = valueBinding != null ? (Boolean) valueBinding.getValue(getFacesContext()) : null;
- return value != null ? value : DEFAULT_MARKED;
- }
+ public abstract void setExpanded(boolean expanded);
- public void setExpanded(boolean expanded) {
- this.expanded = expanded;
- }
+ public abstract void setMarked(boolean b);
- public boolean isExpanded() {
- if (expanded != null) {
- return expanded;
- }
- ValueBinding valueBinding = getValueBinding("expanded");
- Boolean value = valueBinding != null ? (Boolean) valueBinding.getValue(getFacesContext()) : null;
- return value != null ? value : DEFAULT_EXPANDED;
- }
+ public abstract boolean isMarked();
+ public abstract boolean isExpanded();
}