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/24 22:47:30 UTC
svn commit: r707744 [1/3] - 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...
Author: lofwyr
Date: Fri Oct 24 13:47:27 2008
New Revision: 707744
URL: http://svn.apache.org/viewvc?rev=707744&view=rev
Log:
TOBAGO-715: Constants
* moving the renderer type constants to class RendererTypes
* move other constants to appropreate positions (see javadoc)
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java (contents, props changed)
- copied, changed from r707725, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListboxBox.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxToolBarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DefaultLayoutTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetPageCommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeDataTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeListboxBoxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasCommandType.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataRequest.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextAreaExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/OnComponentCreated.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java Fri Oct 24 13:47:27 2008
@@ -20,12 +20,42 @@
/**
* @see org.apache.myfaces.tobago.component.Attributes
* @see org.apache.myfaces.tobago.component.Facets
+ * @see org.apache.myfaces.tobago.component.RendererType
+ * @see org.apache.myfaces.tobago.component.AbstractUICommand
+ * @see org.apache.myfaces.tobago.OnComponentCreated
+ * @see org.apache.myfaces.tobago.renderkit.HtmlUtils
+ * @deprecated
*/
+@Deprecated
public final class TobagoConstants {
public static final String SUBCOMPONENT_SEP = "::";
- // public static final String ATTR_ACCESS_KEY = "accessKey";
+ /** @deprecated Please use AbstractUICommand instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String COMMAND_TYPE_SUBMIT = "submit";
+ /** @deprecated Please use AbstractUICommand instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String COMMAND_TYPE_RESET = "reset";
+ /** @deprecated Please use AbstractUICommand instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String COMMAND_TYPE_NAVIGATE = "navigate";
+ /** @deprecated Please use AbstractUICommand instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String COMMAND_TYPE_SCRIPT = "script";
+
+ /** @deprecated Please use AbstractUIPage instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String FORM_ACCEPT_CHARSET = "utf-8";
+
+ /** @deprecated Please use OnComponentCreated instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String TOBAGO_COMPONENT_CREATED = "org.apache.myfaces.tobago.CREATION_MARKER";
+
+ /** @deprecated Please use HtmlUtils instead. Will be removed after Tobago 1.1 */
+ @Deprecated
+ public static final String CHAR_NON_BEAKING_SPACE = "\u00a0";
+
/** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
@Deprecated
public static final String ATTR_ACTION = "action";
@@ -548,51 +578,100 @@
@Deprecated
public static final String FACET_TOOL_BAR_COMMAND = "toolBarCommand";
- // Command types
- public static final String COMMAND_TYPE_SUBMIT = "submit";
- public static final String COMMAND_TYPE_RESET = "reset";
- public static final String COMMAND_TYPE_NAVIGATE = "navigate";
- // TODO: find an abstract way, to avoid this
- public static final String COMMAND_TYPE_SCRIPT = "script";
-
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_BOX = "Box";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_BUTTON = "Button";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_CALENDAR = "Calendar";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_DATE = "Date";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_DEFAULT_LAYOUT = "DefaultLayout";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_FILE = "File";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_GRID_LAYOUT = "GridLayout";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_HIDDEN = "Hidden";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_IN = "In";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_IMAGE = "Image";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_LINK = "Link";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_LABEL = "Label";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_MENUBAR = "MenuBar";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_MENUCOMMAND = "MenuCommand";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_OUT = "Out";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_PANEL = "Panel";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_POPUP = "Popup";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_DATE_PICKER = "DatePicker";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SELECT_BOOLEAN_CHECKBOX = "SelectBooleanCheckbox";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SELECT_MANY_CHECKBOX = "SelectManyCheckbox";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SELECT_MANY_LISTBOX = "SelectManyListbox";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SELECT_ONE_CHOICE = "SelectOneChoice";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SELECT_ONE_RADIO = "SelectOneRadio";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SELECT_ONE_LISTBOX = "SelectOneListbox";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_TEXT_AREA = "TextArea";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_TIME = "Time";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_TOOL_BAR = "ToolBar";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_TREE_NODE = "TreeNode";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_TREE_OLD_NODE = "TreeOldNode";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_SHEET = "Sheet";
+ /** @deprecated Please use RendererTypes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String RENDERER_TYPE_VERBATIM = "Verbatim";
- public static final String FORM_ACCEPT_CHARSET = "utf-8";
-
- public static final String TOBAGO_COMPONENT_CREATED = "org.apache.myfaces.tobago.CREATION_MARKER";
-
- public static final String CHAR_NON_BEAKING_SPACE = "\u00a0";
-
private TobagoConstants() {
// to prevent instantiation
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java Fri Oct 24 13:47:27 2008
@@ -20,12 +20,12 @@
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
-import javax.faces.component.UIComponent;
+import javax.faces.FacesException;
import javax.faces.component.ContextCallback;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import javax.faces.FacesException;
import java.io.IOException;
import java.util.Iterator;
@@ -34,8 +34,13 @@
* Time: 5:02:10 PM
* $Id$
*/
-public abstract class AbstractUICommand extends javax.faces.component.UICommand implements InvokeOnComponent,
- SupportsRenderedPartially {
+public abstract class AbstractUICommand extends javax.faces.component.UICommand
+ implements InvokeOnComponent, SupportsRenderedPartially {
+
+ public static final String COMMAND_TYPE_SUBMIT = "submit";
+ public static final String COMMAND_TYPE_RESET = "reset";
+ public static final String COMMAND_TYPE_NAVIGATE = "navigate";
+ public static final String COMMAND_TYPE_SCRIPT = "script";
public void processDecodes(FacesContext context) {
if (context == null) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java Fri Oct 24 13:47:27 2008
@@ -53,6 +53,8 @@
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Page";
+ public static final String FORM_ACCEPT_CHARSET = "utf-8";
+
private static final int DEFAULT_WIDTH = 1024;
private static final int DEFAULT_HEIGHT = 768;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java Fri Oct 24 13:47:27 2008
@@ -17,9 +17,6 @@
* limitations under the License.
*/
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_OUT;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_SELECT_BOOLEAN_CHECKBOX;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_SELECT_ONE_RADIO;
import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UICommand;
@@ -58,7 +55,7 @@
}
public static UIColumn createTextColumn(String label, String sortable, String align, String value, String clientId) {
- UIComponent text = createComponent(UIOutput.COMPONENT_TYPE, RENDERER_TYPE_OUT, clientId + "_t");
+ UIComponent text = createComponent(UIOutput.COMPONENT_TYPE, RendererType.OUT, clientId + "_t");
TagUtils.setStringProperty(text, Attributes.VALUE, value);
TagUtils.setBooleanProperty(text, Attributes.CREATE_SPAN, "false");
TagUtils.setBooleanProperty(text, Attributes.ESCAPE, "false");
@@ -101,7 +98,7 @@
final ValueBinding valueBinding = command.getValueBinding(Attributes.VALUE);
if (valueBinding != null) {
radio = (UIMenuSelectOne) createComponent(facesContext, UIMenuSelectOne.COMPONENT_TYPE,
- RENDERER_TYPE_SELECT_ONE_RADIO, clientId);
+ RendererType.SELECT_ONE_RADIO, clientId);
//noinspection unchecked
command.getFacets().put(Facets.ITEMS, radio);
radio.setValueBinding(Attributes.VALUE, valueBinding);
@@ -116,7 +113,7 @@
public static UIComponent createUISelectBooleanFacet(FacesContext facesContext, UICommand command, String clientId) {
UIComponent checkbox = createComponent(facesContext, UISelectBoolean.COMPONENT_TYPE,
- RENDERER_TYPE_SELECT_BOOLEAN_CHECKBOX, clientId);
+ RendererType.SELECT_BOOLEAN_CHECKBOX, clientId);
//noinspection unchecked
command.getFacets().put(Facets.ITEMS, checkbox);
ValueBinding valueBinding = command.getValueBinding(Attributes.VALUE);
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java (from r707725, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java&r1=707725&r2=707744&rev=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java Fri Oct 24 13:47:27 2008
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago;
+package org.apache.myfaces.tobago.component;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,582 +18,63 @@
*/
/**
- * @see org.apache.myfaces.tobago.component.Attributes
- * @see org.apache.myfaces.tobago.component.Facets
+ * Constants for the renderer type
*/
-public final class TobagoConstants {
+public final class RendererType {
- public static final String SUBCOMPONENT_SEP = "::";
+ public static final String BOX = "Box";
+ public static final String BOX_TOOL_BAR = "BoxToolBar";
+ public static final String BUTTON = "Button";
+ public static final String CALENDAR = "Calendar";
+ public static final String CELL = "Cell";
+ public static final String COLUMN_SELECTOR = "ColumnSelector";
+ public static final String COMMAND = "Command";
+ public static final String DATE = "Date";
+ public static final String DATE_PICKER = "DatePicker";
+ public static final String DEFAULT_LAYOUT = "DefaultLayout";
+ public static final String FILE = "File";
+ public static final String FORM = "Form";
+ public static final String GRID_LAYOUT = "GridLayout";
+ public static final String HIDDEN = "Hidden";
+ public static final String IN = "In";
+ public static final String IMAGE = "Image";
+ public static final String LINK = "Link";
+ public static final String LABEL = "Label";
+ public static final String MESSAGE = "Message";
+ public static final String MESSAGES = "Messages";
+ public static final String MENU_BAR = "MenuBar";
+ public static final String MENU_COMMAND = "MenuCommand";
+ public static final String OBJECT = "Object";
+ public static final String OUT = "Out";
+ public static final String PAGE = "Page";
+ public static final String PANEL = "Panel";
+ public static final String POPUP = "Popup";
+ public static final String PROGRESS = "Progress";
+ public static final String SCRIPT = "Script";
+ public static final String SELECT_BOOLEAN_CHECKBOX = "SelectBooleanCheckbox";
+ public static final String SELECT_MANY_CHECKBOX = "SelectManyCheckbox";
+ public static final String SELECT_MANY_LISTBOX = "SelectManyListbox";
+ public static final String SELECT_ONE_CHOICE = "SelectOneChoice";
+ public static final String SELECT_ONE_RADIO = "SelectOneRadio";
+ public static final String SELECT_ONE_LISTBOX = "SelectOneListbox";
+ public static final String SELECT_REFERENCE = "SelectReference";
+ public static final String SEPARATOR = "Separator";
+ public static final String SHEET_PAGE_COMMAND = "SheetPageCommand";
+ public static final String STYLE = "Style";
+ public static final String TEXT_AREA = "TextArea";
+ public static final String TAB_GROUP = "TabGroup";
+ public static final String TAB = "Tab";
+ public static final String TIME = "Time";
+ public static final String TOOL_BAR = "ToolBar";
+ public static final String TREE = "Tree";
+ public static final String TREE_DATA = "TreeData";
+ public static final String TREE_LISTBOX_BOX = "TreeListboxBox";
+ public static final String TREE_NODE = "TreeNode";
+ public static final String SHEET = "Sheet";
+ public static final String VERBATIM = "Verbatim";
+ public static final String WIZARD = "Wizard";
- // public static final String ATTR_ACCESS_KEY = "accessKey";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ACTION = "action";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ACTION_ONCLICK = "onclick";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ACTION_LINK = "link";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ACTION_LISTENER = "actionListener";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ALIGN = "align";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ALT = "alt";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_AUTO_RELOAD = "autoReload";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_BODY_CONTENT = "bodyContent";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_BORDER = "border";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CHARSET = "charset";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CALENDAR_DATE_INPUT_ID = "CalendarDateInputId";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CELLSPACING = "cellspacing";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CLASSES_BLOCKS = "cssClassesBlocks";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CLIENT_PROPERTIES = "clientProperties";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_COLUMNS = "columns";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CONVERTER = "converter";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_DATE_STYLE = "dateStyle";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_DEFAULT_COMMAND = "defaultCommand";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_DELAY = "delay";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_DIRECT_LINK_COUNT = "directLinkCount";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_DISABLED = "disabled";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_DOCTYPE = "doctype";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ENCTYPE = "enctype";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ESCAPE = "escape";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_EXPANDED = "expanded";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_EVENT = "event";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FIRST = "first";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FREQUENCY = "frequency";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FOCUS = "focus";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FOCUS_ID = "focusId";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FOOTER_HEIGHT = "footerHeight";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FORCE_VERTICAL_SCROLLBAR = "forceVerticalScrollbar";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FORMAT_PATTERN = "formatPattern";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_FOR = "for";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_GLOBAL_ONLY = "globalOnly";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_HEIGHT = "height";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_HIDDEN = "hidden";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_HOVER = "hover";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_I18N = "i18n";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ICON_SIZE = "iconSize";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ID = "id";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_IMMEDIATE = "immediate";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_IMAGE = "image";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_INLINE = "inline";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_INNER_HEIGHT = "innerHeight";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_INNER_WIDTH = "innerWidth";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ITEM_DESCRIPTION = "itemDescription";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ITEM_DISABLED = "itemDisabled";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ITEM_LABEL = "itemLabel";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ITEM_IMAGE = "itemImage";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ITEM_VALUE = "itemValue";
-
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_LABEL = "label";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_LABEL_POSITION = "labelPosition";
- // public static final String ATTR_LABEL_WITH_ACCESS_KEY = "labelWithAccessKey";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_LAYOUT_HEIGHT = "layoutHeight";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARGIN = "margin";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARGIN_BOTTOM = "marginBottom";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARGIN_LEFT = "marginLeft";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARGIN_RIGHT = "marginRight";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARGIN_TOP = "marginTop";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARKED = "marked";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MODAL = "modal";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_LAYOUT_ORDER = "layoutOrder";
- //public static final String ATTR_LAYOUT_TABLE_STYLE = "layoutTableStyle";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_LAYOUT_WIDTH = "layoutWidth";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_LEFT = "left";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MARKUP = "markup";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MAX = "max";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MAX_SEVERITY = "maxSeverity";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MAX_NUMBER = "maxNumber";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MENU_POPUP = "menuPopup";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MENU_POPUP_TYPE = "menuPopupType";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_COMMAND_TYPE = "menuType";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_METHOD = "method";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MIN = "min";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MIN_SEVERITY = "minSeverity";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MINIMUM_SIZE = "minimunSize";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MODE = "mode";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_MUTABLE = "mutable";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_NAME = "name";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_NAVIGATE = "navigate";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_NUMBER_STYLE = "numberStyle";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ONCHANGE = "onchange";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ONCLICK = "onclick";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ORDER_BY = "orderBy";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ORIENTATION = "orientation";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_PAGE_MENU = "pageMenu";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_PASSWORD = "password";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_POPUP_LIST = "popupList";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RENDERED_PARTIALLY = "renderedPartially";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_POPUP_CLOSE = "popupClose";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_POPUP_RESET = "popupReset";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_POPUP_CALENDAR_ID = "popupCalendarId";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_PREFORMATED = "preformated";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_READONLY = "readonly";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_REFERENCE = "reference";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RELATIVE = "relative";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RENDERED = "rendered";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RENDERER_TYPE = "rendererType";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RENDER_AS = "renderAs";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RENDER_RANGE = "renderRange";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_RENDER_RANGE_EXTERN = "renderRangeExtern";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_REQUIRED = "required";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ROW_ID = "sheetRowId";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ROWS = "rows";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SCRIPT_FILES = "scriptFiles";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SCROLLBAR_HEIGHT = "scrollbarHeight";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SCROLLBARS = "scrollbars";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SELECTED_INDEX = "selectedIndex";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SELECTED_LIST_STRING = "selectedListString";
- // public static final String ATTR_SERVER_SIDE_TABS = "serverSideTab";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SORTABLE = "sortable";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_CREATE_SPAN = "createSpan";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SELECTABLE = "selectable";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_DIRECT_LINKS = "showDirectLinks";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_HEADER = "showHeader";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_ICONS = "showIcons";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_JUNCTIONS = "showJunctions";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_PAGE_RANGE = "showPageRange";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_ROOT = "showRoot";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_ROOT_JUNCTION = "showRootJunction";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_ROW_RANGE = "showRowRange";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_SUMMARY = "showSummary";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SHOW_DETAIL = "showDetail";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SPAN_X = "spanX";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SPAN_Y = "spanY";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SRC = "src";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STATE = "state";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STATE_PREVIEW = "state_preview";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STYLE = "style";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STYLE_BODY = "style_body";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STYLE_CLASS = "styleClass";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STYLE_HEADER = "style_header";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STYLE_INNER = "style_inner";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_STYLE_FILES = "styleFiles";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SUPPPRESS_TOOLBAR_CONTAINER = "suppressToolbarContainer";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_SWITCH_TYPE = "switchType";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TARGET = "target";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TIME_STYLE = "timeStyle";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TIMEZONE = "timezone";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TITLE = "title";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TIP = "tip";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TOP = "top";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TRANSITION = "transition";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TYPE = "type";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_VALUE = "value";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_VALUE_CHANGE_LISTENER = "valueChangeListener";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_VAR = "var";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_UNIT = "unit";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_UPDATE = "update";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_WIDTH = "width";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_WIDTH_LIST = "widthList";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_WIDTH_LIST_STRING = "widthListString";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_APPLICATION_ICON = "applicationIcon";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_VALIDATOR = "validator";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_TAB_INDEX = "tabIndex";
- /** @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String ATTR_ZINDEX = "zIndex";
-
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_ACTION = "action";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_CONFIRMATION = "confirmation";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_LABEL = "label";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_LAYOUT = "layout";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_LAYOUT_DEFAULT = "layoutDefault";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_IMAGE = "image ";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_ITEMS = "items";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_MENUBAR = "menuBar";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_MENUPOPUP = "menupopup";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_PAGER_LINKS = "pagerLinks";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_PAGER_PAGE = "pagerPage";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_PAGER_ROW = "pagerRow";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_PICKER = "picker";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_PICKER_POPUP = "pickerPopup";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_POPUP = "popup";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_RELOAD = "reload";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_TOOL_BAR = "toolBar";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
- @Deprecated
- public static final String FACET_TOOL_BAR_COMMAND = "toolBarCommand";
-
- // Command types
- public static final String COMMAND_TYPE_SUBMIT = "submit";
- public static final String COMMAND_TYPE_RESET = "reset";
- public static final String COMMAND_TYPE_NAVIGATE = "navigate";
- // TODO: find an abstract way, to avoid this
- public static final String COMMAND_TYPE_SCRIPT = "script";
-
- public static final String RENDERER_TYPE_BOX = "Box";
- public static final String RENDERER_TYPE_BUTTON = "Button";
- public static final String RENDERER_TYPE_CALENDAR = "Calendar";
- public static final String RENDERER_TYPE_DATE = "Date";
- public static final String RENDERER_TYPE_DEFAULT_LAYOUT = "DefaultLayout";
- public static final String RENDERER_TYPE_FILE = "File";
- public static final String RENDERER_TYPE_GRID_LAYOUT = "GridLayout";
- public static final String RENDERER_TYPE_HIDDEN = "Hidden";
- public static final String RENDERER_TYPE_IN = "In";
- public static final String RENDERER_TYPE_IMAGE = "Image";
- public static final String RENDERER_TYPE_LINK = "Link";
- public static final String RENDERER_TYPE_LABEL = "Label";
- public static final String RENDERER_TYPE_MENUBAR = "MenuBar";
- public static final String RENDERER_TYPE_MENUCOMMAND = "MenuCommand";
- public static final String RENDERER_TYPE_OUT = "Out";
- public static final String RENDERER_TYPE_PANEL = "Panel";
- public static final String RENDERER_TYPE_POPUP = "Popup";
- public static final String RENDERER_TYPE_DATE_PICKER = "DatePicker";
- public static final String RENDERER_TYPE_SELECT_BOOLEAN_CHECKBOX = "SelectBooleanCheckbox";
- public static final String RENDERER_TYPE_SELECT_MANY_CHECKBOX = "SelectManyCheckbox";
- public static final String RENDERER_TYPE_SELECT_MANY_LISTBOX = "SelectManyListbox";
- public static final String RENDERER_TYPE_SELECT_ONE_CHOICE = "SelectOneChoice";
- public static final String RENDERER_TYPE_SELECT_ONE_RADIO = "SelectOneRadio";
- public static final String RENDERER_TYPE_SELECT_ONE_LISTBOX = "SelectOneListbox";
- public static final String RENDERER_TYPE_TEXT_AREA = "TextArea";
- public static final String RENDERER_TYPE_TIME = "Time";
- public static final String RENDERER_TYPE_TOOL_BAR = "ToolBar";
- public static final String RENDERER_TYPE_TREE_NODE = "TreeNode";
- public static final String RENDERER_TYPE_TREE_OLD_NODE = "TreeOldNode";
- public static final String RENDERER_TYPE_SHEET = "Sheet";
- public static final String RENDERER_TYPE_VERBATIM = "Verbatim";
-
- public static final String FORM_ACCEPT_CHARSET = "utf-8";
-
- public static final String TOBAGO_COMPONENT_CREATED = "org.apache.myfaces.tobago.CREATION_MARKER";
-
- public static final String CHAR_NON_BEAKING_SPACE = "\u00a0";
-
- private TobagoConstants() {
+ private RendererType() {
// to prevent instantiation
}
-}
+}
\ No newline at end of file
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RendererType.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Fri Oct 24 13:47:27 2008
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.event.SortActionEvent;
import org.apache.myfaces.tobago.model.SheetState;
@@ -196,7 +195,7 @@
|| child instanceof UISelectBoolean) {
continue;
} else if (child instanceof UIInput
- && TobagoConstants.RENDERER_TYPE_HIDDEN.equals(child.getRendererType())) {
+ && RendererType.HIDDEN.equals(child.getRendererType())) {
continue;
} else if (child instanceof UIOutput) {
break;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java Fri Oct 24 13:47:27 2008
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_DEFAULT_LAYOUT;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -37,7 +36,7 @@
if (instance == null) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
instance = (UIDefaultLayout) facesContext.getApplication().createComponent(COMPONENT_TYPE);
- instance.setRendererType(RENDERER_TYPE_DEFAULT_LAYOUT);
+ instance.setRendererType(RendererType.DEFAULT_LAYOUT);
instance.setId("UIDefaultLayout");
}
return instance;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java Fri Oct 24 13:47:27 2008
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_GRID_LAYOUT;
import org.apache.myfaces.tobago.config.ThemeConfig;
import javax.faces.component.UIComponent;
@@ -182,7 +181,7 @@
for (int i = 0; i < depth; i++) {
UITreeListboxBox box = (UITreeListboxBox) CreateComponentUtils.createComponent(
facesContext, UITreeListboxBox.COMPONENT_TYPE,
- UITreeListboxBox.RENDERER_TYPE);
+ RendererType.TREE_LISTBOX_BOX);
getFacets().put(BOXES_PREFIX + i, box);
box.setLevel(i);
box.setNodes(getNodes(i));
@@ -263,7 +262,7 @@
if (layout == null) {
layout = (UILayout) CreateComponentUtils.createComponent(
UIGridLayout.COMPONENT_TYPE,
- RENDERER_TYPE_GRID_LAYOUT);
+ RendererType.GRID_LAYOUT);
int depth = ((DefaultMutableTreeNode) getValue()).getDepth();
final int defaultColumnCount = ThemeConfig.getValue(
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListboxBox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListboxBox.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListboxBox.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListboxBox.java Fri Oct 24 13:47:27 2008
@@ -28,6 +28,7 @@
public class UITreeListboxBox extends UIComponentBase {
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TreeListboxBox";
+ @Deprecated
public static final String RENDERER_TYPE = "TreeListboxBox";
public static final String COMPONENT_FAMILY = "javax.faces.Output";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java Fri Oct 24 13:47:27 2008
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.model.TreeState;
import org.apache.myfaces.tobago.util.ComponentUtil;
@@ -191,7 +190,7 @@
// TODO
UIComponent component = facesContext.getApplication().createComponent(UIPanel.COMPONENT_TYPE);
- component.setRendererType(TobagoConstants.RENDERER_TYPE_TOOL_BAR);
+ component.setRendererType(RendererType.TOOL_BAR);
UIComponent toolbar = component;
toolbar.getAttributes().put(Attributes.ICON_SIZE, AbstractUIToolBar.ICON_SMALL);
toolbar.getAttributes().put(Attributes.LABEL_POSITION, AbstractUIToolBar.LABEL_OFF);
@@ -204,7 +203,7 @@
UITreeOld.Command[] commands = getCommands();
for (int i = 0; i < commands.length; i++) {
UICommand command = (UICommand) facesContext.getApplication().createComponent(UICommand.COMPONENT_TYPE);
- command.setRendererType(TobagoConstants.RENDERER_TYPE_LINK);
+ command.setRendererType(RendererType.LINK);
toolbar.getChildren().add(command);
command.setId(commands[i].getCommand());
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java Fri Oct 24 13:47:27 2008
@@ -20,7 +20,6 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.TobagoConstants;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -35,6 +34,7 @@
private static final Log LOG = LogFactory.getLog(UITreeOldNode.class);
private static final String SUB_REFERENCE_KEY = "subReferenceKey";
+ private static final String RENDERER_TYPE_TREE_OLD_NODE = "TreeOldNode";
protected UITreeOldNode(UIComponent parent, int index) {
super();
@@ -46,7 +46,7 @@
getAttributes().put(SUB_REFERENCE_KEY, parentSubReference + ".childAt[" + index + "]");
}
}
- setRendererType(TobagoConstants.RENDERER_TYPE_TREE_OLD_NODE);
+ setRendererType(RENDERER_TYPE_TREE_OLD_NODE);
parent.getChildren().add(this);
initId();
initName();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java Fri Oct 24 13:47:27 2008
@@ -20,12 +20,12 @@
import org.apache.commons.lang.ClassUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_IN;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.component.RendererType;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.util.ComponentUtil;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -84,7 +84,7 @@
rendererType = component.getRendererType();
} else {
family = UIInput.COMPONENT_FAMILY;
- rendererType = RENDERER_TYPE_IN;
+ rendererType = RendererType.IN;
}
Object renderer = ComponentUtil.getRenderer(facesContext, family, rendererType);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java Fri Oct 24 13:47:27 2008
@@ -19,17 +19,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_OUT;
+import org.apache.myfaces.tobago.component.RendererType;
import org.apache.myfaces.tobago.config.TobagoConfig;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.render.Renderer;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
-import java.io.Serializable;
// FIXME: is this class thread-safe?
@@ -370,7 +370,7 @@
LOG.debug("rendererType = '" + rendererType + "'");
}
if ("javax.faces.Text".equals(rendererType)) { // TODO: find a better way
- name = RENDERER_TYPE_OUT;
+ name = RendererType.OUT;
} else {
name = rendererType;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java Fri Oct 24 13:47:27 2008
@@ -19,7 +19,6 @@
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.OnComponentCreated;
-import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_COMPONENT_CREATED;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentTag;
@@ -32,8 +31,8 @@
UIComponent component = getComponentInstance();
if (component instanceof OnComponentCreated
- && component.getAttributes().get(TOBAGO_COMPONENT_CREATED) == null) {
- component.getAttributes().put(TOBAGO_COMPONENT_CREATED, Boolean.TRUE);
+ && component.getAttributes().get(OnComponentCreated.MARKER) == null) {
+ component.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
((OnComponentCreated) component).onComponentCreated(getFacesContext(), getComponentInstance());
}
return result;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java Fri Oct 24 13:47:27 2008
@@ -26,6 +26,7 @@
public class HtmlUtils {
public static final String LAYOUT_ATTRIBUTE_PREFIX = "layout.";
+ public static final String CHAR_NON_BEAKING_SPACE = "\u00a0";
public static String generateAttribute(String name, Object value) {
String stringValue;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Fri Oct 24 13:47:27 2008
@@ -20,8 +20,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_LABEL;
import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.component.RendererType;
import javax.faces.component.UIComponent;
import java.util.Locale;
@@ -38,7 +38,7 @@
public LabelWithAccessKey(UIComponent component) {
Object value;
- if (RENDERER_TYPE_LABEL.equals(component.getRendererType())) {
+ if (RendererType.LABEL.equals(component.getRendererType())) {
value = component.getAttributes().get(Attributes.VALUE);
} else {
value = component.getAttributes().get(Attributes.LABEL);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java Fri Oct 24 13:47:27 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Cell;
import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.RendererType;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
@@ -220,7 +221,7 @@
space = layoutSpace.intValue();
}
if (space == -1
- && (!org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_OUT.equals(component.getRendererType()))) {
+ && (!RendererType.OUT.equals(component.getRendererType()))) {
UIComponent parent = component.getParent();
space = LayoutUtil.getInnerSpace(facesContext, parent, width);
if (space > 0 && !ComponentUtil.isFacetOf(component, parent)) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Fri Oct 24 13:47:27 2008
@@ -30,8 +30,8 @@
import javax.faces.convert.ConverterException;
import javax.faces.el.ValueBinding;
import javax.faces.render.Renderer;
-import java.util.Locale;
import java.io.IOException;
+import java.util.Locale;
/**
* Date: Apr 21, 2007
@@ -69,7 +69,7 @@
LOG.debug("rendererType = '" + rendererType + "'");
}
/* if ("javax.faces.Text".equals(rendererType)) { // TODO: find a better way
- name = RENDERER_TYPE_OUT;
+ name = OUT;
} else {*/
name = rendererType;
/*}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java Fri Oct 24 13:47:27 2008
@@ -23,6 +23,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.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
@@ -36,7 +37,7 @@
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanel",
componentType = "org.apache.myfaces.tobago.Box",
interfaces = "org.apache.myfaces.tobago.ajax.api.AjaxComponent",
- rendererType = "Box",
+ rendererType = RendererType.BOX,
facets = {
@Facet(name= Facets.TOOL_BAR, description = "Contains an instance of UIToolBar",
allowedChildComponenents = "org.apache.myfaces.tobago.ToolBar"),
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxToolBarTagDeclaration.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxToolBarTagDeclaration.java Fri Oct 24 13:47:27 2008
@@ -18,11 +18,12 @@
*/
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.component.RendererType;
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBar",
generate = false,
- rendererType = "BoxToolBar",
+ rendererType = RendererType.BOX_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/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java Fri Oct 24 13:47:27 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.RendererType;
import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasCommandType;
import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
@@ -49,7 +50,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIButtonCommand",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand",
- rendererType = "Button",
+ rendererType = RendererType.BUTTON,
allowedChildComponenents = "NONE",
facets = {
@Facet(name= Facets.CONFIRMATION, description = "Contains a UIOutput instance with the confirmation message.",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java Fri Oct 24 13:47:27 2008
@@ -18,11 +18,12 @@
*/
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.Tag;
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.apt.annotation.DynamicExpression;
+import org.apache.myfaces.tobago.component.RendererType;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
/*
@@ -37,7 +38,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UICalendar",
uiComponentBaseClass = "javax.faces.component.UIOutput",
- rendererType = "Calendar")
+ rendererType = RendererType.CALENDAR)
public interface CalendarTagDeclaration extends HasIdBindingAndRendered {
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java Fri Oct 24 13:47:27 2008
@@ -21,6 +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.taglib.decl.HasIdBindingAndRendered;
/*
@@ -38,7 +39,7 @@
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanelBase",
interfaces = "org.apache.myfaces.tobago.component.Cell",
componentType = "org.apache.myfaces.tobago.Cell",
- rendererType = "Cell")
+ rendererType = RendererType.CELL)
public interface CellTagDeclaration extends HasIdBindingAndRendered {
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java?rev=707744&r1=707743&r2=707744&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java Fri Oct 24 13:47:27 2008
@@ -20,6 +20,7 @@
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
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.taglib.decl.HasBinding;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
@@ -37,7 +38,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIColumn",
componentType = "org.apache.myfaces.tobago.ColumnSelector",
- rendererType = "ColumnSelector",
+ rendererType = RendererType.COLUMN_SELECTOR,
allowedChildComponenents = "NONE")
public interface ColumnSelectorTagDeclaration extends IsDisabled, IsRendered, HasBinding {
}