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 21:16:41 UTC
svn commit: r707725 [1/5] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/
core/src/main/java/org/apache/myfaces/tobago/ajax/api/
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tob...
Author: lofwyr
Date: Fri Oct 24 12:16:37 2008
New Revision: 707725
URL: http://svn.apache.org/viewvc?rev=707725&view=rev
Log:
TOBAGO-715: Constants
* moving the attribute constants to class Attributes
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java (contents, props changed)
- copied, changed from r707660, 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/ajax/api/AjaxResponseRenderer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.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/AbstractUIPopup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.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/UIDatePicker.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/UILayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.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/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/context/ClientProperties.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.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/html/StyleClasses.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ConverterTag.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/TobagoResponseWriterImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterWrapper.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/RichTextEditorTag.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxToolBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.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/FileRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.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/PanelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.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/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.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/TabGroupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.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=707725&r1=707724&r2=707725&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 12:16:37 2008
@@ -17,167 +17,480 @@
* limitations under the License.
*/
+/**
+ * @see org.apache.myfaces.tobago.component.Attributes
+ * @see org.apache.myfaces.tobago.component.Facets
+ */
public final class TobagoConstants {
public static final String SUBCOMPONENT_SEP = "::";
// 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 */
@@ -277,7 +590,6 @@
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 ATTR_POPUP_CLOSE = "popupClose";
public static final String CHAR_NON_BEAKING_SPACE = "\u00a0";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java Fri Oct 24 12:16:37 2008
@@ -19,8 +19,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_CHARSET;
import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.FACES_MESSAGES_KEY;
import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.VIEW_ROOT_KEY;
@@ -170,7 +170,7 @@
UIComponent page = ComponentUtil.findPage(facesContext);
String charset;
if (page != null) { // in case of CODE_RELOAD_REQUIRED page is null
- charset = (String) page.getAttributes().get(ATTR_CHARSET);
+ charset = (String) page.getAttributes().get(Attributes.CHARSET);
} else {
charset = "UTF-8";
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java Fri Oct 24 12:16:37 2008
@@ -19,12 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_FIRST;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_IMMEDIATE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTED_LIST_STRING;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STATE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_UPDATE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH_LIST_STRING;
import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
import org.apache.myfaces.tobago.compat.FacesUtils;
@@ -65,10 +59,16 @@
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Data";
- /** @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
+ /**
+ * @see Facets
+ * @deprecated Please use Facets instead. Will be removed after Tobago 1.1 */
@Deprecated
public static final String FACET_SORTER = "sorter";
public static final String SORTER_ID = "sorter";
+ /**
+ * @see Attributes
+ * @deprecated Please use Attributes instead. Will be removed after Tobago 1.1 */
+ @Deprecated
public static final String ATTR_SCROLL_POSITION = "attrScrollPosition";
public static final String NONE = "none";
@@ -90,8 +90,8 @@
SheetState state = getSheetState(facesContext);
if (state.getFirst() > -1 && state.getFirst() < getRowCount()) {
- if (FacesUtils.hasValueBindingOrValueExpression(this, ATTR_FIRST)) {
- FacesUtils.setValueOfBindingOrExpression(facesContext, state.getFirst(), this, ATTR_FIRST);
+ if (FacesUtils.hasValueBindingOrValueExpression(this, Attributes.FIRST)) {
+ FacesUtils.setValueOfBindingOrExpression(facesContext, state.getFirst(), this, Attributes.FIRST);
} else {
setFirst(state.getFirst());
}
@@ -120,12 +120,12 @@
if (sheetState != null) {
return sheetState;
} else {
- if (FacesUtils.hasValueBindingOrValueExpression(this, ATTR_STATE)) {
+ if (FacesUtils.hasValueBindingOrValueExpression(this, Attributes.STATE)) {
SheetState state = (SheetState)
- FacesUtils.getValueFromValueBindingOrValueExpression(facesContext, this, ATTR_STATE);
+ FacesUtils.getValueFromValueBindingOrValueExpression(facesContext, this, Attributes.STATE);
if (state == null) {
state = new SheetState();
- FacesUtils.setValueOfBindingOrExpression(facesContext, state, this, ATTR_STATE);
+ FacesUtils.setValueOfBindingOrExpression(facesContext, state, this, Attributes.STATE);
}
return state;
} else {
@@ -227,11 +227,11 @@
// state.setAscending(sortActionListener != null && sortActionListener.isAscending());
Map attributes = getAttributes();
//noinspection unchecked
- state.setSelectedRows((List<Integer>) attributes.get(ATTR_SELECTED_LIST_STRING));
- state.setColumnWidths((String) attributes.get(ATTR_WIDTH_LIST_STRING));
- state.setScrollPosition((Integer[]) attributes.get(ATTR_SCROLL_POSITION));
- attributes.remove(ATTR_SELECTED_LIST_STRING);
- attributes.remove(ATTR_SCROLL_POSITION);
+ state.setSelectedRows((List<Integer>) attributes.get(Attributes.SELECTED_LIST_STRING));
+ state.setColumnWidths((String) attributes.get(Attributes.WIDTH_LIST_STRING));
+ state.setScrollPosition((Integer[]) attributes.get(Attributes.SCROLL_POSITION));
+ attributes.remove(Attributes.SELECTED_LIST_STRING);
+ attributes.remove(Attributes.SCROLL_POSITION);
}
}
@@ -367,9 +367,9 @@
UIComponent reload = getFacet(Facets.RELOAD);
if (ajaxId != null && ajaxId.equals(getClientId(context)) && reload != null && reload.isRendered()
&& ajaxId.equals(ComponentUtil.findPage(context, this).getActionId())) {
- Boolean immediate = (Boolean) reload.getAttributes().get(ATTR_IMMEDIATE);
+ Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
if (immediate != null && immediate) {
- Boolean update = (Boolean) reload.getAttributes().get(ATTR_UPDATE);
+ Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
if (update != null && !update) {
if (context.getExternalContext().getResponse() instanceof HttpServletResponse) {
((HttpServletResponse) context.getExternalContext().getResponse())
@@ -404,9 +404,9 @@
//}
UIComponent reload = getFacet(Facets.RELOAD);
if (reload != null && reload.isRendered()) {
- Boolean immediate = (Boolean) reload.getAttributes().get(ATTR_IMMEDIATE);
+ Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
if (immediate != null && !immediate) {
- Boolean update = (Boolean) reload.getAttributes().get(ATTR_UPDATE);
+ Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
if (update != null && !update) {
return;
}
@@ -416,7 +416,7 @@
}
public Integer[] getScrollPosition() {
- Integer[] scrollPosition = (Integer[]) getAttributes().get(ATTR_SCROLL_POSITION);
+ Integer[] scrollPosition = (Integer[]) getAttributes().get(Attributes.SCROLL_POSITION);
if (scrollPosition == null) {
scrollPosition = getSheetState(FacesContext.getCurrentInstance()).getScrollPosition();
}
@@ -529,8 +529,8 @@
// can't happen
}
- if (FacesUtils.hasValueBindingOrValueExpression(this, ATTR_FIRST)) {
- FacesUtils.setValueOfBindingOrExpression(FacesContext.getCurrentInstance(), first, this, ATTR_FIRST);
+ if (FacesUtils.hasValueBindingOrValueExpression(this, Attributes.FIRST)) {
+ FacesUtils.setValueOfBindingOrExpression(FacesContext.getCurrentInstance(), first, this, Attributes.FIRST);
} else {
setFirst(first);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java Fri Oct 24 12:16:37 2008
@@ -20,8 +20,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.OnComponentCreated;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SPAN_X;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SPAN_Y;
import org.apache.myfaces.tobago.layout.LayoutManager;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.grid.GridLayoutManager;
@@ -163,12 +161,12 @@
public static int getSpanX(UIComponent component) {
return ComponentUtil.getIntAttribute(
- component, ATTR_SPAN_X, 1);
+ component, Attributes.SPAN_X, 1);
}
public static int getSpanY(UIComponent component) {
return ComponentUtil.getIntAttribute(
- component, ATTR_SPAN_Y, 1);
+ component, Attributes.SPAN_Y, 1);
}
public boolean isIgnoreFree() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUILabel.java Fri Oct 24 12:16:37 2008
@@ -17,12 +17,11 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
import java.io.IOException;
public class AbstractUILabel extends javax.faces.component.UIOutput {
@@ -31,7 +30,7 @@
@Override
public void encodeBegin(FacesContext facesContext) throws IOException {
- String forComponent = (String) getAttributes().get(TobagoConstants.ATTR_FOR);
+ String forComponent = (String) getAttributes().get(Attributes.FOR);
if (LOG.isDebugEnabled()) {
LOG.debug("for = '" + forComponent + "'");
}
@@ -40,7 +39,7 @@
UIComponent child = (UIComponent) object;
if (child instanceof javax.faces.component.UIInput) {
forComponent = child.getId();
- getAttributes().put(TobagoConstants.ATTR_FOR, forComponent);
+ getAttributes().put(Attributes.FOR, forComponent);
break;
}
}
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=707725&r1=707724&r2=707725&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 12:16:37 2008
@@ -20,7 +20,6 @@
import org.apache.commons.collections.KeyValue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STATE;
import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
@@ -223,12 +222,12 @@
}
public PageState getPageState(FacesContext facesContext) {
- if (FacesUtils.hasValueBindingOrValueExpression(this, ATTR_STATE)) {
+ if (FacesUtils.hasValueBindingOrValueExpression(this, Attributes.STATE)) {
PageState state = (PageState)
- FacesUtils.getValueFromValueBindingOrValueExpression(facesContext, this, ATTR_STATE);
+ FacesUtils.getValueFromValueBindingOrValueExpression(facesContext, this, Attributes.STATE);
if (state == null) {
state = new PageStateImpl();
- FacesUtils.setValueOfBindingOrExpression(facesContext, state, this, ATTR_STATE);
+ FacesUtils.setValueOfBindingOrExpression(facesContext, state, this, Attributes.STATE);
}
return state;
} else {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java Fri Oct 24 12:16:37 2008
@@ -17,7 +17,6 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
@@ -76,7 +75,7 @@
if (action != null) {
UIComponent command = page.findComponent(SEPARATOR_CHAR + action);
if (command != null && command instanceof UICommand) {
- return !(command.getAttributes().get(TobagoConstants.ATTR_POPUP_CLOSE) != null);
+ return !(command.getAttributes().get(Attributes.POPUP_CLOSE) != null);
}
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITabGroup.java Fri Oct 24 12:16:37 2008
@@ -19,15 +19,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_WIDTH;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTED_INDEX;
import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
+import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeSource;
-import org.apache.myfaces.tobago.compat.FacesUtils;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
@@ -35,14 +32,14 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import javax.faces.event.ActionListener;
-import javax.faces.event.ActionEvent;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import java.util.Collection;
+import java.util.List;
public abstract class AbstractUITabGroup extends UIPanelBase implements TabChangeSource, ActionSource, AjaxComponent {
@@ -90,8 +87,8 @@
private void resetTabLayout() {
for (UIComponent component : (List<UIComponent>) getChildren()) {
- component.getAttributes().remove(ATTR_LAYOUT_WIDTH);
- component.getAttributes().remove(ATTR_LAYOUT_HEIGHT);
+ component.getAttributes().remove(Attributes.LAYOUT_WIDTH);
+ component.getAttributes().remove(Attributes.LAYOUT_HEIGHT);
}
}
@@ -184,8 +181,8 @@
super.broadcast(facesEvent);
if (facesEvent instanceof TabChangeEvent && facesEvent.getComponent() == this) {
Integer index = ((TabChangeEvent) facesEvent).getNewTabIndex();
- if (FacesUtils.hasValueBindingOrValueExpression(this, ATTR_SELECTED_INDEX)) {
- FacesUtils.setValueOfBindingOrExpression(getFacesContext(), index, this, ATTR_SELECTED_INDEX);
+ if (FacesUtils.hasValueBindingOrValueExpression(this, Attributes.SELECTED_INDEX)) {
+ FacesUtils.setValueOfBindingOrExpression(getFacesContext(), index, this, Attributes.SELECTED_INDEX);
} else {
setSelectedIndex(index);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java Fri Oct 24 12:16:37 2008
@@ -17,7 +17,6 @@
* limitations under the License.
*/
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTABLE;
import org.apache.myfaces.tobago.model.MixedTreeModel;
import org.apache.myfaces.tobago.util.ComponentUtil;
@@ -92,7 +91,7 @@
public boolean isSelectableTree() {
final Object selectable
- = ComponentUtil.getAttribute(this, ATTR_SELECTABLE);
+ = ComponentUtil.getAttribute(this, Attributes.SELECTABLE);
return selectable != null
&& (selectable.equals("multi") || selectable.equals("multiLeafOnly")
|| selectable.equals("single") || selectable.equals("singleLeafOnly")
@@ -130,7 +129,7 @@
context.addMessage(getClientId(context), facesMessage);
}
- String selectable = ComponentUtil.getStringAttribute(this, ATTR_SELECTABLE);
+ String selectable = ComponentUtil.getStringAttribute(this, SELECTABLE);
if (selectable != null && selectable.endsWith("LeafOnly")) {
Set<DefaultMutableTreeNode> selection = getState().getSelection();
@@ -204,7 +203,7 @@
if (showJunctions != null) {
return (showJunctions);
}
- ValueBinding vb = getValueBinding(ATTR_SHOW_JUNCTIONS);
+ ValueBinding vb = getValueBinding(SHOW_JUNCTIONS);
if (vb != null) {
return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
} else {
@@ -220,7 +219,7 @@
if (showIcons != null) {
return (showIcons);
}
- ValueBinding vb = getValueBinding(ATTR_SHOW_ICONS);
+ ValueBinding vb = getValueBinding(SHOW_ICONS);
if (vb != null) {
return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
} else {
@@ -236,7 +235,7 @@
if (showRoot != null) {
return (showRoot);
}
- ValueBinding vb = getValueBinding(ATTR_SHOW_ROOT);
+ ValueBinding vb = getValueBinding(SHOW_ROOT);
if (vb != null) {
return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
} else {
@@ -253,7 +252,7 @@
if (showRootJunction != null) {
return (showRootJunction);
}
- ValueBinding vb = getValueBinding(ATTR_SHOW_ROOT_JUNCTION);
+ ValueBinding vb = getValueBinding(SHOW_ROOT_JUNCTION);
if (vb != null) {
return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
} else {
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java (from r707660, 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/Attributes.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java&r1=707660&r2=707725&rev=707725&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/Attributes.java Fri Oct 24 12:16:37 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
@@ -17,271 +17,162 @@
* limitations under the License.
*/
-public final class TobagoConstants {
-
- public static final String SUBCOMPONENT_SEP = "::";
-
- // public static final String ATTR_ACCESS_KEY = "accessKey";
- public static final String ATTR_ACTION = "action";
- public static final String ATTR_ACTION_ONCLICK = "onclick";
- public static final String ATTR_ACTION_LINK = "link";
- public static final String ATTR_ACTION_LISTENER = "actionListener";
- public static final String ATTR_ALIGN = "align";
- public static final String ATTR_ALT = "alt";
- public static final String ATTR_AUTO_RELOAD = "autoReload";
- public static final String ATTR_BODY_CONTENT = "bodyContent";
- public static final String ATTR_BORDER = "border";
- public static final String ATTR_CHARSET = "charset";
- public static final String ATTR_CALENDAR_DATE_INPUT_ID = "CalendarDateInputId";
- public static final String ATTR_CELLSPACING = "cellspacing";
- public static final String ATTR_CLASSES_BLOCKS = "cssClassesBlocks";
- public static final String ATTR_CLIENT_PROPERTIES = "clientProperties";
- public static final String ATTR_COLUMNS = "columns";
- public static final String ATTR_CONVERTER = "converter";
- public static final String ATTR_DATE_STYLE = "dateStyle";
- public static final String ATTR_DEFAULT_COMMAND = "defaultCommand";
- public static final String ATTR_DELAY = "delay";
- public static final String ATTR_DIRECT_LINK_COUNT = "directLinkCount";
- public static final String ATTR_DISABLED = "disabled";
- public static final String ATTR_DOCTYPE = "doctype";
- public static final String ATTR_ENCTYPE = "enctype";
- public static final String ATTR_ESCAPE = "escape";
- public static final String ATTR_EXPANDED = "expanded";
- public static final String ATTR_EVENT = "event";
- public static final String ATTR_FIRST = "first";
- public static final String ATTR_FREQUENCY = "frequency";
- public static final String ATTR_FOCUS = "focus";
- public static final String ATTR_FOCUS_ID = "focusId";
- public static final String ATTR_FOOTER_HEIGHT = "footerHeight";
- public static final String ATTR_FORCE_VERTICAL_SCROLLBAR = "forceVerticalScrollbar";
- public static final String ATTR_FORMAT_PATTERN = "formatPattern";
- public static final String ATTR_FOR = "for";
- public static final String ATTR_GLOBAL_ONLY = "globalOnly";
- public static final String ATTR_HEIGHT = "height";
- public static final String ATTR_HIDDEN = "hidden";
- public static final String ATTR_HOVER = "hover";
- public static final String ATTR_I18N = "i18n";
- public static final String ATTR_ICON_SIZE = "iconSize";
- public static final String ATTR_ID = "id";
- public static final String ATTR_IMMEDIATE = "immediate";
- public static final String ATTR_IMAGE = "image";
- public static final String ATTR_INLINE = "inline";
- public static final String ATTR_INNER_HEIGHT = "innerHeight";
- public static final String ATTR_INNER_WIDTH = "innerWidth";
- public static final String ATTR_ITEM_DESCRIPTION = "itemDescription";
- public static final String ATTR_ITEM_DISABLED = "itemDisabled";
- public static final String ATTR_ITEM_LABEL = "itemLabel";
- public static final String ATTR_ITEM_IMAGE = "itemImage";
- public static final String ATTR_ITEM_VALUE = "itemValue";
-
- public static final String ATTR_LABEL = "label";
- public static final String ATTR_LABEL_POSITION = "labelPosition";
- // public static final String ATTR_LABEL_WITH_ACCESS_KEY = "labelWithAccessKey";
- public static final String ATTR_LAYOUT_HEIGHT = "layoutHeight";
- public static final String ATTR_MARGIN = "margin";
- public static final String ATTR_MARGIN_BOTTOM = "marginBottom";
- public static final String ATTR_MARGIN_LEFT = "marginLeft";
- public static final String ATTR_MARGIN_RIGHT = "marginRight";
- public static final String ATTR_MARGIN_TOP = "marginTop";
- public static final String ATTR_MARKED = "marked";
- public static final String ATTR_MODAL = "modal";
- public static final String ATTR_LAYOUT_ORDER = "layoutOrder";
- //public static final String ATTR_LAYOUT_TABLE_STYLE = "layoutTableStyle";
- public static final String ATTR_LAYOUT_WIDTH = "layoutWidth";
- public static final String ATTR_LEFT = "left";
- public static final String ATTR_MARKUP = "markup";
- public static final String ATTR_MAX = "max";
- public static final String ATTR_MAX_SEVERITY = "maxSeverity";
- public static final String ATTR_MAX_NUMBER = "maxNumber";
- public static final String ATTR_MENU_POPUP = "menuPopup";
- public static final String ATTR_MENU_POPUP_TYPE = "menuPopupType";
- public static final String ATTR_COMMAND_TYPE = "menuType";
- public static final String ATTR_METHOD = "method";
- public static final String ATTR_MIN = "min";
- public static final String ATTR_MIN_SEVERITY = "minSeverity";
- public static final String ATTR_MINIMUM_SIZE = "minimunSize";
- public static final String ATTR_MODE = "mode";
- public static final String ATTR_MUTABLE = "mutable";
- public static final String ATTR_NAME = "name";
- public static final String ATTR_NAVIGATE = "navigate";
- public static final String ATTR_NUMBER_STYLE = "numberStyle";
- public static final String ATTR_ONCHANGE = "onchange";
- public static final String ATTR_ONCLICK = "onclick";
- public static final String ATTR_ORDER_BY = "orderBy";
- public static final String ATTR_ORIENTATION = "orientation";
- public static final String ATTR_PAGE_MENU = "pageMenu";
- public static final String ATTR_PASSWORD = "password";
- public static final String ATTR_POPUP_LIST = "popupList";
- public static final String ATTR_RENDERED_PARTIALLY = "renderedPartially";
- public static final String ATTR_POPUP_RESET = "popupReset";
- public static final String ATTR_POPUP_CALENDAR_ID = "popupCalendarId";
- public static final String ATTR_PREFORMATED = "preformated";
- public static final String ATTR_READONLY = "readonly";
- public static final String ATTR_REFERENCE = "reference";
- public static final String ATTR_RELATIVE = "relative";
- public static final String ATTR_RENDERED = "rendered";
- public static final String ATTR_RENDERER_TYPE = "rendererType";
- public static final String ATTR_RENDER_AS = "renderAs";
- public static final String ATTR_RENDER_RANGE = "renderRange";
- public static final String ATTR_RENDER_RANGE_EXTERN = "renderRangeExtern";
- public static final String ATTR_REQUIRED = "required";
- public static final String ATTR_ROW_ID = "sheetRowId";
- public static final String ATTR_ROWS = "rows";
- public static final String ATTR_SCRIPT_FILES = "scriptFiles";
- public static final String ATTR_SCROLLBAR_HEIGHT = "scrollbarHeight";
- public static final String ATTR_SCROLLBARS = "scrollbars";
- public static final String ATTR_SELECTED_INDEX = "selectedIndex";
- public static final String ATTR_SELECTED_LIST_STRING = "selectedListString";
- // public static final String ATTR_SERVER_SIDE_TABS = "serverSideTab";
- public static final String ATTR_SORTABLE = "sortable";
- public static final String ATTR_CREATE_SPAN = "createSpan";
- public static final String ATTR_SELECTABLE = "selectable";
- public static final String ATTR_SHOW_DIRECT_LINKS = "showDirectLinks";
- public static final String ATTR_SHOW_HEADER = "showHeader";
- public static final String ATTR_SHOW_ICONS = "showIcons";
- public static final String ATTR_SHOW_JUNCTIONS = "showJunctions";
- public static final String ATTR_SHOW_PAGE_RANGE = "showPageRange";
- public static final String ATTR_SHOW_ROOT = "showRoot";
- public static final String ATTR_SHOW_ROOT_JUNCTION = "showRootJunction";
- public static final String ATTR_SHOW_ROW_RANGE = "showRowRange";
- public static final String ATTR_SHOW_SUMMARY = "showSummary";
- public static final String ATTR_SHOW_DETAIL = "showDetail";
- public static final String ATTR_SPAN_X = "spanX";
- public static final String ATTR_SPAN_Y = "spanY";
- public static final String ATTR_SRC = "src";
- public static final String ATTR_STATE = "state";
- public static final String ATTR_STATE_PREVIEW = "state_preview";
- public static final String ATTR_STYLE = "style";
- public static final String ATTR_STYLE_BODY = "style_body";
- public static final String ATTR_STYLE_CLASS = "styleClass";
- public static final String ATTR_STYLE_HEADER = "style_header";
- public static final String ATTR_STYLE_INNER = "style_inner";
- public static final String ATTR_STYLE_FILES = "styleFiles";
- public static final String ATTR_SUPPPRESS_TOOLBAR_CONTAINER = "suppressToolbarContainer";
- public static final String ATTR_SWITCH_TYPE = "switchType";
- public static final String ATTR_TARGET = "target";
- public static final String ATTR_TIME_STYLE = "timeStyle";
- public static final String ATTR_TIMEZONE = "timezone";
- public static final String ATTR_TITLE = "title";
- public static final String ATTR_TIP = "tip";
- public static final String ATTR_TOP = "top";
- public static final String ATTR_TRANSITION = "transition";
- public static final String ATTR_TYPE = "type";
- public static final String ATTR_VALUE = "value";
- public static final String ATTR_VALUE_CHANGE_LISTENER = "valueChangeListener";
- public static final String ATTR_VAR = "var";
- public static final String ATTR_UNIT = "unit";
- public static final String ATTR_UPDATE = "update";
- public static final String ATTR_WIDTH = "width";
- public static final String ATTR_WIDTH_LIST = "widthList";
- public static final String ATTR_WIDTH_LIST_STRING = "widthListString";
- public static final String ATTR_APPLICATION_ICON = "applicationIcon";
- public static final String ATTR_VALIDATOR = "validator";
- public static final String ATTR_TAB_INDEX = "tabIndex";
- 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 ATTR_POPUP_CLOSE = "popupClose";
-
- public static final String CHAR_NON_BEAKING_SPACE = "\u00a0";
+/**
+ * Name constants of the attributes of the Tobago components.
+ */
+public final class Attributes {
- private TobagoConstants() {
- // to prevent instantiation
- }
+ public static final String ACTION = "action";
+ public static final String ACTION_LISTENER = "actionListener";
+ public static final String ALIGN = "align";
+ public static final String ALT = "alt";
+ public static final String APPLICATION_ICON = "applicationIcon";
+ public static final String AUTO_RELOAD = "autoReload";
+ public static final String BODY_CONTENT = "bodyContent";
+ public static final String BORDER = "border";
+ public static final String CHARSET = "charset";
+ public static final String CELLSPACING = "cellspacing";
+ public static final String CLIENT_PROPERTIES = "clientProperties";
+ public static final String COLUMNS = "columns";
+ public static final String CONVERTER = "converter";
+ public static final String CREATE_SPAN = "createSpan";
+ public static final String CSS_CLASSES_BLOCKS = "cssClassesBlocks";
+ public static final String DATE_INPUT_ID = "dateInputId";
+ public static final String DATE_STYLE = "dateStyle";
+ public static final String DEFAULT_COMMAND = "defaultCommand";
+ public static final String DELAY = "delay";
+ public static final String DIRECT_LINK_COUNT = "directLinkCount";
+ public static final String DISABLED = "disabled";
+ public static final String DOCTYPE = "doctype";
+ public static final String ENCTYPE = "enctype";
+ public static final String ESCAPE = "escape";
+ public static final String EXPANDED = "expanded";
+ public static final String EVENT = "event";
+ public static final String FIRST = "first";
+ public static final String FREQUENCY = "frequency";
+ public static final String FOCUS = "focus";
+ public static final String FOCUS_ID = "focusId";
+ public static final String FOOTER_HEIGHT = "footerHeight";
+ public static final String FORCE_VERTICAL_SCROLLBAR = "forceVerticalScrollbar";
+ public static final String FORMAT_PATTERN = "formatPattern";
+ public static final String FOR = "for";
+ public static final String GLOBAL_ONLY = "globalOnly";
+ public static final String HEIGHT = "height";
+ public static final String HIDDEN = "hidden";
+ public static final String HOVER = "hover";
+ public static final String I18N = "i18n";
+ public static final String ICON_SIZE = "iconSize";
+ public static final String ID = "id";
+ public static final String IMMEDIATE = "immediate";
+ public static final String IMAGE = "image";
+ public static final String INLINE = "inline";
+ public static final String INNER_HEIGHT = "innerHeight";
+ public static final String INNER_WIDTH = "innerWidth";
+ public static final String ITEM_DESCRIPTION = "itemDescription";
+ public static final String ITEM_DISABLED = "itemDisabled";
+ public static final String ITEM_LABEL = "itemLabel";
+ public static final String ITEM_IMAGE = "itemImage";
+ public static final String ITEM_VALUE = "itemValue";
+ public static final String LABEL = "label";
+ public static final String LABEL_POSITION = "labelPosition";
+ public static final String LAYOUT_HEIGHT = "layoutHeight";
+ public static final String LAYOUT_ORDER = "layoutOrder";
+ public static final String LAYOUT_WIDTH = "layoutWidth";
+ public static final String LEFT = "left";
+ public static final String LINK = "link";
+ public static final String MARGIN = "margin";
+ public static final String MARGIN_BOTTOM = "marginBottom";
+ public static final String MARGIN_LEFT = "marginLeft";
+ public static final String MARGIN_RIGHT = "marginRight";
+ public static final String MARGIN_TOP = "marginTop";
+ public static final String MARKED = "marked";
+ public static final String MARKUP = "markup";
+ public static final String MAX = "max";
+ public static final String MAX_SEVERITY = "maxSeverity";
+ public static final String MAX_NUMBER = "maxNumber";
+ public static final String MENU_POPUP = "menuPopup";
+ public static final String MENU_POPUP_TYPE = "menuPopupType";
+ public static final String METHOD = "method";
+ public static final String MIN = "min";
+ public static final String MIN_SEVERITY = "minSeverity";
+ public static final String MINIMUN_SIZE = "minimunSize";
+ public static final String MODAL = "modal";
+ public static final String MODE = "mode";
+ public static final String MUTABLE = "mutable";
+ public static final String NAME = "name";
+ public static final String NAVIGATE = "navigate";
+ public static final String NUMBER_STYLE = "numberStyle";
+ public static final String ONCHANGE = "onchange";
+ public static final String ONCLICK = "onclick";
+ public static final String ORDER_BY = "orderBy";
+ public static final String ORIENTATION = "orientation";
+ public static final String PAGE_MENU = "pageMenu";
+ public static final String PASSWORD = "password";
+ public static final String POPUP_CLOSE = "popupClose";
+ public static final String POPUP_LIST = "popupList";
+ public static final String POPUP_RESET = "popupReset";
+ public static final String POPUP_CALENDAR_ID = "popupCalendarId";
+ public static final String PREFORMATED = "preformated";
+ public static final String READONLY = "readonly";
+ public static final String REFERENCE = "reference";
+ public static final String RELATIVE = "relative";
+ public static final String RENDERED = "rendered";
+ public static final String RENDERED_PARTIALLY = "renderedPartially";
+ public static final String RENDERER_TYPE = "rendererType";
+ public static final String RENDER_AS = "renderAs";
+ public static final String RENDER_RANGE = "renderRange";
+ public static final String RENDER_RANGE_EXTERN = "renderRangeExtern";
+ public static final String REQUIRED = "required";
+ public static final String ROW_ID = "rowId";
+ public static final String ROWS = "rows";
+ public static final String SCRIPT_FILES = "scriptFiles";
+ public static final String SCROLLBAR_HEIGHT = "scrollbarHeight";
+ public static final String SCROLLBARS = "scrollbars";
+ public static final String SCROLL_POSITION = "scrollPosition";
+ public static final String SELECTED_INDEX = "selectedIndex";
+ public static final String SELECTED_LIST_STRING = "selectedListString";
+ public static final String SORTABLE = "sortable";
+ public static final String SELECTABLE = "selectable";
+ public static final String SHOW_DIRECT_LINKS = "showDirectLinks";
+ public static final String SHOW_HEADER = "showHeader";
+ public static final String SHOW_ICONS = "showIcons";
+ public static final String SHOW_JUNCTIONS = "showJunctions";
+ public static final String SHOW_PAGE_RANGE = "showPageRange";
+ public static final String SHOW_ROOT = "showRoot";
+ public static final String SHOW_ROOT_JUNCTION = "showRootJunction";
+ public static final String SHOW_ROW_RANGE = "showRowRange";
+ public static final String SHOW_SUMMARY = "showSummary";
+ public static final String SHOW_DETAIL = "showDetail";
+ public static final String SPAN_X = "spanX";
+ public static final String SPAN_Y = "spanY";
+ public static final String SRC = "src";
+ public static final String STATE = "state";
+ public static final String STATE_PREVIEW = "statePreview";
+ public static final String STYLE = "style";
+ public static final String STYLE_BODY = "style_body";
+ public static final String STYLE_CLASS = "styleClass";
+ public static final String STYLE_HEADER = "style_header";
+ public static final String STYLE_INNER = "style_inner";
+ public static final String STYLE_FILES = "styleFiles";
+ public static final String SUPPRESS_TOOLBAR_CONTAINER = "suppressToolbarContainer";
+ public static final String SWITCH_TYPE = "switchType";
+ public static final String TAB_INDEX = "tabIndex";
+ public static final String TARGET = "target";
+ public static final String TIME_STYLE = "timeStyle";
+ public static final String TIMEZONE = "timezone";
+ public static final String TITLE = "title";
+ public static final String TIP = "tip";
+ public static final String TOP = "top";
+ public static final String TRANSITION = "transition";
+ public static final String TYPE = "type";
+ public static final String VALUE = "value";
+ public static final String VALUE_CHANGE_LISTENER = "valueChangeListener";
+ public static final String VAR = "var";
+ public static final String UNIT = "unit";
+ public static final String UPDATE = "update";
+ public static final String VALIDATOR = "validator";
+ public static final String WIDTH = "width";
+ public static final String WIDTH_LIST = "widthList";
+ public static final String WIDTH_LIST_STRING = "widthListString";
+ public static final String Z_INDEX = "zIndex";
}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
------------------------------------------------------------------------------
svn:mergeinfo =
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=707725&r1=707724&r2=707725&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 12:16:37 2008
@@ -17,12 +17,6 @@
* limitations under the License.
*/
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ALIGN;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_CREATE_SPAN;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ESCAPE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SORTABLE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
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;
@@ -65,9 +59,9 @@
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");
- TagUtils.setStringProperty(text, ATTR_VALUE, value);
- TagUtils.setBooleanProperty(text, ATTR_CREATE_SPAN, "false");
- TagUtils.setBooleanProperty(text, ATTR_ESCAPE, "false");
+ TagUtils.setStringProperty(text, Attributes.VALUE, value);
+ TagUtils.setBooleanProperty(text, Attributes.CREATE_SPAN, "false");
+ TagUtils.setBooleanProperty(text, Attributes.ESCAPE, "false");
return createColumn(label, sortable, align, text, clientId);
}
@@ -89,9 +83,9 @@
public static UIColumn createColumn(String label, String sortable, String align, String clientId) {
UIColumn column = (UIColumn) createComponent(UIColumn.COMPONENT_TYPE, null, clientId);
- TagUtils.setStringProperty(column, ATTR_LABEL, label);
- TagUtils.setBooleanProperty(column, ATTR_SORTABLE, sortable);
- TagUtils.setStringProperty(column, ATTR_ALIGN, align);
+ TagUtils.setStringProperty(column, Attributes.LABEL, label);
+ TagUtils.setBooleanProperty(column, Attributes.SORTABLE, sortable);
+ TagUtils.setStringProperty(column, Attributes.ALIGN, align);
return column;
}
@@ -104,13 +98,13 @@
public static UIMenuSelectOne createUIMenuSelectOneFacet(FacesContext facesContext,
javax.faces.component.UICommand command, String clientId) {
UIMenuSelectOne radio = null;
- final ValueBinding valueBinding = command.getValueBinding(ATTR_VALUE);
+ final ValueBinding valueBinding = command.getValueBinding(Attributes.VALUE);
if (valueBinding != null) {
radio = (UIMenuSelectOne) createComponent(facesContext, UIMenuSelectOne.COMPONENT_TYPE,
RENDERER_TYPE_SELECT_ONE_RADIO, clientId);
//noinspection unchecked
command.getFacets().put(Facets.ITEMS, radio);
- radio.setValueBinding(ATTR_VALUE, valueBinding);
+ radio.setValueBinding(Attributes.VALUE, valueBinding);
}
return radio;
}
@@ -125,12 +119,12 @@
RENDERER_TYPE_SELECT_BOOLEAN_CHECKBOX, clientId);
//noinspection unchecked
command.getFacets().put(Facets.ITEMS, checkbox);
- ValueBinding valueBinding = command.getValueBinding(ATTR_VALUE);
+ ValueBinding valueBinding = command.getValueBinding(Attributes.VALUE);
if (valueBinding != null) {
- checkbox.setValueBinding(ATTR_VALUE, valueBinding);
+ checkbox.setValueBinding(Attributes.VALUE, valueBinding);
} else {
//noinspection unchecked
- checkbox.getAttributes().put(ATTR_VALUE, command.getAttributes().get(ATTR_VALUE));
+ checkbox.getAttributes().put(Attributes.VALUE, command.getAttributes().get(Attributes.VALUE));
}
return checkbox;
}