You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/10/30 16:41:02 UTC
svn commit: r709183 [2/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/config/
core/src/main/java/org/apache/myfaces/tobag...
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -21,7 +21,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -44,7 +44,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITextarea",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIInputBase",
- rendererType = RendererType.TEXT_AREA,
+ rendererType = RendererTypes.TEXT_AREA,
allowedChildComponenents = "NONE")
public interface TextAreaTagDeclaration extends TextInputTagDeclaration, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasDeprecatedDimension,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
@@ -41,7 +41,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITimeInput",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUITimeInput",
- rendererType = RendererType.TIME,
+ rendererType = RendererTypes.TIME,
allowedChildComponenents = "NONE")
public interface TimeTagDeclaration
extends InputTagDeclaration, HasIdBindingAndRendered,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasCommandType;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -41,7 +41,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBarCommand",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUICommand",
- rendererType = RendererType.BUTTON,
+ rendererType = RendererTypes.BUTTON,
allowedChildComponenents = "NONE")
public interface ToolBarCommandTagDeclaration extends AbstractCommandTagDeclaration, HasIdBindingAndRendered,
HasLabelAndAccessKey, HasImage, IsDisabled, HasCommandType, HasTip, HasTarget {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasBooleanValue;
import org.apache.myfaces.tobago.taglib.decl.HasCommandType;
@@ -41,7 +41,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBarCheck",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
- rendererType = RendererType.MENU_COMMAND,
+ rendererType = RendererTypes.MENU_COMMAND,
allowedChildComponenents = "NONE")
public interface ToolBarSelectBooleanTagDeclaration extends AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabelAndAccessKey,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasCommandType;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -39,7 +39,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBarSelectOne",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectOneCommand",
- rendererType = RendererType.MENU_COMMAND,
+ rendererType = RendererTypes.MENU_COMMAND,
allowedChildComponenents = "NONE")
public interface ToolBarSelectOneTagDeclaration extends AbstractCommandTagDeclaration,
HasIdBindingAndRendered, IsDisabled, HasCommandType, HasValue {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -23,7 +23,7 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.AbstractUIToolBar;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
/*
* Date: 11.02.2006
@@ -61,7 +61,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBar",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUIToolBar",
- rendererType = RendererType.TOOL_BAR,
+ rendererType = RendererTypes.TOOL_BAR,
allowedChildComponenents = {
"org.apache.myfaces.tobago.SelectOneCommand",
"org.apache.myfaces.tobago.SelectBooleanCommand",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeDataTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeDataTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeDataTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeDataTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.HasVar;
@@ -33,7 +33,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeData",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUITreeData",
- rendererType = RendererType.TREE_DATA,
+ rendererType = RendererTypes.TREE_DATA,
allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode")
public interface TreeDataTagDeclaration extends
HasIdBindingAndRendered, HasTreeNodeValue, HasVar {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -24,7 +24,7 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasAction;
import org.apache.myfaces.tobago.taglib.decl.HasActionListener;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -50,7 +50,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUITreeNode",
- rendererType = RendererType.TREE_NODE,
+ rendererType = RendererTypes.TREE_NODE,
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode",
"org.apache.myfaces.tobago.TreeData"
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -22,7 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
@@ -37,7 +37,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITree",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUITree",
- rendererType = RendererType.TREE,
+ rendererType = RendererTypes.TREE,
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode",
"org.apache.myfaces.tobago.TreeData"
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java Thu Oct 30 08:40:58 2008
@@ -30,7 +30,7 @@
import org.apache.myfaces.tobago.component.AbstractUIPopup;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UIInputBase;
import org.apache.myfaces.tobago.context.TransientStateHolder;
@@ -682,7 +682,7 @@
if (labelText != null) {
Application application = FacesContext.getCurrentInstance().getApplication();
label = application.createComponent(UIOutput.COMPONENT_TYPE);
- label.setRendererType(RendererType.LABEL);
+ label.setRendererType(RendererTypes.LABEL);
String idprefix = ComponentUtil.getComponentId(facesContext, component);
label.setId(idprefix + "_" + Facets.LABEL);
label.setRendered(true);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java Thu Oct 30 08:40:58 2008
@@ -23,7 +23,7 @@
import org.apache.myfaces.tobago.component.Cell;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.Form;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.renderkit.LayoutInformationProvider;
import javax.faces.component.UIComponent;
@@ -204,7 +204,7 @@
public static void maybeSetLayoutAttribute(UIComponent cell, String attribute,
Integer value) {
- if (RendererType.OUT.equals(cell.getRendererType())) {
+ if (RendererTypes.OUT.equals(cell.getRendererType())) {
return;
}
if (LOG.isDebugEnabled()) {
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIInput;
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -248,7 +248,7 @@
FacesContext facesContext = FacesContext.getCurrentInstance();
UIInput textbox = (UIInput)
- CreateComponentUtils.createComponent(facesContext, UIInput.COMPONENT_TYPE, RendererType.IN, "sac1i");
+ CreateComponentUtils.createComponent(facesContext, UIInput.COMPONENT_TYPE, RendererTypes.IN, "sac1i");
ComponentUtil.setStringProperty(
textbox, Attributes.VALUE, "#{luminary.population}");
columns.add(CreateComponentUtils.createColumn(
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java Thu Oct 30 08:40:58 2008
@@ -27,7 +27,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.config.ThemeConfig;
import javax.faces.component.UIComponent;
@@ -63,7 +63,7 @@
public static final String[] DEFAULT_RENDERER_TYPES = {
"Action",
- RendererType.BUTTON,
+ RendererTypes.BUTTON,
"Calendar",
"Date",
"File",
@@ -73,8 +73,8 @@
"Hidden",
"Image",
"Items",
- RendererType.LABEL,
- RendererType.LINK,
+ RendererTypes.LABEL,
+ RendererTypes.LINK,
"Message",
"Messages",
"MultiSelect",
@@ -86,13 +86,13 @@
"SelectItems",
"SelectManyCheckbox",
"SelectOneChoice",
- RendererType.SELECT_ONE_RADIO,
+ RendererTypes.SELECT_ONE_RADIO,
"Sheet",
"Subview",
"TabGroup",
"Tab",
"TextArea",
- RendererType.IN,
+ RendererTypes.IN,
"Out",
"Tree",
"TreeNode",
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java Thu Oct 30 08:40:58 2008
@@ -21,7 +21,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import com.sun.facelets.tag.jsf.ComponentSupport;
import org.apache.myfaces.tobago.OnComponentCreated;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIDateInput;
import org.apache.myfaces.tobago.component.UIDatePicker;
@@ -44,14 +44,14 @@
}
protected String getSubRendererType() {
- return RendererType.DATE;
+ return RendererTypes.DATE;
}
protected void onComponentPopulated(FaceletContext faceletContext, UIComponent panel, UIComponent parent) {
if (panel.getChildCount() == 2) {
Application application = faceletContext.getFacesContext().getApplication();
UIDatePicker picker = (UIDatePicker) application.createComponent(UIDatePicker.COMPONENT_TYPE);
- picker.setRendererType(RendererType.DATE_PICKER);
+ picker.setRendererType(RendererTypes.DATE_PICKER);
picker.setFor("@auto");
UIViewRoot root = ComponentSupport.getViewRoot(faceletContext, parent);
picker.setId(root.createUniqueId());
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIFileInput;
/*
@@ -36,6 +36,6 @@
}
protected String getSubRendererType() {
- return RendererType.FILE;
+ return RendererTypes.FILE;
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIInput;
/*
@@ -36,6 +36,6 @@
}
protected String getSubRendererType() {
- return RendererType.IN;
+ return RendererTypes.IN;
}
}
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -19,7 +19,7 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.AbstractUISelectBoolean;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
/*
* Date: Aug 9, 2007
@@ -36,6 +36,6 @@
}
protected String getSubRendererType() {
- return RendererType.SELECT_BOOLEAN_CHECKBOX;
+ return RendererTypes.SELECT_BOOLEAN_CHECKBOX;
}
}
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectManyCheckbox;
public class SelectManyCheckboxExtensionHandler extends TobagoLabelExtensionHandler {
@@ -32,7 +32,7 @@
}
protected String getSubRendererType() {
- return RendererType.SELECT_MANY_CHECKBOX;
+ return RendererTypes.SELECT_MANY_CHECKBOX;
}
protected String getRows() {
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectManyListbox;
/*
@@ -36,7 +36,7 @@
}
protected String getSubRendererType() {
- return RendererType.SELECT_MANY_LISTBOX;
+ return RendererTypes.SELECT_MANY_LISTBOX;
}
protected String getRows() {
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
/*
@@ -36,6 +36,6 @@
}
protected String getSubRendererType() {
- return RendererType.SELECT_ONE_CHOICE;
+ return RendererTypes.SELECT_ONE_CHOICE;
}
}
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneListbox;
/*
@@ -36,7 +36,7 @@
}
protected String getSubRendererType() {
- return RendererType.SELECT_ONE_LISTBOX;
+ return RendererTypes.SELECT_ONE_LISTBOX;
}
protected String getRows() {
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
public class SelectOneRadioExtensionHandler extends TobagoLabelExtensionHandler {
@@ -32,6 +32,6 @@
}
protected String getSubRendererType() {
- return RendererType.SELECT_ONE_RADIO;
+ return RendererTypes.SELECT_ONE_RADIO;
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextAreaExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextAreaExtensionHandler.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextAreaExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextAreaExtensionHandler.java Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIInput;
/*
@@ -36,7 +36,7 @@
}
protected String getSubRendererType() {
- return RendererType.TEXT_AREA;
+ return RendererTypes.TEXT_AREA;
}
protected String getRows() {
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=709183&r1=709182&r2=709183&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 Thu Oct 30 08:40:58 2008
@@ -18,7 +18,7 @@
*/
import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIFileInput;
/*
@@ -36,6 +36,6 @@
}
protected String getSubRendererType() {
- return RendererType.TIME;
+ return RendererTypes.TIME;
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Thu Oct 30 08:40:58 2008
@@ -29,7 +29,7 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.InputSuggest;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UIGridLayout;
import org.apache.myfaces.tobago.component.UILabel;
@@ -130,7 +130,7 @@
}
Application application = faceletContext.getFacesContext().getApplication();
UILabel label = (UILabel) application.createComponent(UILabel.COMPONENT_TYPE);
- label.setRendererType(RendererType.LABEL);
+ label.setRendererType(RendererTypes.LABEL);
label.setId(uid);
label.getAttributes().put(Attributes.FOR, "@auto");
if (tipAttribute != null) {
@@ -176,7 +176,7 @@
private void addGridLayout(FaceletContext faceletContext, UIComponent panel, UIViewRoot root) {
Application application = faceletContext.getFacesContext().getApplication();
UIGridLayout gridLayout = (UIGridLayout) application.createComponent(UIGridLayout.COMPONENT_TYPE);
- gridLayout.setRendererType(RendererType.GRID_LAYOUT);
+ gridLayout.setRendererType(RendererTypes.GRID_LAYOUT);
if (labelWidthAttribute != null) {
String columns = getColumns(labelWidthAttribute.getValue(faceletContext));
if (!LayoutUtil.checkTokens(columns)) {
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java Thu Oct 30 08:40:58 2008
@@ -23,7 +23,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
/**
@@ -35,7 +35,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UIWizard",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanel",
generate = false,
- rendererType = RendererType.WIZARD)
+ rendererType = RendererTypes.WIZARD)
public interface WizardTagDeclaration extends HasIdBindingAndRendered {
@TagAttribute(required = true)
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Thu Oct 30 08:40:58 2008
@@ -24,7 +24,7 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIBox;
import org.apache.myfaces.tobago.component.UIDateInput;
import org.apache.myfaces.tobago.component.UIDatePicker;
@@ -72,7 +72,7 @@
link.setImmediate(true);
String linkId = link.getId();
UIHiddenInput hidden = (UIHiddenInput)
- CreateComponentUtils.createComponent(facesContext, UIHiddenInput.COMPONENT_TYPE, RendererType.HIDDEN);
+ CreateComponentUtils.createComponent(facesContext, UIHiddenInput.COMPONENT_TYPE, RendererTypes.HIDDEN);
if (linkId != null) {
hidden.setId(linkId + "hidden");
} else {
@@ -83,7 +83,7 @@
// create popup
final AbstractUIPopup popup =
(AbstractUIPopup) CreateComponentUtils.createComponent(facesContext, UIPopup.COMPONENT_TYPE,
- RendererType.POPUP);
+ RendererTypes.POPUP);
if (linkId != null) {
popup.setId(linkId + "popup");
} else {
@@ -96,58 +96,58 @@
popup.setRendered(false);
final UIComponent box = CreateComponentUtils.createComponent(
- facesContext, UIBox.COMPONENT_TYPE, RendererType.BOX);
+ facesContext, UIBox.COMPONENT_TYPE, RendererTypes.BOX);
popup.getChildren().add(box);
box.setId("box");
// TODO: set string resources in renderer
box.getAttributes().put(Attributes.LABEL, ResourceManagerUtil.getPropertyNotNull(
facesContext, "tobago", "datePickerTitle"));
UIComponent layout = CreateComponentUtils.createComponent(
- facesContext, UIGridLayout.COMPONENT_TYPE, RendererType.GRID_LAYOUT);
+ facesContext, UIGridLayout.COMPONENT_TYPE, RendererTypes.GRID_LAYOUT);
box.getFacets().put(Facets.LAYOUT, layout);
layout.setId("layout");
layout.getAttributes().put(Attributes.ROWS, "*;fixed;fixed");
final UIComponent calendar = CreateComponentUtils.createComponent(
facesContext, javax.faces.component.UIOutput.COMPONENT_TYPE,
- RendererType.CALENDAR);
+ RendererTypes.CALENDAR);
calendar.setId("calendar");
box.getChildren().add(calendar);
// add time input
final UIComponent timePanel = CreateComponentUtils.createComponent(
- facesContext, UIPanel.COMPONENT_TYPE, RendererType.PANEL);
+ facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL);
timePanel.setId("timePanel");
box.getChildren().add(timePanel);
layout = CreateComponentUtils.createComponent(
- facesContext, UIGridLayout.COMPONENT_TYPE, RendererType.GRID_LAYOUT);
+ facesContext, UIGridLayout.COMPONENT_TYPE, RendererTypes.GRID_LAYOUT);
timePanel.getFacets().put(Facets.LAYOUT, layout);
layout.setId("timePanelLayout");
layout.getAttributes().put(Attributes.COLUMNS, "1*;fixed;1*");
UIComponent cell = CreateComponentUtils.createComponent(
- facesContext, UIPanel.COMPONENT_TYPE, RendererType.PANEL);
+ facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL);
cell.setId("cell1");
timePanel.getChildren().add(cell);
final UIComponent time = CreateComponentUtils.createComponent(
facesContext,
UITimeInput.COMPONENT_TYPE,
- RendererType.TIME);
+ RendererTypes.TIME);
timePanel.getChildren().add(time);
time.setId("time");
cell = CreateComponentUtils.createComponent(
- facesContext, UIPanel.COMPONENT_TYPE, RendererType.PANEL);
+ facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL);
cell.setId("cell2");
timePanel.getChildren().add(cell);
UIComponent buttonPanel = CreateComponentUtils.createComponent(
- facesContext, UIPanel.COMPONENT_TYPE, RendererType.PANEL);
+ facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL);
buttonPanel.setId("buttonPanel");
layout = CreateComponentUtils.createComponent(
- facesContext, UIGridLayout.COMPONENT_TYPE, RendererType.GRID_LAYOUT);
+ facesContext, UIGridLayout.COMPONENT_TYPE, RendererTypes.GRID_LAYOUT);
layout.setId("buttonPanelLayout");
buttonPanel.getFacets().put(Facets.LAYOUT, layout);
layout.getAttributes().put(Attributes.COLUMNS, "*;*");
@@ -158,7 +158,7 @@
final org.apache.myfaces.tobago.component.UICommand okButton =
(org.apache.myfaces.tobago.component.UICommand) CreateComponentUtils.createComponent(facesContext,
org.apache.myfaces.tobago.component.UIButtonCommand.COMPONENT_TYPE,
- RendererType.BUTTON);
+ RendererTypes.BUTTON);
buttonPanel.getChildren().add(okButton);
okButton.setId("ok" + CLOSE_POPUP);
okButton.getAttributes().put(Attributes.LABEL, ResourceManagerUtil.getPropertyNotNull(
@@ -167,7 +167,7 @@
final org.apache.myfaces.tobago.component.UICommand cancelButton =
(org.apache.myfaces.tobago.component.UICommand) CreateComponentUtils.createComponent(facesContext,
org.apache.myfaces.tobago.component.UIButtonCommand.COMPONENT_TYPE,
- RendererType.BUTTON);
+ RendererTypes.BUTTON);
buttonPanel.getChildren().add(cancelButton);
cancelButton.getAttributes().put(Attributes.LABEL, ResourceManagerUtil.getPropertyNotNull(
@@ -176,7 +176,7 @@
// create image
UIGraphic image = (UIGraphic) CreateComponentUtils.createComponent(
- facesContext, UIGraphic.COMPONENT_TYPE, RendererType.IMAGE);
+ facesContext, UIGraphic.COMPONENT_TYPE, RendererTypes.IMAGE);
image.setRendered(true);
if (linkId != null) {
image.setId(linkId + "image");
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java Thu Oct 30 08:40:58 2008
@@ -27,7 +27,7 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UISelectBooleanCommand;
import org.apache.myfaces.tobago.component.UIToolBar;
@@ -164,7 +164,7 @@
private UIComponent createToolbar(FacesContext facesContext, UIInput component) {
UIPanel toolbar = (UIPanel) CreateComponentUtils.createComponent(
- facesContext, UIPanel.COMPONENT_TYPE, RendererType.TOOL_BAR);
+ facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.TOOL_BAR);
String clientId = component.getClientId(facesContext);
component.getFacets().put(Facets.TOOL_BAR, toolbar);
@@ -176,7 +176,7 @@
// toolbar.getChildren().add(command);
command = (UICommand) CreateComponentUtils.createComponent(
- facesContext, UISelectBooleanCommand.COMPONENT_TYPE, RendererType.MENU_COMMAND);
+ facesContext, UISelectBooleanCommand.COMPONENT_TYPE, RendererTypes.MENU_COMMAND);
toolbar.getChildren().add(command);
command.getAttributes().put(Attributes.IMAGE, "image/tobago-richtext-edit.gif");
@@ -192,7 +192,7 @@
command.getAttributes().put(Attributes.ONCLICK, onClick);
command = (UICommand) CreateComponentUtils.createComponent(
- facesContext, UISelectBooleanCommand.COMPONENT_TYPE, RendererType.MENU_COMMAND);
+ facesContext, UISelectBooleanCommand.COMPONENT_TYPE, RendererTypes.MENU_COMMAND);
toolbar.getChildren().add(command);
//command.getAttributes().put(ATTR_COMMAND_TYPE, ToolBarSelectBooleanTag.COMMAND_TYPE);
command.getAttributes().put(Attributes.IMAGE, "image/tobago-richtext-preview.gif");
@@ -205,7 +205,7 @@
command.getAttributes().put(Attributes.ONCLICK, onClick);
command = (UICommand) CreateComponentUtils.createComponent(
- facesContext, UICommand.COMPONENT_TYPE, RendererType.MENU_COMMAND);
+ facesContext, UICommand.COMPONENT_TYPE, RendererTypes.MENU_COMMAND);
toolbar.getChildren().add(command);
command.getAttributes().put(Attributes.IMAGE, "image/config.gif");
command.getAttributes().put(Attributes.ONCLICK, "Tobago.doEditorCommand(this);");
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Thu Oct 30 08:40:58 2008
@@ -30,7 +30,7 @@
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIColumnEvent;
import org.apache.myfaces.tobago.component.UIColumnSelector;
import org.apache.myfaces.tobago.component.UICommand;
@@ -783,7 +783,7 @@
String columnId = column.getClientId(facesContext);
String sorterId = columnId.substring(columnId.lastIndexOf(":") + 1) + "_" + UIData.SORTER_ID;
sortCommand = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
- sortCommand.setRendererType(RendererType.LINK);
+ sortCommand.setRendererType(RendererTypes.LINK);
sortCommand.setId(sorterId);
column.getFacets().put(Facets.SORTER, sortCommand);
}
@@ -881,7 +881,7 @@
menu = (UIPanel) application.createComponent(UIMenu.COMPONENT_TYPE);
menu.setId("selectorMenu");
column.getFacets().put(Facets.MENUPOPUP, menu);
- menu.setRendererType(RendererType.MENU_BAR);
+ menu.setRendererType(RendererTypes.MENU_BAR);
menu.getAttributes().put(Attributes.MENU_POPUP, Boolean.TRUE);
menu.getAttributes().put(Attributes.MENU_POPUP_TYPE, "SheetSelector");
menu.getAttributes().put(Attributes.IMAGE, "image/sheetSelectorMenu.gif");
@@ -923,7 +923,7 @@
String action) {
UIMenuCommand menuItem
= (UIMenuCommand) application.createComponent(UIMenuCommand.COMPONENT_TYPE);
- menuItem.setRendererType(RendererType.MENU_COMMAND);
+ menuItem.setRendererType(RendererTypes.MENU_COMMAND);
menuItem.getAttributes().put(Attributes.ONCLICK, action);
menuItem.getAttributes().put(Attributes.LABEL, label);
return menuItem;
@@ -1052,7 +1052,7 @@
PageAction command, boolean disabled) {
UICommand link;
link = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
- link.setRendererType(RendererType.SHEET_PAGE_COMMAND);
+ link.setRendererType(RendererTypes.SHEET_PAGE_COMMAND);
link.setRendered(true);
link.setId(command.getToken());
link.getAttributes().put(Attributes.INLINE, Boolean.TRUE);
@@ -1235,7 +1235,7 @@
if (renderer == null) {
LOG.warn("can't find renderer for " + column.getClass().getName());
renderer = ComponentUtil.getRenderer(facesContext,
- org.apache.myfaces.tobago.component.UIPanel.COMPONENT_FAMILY, RendererType.OUT);
+ org.apache.myfaces.tobago.component.UIPanel.COMPONENT_FAMILY, RendererTypes.OUT);
}
width = renderer.getFixedWidth(facesContext, column);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Thu Oct 30 08:40:58 2008
@@ -23,7 +23,7 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIMenu;
import org.apache.myfaces.tobago.component.UIMenuSelectOne;
import org.apache.myfaces.tobago.component.UISelectBooleanCommand;
@@ -464,7 +464,7 @@
writer.endElement(HtmlConstants.DIV);
popupMenu.getAttributes().put(Attributes.MENU_POPUP, Boolean.TRUE);
popupMenu.getAttributes().put(Attributes.MENU_POPUP_TYPE, "ToolBarButton");
- popupMenu.setRendererType(RendererType.MENU_BAR);
+ popupMenu.setRendererType(RendererTypes.MENU_BAR);
if (popupMenu instanceof UIMenu) {
((UIMenu) popupMenu).setLabel(null);
} else {
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java?rev=709183&r1=709182&r2=709183&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java Thu Oct 30 08:40:58 2008
@@ -23,7 +23,7 @@
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.RendererType;
+import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIData;
@@ -335,7 +335,7 @@
if (layoutSpace != null) {
space = layoutSpace.intValue();
}
- if (space == -1 && (!RendererType.OUT.equals(component.getRendererType()))) {
+ if (space == -1 && (!RendererTypes.OUT.equals(component.getRendererType()))) {
UIComponent parent = component.getParent();
space = LayoutUtil.getInnerSpace(facesContext, parent, width);
if (space > 0 && !ComponentUtil.isFacetOf(component, parent)) {