You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2022/02/13 13:31:31 UTC
[myfaces-tobago] branch TOBAGO-1999_Select2 updated (0d1a68e -> be9d9d0)
This is an automated email from the ASF dual-hosted git repository.
weber pushed a change to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 0d1a68e TOBAGO-2090 Tobago 2.x: FileDrop: inclomplete cancel on empty list
new b65f04c cherrypick from 2.x: style: checkstyle
new 207670b cherrypick from 2.x: build: CVE fix
new dbcdbe7 cherrypick from 2.x: build: CVE fix
new a8d5fe6 cherrypick from 2.x: build: CVE fix
new b821e13 cherrypick from 2.x: build: CVE fix
new f667af2 cherrypick from 2.x: fix: CVE
new 1596a7b cherrypick from 2.x: build: update dependencies
new 7b92eb8 cherrypick from 2.x: build: update checkstyle-rules to release version
new f3d1a50 cherrypick from 2.x: build: update some lib versions
new e7465a0 cherrypick from 2.x: chore: add .editorconfig file
new 41745da cherrypick from 2.x: chore: add .editorconfig file
new 0a30f09 cherrypick from 2.x: build: update some lib versions
new db0be85 cherrypick from 2.x: build(deps): bump geronimo-el_2.2_spec from 1.0.4 to 1.1
new f41b593 cherrypick from 2.x: build(deps): bump maven-surefire-plugin from 2.9 to 2.22.2
new 7497b34 cherrypick from 2.x: build(deps): bump maven-plugin-plugin from 2.4.1 to 3.6.4
new e78371c cherrypick from 2.x: build(deps): bump maven-install-plugin from 2.3.1 to 2.5.2
new 6f435be cherrypick from 2.x: chore: update antrun plugin
new 14f8e31 cherrypick from 2.x: chore: Remove Maven Reporting Section
new c6e69bf cherrypick from 2.x: build: checkstyle enhancements
new 8c375f8 cherrypick from 2.x: build: fix
new 624f4b5 cherrypick from 2.x: build: checkstyle enhancements
new b743649 cherrypick from 2.x: build: use specific tobago-2 checkstyle
new b3f7225 cherrypick from 2.x: chore: Update jQuery UI to 1.13.1
new a8fcdb4 cherrypick from 2.x: build(deps): bump geronimo-jcdi_1.0_spec from 1.0 to 1.1
new 0ef7765 cherrypick from 2.x: chore: Update jQuery to 3.6.0
new 6b2baf2 cherrypick from 2.x: chore: Update jQuery UI Timepicker to 1.6.3
new 8407adb cherrypick from 2.x: chore: Update jQuery UI to 1.13.1
new 2d51116 cherrypick from 2.x: build: checkstyle enhancements
new 96a8db4 cherrypick from 2.x: build: checkstyle enhancements
new 0aba8a4 cherrypick from 2.x: build(deps): bump apache-rat-plugin from 0.11 to 0.13
new b98bbde cherrypick from 2.x: build(deps): bump xml-maven-plugin from 1.0 to 1.0.2
new be9d9d0 cherrypick from 2.x: build(deps): bump cargo-maven2-plugin from 1.0.3 to 1.8.5
The 32 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.editorconfig | 27 +
pom.xml | 324 +-
.../org/apache/myfaces/tobago/ajax/AjaxUtils.java | 4 +-
.../tobago/application/ActionListenerImpl.java | 2 +-
.../myfaces/tobago/application/ProjectStage.java | 12 +-
.../apache/myfaces/tobago/compat/FacesUtilsEL.java | 10 +-
.../myfaces/tobago/component/Attributes.java | 84 +-
.../myfaces/tobago/component/ComponentTypes.java | 3 +
.../apache/myfaces/tobago/component/Facets.java | 3 +-
.../myfaces/tobago/component/InputSuggest2.java | 2 +-
.../component/MethodBindingToMethodExpression.java | 8 +-
.../apache/myfaces/tobago/component/Position.java | 4 +-
.../myfaces/tobago/component/RendererTypes.java | 2 +-
.../apache/myfaces/tobago/component/Sorter.java | 16 +-
.../apache/myfaces/tobago/config/Configurable.java | 9 +-
.../apache/myfaces/tobago/config/TobagoConfig.java | 2 +-
.../apache/myfaces/tobago/context/Capability.java | 5 +-
.../myfaces/tobago/context/ClientProperties.java | 31 +-
.../org/apache/myfaces/tobago/context/Markup.java | 21 +-
.../myfaces/tobago/context/MarkupConfig.java | 4 +-
.../myfaces/tobago/context/MarkupEditor.java | 8 +-
.../myfaces/tobago/context/ResourceManager.java | 29 +-
.../tobago/context/ResourceManagerUtils.java | 19 +-
.../apache/myfaces/tobago/context/ThemeImpl.java | 20 +-
.../myfaces/tobago/context/TobagoBundle.java | 6 +-
.../myfaces/tobago/context/TobagoContext.java | 4 +-
.../tobago/context/TobagoMessageBundle.java | 6 +-
.../tobago/context/TobagoResourceBundle.java | 6 +-
.../tobago/context/TransientStateHolder.java | 4 +-
.../apache/myfaces/tobago/context/UserAgent.java | 29 +-
.../myfaces/tobago/convert/DurationConverter.java | 2 +-
.../myfaces/tobago/convert/ThemeConverter.java | 4 +-
.../event/MethodExpressionTabChangeListener.java | 2 +-
.../apache/myfaces/tobago/event/PageAction.java | 3 +-
.../myfaces/tobago/event/PageActionEvent.java | 5 +-
.../myfaces/tobago/event/PopupActionListener.java | 4 +-
.../tobago/event/PopupFacetActionListener.java | 4 +-
.../tobago/event/ResetFormActionListener.java | 2 +-
.../tobago/event/ResetInputActionListener.java | 4 +-
.../tobago/event/SheetStateChangeEvent.java | 2 +-
.../myfaces/tobago/event/TabChangeEvent.java | 12 +-
.../myfaces/tobago/event/TreeExpansionEvent.java | 2 +-
.../tobago/event/TreeExpansionListener.java | 2 +-
.../ValueExpressionResetInputActionListener.java | 4 +-
.../ValueExpressionSheetStateChangeListener.java | 2 +-
.../event/ValueExpressionTabChangeListener.java | 2 +-
.../myfaces/tobago/facelets/ContentTypeRule.java | 2 +-
.../tobago/facelets/DeprecatedDimensionRule.java | 4 +-
.../facelets/FixCharacterEncodingFilter.java | 4 +-
.../facelets/GridLayoutConstraintHandler.java | 9 +-
.../myfaces/tobago/facelets/LoadBundleHandler.java | 2 +-
.../MetaInfResourcesClasspathResourceResolver.java | 7 +-
.../tobago/facelets/PopupReferenceHandler.java | 2 +-
.../myfaces/tobago/facelets/PositionRule.java | 4 +-
.../facelets/ResetInputActionListenerHandler.java | 2 +-
.../apache/myfaces/tobago/facelets/Resource.java | 9 +-
.../facelets/SheetStateChangeSourceRule.java | 2 +-
.../tobago/facelets/SortActionSourceRule.java | 4 +-
.../myfaces/tobago/facelets/SuggestMethodRule.java | 2 +-
.../tobago/facelets/SupportsMarkupRule.java | 2 +-
.../facelets/SupportsRenderedPartiallyRule.java | 2 +-
.../tobago/facelets/TabChangeSourceRule.java | 2 +-
.../extension/MenuRadioExtensionHandler.java | 2 +-
.../SelectOneListboxExtensionHandler.java | 3 +-
.../extension/TobagoMenuExtensionHandler.java | 2 +-
.../tobago/internal/ajax/AjaxInternalUtils.java | 4 +-
.../tobago/internal/ajax/AjaxNavigationState.java | 3 +-
.../myfaces/tobago/internal/ajax/AjaxRenderer.java | 2 +-
.../tobago/internal/ajax/AjaxResponseRenderer.java | 5 +-
.../tobago/internal/component/AbstractUIData.java | 22 +-
.../internal/component/AbstractUIDatePicker.java | 4 +-
.../internal/component/AbstractUIFileDrop.java | 6 +-
.../internal/component/AbstractUIFlowLayout.java | 2 +-
.../internal/component/AbstractUIGridLayout.java | 12 +-
.../internal/component/AbstractUIMessages.java | 4 +-
.../tobago/internal/component/AbstractUIPage.java | 15 +-
.../tobago/internal/component/AbstractUIPopup.java | 2 +-
.../component/AbstractUISelectBooleanCheckbox.java | 2 +-
.../component/AbstractUISelectManyShuttle.java | 2 +-
.../component/AbstractUISelectOneBase.java | 2 +-
.../tobago/internal/component/AbstractUISheet.java | 76 +-
.../internal/component/AbstractUISheetLayout.java | 8 +-
.../internal/component/AbstractUISplitLayout.java | 9 +-
.../internal/component/AbstractUITabGroup.java | 2 +-
.../component/AbstractUITabGroupLayout.java | 2 +-
.../tobago/internal/component/AbstractUITree.java | 10 +-
.../internal/component/AbstractUITreeNode.java | 32 +-
.../internal/component/AbstractUITreeSelect.java | 5 +-
.../internal/config/ContentSecurityPolicy.java | 4 +-
.../tobago/internal/config/RendererConfig.java | 2 +-
.../config/TobagoConfigEntityResolver.java | 3 +
.../internal/config/TobagoConfigFragment.java | 12 +-
.../tobago/internal/config/TobagoConfigMerger.java | 2 +-
.../internal/config/TobagoConfigVersion.java | 4 +-
.../internal/context/ClientPropertiesKey.java | 4 +-
.../tobago/internal/context/MeasureValue.java | 2 +-
.../tobago/internal/context/ResourceLocator.java | 33 +-
.../internal/context/ResourceManagerImpl.java | 113 +-
.../internal/context/ResponseWriterDivider.java | 32 +-
.../tobago/internal/context/StringValue.java | 2 +-
.../internal/context/ThemeConfigCacheKey.java | 4 +-
.../myfaces/tobago/internal/layout/BankHead.java | 4 +-
.../myfaces/tobago/internal/layout/Cell.java | 4 +-
.../myfaces/tobago/internal/layout/Grid.java | 35 +-
.../tobago/internal/layout/LayoutContext.java | 2 +-
.../tobago/internal/layout/LayoutUtils.java | 8 +-
.../myfaces/tobago/internal/layout/MathUtils.java | 7 +-
.../myfaces/tobago/internal/package-info.java | 5 +-
.../tobago/internal/taglib/TobagoELTag.java | 2 -
.../internal/taglib/component/AttributeTag.java | 33 +-
.../taglib/component/BoxToolBarTagDeclaration.java | 2 +-
.../taglib/component/CellTagDeclaration.java | 9 +-
.../taglib/component/ColumnNodeTagDeclaration.java | 4 +-
.../taglib/component/ColumnTagDeclaration.java | 12 +-
.../taglib/component/CommandTagDeclaration.java | 7 +-
.../internal/taglib/component/ConverterTag.java | 16 +-
.../taglib/component/DataAttributeTag.java | 10 +-
.../taglib/component/DatePickerTagDeclaration.java | 10 +-
.../taglib/component/DateTagDeclaration.java | 8 +-
.../component/ExtensionPanelDeclaration.java | 2 +-
.../taglib/component/FileDropTagDeclaration.java | 13 +-
.../taglib/component/FileTagDeclaration.java | 4 +-
.../taglib/component/FlowLayoutTagDeclaration.java | 13 +-
.../taglib/component/FormTagDeclaration.java | 10 +-
.../taglib/component/GridLayoutConstraintTag.java | 4 +-
.../taglib/component/ImageTagDeclaration.java | 5 +-
.../taglib/component/InTagDeclaration.java | 8 +-
.../internal/taglib/component/LoadBundleTag.java | 22 +-
.../taglib/component/MediatorTagDeclaration.java | 4 +-
.../taglib/component/MenuBarTagDeclaration.java | 8 +-
.../component/MenuCommandTagDeclaration.java | 2 +-
.../taglib/component/MessagesTagDeclaration.java | 24 +-
.../taglib/component/ObjectTagDeclaration.java | 8 +-
.../taglib/component/OutTagDeclaration.java | 10 +-
.../taglib/component/PageTagDeclaration.java | 28 +-
.../taglib/component/PanelTagDeclaration.java | 9 +-
.../taglib/component/PopupReferenceTag.java | 11 +-
.../taglib/component/PopupTagDeclaration.java | 10 +-
.../taglib/component/ProgressTagDeclaration.java | 6 +-
.../taglib/component/ReloadTagDeclaration.java | 6 +-
.../component/ResetInputActionListenerTag.java | 12 +-
.../taglib/component/ScriptTagDeclaration.java | 1 +
.../SelectBooleanCheckboxTagDeclaration.java | 10 +-
.../taglib/component/SelectItemTagDeclaration.java | 11 +-
.../component/SelectItemsTagDeclaration.java | 16 +-
.../component/SelectOneChoiceTagDeclaration.java | 25 +-
.../component/SelectOneListboxTagDeclaration.java | 25 +-
.../component/SelectOneRadioTagDeclaration.java | 25 +-
.../component/SelectReferenceTagDeclaration.java | 3 +-
.../taglib/component/SheetTagDeclaration.java | 56 +-
.../component/SplitLayoutTagDeclaration.java | 17 +-
.../taglib/component/StyleTagDeclaration.java | 1 +
.../taglib/component/SuggestTagDeclaration.java | 18 +-
.../taglib/component/TabChangeListenerTag.java | 20 +-
.../taglib/component/TabGroupTagDeclaration.java | 7 +-
.../component/TabGroupToolBarTagDeclaration.java | 2 +-
.../taglib/component/ToolBarTagDeclaration.java | 16 +-
.../taglib/component/TreeDataTagDeclaration.java | 4 +-
.../component/TreeListboxTagDeclaration.java | 3 +-
.../taglib/component/TreeMenuTagDeclaration.java | 7 +-
.../taglib/component/TreeNodeTagDeclaration.java | 7 +-
.../taglib/component/TreeSelectTagDeclaration.java | 8 +-
.../taglib/component/TreeTagDeclaration.java | 8 +-
.../taglib/component/ValidateFileItemTag.java | 4 +-
.../component/ValidateSubmittedValueLengthTag.java | 7 +-
.../taglib/component/WizardTagDeclaration.java | 2 +-
.../internal/taglib/declaration/Component.java | 12 +-
.../internal/taglib/declaration/HasAction.java | 11 +-
.../taglib/declaration/HasActionListener.java | 7 +-
.../taglib/declaration/HasColumnLayout.java | 5 +-
.../internal/taglib/declaration/HasConverter.java | 10 +-
.../taglib/declaration/HasCurrentMarkup.java | 6 +-
.../internal/taglib/declaration/HasFieldId.java | 4 +-
.../tobago/internal/taglib/declaration/HasId.java | 4 +-
.../internal/taglib/declaration/HasLabel.java | 4 +-
.../internal/taglib/declaration/HasLabelWidth.java | 5 +-
.../internal/taglib/declaration/HasLink.java | 2 +-
.../internal/taglib/declaration/HasMargin.java | 4 +-
.../internal/taglib/declaration/HasMarkup.java | 7 +-
.../internal/taglib/declaration/HasOnchange.java | 5 +-
.../internal/taglib/declaration/HasOnclick.java | 2 -
.../taglib/declaration/HasPlaceholder.java | 5 +-
.../taglib/declaration/HasRenderedPartially.java | 6 +-
.../internal/taglib/declaration/HasResource.java | 11 +-
.../internal/taglib/declaration/HasRowLayout.java | 5 +-
.../internal/taglib/declaration/HasSanitize.java | 5 +-
.../internal/taglib/declaration/HasSpacing.java | 7 +-
.../taglib/declaration/HasSuggestMethod.java | 9 +-
.../declaration/HasTabChangeListenerType.java | 3 +-
.../internal/taglib/declaration/HasTabIndex.java | 14 +-
.../internal/taglib/declaration/HasTarget.java | 3 +-
.../internal/taglib/declaration/HasValidator.java | 8 +-
.../taglib/declaration/HasValueChangeListener.java | 9 +-
.../tobago/internal/taglib/declaration/HasVar.java | 5 +-
.../taglib/declaration/IsDefaultCommand.java | 4 +-
.../internal/taglib/declaration/IsDraggable.java | 3 +-
.../declaration/IsGridLayoutComponentBase.java | 6 +-
.../IsGridLayoutComponentWithDimension.java | 12 +-
.../taglib/declaration/IsImmediateCommand.java | 7 +-
.../tobago/internal/taglib/declaration/IsOmit.java | 10 +-
.../internal/taglib/declaration/IsPassword.java | 4 +-
.../internal/taglib/declaration/IsRendered.java | 4 +-
.../internal/taglib/declaration/IsRequired.java | 5 +-
.../taglib/declaration/IsRequiredForSelect.java | 5 +-
.../internal/taglib/declaration/IsShowRoot.java | 5 +-
.../taglib/declaration/IsShowRootJunction.java | 4 +-
.../internal/taglib/declaration/IsTransition.java | 3 +-
.../taglib/extension/DateExtensionTag.java | 83 +-
.../taglib/extension/ExtensionPanelTag.java | 6 +-
.../taglib/extension/FileExtensionTag.java | 56 +-
.../internal/taglib/extension/InExtensionTag.java | 89 +-
.../taglib/extension/LabelExtensionTag.java | 28 +-
.../taglib/extension/MenuCheckboxExtensionTag.java | 62 +-
.../taglib/extension/MenuRadioExtensionTag.java | 68 +-
.../internal/taglib/extension/OutExtensionTag.java | 43 +-
.../SelectBooleanCheckboxExtensionTag.java | 71 +-
.../extension/SelectManyCheckboxExtensionTag.java | 67 +-
.../extension/SelectManyListboxExtensionTag.java | 69 +-
.../extension/SelectManyShuttleExtensionTag.java | 59 +-
.../extension/SelectOneChoiceExtensionTag.java | 67 +-
.../extension/SelectOneListboxExtensionTag.java | 67 +-
.../extension/SelectOneRadioExtensionTag.java | 68 +-
.../taglib/extension/SeparatorExtensionTag.java | 18 +-
.../taglib/extension/TextareaExtensionTag.java | 73 +-
.../taglib/extension/TimeExtensionTag.java | 73 +-
.../extension/TobagoExtensionBodyTagSupport.java | 6 +-
.../internal/util/ComponentAttributeUtils.java | 12 +-
.../tobago/internal/util/DateFormatUtils.java | 4 +-
.../myfaces/tobago/internal/util/Deprecation.java | 7 +-
.../tobago/internal/util/FacesContextUtils.java | 4 +-
.../tobago/internal/util/FindComponentUtils.java | 5 +-
.../tobago/internal/util/HtmlWriterUtils.java | 4 +-
.../internal/util/JavascriptWriterUtils.java | 4 +-
.../tobago/internal/util/JsonWriterUtils.java | 4 +-
.../myfaces/tobago/internal/util/NumberUtils.java | 2 +-
.../myfaces/tobago/internal/util/PartUtils.java | 88 +-
.../tobago/internal/util/ResponseUtils.java | 2 +-
.../tobago/internal/util/ResponseWriterBuffer.java | 18 +-
.../myfaces/tobago/internal/util/StringUtils.java | 13 +-
.../myfaces/tobago/internal/util/WriterUtils.java | 23 +-
.../webapp/DebugResponseWriterWrapper.java | 9 +
.../tobago/internal/webapp/HtmlResponseWriter.java | 13 +-
.../tobago/internal/webapp/JsonResponseWriter.java | 10 +-
.../internal/webapp/TobagoResponseWriterBase.java | 50 +-
.../webapp/TobagoResponseWriterWrapper.java | 9 +
.../myfaces/tobago/layout/AutoLayoutToken.java | 2 +-
.../apache/myfaces/tobago/layout/LayoutBase.java | 16 +
.../apache/myfaces/tobago/layout/LayoutBox.java | 8 +
.../myfaces/tobago/layout/LayoutComponent.java | 5 +
.../myfaces/tobago/layout/LayoutContainer.java | 3 +
.../org/apache/myfaces/tobago/layout/Measure.java | 4 +-
.../myfaces/tobago/layout/MeasureEditor.java | 8 +-
.../apache/myfaces/tobago/layout/Orientation.java | 4 +-
.../apache/myfaces/tobago/layout/PixelMeasure.java | 8 +-
.../apache/myfaces/tobago/model/ExpandedState.java | 11 +-
.../java/org/apache/myfaces/tobago/model/Node.java | 10 +-
.../org/apache/myfaces/tobago/model/PageState.java | 16 +-
.../apache/myfaces/tobago/model/PageStateImpl.java | 4 +-
.../apache/myfaces/tobago/model/SelectItem.java | 1 +
.../apache/myfaces/tobago/model/Selectable.java | 3 +-
.../apache/myfaces/tobago/model/SelectedState.java | 7 +-
.../myfaces/tobago/model/TreeNodeDataModel.java | 21 +-
.../org/apache/myfaces/tobago/model/TreePath.java | 14 +-
.../myfaces/tobago/model/TreeSelectable.java | 2 +-
.../org/apache/myfaces/tobago/model/Wizard.java | 5 +-
.../myfaces/tobago/portlet/PortletUtils.java | 4 +-
.../renderkit/AbstractRendererBaseWrapper.java | 8 +-
.../apache/myfaces/tobago/renderkit/HtmlUtils.java | 17 +-
.../tobago/renderkit/LabelWithAccessKey.java | 15 +-
.../myfaces/tobago/renderkit/RendererBase.java | 2 +-
.../tobago/renderkit/SelectManyRendererBase.java | 126 +-
.../tobago/renderkit/SelectOneRendererBase.java | 2 +-
.../myfaces/tobago/renderkit/css/Classes.java | 12 +-
.../apache/myfaces/tobago/renderkit/css/Style.java | 13 +-
.../tobago/renderkit/html/DataAttributes.java | 63 +-
.../tobago/renderkit/html/HtmlAttributes.java | 52 +-
.../tobago/renderkit/html/HtmlElements.java | 3 +
.../myfaces/tobago/sanitizer/JsoupSanitizer.java | 2 +-
.../tobago/servlet/NonFacesRequestServlet.java | 3 +-
.../myfaces/tobago/servlet/ResourceServlet.java | 6 +-
.../apache/myfaces/tobago/util/BeanComparator.java | 13 +-
.../apache/myfaces/tobago/util/ComparatorBase.java | 2 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 122 +-
.../myfaces/tobago/util/ContextCallback.java | 2 +-
.../myfaces/tobago/util/CreateComponentUtils.java | 29 +-
.../myfaces/tobago/util/DebugActionListener.java | 4 +-
.../tobago/util/DebugNavigationHandler.java | 2 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 8 +-
.../org/apache/myfaces/tobago/util/DebugUtils.java | 2 +-
.../myfaces/tobago/util/EncodeAjaxCallback.java | 24 +-
.../apache/myfaces/tobago/util/FacesVersion.java | 4 +
.../org/apache/myfaces/tobago/util/LayoutInfo.java | 9 +-
.../apache/myfaces/tobago/util/LocaleUtils.java | 6 +-
.../apache/myfaces/tobago/util/MessageUtils.java | 4 +-
.../tobago/util/ProcessValidationsCallback.java | 2 +-
.../tobago/util/UpdateModelValuesCallback.java | 2 +-
.../tobago/util/ValueBindingComparator.java | 2 +-
.../tobago/util/ValueExpressionComparator.java | 7 +-
.../myfaces/tobago/util/VariableResolverUtils.java | 8 +-
.../org/apache/myfaces/tobago/util/XmlUtils.java | 8 +-
.../validator/ClearValidatorsActionListener.java | 7 +-
.../validator/SubmittedValueLengthValidator.java | 5 +-
.../org/apache/myfaces/tobago/webapp/Secret.java | 10 +-
.../tobago/webapp/SecretSessionListener.java | 2 +-
.../tobago/webapp/TobagoResponseWriter.java | 20 +-
.../myfaces/tobago/component/SorterUnitTest.java | 50 +-
.../myfaces/tobago/component/UISheetUnitTest.java | 6 +-
.../myfaces/tobago/context/MarkupUnitTest.java | 46 +-
.../myfaces/tobago/context/UserAgentUnitTest.java | 14 +-
.../internal/config/AbstractTobagoTestBase.java | 3 +-
.../context/ResponseWriterDividerUnitTest.java | 2 +-
.../internal/context/ThemeParserUnitTest.java | 2 +-
.../tobago/internal/layout/MathUtilsUnitTest.java | 20 +-
.../mock/servlet/MockHttpServletRequest.java | 11 +-
.../mock/servlet/MockHttpServletResponse.java | 15 +-
.../internal/mock/servlet/MockHttpSession.java | 7 +-
.../internal/mock/servlet/MockPageContext.java | 6 +-
.../internal/taglib/component/DummyBean.java | 4 +-
.../internal/taglib/component/GenericTestBase.java | 6 +-
.../tobago/internal/util/PartUtilsUnitTest.java | 2 +-
.../tobago/layout/IntervalListUnitTest.java | 38 +-
.../tobago/model/MixedTreeModelUnitTest.java | 14 +-
.../apache/myfaces/tobago/model/NodeUnitTest.java | 15 +-
.../tobago/renderkit/css/ClassesUnitTest.java | 4 +-
.../myfaces/tobago/util/RangeParserUnitTest.java | 8 +-
.../webapp/TobagoResponseWriterUnitTest.java | 13 +-
.../tobago-example-addressbook-cdi/pom.xml | 23 +-
.../tobago/example/addressbook/Address.java | 2 +-
.../DerbyShutdownServletContextListener.java | 2 +-
.../tobago/example/addressbook/EmailAddress.java | 2 +-
.../tobago/example/addressbook/JpaAddressDao.java | 6 +-
.../example/addressbook/OpenJpaLoadTimeWeaver.java | 6 +-
.../tobago/example/addressbook/Picture.java | 2 +-
.../tobago/example/addressbook/web/Controller.java | 13 +-
.../tobago/example/addressbook/web/Layout.java | 2 +-
.../example/addressbook/web/PictureServlet.java | 2 +-
.../addressbook/web/StartupPhaseListener.java | 4 +-
tobago-example/tobago-example-addressbook/pom.xml | 21 -
.../tobago/example/addressbook/Address.java | 2 +-
.../DerbyShutdownServletContextListener.java | 2 +-
.../tobago/example/addressbook/EmailAddress.java | 2 +-
.../tobago/example/addressbook/JpaAddressDao.java | 6 +-
.../example/addressbook/OpenJpaLoadTimeWeaver.java | 26 +-
.../tobago/example/addressbook/Picture.java | 2 +-
.../example/addressbook/web/AppenderModel.java | 2 +-
.../tobago/example/addressbook/web/Controller.java | 13 +-
.../tobago/example/addressbook/web/Layout.java | 2 +-
.../example/addressbook/web/LoggingController.java | 39 +-
.../example/addressbook/web/PictureServlet.java | 2 +-
.../addressbook/web/StartupPhaseListener.java | 4 +-
.../tobago/example/data/CantorInterval.java | 20 +-
tobago-example/tobago-example-demo/pom.xml | 29 +-
.../apache/myfaces/tobago/example/demo/Bird.java | 4 +-
.../tobago/example/demo/BirdController.java | 6 +-
...lePageDeclarationLanguageNavigationHandler.java | 9 +-
.../tobago/example/demo/NavigationTree.java | 7 +-
.../example/demo/PartialReloadController.java | 2 +-
.../tobago/example/demo/TobagoDemoController.java | 10 +-
.../myfaces/tobago/example/demo/TreeEditor.java | 2 +-
.../tobago/example/demo/UniversalLoggingInfo.java | 6 +-
.../demo/clientConfig/ClientConfigController.java | 8 +-
.../tobago/example/demo/jsp/AbstractConverter.java | 6 +-
.../tobago/example/demo/jsp/JspTagConverter.java | 2 +-
.../tobago/example/demo/jsp/StringExpression.java | 4 +-
.../tobago/example/demo/overview/SheetConfig.java | 2 +-
.../myfaces/tobago/example/demo/sudoku/Sudoku.java | 10 +-
.../tobago/example/security/Controller.java | 8 +-
tobago-example/tobago-example-test/pom.xml | 6 +-
.../myfaces/tobago/example/test/Attribute.java | 2 +-
.../example/test/ClientConfigController.java | 8 +-
.../tobago/example/test/FilterController.java | 6 +-
.../myfaces/tobago/example/test/Immediate.java | 16 +-
.../example/test/InputSuggestController.java | 2 +-
.../myfaces/tobago/example/test/KillSession.java | 2 +-
.../myfaces/tobago/example/test/MeasureBean.java | 2 +-
.../example/test/PopupReferenceController.java | 8 +-
.../apache/myfaces/tobago/example/test/Reload.java | 4 +-
.../example/test/SelectBooleanCheckboxBean.java | 50 +-
.../tobago/example/test/SheetSortController.java | 7 +-
.../tobago/example/test/TreeController.java | 2 +-
.../tobago/example/test/AutomaticSeleniumTest.java | 6 +-
.../tobago/example/test/TobagoSelenium.java | 24 +-
.../org/apache/myfaces/tobago/TobagoConstants.java | 14 +-
.../apache/myfaces/tobago/ajax/api/AjaxUtils.java | 24 +-
.../apache/myfaces/tobago/bean/ResourceMap.java | 2 +-
.../tobago/compat/FacesInvokeOnComponent12.java | 3 +-
.../myfaces/tobago/component/ComponentUtil.java | 3 +-
.../myfaces/tobago/component/UIViewRoot.java | 4 +-
.../apache/myfaces/tobago/config/ThemeConfig.java | 3 +
.../tobago/context/ResourceManagerUtil.java | 12 +-
.../myfaces/tobago/event/PageActionUtil.java | 2 +-
.../ValueBindingResetInputActionListener.java | 2 +-
.../event/ValueBindingTabChangeListener.java | 2 +-
.../internal/lifecycle/PhaseListenerManager.java | 4 +-
.../myfaces/tobago/internal/taglib/TagUtils.java | 6 +-
.../myfaces/tobago/internal/util/AccessKeyMap.java | 3 +-
.../tobago/renderkit/html/HtmlRendererUtil.java | 14 +-
.../tobago/renderkit/html/HtmlStyleMap.java | 5 +-
.../renderkit/html/util/CommandRendererHelper.java | 25 +-
.../myfaces/tobago/renderkit/util/JQueryUtils.java | 6 +-
.../apache/myfaces/tobago/util/MessageFactory.java | 21 +
.../org/apache/myfaces/tobago/util/StringUtil.java | 9 +
.../apache/myfaces/tobago/util/StringUtils.java | 1 +
.../myfaces/tobago/util/VariableResolverUtil.java | 2 +-
.../internal/component/AbstractUINumberSlider.java | 2 +-
.../apache/myfaces/tobago/model/AbstractCrud.java | 13 +-
.../java/org/apache/myfaces/tobago/model/Crud.java | 30 +-
.../sandbox/standard/tag/NumberSliderRenderer.java | 56 +-
.../tobago/security/AuthorizationUtils.java | 2 +-
.../security/CheckAuthorisationMethodBinding.java | 12 +-
.../CheckAuthorisationMethodExpression.java | 2 +-
tobago-theme/tobago-theme-scarborough/pom.xml | 4 +-
.../html/speyside/standard/tag/BoxRenderer.java | 28 +-
tobago-theme/tobago-theme-standard/pom.xml | 2 +-
.../myfaces/tobago/renderkit/html/Command.java | 35 +-
.../myfaces/tobago/renderkit/html/JsonUtils.java | 6 +-
.../html/standard/standard/tag/BoxRenderer.java | 2 +-
.../standard/standard/tag/CalendarRenderer.java | 4 +-
.../html/standard/standard/tag/ColumnRenderer.java | 10 +-
.../standard/standard/tag/DatePickerRenderer.java | 4 +-
.../standard/standard/tag/FileDropRenderer.java | 10 +-
.../html/standard/standard/tag/FileRenderer.java | 4 +-
.../html/standard/standard/tag/ImageRenderer.java | 4 +-
.../html/standard/standard/tag/LabelRenderer.java | 4 +-
.../html/standard/standard/tag/LinkRenderer.java | 2 +-
.../standard/standard/tag/MediatorRenderer.java | 6 +-
.../standard/standard/tag/MenuCommandRenderer.java | 4 +-
.../html/standard/standard/tag/OutRenderer.java | 4 +-
.../html/standard/standard/tag/PanelRenderer.java | 6 +-
.../standard/tag/SelectManyCheckboxRenderer.java | 2 +-
.../standard/tag/SelectManyListboxRenderer.java | 2 +-
.../standard/tag/SelectManyShuttleRenderer.java | 2 +-
.../standard/tag/SelectOneRadioRenderer.java | 4 +-
.../standard/tag/SelectReferenceRenderer.java | 6 +-
.../standard/standard/tag/SeparatorRenderer.java | 6 +-
.../html/standard/standard/tag/SheetRenderer.java | 32 +-
.../standard/standard/tag/SplitLayoutRenderer.java | 13 +-
.../standard/standard/tag/SubviewRenderer.java | 6 +-
.../standard/tag/TabGroupLayoutRenderer.java | 4 +-
.../standard/standard/tag/TabGroupRenderer.java | 2 +-
.../html/standard/standard/tag/TabRenderer.java | 2 +-
.../standard/standard/tag/TextareaRenderer.java | 2 +-
.../standard/standard/tag/ToolBarRendererBase.java | 14 +-
.../standard/standard/tag/TreeListboxRenderer.java | 2 +-
.../html/standard/standard/tag/TreeRenderer.java | 2 +-
.../standard/standard/tag/TreeSelectRenderer.java | 4 +-
.../standard/standard/tag/VerbatimRenderer.java | 6 +-
.../renderkit/html/util/HtmlRendererUtils.java | 17 +-
.../myfaces/tobago/renderkit/util/RenderUtils.java | 2 +-
.../src/main/resources/META-INF/tobago-config.xml | 20 +-
.../standard/script/contrib/jquery-3.5.1.min.js | 2 -
.../standard/script/contrib/jquery-3.5.1.min.map | 1 -
.../contrib/{jquery-3.5.1.js => jquery-3.6.0.js} | 227 +-
.../standard/script/contrib/jquery-3.6.0.min.js | 2 +
.../standard/script/contrib/jquery-3.6.0.min.map | 1 +
.../script/contrib/jquery-ui-1.10.4.custom.js | 5102 -----------------
.../script/contrib/jquery-ui-1.10.4.custom.min.js | 7 -
.../script/contrib/jquery-ui-1.10.4.custom_af.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ar.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_ar_DZ.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_az.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_be.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_bg.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_bs.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ca.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_cs.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_cy.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_de.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_el.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_en_AU.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_en_GB.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_en_NZ.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_eo.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_es.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_et.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_eu.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_fa.js | 59 -
.../script/contrib/jquery-ui-1.10.4.custom_fi.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_fo.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_fr.js | 25 -
.../contrib/jquery-ui-1.10.4.custom_fr_CA.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_fr_CH.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_gl.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_he.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hi.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hr.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hu.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hy.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_id.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_is.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_it.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ja.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ka.js | 21 -
.../script/contrib/jquery-ui-1.10.4.custom_kk.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_km.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ko.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ky.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_lb.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_lt.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_lv.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_mk.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ml.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ms.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_nb.js | 22 -
.../script/contrib/jquery-ui-1.10.4.custom_nl.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_nl_BE.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_nn.js | 22 -
.../script/contrib/jquery-ui-1.10.4.custom_no.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_pl.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_pt.js | 22 -
.../contrib/jquery-ui-1.10.4.custom_pt_BR.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_rm.js | 21 -
.../script/contrib/jquery-ui-1.10.4.custom_ro.js | 26 -
.../script/contrib/jquery-ui-1.10.4.custom_ru.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sk.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sl.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_sq.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sr.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_sr_SR.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sv.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ta.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_th.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_tj.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_tr.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_uk.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_vi.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_zh_HK.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_zh_TW.js | 23 -
.../script/contrib/jquery-ui-1.13.1.custom.js | 5928 ++++++++++++++++++++
.../script/contrib/jquery-ui-1.13.1.custom.min.js | 6 +
.../script/contrib/jquery-ui-1.13.1.custom_af.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ar.js | 42 +
.../contrib/jquery-ui-1.13.1.custom_ar_DZ.js | 42 +
.../script/contrib/jquery-ui-1.13.1.custom_az.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_be.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_bg.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_bs.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ca.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_cs.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_cy.js | 48 +
....custom_da.js => jquery-ui-1.13.1.custom_da.js} | 0
.../script/contrib/jquery-ui-1.13.1.custom_de.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_de_AT.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_el.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_en_AU.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_en_GB.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_en_NZ.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_eo.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_es.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_et.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_eu.js | 39 +
.../script/contrib/jquery-ui-1.13.1.custom_fa.js | 76 +
.../script/contrib/jquery-ui-1.13.1.custom_fi.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_fo.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_fr.js | 42 +
.../contrib/jquery-ui-1.13.1.custom_fr_CA.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_fr_CH.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_gl.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_he.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_hi.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_hr.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_hu.js | 39 +
.../script/contrib/jquery-ui-1.13.1.custom_hy.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_id.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_is.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_it.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_it_CH.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ja.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ka.js | 51 +
.../script/contrib/jquery-ui-1.13.1.custom_kk.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_km.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ko.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ky.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_lb.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_lt.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_lv.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_mk.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ml.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ms.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_nb.js | 52 +
.../script/contrib/jquery-ui-1.13.1.custom_nl.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_nl_BE.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_nn.js | 52 +
.../script/contrib/jquery-ui-1.13.1.custom_no.js | 53 +
.../script/contrib/jquery-ui-1.13.1.custom_pl.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_pt.js | 47 +
.../contrib/jquery-ui-1.13.1.custom_pt_BR.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_rm.js | 64 +
.../script/contrib/jquery-ui-1.13.1.custom_ro.js | 43 +
.../script/contrib/jquery-ui-1.13.1.custom_ru.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sk.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sl.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_sq.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sr.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_sr_SR.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sv.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ta.js | 56 +
.../script/contrib/jquery-ui-1.13.1.custom_th.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_tj.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_tr.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_uk.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_vi.js | 40 +
....custom_zh.js => jquery-ui-1.13.1.custom_zh.js} | 0
.../contrib/jquery-ui-1.13.1.custom_zh_CN.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_zh_HK.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_zh_TW.js | 40 +
.../contrib/jquery-ui-timepicker-addon-1.4.5.js | 2203 --------
.../contrib/jquery-ui-timepicker-addon-1.4.5_sr.js | 21 -
.../contrib/jquery-ui-timepicker-addon-1.4.5_zh.js | 21 -
.../contrib/jquery-ui-timepicker-addon-1.6.3.js | 2291 ++++++++
.../jquery-ui-timepicker-addon-1.6.3.min.js | 5 +
...f.js => jquery-ui-timepicker-addon-1.6.3_af.js} | 1 +
...m.js => jquery-ui-timepicker-addon-1.6.3_am.js} | 1 +
...g.js => jquery-ui-timepicker-addon-1.6.3_bg.js} | 1 +
...a.js => jquery-ui-timepicker-addon-1.6.3_ca.js} | 1 +
...s.js => jquery-ui-timepicker-addon-1.6.3_cs.js} | 1 +
...a.js => jquery-ui-timepicker-addon-1.6.3_da.js} | 1 +
...e.js => jquery-ui-timepicker-addon-1.6.3_de.js} | 1 +
...l.js => jquery-ui-timepicker-addon-1.6.3_el.js} | 7 +-
...s.js => jquery-ui-timepicker-addon-1.6.3_es.js} | 6 +-
...t.js => jquery-ui-timepicker-addon-1.6.3_et.js} | 1 +
...u.js => jquery-ui-timepicker-addon-1.6.3_eu.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_fa.js | 22 +
...i.js => jquery-ui-timepicker-addon-1.6.3_fi.js} | 1 +
...r.js => jquery-ui-timepicker-addon-1.6.3_fr.js} | 1 +
...l.js => jquery-ui-timepicker-addon-1.6.3_gl.js} | 1 +
...e.js => jquery-ui-timepicker-addon-1.6.3_he.js} | 1 +
...r.js => jquery-ui-timepicker-addon-1.6.3_hr.js} | 1 +
...u.js => jquery-ui-timepicker-addon-1.6.3_hu.js} | 1 +
...d.js => jquery-ui-timepicker-addon-1.6.3_id.js} | 1 +
...t.js => jquery-ui-timepicker-addon-1.6.3_it.js} | 1 +
...a.js => jquery-ui-timepicker-addon-1.6.3_ja.js} | 1 +
...o.js => jquery-ui-timepicker-addon-1.6.3_ko.js} | 1 +
...t.js => jquery-ui-timepicker-addon-1.6.3_lt.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_lv.js | 22 +
...g.js => jquery-ui-timepicker-addon-1.6.3_mk.js} | 13 +-
...l.js => jquery-ui-timepicker-addon-1.6.3_nl.js} | 1 +
...o.js => jquery-ui-timepicker-addon-1.6.3_no.js} | 1 +
...l.js => jquery-ui-timepicker-addon-1.6.3_pl.js} | 1 +
...t.js => jquery-ui-timepicker-addon-1.6.3_pt.js} | 1 +
...s => jquery-ui-timepicker-addon-1.6.3_pt_BR.js} | 1 +
...o.js => jquery-ui-timepicker-addon-1.6.3_ro.js} | 1 +
...u.js => jquery-ui-timepicker-addon-1.6.3_ru.js} | 1 +
...k.js => jquery-ui-timepicker-addon-1.6.3_sk.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_sl.js | 22 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_sq.js | 22 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_sr.js | 22 +
...s => jquery-ui-timepicker-addon-1.6.3_sr_YU.js} | 1 +
...v.js => jquery-ui-timepicker-addon-1.6.3_sv.js} | 1 +
...h.js => jquery-ui-timepicker-addon-1.6.3_th.js} | 3 +-
...r.js => jquery-ui-timepicker-addon-1.6.3_tr.js} | 1 +
...k.js => jquery-ui-timepicker-addon-1.6.3_uk.js} | 1 +
...i.js => jquery-ui-timepicker-addon-1.6.3_vi.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_zh.js | 22 +
...s => jquery-ui-timepicker-addon-1.6.3_zh_TW.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.4.5.css | 11 -
.../contrib/jquery-ui-timepicker-addon-1.6.3.css | 33 +
.../ui-lightness/images/animated-overlay.gif | Bin 1738 -> 0 bytes
.../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 418 -> 476 bytes
.../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 312 -> 384 bytes
.../images/ui-bg_flat_10_000000_40x100.png | Bin 205 -> 0 bytes
.../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 262 -> 324 bytes
.../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 348 -> 406 bytes
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 265 bytes
.../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 5815 -> 5873 bytes
.../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 278 -> 342 bytes
.../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 328 -> 386 bytes
.../images/ui-icons_222222_256x240.png | Bin 6922 -> 7025 bytes
.../images/ui-icons_228ef1_256x240.png | Bin 4549 -> 4618 bytes
.../images/ui-icons_ef8c08_256x240.png | Bin 4549 -> 4618 bytes
.../images/ui-icons_ffd27a_256x240.png | Bin 4549 -> 4618 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 6299 -> 6487 bytes
.../ui-lightness/jquery-ui-1.10.4.custom.min.css | 7 -
...10.4.custom.css => jquery-ui-1.13.1.custom.css} | 562 +-
.../origin/external/prepare-jquery-ui-resources.sh | 6 +-
tobago-tool/tobago-theme-plugin/pom.xml | 7 +-
.../tobago/maven/plugin/IndexThemeMojo.java | 5 +-
.../apt/annotation/BodyContentDescription.java | 5 +-
.../myfaces/tobago/apt/annotation/Converter.java | 3 +-
.../tobago/apt/annotation/DynamicExpression.java | 16 +-
.../tobago/apt/annotation/ExtensionTag.java | 2 +-
.../myfaces/tobago/apt/annotation/Facet.java | 9 +-
.../myfaces/tobago/apt/annotation/Preliminary.java | 6 +-
.../tobago/apt/annotation/TagAttribute.java | 8 +-
.../myfaces/tobago/apt/annotation/Taglib.java | 6 +-
.../tobago/apt/annotation/UIComponentTag.java | 11 +-
.../apt/annotation/UIComponentTagAttribute.java | 20 +-
.../myfaces/tobago/apt/annotation/Validator.java | 3 +-
.../tobago/apt/annotation/ValidatorTag.java | 1 +
tobago-tool/tobago-tool-apt/pom.xml | 2 +-
.../tobago/apt/generate/ComponentPropertyInfo.java | 4 +-
.../myfaces/tobago/apt/generate/PropertyInfo.java | 4 +-
.../tobago/apt/processor/ClassesGenerator.java | 4 +-
.../tobago/apt/processor/FacesConfigGenerator.java | 9 +-
.../tobago/apt/processor/TaglibGenerator.java | 2 +-
695 files changed, 14809 insertions(+), 12475 deletions(-)
create mode 100644 .editorconfig
delete mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.js
delete mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.map
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-3.5.1.js => jquery-3.6.0.js} (98%)
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.map
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.min.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_af.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar_DZ.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_az.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_be.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bg.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bs.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ca.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cs.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cy.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_de.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_el.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_AU.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_GB.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_NZ.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eo.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_es.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_et.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eu.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fa.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fi.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fo.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CA.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CH.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_gl.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_he.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hi.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hr.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hu.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hy.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_id.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_is.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_it.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ja.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ka.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_kk.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_km.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ko.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ky.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lb.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lt.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lv.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_mk.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ml.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ms.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nb.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl_BE.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nn.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_no.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pl.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt_BR.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_rm.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ro.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ru.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sk.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sl.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sq.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr_SR.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sv.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ta.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_th.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tj.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tr.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_uk.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_vi.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_HK.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_TW.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom.min.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_af.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ar.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ar_DZ.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_az.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_be.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_bg.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_bs.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ca.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_cs.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_cy.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-1.10.4.custom_da.js => jquery-ui-1.13.1.custom_da.js} (100%)
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_de.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_de_AT.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_el.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_en_AU.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_en_GB.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_en_NZ.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_eo.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_es.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_et.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_eu.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_fa.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_fi.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_fo.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_fr.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_fr_CA.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_fr_CH.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_gl.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_he.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_hi.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_hr.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_hu.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_hy.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_id.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_is.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_it.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_it_CH.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ja.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ka.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_kk.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_km.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ko.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ky.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_lb.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_lt.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_lv.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_mk.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ml.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ms.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_nb.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_nl.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_nl_BE.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_nn.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_no.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_pl.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_pt.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_pt_BR.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_rm.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ro.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ru.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_sk.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_sl.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_sq.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_sr.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_sr_SR.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_sv.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_ta.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_th.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_tj.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_tr.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_uk.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_vi.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-1.10.4.custom_zh.js => jquery-ui-1.13.1.custom_zh.js} (100%)
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_zh_CN.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_zh_HK.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom_zh_TW.js
delete mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr.js
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.min.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_af.js => jquery-ui-timepicker-addon-1.6.3_af.js} (93%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_am.js => jquery-ui-timepicker-addon-1.6.3_am.js} (97%)
mode change 100755 => 100644
copy tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_bg.js => jquery-ui-timepicker-addon-1.6.3_bg.js} (95%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_ca.js => jquery-ui-timepicker-addon-1.6.3_ca.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_cs.js => jquery-ui-timepicker-addon-1.6.3_cs.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_da.js => jquery-ui-timepicker-addon-1.6.3_da.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_de.js => jquery-ui-timepicker-addon-1.6.3_de.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_el.js => jquery-ui-timepicker-addon-1.6.3_el.js} (79%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_es.js => jquery-ui-timepicker-addon-1.6.3_es.js} (83%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_et.js => jquery-ui-timepicker-addon-1.6.3_et.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_eu.js => jquery-ui-timepicker-addon-1.6.3_eu.js} (95%)
mode change 100755 => 100644
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fa.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_fi.js => jquery-ui-timepicker-addon-1.6.3_fi.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_fr.js => jquery-ui-timepicker-addon-1.6.3_fr.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_gl.js => jquery-ui-timepicker-addon-1.6.3_gl.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_he.js => jquery-ui-timepicker-addon-1.6.3_he.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_hr.js => jquery-ui-timepicker-addon-1.6.3_hr.js} (95%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_hu.js => jquery-ui-timepicker-addon-1.6.3_hu.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_id.js => jquery-ui-timepicker-addon-1.6.3_id.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_it.js => jquery-ui-timepicker-addon-1.6.3_it.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_ja.js => jquery-ui-timepicker-addon-1.6.3_ja.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_ko.js => jquery-ui-timepicker-addon-1.6.3_ko.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_lt.js => jquery-ui-timepicker-addon-1.6.3_lt.js} (97%)
mode change 100755 => 100644
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lv.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_bg.js => jquery-ui-timepicker-addon-1.6.3_mk.js} (53%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_nl.js => jquery-ui-timepicker-addon-1.6.3_nl.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_no.js => jquery-ui-timepicker-addon-1.6.3_no.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_pl.js => jquery-ui-timepicker-addon-1.6.3_pl.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_pt.js => jquery-ui-timepicker-addon-1.6.3_pt.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_pt_BR.js => jquery-ui-timepicker-addon-1.6.3_pt_BR.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_ro.js => jquery-ui-timepicker-addon-1.6.3_ro.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_ru.js => jquery-ui-timepicker-addon-1.6.3_ru.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_sk.js => jquery-ui-timepicker-addon-1.6.3_sk.js} (96%)
mode change 100755 => 100644
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sl.js
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sq.js
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_sr_YU.js => jquery-ui-timepicker-addon-1.6.3_sr_YU.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_sv.js => jquery-ui-timepicker-addon-1.6.3_sv.js} (96%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_th.js => jquery-ui-timepicker-addon-1.6.3_th.js} (91%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_tr.js => jquery-ui-timepicker-addon-1.6.3_tr.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_uk.js => jquery-ui-timepicker-addon-1.6.3_uk.js} (97%)
mode change 100755 => 100644
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_vi.js => jquery-ui-timepicker-addon-1.6.3_vi.js} (96%)
mode change 100755 => 100644
create mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh.js
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/{jquery-ui-timepicker-addon-1.4.5_zh_TW.js => jquery-ui-timepicker-addon-1.6.3_zh_TW.js} (96%)
mode change 100755 => 100644
delete mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.4.5.css
create mode 100644 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.6.3.css
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/images/animated-overlay.gif
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
delete mode 100755 tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/jquery-ui-1.10.4.custom.min.css
rename tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/{jquery-ui-1.10.4.custom.css => jquery-ui-1.13.1.custom.css} (62%)
[myfaces-tobago] 25/32: cherrypick from 2.x: chore: Update jQuery to 3.6.0
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 0ef77656dd097f3aeea58d9e460c23c7005206a7
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 10:59:17 2022 +0100
cherrypick from 2.x: chore: Update jQuery to 3.6.0
issue: TOBAGO-2110
---
.../src/main/resources/META-INF/tobago-config.xml | 4 +-
.../standard/script/contrib/jquery-3.5.1.min.js | 2 -
.../standard/script/contrib/jquery-3.5.1.min.map | 1 -
.../contrib/{jquery-3.5.1.js => jquery-3.6.0.js} | 227 +++++++++++----------
.../standard/script/contrib/jquery-3.6.0.min.js | 2 +
.../standard/script/contrib/jquery-3.6.0.min.map | 1 +
6 files changed, 123 insertions(+), 114 deletions(-)
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 7f933e2..2407a56 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -399,7 +399,7 @@
</renderer>
</renderers>
<resources production="true">
- <script priority="10" name="script/contrib/jquery-3.5.1.js"/>
+ <script priority="10" name="script/contrib/jquery-3.6.0.js"/>
<script priority="20" name="script/contrib/jquery-ui-1.13.1.custom.js"/>
<script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
<script priority="35" name="script/contrib/select2/select2.full.js"/>
@@ -412,7 +412,7 @@
<style priority="40" name="style/style.css"/>
</resources>
<resources production="false">
- <script priority="10" name="script/contrib/jquery-3.5.1.js"/>
+ <script priority="10" name="script/contrib/jquery-3.6.0.js"/>
<script priority="20" name="script/contrib/jquery-ui-1.13.1.custom.js"/>
<script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
<script priority="35" name="script/contrib/select2/select2.full.js"/>
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.js
deleted file mode 100644
index b061403..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l= [...]
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.map b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.map
deleted file mode 100644
index faa1db8..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["jquery-3.5.1.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script" [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.js
similarity index 98%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.js
index 5093733..fc6c299 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.5.1.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.js
@@ -1,15 +1,15 @@
/*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
*/
( function( global, factory ) {
@@ -76,12 +76,16 @@ var support = {};
var isFunction = function isFunction( obj ) {
- // Support: Chrome <=57, Firefox <=52
- // In some browsers, typeof returns "function" for HTML <object> elements
- // (i.e., `typeof document.createElement( "object" ) === "function"`).
- // We don't want to classify *any* DOM node as a function.
- return typeof obj === "function" && typeof obj.nodeType !== "number";
- };
+ // Support: Chrome <=57, Firefox <=52
+ // In some browsers, typeof returns "function" for HTML <object> elements
+ // (i.e., `typeof document.createElement( "object" ) === "function"`).
+ // We don't want to classify *any* DOM node as a function.
+ // Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5
+ // Plus for old WebKit, typeof returns "function" for HTML collections
+ // (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756)
+ return typeof obj === "function" && typeof obj.nodeType !== "number" &&
+ typeof obj.item !== "function";
+ };
var isWindow = function isWindow( obj ) {
@@ -147,7 +151,7 @@ function toType( obj ) {
var
- version = "3.5.1",
+ version = "3.6.0",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -401,7 +405,7 @@ jQuery.extend( {
if ( isArrayLike( Object( arr ) ) ) {
jQuery.merge( ret,
typeof arr === "string" ?
- [ arr ] : arr
+ [ arr ] : arr
);
} else {
push.call( ret, arr );
@@ -496,9 +500,9 @@ if ( typeof Symbol === "function" ) {
// Populate the class2type map
jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( _i, name ) {
- class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
+ function( _i, name ) {
+ class2type[ "[object " + name + "]" ] = name.toLowerCase();
+ } );
function isArrayLike( obj ) {
@@ -518,14 +522,14 @@ function isArrayLike( obj ) {
}
var Sizzle =
/*!
- * Sizzle CSS Selector Engine v2.3.5
+ * Sizzle CSS Selector Engine v2.3.6
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
- * Date: 2020-03-14
+ * Date: 2021-02-16
*/
( function( window ) {
var i,
@@ -1108,8 +1112,8 @@ support = Sizzle.support = {};
* @returns {Boolean} True iff elem is a non-HTML XML node
*/
isXML = Sizzle.isXML = function( elem ) {
- var namespace = elem.namespaceURI,
- docElem = ( elem.ownerDocument || elem ).documentElement;
+ var namespace = elem && elem.namespaceURI,
+ docElem = elem && ( elem.ownerDocument || elem ).documentElement;
// Support: IE <=8
// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -3024,9 +3028,9 @@ var rneedsContext = jQuery.expr.match.needsContext;
function nodeName( elem, name ) {
- return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+ return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-};
+}
var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
@@ -3997,8 +4001,8 @@ jQuery.extend( {
resolveContexts = Array( i ),
resolveValues = slice.call( arguments ),
- // the master Deferred
- master = jQuery.Deferred(),
+ // the primary Deferred
+ primary = jQuery.Deferred(),
// subordinate callback factory
updateFunc = function( i ) {
@@ -4006,30 +4010,30 @@ jQuery.extend( {
resolveContexts[ i ] = this;
resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
if ( !( --remaining ) ) {
- master.resolveWith( resolveContexts, resolveValues );
+ primary.resolveWith( resolveContexts, resolveValues );
}
};
};
// Single- and empty arguments are adopted like Promise.resolve
if ( remaining <= 1 ) {
- adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+ adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject,
!remaining );
// Use .then() to unwrap secondary thenables (cf. gh-3000)
- if ( master.state() === "pending" ||
+ if ( primary.state() === "pending" ||
isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
- return master.then();
+ return primary.then();
}
}
// Multiple arguments are aggregated like Promise.all array elements
while ( i-- ) {
- adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
+ adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject );
}
- return master.promise();
+ return primary.promise();
}
} );
@@ -4180,8 +4184,8 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
for ( ; i < len; i++ ) {
fn(
elems[ i ], key, raw ?
- value :
- value.call( elems[ i ], i, fn( elems[ i ], key ) )
+ value :
+ value.call( elems[ i ], i, fn( elems[ i ], key ) )
);
}
}
@@ -5089,10 +5093,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
}
-var
- rkeyEvent = /^key/,
- rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
- rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+var rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
function returnTrue() {
return true;
@@ -5387,8 +5388,8 @@ jQuery.event = {
event = jQuery.event.fix( nativeEvent ),
handlers = (
- dataPriv.get( this, "events" ) || Object.create( null )
- )[ event.type ] || [],
+ dataPriv.get( this, "events" ) || Object.create( null )
+ )[ event.type ] || [],
special = jQuery.event.special[ event.type ] || {};
// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5512,12 +5513,12 @@ jQuery.event = {
get: isFunction( hook ) ?
function() {
if ( this.originalEvent ) {
- return hook( this.originalEvent );
+ return hook( this.originalEvent );
}
} :
function() {
if ( this.originalEvent ) {
- return this.originalEvent[ name ];
+ return this.originalEvent[ name ];
}
},
@@ -5656,7 +5657,13 @@ function leverageNative( el, type, expectSync ) {
// Cancel the outer synthetic event
event.stopImmediatePropagation();
event.preventDefault();
- return result.value;
+
+ // Support: Chrome 86+
+ // In Chrome, if an element having a focusout handler is blurred by
+ // clicking outside of it, it invokes the handler synchronously. If
+ // that handler calls `.remove()` on the element, the data is cleared,
+ // leaving `result` undefined. We need to guard against this.
+ return result && result.value;
}
// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5821,34 +5828,7 @@ jQuery.each( {
targetTouches: true,
toElement: true,
touches: true,
-
- which: function( event ) {
- var button = event.button;
-
- // Add which for key events
- if ( event.which == null && rkeyEvent.test( event.type ) ) {
- return event.charCode != null ? event.charCode : event.keyCode;
- }
-
- // Add which for click: 1 === left; 2 === middle; 3 === right
- if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
- if ( button & 1 ) {
- return 1;
- }
-
- if ( button & 2 ) {
- return 3;
- }
-
- if ( button & 4 ) {
- return 2;
- }
-
- return 0;
- }
-
- return event.which;
- }
+ which: true
}, jQuery.event.addProp );
jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
@@ -5874,6 +5854,12 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
return true;
},
+ // Suppress native focus or blur as it's already being fired
+ // in leverageNative.
+ _default: function() {
+ return true;
+ },
+
delegateType: delegateType
};
} );
@@ -6541,6 +6527,10 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
// set in CSS while `offset*` properties report correct values.
// Behavior in IE 9 is more subtle than in newer versions & it passes
// some versions of this test; make sure not to make it pass there!
+ //
+ // Support: Firefox 70+
+ // Only Firefox includes border widths
+ // in computed dimensions. (gh-4529)
reliableTrDimensions: function() {
var table, tr, trChild, trStyle;
if ( reliableTrDimensionsVal == null ) {
@@ -6548,17 +6538,32 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
tr = document.createElement( "tr" );
trChild = document.createElement( "div" );
- table.style.cssText = "position:absolute;left:-11111px";
+ table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
+ tr.style.cssText = "border:1px solid";
+
+ // Support: Chrome 86+
+ // Height set through cssText does not get applied.
+ // Computed height then comes back as 0.
tr.style.height = "1px";
trChild.style.height = "9px";
+ // Support: Android 8 Chrome 86+
+ // In our bodyBackground.html iframe,
+ // display for all div elements is set to "inline",
+ // which causes a problem only in Android 8 Chrome 86.
+ // Ensuring the div is display: block
+ // gets around this issue.
+ trChild.style.display = "block";
+
documentElement
.appendChild( table )
.appendChild( tr )
.appendChild( trChild );
trStyle = window.getComputedStyle( tr );
- reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+ reliableTrDimensionsVal = ( parseInt( trStyle.height, 10 ) +
+ parseInt( trStyle.borderTopWidth, 10 ) +
+ parseInt( trStyle.borderBottomWidth, 10 ) ) === tr.offsetHeight;
documentElement.removeChild( table );
}
@@ -7022,10 +7027,10 @@ jQuery.each( [ "height", "width" ], function( _i, dimension ) {
// Running getBoundingClientRect on a disconnected node
// in IE throws an error.
( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
- swap( elem, cssShow, function() {
- return getWidthOrHeight( elem, dimension, extra );
- } ) :
- getWidthOrHeight( elem, dimension, extra );
+ swap( elem, cssShow, function() {
+ return getWidthOrHeight( elem, dimension, extra );
+ } ) :
+ getWidthOrHeight( elem, dimension, extra );
}
},
@@ -7084,7 +7089,7 @@ jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
swap( elem, { marginLeft: 0 }, function() {
return elem.getBoundingClientRect().left;
} )
- ) + "px";
+ ) + "px";
}
}
);
@@ -7223,7 +7228,7 @@ Tween.propHooks = {
if ( jQuery.fx.step[ tween.prop ] ) {
jQuery.fx.step[ tween.prop ]( tween );
} else if ( tween.elem.nodeType === 1 && (
- jQuery.cssHooks[ tween.prop ] ||
+ jQuery.cssHooks[ tween.prop ] ||
tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
} else {
@@ -7468,7 +7473,7 @@ function defaultPrefilter( elem, props, opts ) {
anim.done( function() {
- /* eslint-enable no-loop-func */
+ /* eslint-enable no-loop-func */
// The final step of a "hide" animation is actually hiding the element
if ( !hidden ) {
@@ -7588,7 +7593,7 @@ function Animation( elem, properties, options ) {
tweens: [],
createTween: function( prop, end ) {
var tween = jQuery.Tween( elem, animation.opts, prop, end,
- animation.opts.specialEasing[ prop ] || animation.opts.easing );
+ animation.opts.specialEasing[ prop ] || animation.opts.easing );
animation.tweens.push( tween );
return tween;
},
@@ -7761,7 +7766,8 @@ jQuery.fn.extend( {
anim.stop( true );
}
};
- doAnimation.finish = doAnimation;
+
+ doAnimation.finish = doAnimation;
return empty || optall.queue === false ?
this.each( doAnimation ) :
@@ -8401,8 +8407,8 @@ jQuery.fn.extend( {
if ( this.setAttribute ) {
this.setAttribute( "class",
className || value === false ?
- "" :
- dataPriv.get( this, "__className__" ) || ""
+ "" :
+ dataPriv.get( this, "__className__" ) || ""
);
}
}
@@ -8417,7 +8423,7 @@ jQuery.fn.extend( {
while ( ( elem = this[ i++ ] ) ) {
if ( elem.nodeType === 1 &&
( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
- return true;
+ return true;
}
}
@@ -8707,9 +8713,7 @@ jQuery.extend( jQuery.event, {
special.bindType || type;
// jQuery handler
- handle = (
- dataPriv.get( cur, "events" ) || Object.create( null )
- )[ event.type ] &&
+ handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] &&
dataPriv.get( cur, "handle" );
if ( handle ) {
handle.apply( cur, data );
@@ -8856,7 +8860,7 @@ var rquery = ( /\?/ );
// Cross-browser xml parsing
jQuery.parseXML = function( data ) {
- var xml;
+ var xml, parserErrorElem;
if ( !data || typeof data !== "string" ) {
return null;
}
@@ -8865,12 +8869,17 @@ jQuery.parseXML = function( data ) {
// IE throws on parseFromString with invalid input.
try {
xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
- } catch ( e ) {
- xml = undefined;
- }
+ } catch ( e ) {}
- if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
- jQuery.error( "Invalid XML: " + data );
+ parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
+ if ( !xml || parserErrorElem ) {
+ jQuery.error( "Invalid XML: " + (
+ parserErrorElem ?
+ jQuery.map( parserErrorElem.childNodes, function( el ) {
+ return el.textContent;
+ } ).join( "\n" ) :
+ data
+ ) );
}
return xml;
};
@@ -8971,16 +8980,14 @@ jQuery.fn.extend( {
// Can add propHook for "elements" to filter or add form elements
var elements = jQuery.prop( this, "elements" );
return elements ? jQuery.makeArray( elements ) : this;
- } )
- .filter( function() {
+ } ).filter( function() {
var type = this.type;
// Use .is( ":disabled" ) so that fieldset[disabled] works
return this.name && !jQuery( this ).is( ":disabled" ) &&
rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
( this.checked || !rcheckableType.test( type ) );
- } )
- .map( function( _i, elem ) {
+ } ).map( function( _i, elem ) {
var val = jQuery( this ).val();
if ( val == null ) {
@@ -9033,7 +9040,8 @@ var
// Anchor tag for parsing the document origin
originAnchor = document.createElement( "a" );
- originAnchor.href = location.href;
+
+originAnchor.href = location.href;
// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
function addToPrefiltersOrTransports( structure ) {
@@ -9414,8 +9422,8 @@ jQuery.extend( {
// Context for global events is callbackContext if it is a DOM node or jQuery collection
globalEventContext = s.context &&
( callbackContext.nodeType || callbackContext.jquery ) ?
- jQuery( callbackContext ) :
- jQuery.event,
+ jQuery( callbackContext ) :
+ jQuery.event,
// Deferreds
deferred = jQuery.Deferred(),
@@ -9727,8 +9735,10 @@ jQuery.extend( {
response = ajaxHandleResponses( s, jqXHR, responses );
}
- // Use a noop converter for missing script
- if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+ // Use a noop converter for missing script but not if jsonp
+ if ( !isSuccess &&
+ jQuery.inArray( "script", s.dataTypes ) > -1 &&
+ jQuery.inArray( "json", s.dataTypes ) < 0 ) {
s.converters[ "text script" ] = function() {};
}
@@ -10466,12 +10476,6 @@ jQuery.offset = {
options.using.call( elem, props );
} else {
- if ( typeof props.top === "number" ) {
- props.top += "px";
- }
- if ( typeof props.left === "number" ) {
- props.left += "px";
- }
curElem.css( props );
}
}
@@ -10640,8 +10644,11 @@ jQuery.each( [ "top", "left" ], function( _i, prop ) {
// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
- jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
- function( defaultExtra, funcName ) {
+ jQuery.each( {
+ padding: "inner" + name,
+ content: type,
+ "": "outer" + name
+ }, function( defaultExtra, funcName ) {
// Margin is only for outerHeight, outerWidth
jQuery.fn[ funcName ] = function( margin, value ) {
@@ -10726,7 +10733,8 @@ jQuery.fn.extend( {
}
} );
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+jQuery.each(
+ ( "blur focus focusin focusout resize scroll click dblclick " +
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
function( _i, name ) {
@@ -10737,7 +10745,8 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
this.on( name, null, data, fn ) :
this.trigger( name );
};
- } );
+ }
+);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.js
new file mode 100644
index 0000000..c4c6022
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l= [...]
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.map b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.map
new file mode 100644
index 0000000..7661330
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-3.6.0.min.map
@@ -0,0 +1 @@
+{"version":3,"sources":["jquery-3.6.0.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","item","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val"," [...]
[myfaces-tobago] 05/32: cherrypick from 2.x: build: CVE fix
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b821e137e0881d267b1a018e6e9d99a3d10bdd2d
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon Dec 13 10:29:21 2021 +0100
cherrypick from 2.x: build: CVE fix
also cleanup some unused
* update log4j 2
---
pom.xml | 7 +------
.../tobago-example-addressbook-cdi/pom.xml | 21 ---------------------
tobago-example/tobago-example-addressbook/pom.xml | 21 ---------------------
3 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index f0eae40..f31220a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<mojarra22.version>2.2.16</mojarra22.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
- <log4j.version>2.13.3</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<commons-io.version>2.8.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.1.1</commons-logging.version>
@@ -493,11 +493,6 @@
<version>1.4</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
diff --git a/tobago-example/tobago-example-addressbook-cdi/pom.xml b/tobago-example/tobago-example-addressbook-cdi/pom.xml
index e013f8a..8954c18 100644
--- a/tobago-example/tobago-example-addressbook-cdi/pom.xml
+++ b/tobago-example/tobago-example-addressbook-cdi/pom.xml
@@ -65,27 +65,6 @@
<stopKey>stopKey</stopKey>
<stopPort>9999</stopPort>
</configuration>
- <dependencies>
- <!--
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- <type>jar</type>
- </dependency>-->
- <!--dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.0.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <type>jar</type>
- </dependency-->
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/tobago-example/tobago-example-addressbook/pom.xml b/tobago-example/tobago-example-addressbook/pom.xml
index 3621a5e..578e441 100644
--- a/tobago-example/tobago-example-addressbook/pom.xml
+++ b/tobago-example/tobago-example-addressbook/pom.xml
@@ -59,27 +59,6 @@
<stopKey>stopKey</stopKey>
<stopPort>9999</stopPort>
</configuration>
- <dependencies>
- <!--
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- <type>jar</type>
- </dependency>-->
- <!--dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.0.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <type>jar</type>
- </dependency-->
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[myfaces-tobago] 16/32: cherrypick from 2.x: build(deps): bump maven-install-plugin from 2.3.1 to 2.5.2
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit e78371c8c7a5a41b118c78b1dffd4143cd866f4e
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Feb 7 16:33:23 2022 +0000
cherrypick from 2.x: build(deps): bump maven-install-plugin from 2.3.1 to 2.5.2
Bumps maven-install-plugin from 2.3.1 to 2.5.2.
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-install-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8ffa9b1..9d7b036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -956,7 +956,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[myfaces-tobago] 27/32: cherrypick from 2.x: chore: Update jQuery UI to 1.13.1
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 8407adbdba2ce2134c0468dc83ed4a50efc0510e
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 13:02:09 2022 +0100
cherrypick from 2.x: chore: Update jQuery UI to 1.13.1
this file is autogenerated
issue: TOBAGO-2109
---
.../style/contrib/ui-lightness/jquery-ui-1.13.1.custom.min.css | 7 -------
1 file changed, 7 deletions(-)
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/jquery-ui-1.13.1.custom.min.css b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/jquery-ui-1.13.1.custom.min.css
deleted file mode 100644
index e3bf876..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/ui-lightness/jquery-ui-1.13.1.custom.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.13.1 - 2022-02-09
-* http://jqueryui.com
-* Includes: draggable.css, core.css, datepicker.css, slider.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=ui-lightness&cornerRadiusShadow=5px&offsetLeftShadow=-5px&offsetTopShadow=-5px&thicknessShadow=5px&opacityShadow=20&bgImgOpacityShadow=10&bgTextureShadow=flat&bgColorShadow=000000&opacityOverlay=50&bgImgOpacityOverlay=20&bgTextureOverlay=diagonals_thick&bgColorOverlay=666666&iconColorError=ffd27a&fcError=ffffff&borderColorError=cd0a0a&bgImgOpacityError=18&bgTextureError=diagonals_thick&bgColorError= [...]
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui [...]
[myfaces-tobago] 03/32: cherrypick from 2.x: build: CVE fix
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit dbcdbe7bb5c95b9a9516389ef33ee0740193c25e
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon Sep 20 08:37:35 2021 +0200
cherrypick from 2.x: build: CVE fix
* update commons-compress
---
tobago-tool/tobago-theme-plugin/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tobago-tool/tobago-theme-plugin/pom.xml b/tobago-tool/tobago-theme-plugin/pom.xml
index ecd33fd..18e997f 100644
--- a/tobago-tool/tobago-theme-plugin/pom.xml
+++ b/tobago-tool/tobago-theme-plugin/pom.xml
@@ -68,6 +68,11 @@
<artifactId>plexus-compiler-api</artifactId>
<version>1.5.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.21</version>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
[myfaces-tobago] 07/32: cherrypick from 2.x: build: update dependencies
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 1596a7bbaeb0fee41e0eea7de79258db836f0447
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Jan 4 10:38:55 2022 +0100
cherrypick from 2.x: build: update dependencies
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 010601a..2a0e8bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<mojarra21.version>2.1.29-08</mojarra21.version>
<mojarra22.version>2.2.16</mojarra22.version>
<slf4j.version>1.7.30</slf4j.version>
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.2.10</logback.version>
<log4j.version>2.17.1</log4j.version>
<commons-io.version>2.8.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
@@ -55,7 +55,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <checkstyle-rules.version>15-SNAPSHOT</checkstyle-rules.version>
+ <checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
@@ -1049,7 +1049,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>6.1.6</version>
+ <version>6.5.1</version>
<configuration>
<failBuildOnCVSS>0</failBuildOnCVSS>
<suppressionFile>tobago/dependency-check-suppression-for-tobago-2.x.xml</suppressionFile>
[myfaces-tobago] 10/32: cherrypick from 2.x: chore: add .editorconfig file
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit e7465a00eee3d927f019c4729df576153c80a393
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Jan 26 15:15:35 2022 +0100
cherrypick from 2.x: chore: add .editorconfig file
---
.editorconfig | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..58be185
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
[myfaces-tobago] 15/32: cherrypick from 2.x: build(deps): bump maven-plugin-plugin from 2.4.1 to 3.6.4
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 7497b34d0060e6261257e741116ee5a3f97ad3de
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 2 16:41:00 2022 +0000
cherrypick from 2.x: build(deps): bump maven-plugin-plugin from 2.4.1 to 3.6.4
Bumps [maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 2.4.1 to 3.6.4.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-2.4.1...maven-plugin-tools-3.6.4)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
tobago-tool/tobago-theme-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tobago-tool/tobago-theme-plugin/pom.xml b/tobago-tool/tobago-theme-plugin/pom.xml
index 18e997f..c07e575 100644
--- a/tobago-tool/tobago-theme-plugin/pom.xml
+++ b/tobago-tool/tobago-theme-plugin/pom.xml
@@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.4.1</version>
+ <version>3.6.4</version>
</plugin>
</plugins>
</pluginManagement>
[myfaces-tobago] 04/32: cherrypick from 2.x: build: CVE fix
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit a8d5fe66835c2307fd160c6bc397e965bf0c21e3
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon Sep 20 09:02:49 2021 +0200
cherrypick from 2.x: build: CVE fix
* update jsoup
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7b9d648..f0eae40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,7 +536,7 @@
<!-- jsoup HTML parser library -->
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.11.2</version>
+ <version>1.14.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.maven-taglib</groupId>
[myfaces-tobago] 20/32: cherrypick from 2.x: build: fix
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 8c375f8b783e8f5df211f5b35ea5ff35302138b1
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 9 12:50:01 2022 +0100
cherrypick from 2.x: build: fix
---
.../example/demo/MultiplePageDeclarationLanguageNavigationHandler.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
index a329be2..5806034 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
@@ -47,7 +47,6 @@ public class MultiplePageDeclarationLanguageNavigationHandler extends Navigation
public void handleNavigation(
final FacesContext facesContext, final String fromAction, final String outcomeParameter) {
- final String original = outcome;
String outcome = outcomeParameter;
if (outcome != null) {
@@ -74,7 +73,7 @@ public class MultiplePageDeclarationLanguageNavigationHandler extends Navigation
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Original outcome='" + original + "', adjusted outcome = '" + outcome + "'");
+ LOG.debug("Original outcome='" + outcomeParameter + "', adjusted outcome = '" + outcome + "'");
}
if (StringUtils.startsWith(outcome, "/content/")) {
[myfaces-tobago] 12/32: cherrypick from 2.x: build: update some lib versions
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 0a30f09b40a22602c9efa211853122b80342e80e
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 2 16:52:40 2022 +0100
cherrypick from 2.x: build: update some lib versions
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 952e7ee..574b1de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
<!-- jsoup HTML parser library -->
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.14.2</version>
+ <version>1.14.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.maven-taglib</groupId>
[myfaces-tobago] 06/32: cherrypick from 2.x: fix: CVE
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit f667af2690728a035ceeec5983eab089138ca119
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Jan 4 10:01:33 2022 +0100
cherrypick from 2.x: fix: CVE
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f31220a..010601a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<mojarra22.version>2.2.16</mojarra22.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
- <log4j.version>2.15.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<commons-io.version>2.8.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.1.1</commons-logging.version>
[myfaces-tobago] 17/32: cherrypick from 2.x: chore: update antrun plugin
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 6f435bed54030b3e565e1253d20f0af81ab43ae9
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 9 11:20:04 2022 +0100
cherrypick from 2.x: chore: update antrun plugin
---
pom.xml | 2 +-
tobago-theme/tobago-theme-scarborough/pom.xml | 4 ++--
tobago-theme/tobago-theme-standard/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9d7b036..43e3185 100644
--- a/pom.xml
+++ b/pom.xml
@@ -966,7 +966,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.8</version>
</plugin>
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
diff --git a/tobago-theme/tobago-theme-scarborough/pom.xml b/tobago-theme/tobago-theme-scarborough/pom.xml
index d9b9e62..5e2ca3f 100644
--- a/tobago-theme/tobago-theme-scarborough/pom.xml
+++ b/tobago-theme/tobago-theme-scarborough/pom.xml
@@ -35,13 +35,13 @@
<childDelegation>true</childDelegation>
<excludes>
<exclude>**/DateUnitTest*</exclude>
- <exclude>**/GridLayoutUnitTest*</exclude>
+ <exclude>**/GridLayoutUnitTest*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
<executions>
<execution>
<id>strip-javascript</id>
diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index b2ca041..83a09b7 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -29,7 +29,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
<executions>
<execution>
<id>strip-javascript</id>
[myfaces-tobago] 11/32: cherrypick from 2.x: chore: add .editorconfig file
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 41745daa96e9d3e7f73b39d19a72cfd2055bb687
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Jan 26 15:56:32 2022 +0100
cherrypick from 2.x: chore: add .editorconfig file
* add apache header
---
.editorconfig | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/.editorconfig b/.editorconfig
index 58be185..951bba9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# editorconfig.org
root = true
[myfaces-tobago] 14/32: cherrypick from 2.x: build(deps): bump maven-surefire-plugin from 2.9 to 2.22.2
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit f41b5937467c6086ff6ed0d8d772a28ccae09a19
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 2 16:38:17 2022 +0000
cherrypick from 2.x: build(deps): bump maven-surefire-plugin from 2.9 to 2.22.2
Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.9 to 2.22.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.9...surefire-2.22.2)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1f09678..8ffa9b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -884,7 +884,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
+ <version>2.22.2</version>
<configuration>
<!--
<childDelegation>false</childDelegation>
[myfaces-tobago] 23/32: cherrypick from 2.x: chore: Update jQuery UI to 1.13.1
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b3f7225e4d52948cf44ae75d9f84436c02aa317e
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 10:52:04 2022 +0100
cherrypick from 2.x: chore: Update jQuery UI to 1.13.1
issue: TOBAGO-2109
---
.../src/main/resources/META-INF/tobago-config.xml | 8 +-
.../script/contrib/jquery-ui-1.10.4.custom.js | 5102 -----------------
.../script/contrib/jquery-ui-1.10.4.custom.min.js | 7 -
.../script/contrib/jquery-ui-1.10.4.custom_af.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ar.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_ar_DZ.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_az.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_be.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_bg.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_bs.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ca.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_cs.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_cy.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_de.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_el.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_en_AU.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_en_GB.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_en_NZ.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_eo.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_es.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_et.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_eu.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_fa.js | 59 -
.../script/contrib/jquery-ui-1.10.4.custom_fi.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_fo.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_fr.js | 25 -
.../contrib/jquery-ui-1.10.4.custom_fr_CA.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_fr_CH.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_gl.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_he.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hi.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hr.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hu.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_hy.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_id.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_is.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_it.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ja.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ka.js | 21 -
.../script/contrib/jquery-ui-1.10.4.custom_kk.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_km.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ko.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ky.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_lb.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_lt.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_lv.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_mk.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ml.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ms.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_nb.js | 22 -
.../script/contrib/jquery-ui-1.10.4.custom_nl.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_nl_BE.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_nn.js | 22 -
.../script/contrib/jquery-ui-1.10.4.custom_no.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_pl.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_pt.js | 22 -
.../contrib/jquery-ui-1.10.4.custom_pt_BR.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_rm.js | 21 -
.../script/contrib/jquery-ui-1.10.4.custom_ro.js | 26 -
.../script/contrib/jquery-ui-1.10.4.custom_ru.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sk.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sl.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_sq.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sr.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_sr_SR.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_sv.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_ta.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_th.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_tj.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_tr.js | 23 -
.../script/contrib/jquery-ui-1.10.4.custom_uk.js | 24 -
.../script/contrib/jquery-ui-1.10.4.custom_vi.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_zh_HK.js | 23 -
.../contrib/jquery-ui-1.10.4.custom_zh_TW.js | 23 -
.../script/contrib/jquery-ui-1.13.1.custom.js | 5928 ++++++++++++++++++++
.../script/contrib/jquery-ui-1.13.1.custom.min.js | 6 +
.../script/contrib/jquery-ui-1.13.1.custom_af.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ar.js | 42 +
.../contrib/jquery-ui-1.13.1.custom_ar_DZ.js | 42 +
.../script/contrib/jquery-ui-1.13.1.custom_az.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_be.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_bg.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_bs.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ca.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_cs.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_cy.js | 48 +
....custom_da.js => jquery-ui-1.13.1.custom_da.js} | 0
.../script/contrib/jquery-ui-1.13.1.custom_de.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_de_AT.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_el.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_en_AU.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_en_GB.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_en_NZ.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_eo.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_es.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_et.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_eu.js | 39 +
.../script/contrib/jquery-ui-1.13.1.custom_fa.js | 76 +
.../script/contrib/jquery-ui-1.13.1.custom_fi.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_fo.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_fr.js | 42 +
.../contrib/jquery-ui-1.13.1.custom_fr_CA.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_fr_CH.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_gl.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_he.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_hi.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_hr.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_hu.js | 39 +
.../script/contrib/jquery-ui-1.13.1.custom_hy.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_id.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_is.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_it.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_it_CH.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ja.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ka.js | 51 +
.../script/contrib/jquery-ui-1.13.1.custom_kk.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_km.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ko.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ky.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_lb.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_lt.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_lv.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_mk.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ml.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ms.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_nb.js | 52 +
.../script/contrib/jquery-ui-1.13.1.custom_nl.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_nl_BE.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_nn.js | 52 +
.../script/contrib/jquery-ui-1.13.1.custom_no.js | 53 +
.../script/contrib/jquery-ui-1.13.1.custom_pl.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_pt.js | 47 +
.../contrib/jquery-ui-1.13.1.custom_pt_BR.js | 48 +
.../script/contrib/jquery-ui-1.13.1.custom_rm.js | 64 +
.../script/contrib/jquery-ui-1.13.1.custom_ro.js | 43 +
.../script/contrib/jquery-ui-1.13.1.custom_ru.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sk.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sl.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_sq.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sr.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_sr_SR.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_sv.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_ta.js | 56 +
.../script/contrib/jquery-ui-1.13.1.custom_th.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_tj.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_tr.js | 40 +
.../script/contrib/jquery-ui-1.13.1.custom_uk.js | 41 +
.../script/contrib/jquery-ui-1.13.1.custom_vi.js | 40 +
....custom_zh.js => jquery-ui-1.13.1.custom_zh.js} | 0
.../contrib/jquery-ui-1.13.1.custom_zh_CN.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_zh_HK.js | 40 +
.../contrib/jquery-ui-1.13.1.custom_zh_TW.js | 40 +
.../ui-lightness/images/animated-overlay.gif | Bin 1738 -> 0 bytes
.../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 418 -> 476 bytes
.../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 312 -> 384 bytes
.../images/ui-bg_flat_10_000000_40x100.png | Bin 205 -> 0 bytes
.../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 262 -> 324 bytes
.../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 348 -> 406 bytes
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 265 bytes
.../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 5815 -> 5873 bytes
.../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 278 -> 342 bytes
.../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 328 -> 386 bytes
.../images/ui-icons_222222_256x240.png | Bin 6922 -> 7025 bytes
.../images/ui-icons_228ef1_256x240.png | Bin 4549 -> 4618 bytes
.../images/ui-icons_ef8c08_256x240.png | Bin 4549 -> 4618 bytes
.../images/ui-icons_ffd27a_256x240.png | Bin 4549 -> 4618 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 6299 -> 6487 bytes
.../ui-lightness/jquery-ui-1.10.4.custom.min.css | 7 -
...10.4.custom.css => jquery-ui-1.13.1.custom.css} | 562 +-
.../ui-lightness/jquery-ui-1.13.1.custom.min.css | 7 +
.../origin/external/prepare-jquery-ui-resources.sh | 6 +-
171 files changed, 9424 insertions(+), 7047 deletions(-)
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index bb1a62f..7f933e2 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -400,11 +400,11 @@
</renderers>
<resources production="true">
<script priority="10" name="script/contrib/jquery-3.5.1.js"/>
- <script priority="20" name="script/contrib/jquery-ui-1.10.4.custom.js"/>
+ <script priority="20" name="script/contrib/jquery-ui-1.13.1.custom.js"/>
<script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
<script priority="35" name="script/contrib/select2/select2.full.js"/>
<script priority="40" name="script/tobago.js"/>
- <style priority="10" name="style/contrib/ui-lightness/jquery-ui-1.10.4.custom.css"/>
+ <style priority="10" name="style/contrib/ui-lightness/jquery-ui-1.13.1.custom.css"/>
<style priority="20" name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
<style priority="25" name="style/contrib/select2/select2.css"/>
<style priority="30" name="style/tobago.css"/>
@@ -413,7 +413,7 @@
</resources>
<resources production="false">
<script priority="10" name="script/contrib/jquery-3.5.1.js"/>
- <script priority="20" name="script/contrib/jquery-ui-1.10.4.custom.js"/>
+ <script priority="20" name="script/contrib/jquery-ui-1.13.1.custom.js"/>
<script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
<script priority="35" name="script/contrib/select2/select2.full.js"/>
<script priority="40" name="script/tobago.js"/>
@@ -433,7 +433,7 @@
<script priority="160" name="script/tobago-tree.js"/>
<script priority="170" name="script/tobago-utils.js"/>
<script priority="180" name="script/tobago-logging.js"/>
- <style priority="10" name="style/contrib/ui-lightness/jquery-ui-1.10.4.custom.css"/>
+ <style priority="10" name="style/contrib/ui-lightness/jquery-ui-1.13.1.custom.css"/>
<style priority="20" name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
<style priority="25" name="style/contrib/select2/select2.css"/>
<style priority="30" name="style/tobago.css"/>
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.js
deleted file mode 100755
index 236c19e..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.js
+++ /dev/null
@@ -1,5102 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-07-03
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.datepicker.js, jquery.ui.slider.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( $, undefined ) {
-
-var uuid = 0,
- runiqueId = /^ui-id-\d+$/;
-
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
-$.ui = $.ui || {};
-
-$.extend( $.ui, {
- version: "1.10.4",
-
- keyCode: {
- BACKSPACE: 8,
- COMMA: 188,
- DELETE: 46,
- DOWN: 40,
- END: 35,
- ENTER: 13,
- ESCAPE: 27,
- HOME: 36,
- LEFT: 37,
- NUMPAD_ADD: 107,
- NUMPAD_DECIMAL: 110,
- NUMPAD_DIVIDE: 111,
- NUMPAD_ENTER: 108,
- NUMPAD_MULTIPLY: 106,
- NUMPAD_SUBTRACT: 109,
- PAGE_DOWN: 34,
- PAGE_UP: 33,
- PERIOD: 190,
- RIGHT: 39,
- SPACE: 32,
- TAB: 9,
- UP: 38
- }
-});
-
-// plugins
-$.fn.extend({
- focus: (function( orig ) {
- return function( delay, fn ) {
- return typeof delay === "number" ?
- this.each(function() {
- var elem = this;
- setTimeout(function() {
- $( elem ).focus();
- if ( fn ) {
- fn.call( elem );
- }
- }, delay );
- }) :
- orig.apply( this, arguments );
- };
- })( $.fn.focus ),
-
- scrollParent: function() {
- var scrollParent;
- if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) {
- scrollParent = this.parents().filter(function() {
- return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
- }).eq(0);
- } else {
- scrollParent = this.parents().filter(function() {
- return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
- }).eq(0);
- }
-
- return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent;
- },
-
- zIndex: function( zIndex ) {
- if ( zIndex !== undefined ) {
- return this.css( "zIndex", zIndex );
- }
-
- if ( this.length ) {
- var elem = $( this[ 0 ] ), position, value;
- while ( elem.length && elem[ 0 ] !== document ) {
- // Ignore z-index if position is set to a value where z-index is ignored by the browser
- // This makes behavior of this function consistent across browsers
- // WebKit always returns auto if the element is positioned
- position = elem.css( "position" );
- if ( position === "absolute" || position === "relative" || position === "fixed" ) {
- // IE returns 0 when zIndex is not specified
- // other browsers return a string
- // we ignore the case of nested elements with an explicit value of 0
- // <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
- value = parseInt( elem.css( "zIndex" ), 10 );
- if ( !isNaN( value ) && value !== 0 ) {
- return value;
- }
- }
- elem = elem.parent();
- }
- }
-
- return 0;
- },
-
- uniqueId: function() {
- return this.each(function() {
- if ( !this.id ) {
- this.id = "ui-id-" + (++uuid);
- }
- });
- },
-
- removeUniqueId: function() {
- return this.each(function() {
- if ( runiqueId.test( this.id ) ) {
- $( this ).removeAttr( "id" );
- }
- });
- }
-});
-
-// selectors
-function focusable( element, isTabIndexNotNaN ) {
- var map, mapName, img,
- nodeName = element.nodeName.toLowerCase();
- if ( "area" === nodeName ) {
- map = element.parentNode;
- mapName = map.name;
- if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
- return false;
- }
- img = $( "img[usemap=#" + mapName + "]" )[0];
- return !!img && visible( img );
- }
- return ( /input|select|textarea|button|object/.test( nodeName ) ?
- !element.disabled :
- "a" === nodeName ?
- element.href || isTabIndexNotNaN :
- isTabIndexNotNaN) &&
- // the element and all of its ancestors must be visible
- visible( element );
-}
-
-function visible( element ) {
- return $.expr.filters.visible( element ) &&
- !$( element ).parents().addBack().filter(function() {
- return $.css( this, "visibility" ) === "hidden";
- }).length;
-}
-
-$.extend( $.expr[ ":" ], {
- data: $.expr.createPseudo ?
- $.expr.createPseudo(function( dataName ) {
- return function( elem ) {
- return !!$.data( elem, dataName );
- };
- }) :
- // support: jQuery <1.8
- function( elem, i, match ) {
- return !!$.data( elem, match[ 3 ] );
- },
-
- focusable: function( element ) {
- return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
- },
-
- tabbable: function( element ) {
- var tabIndex = $.attr( element, "tabindex" ),
- isTabIndexNaN = isNaN( tabIndex );
- return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
- }
-});
-
-// support: jQuery <1.8
-if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
- $.each( [ "Width", "Height" ], function( i, name ) {
- var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
- type = name.toLowerCase(),
- orig = {
- innerWidth: $.fn.innerWidth,
- innerHeight: $.fn.innerHeight,
- outerWidth: $.fn.outerWidth,
- outerHeight: $.fn.outerHeight
- };
-
- function reduce( elem, size, border, margin ) {
- $.each( side, function() {
- size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
- if ( border ) {
- size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
- }
- if ( margin ) {
- size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
- }
- });
- return size;
- }
-
- $.fn[ "inner" + name ] = function( size ) {
- if ( size === undefined ) {
- return orig[ "inner" + name ].call( this );
- }
-
- return this.each(function() {
- $( this ).css( type, reduce( this, size ) + "px" );
- });
- };
-
- $.fn[ "outer" + name] = function( size, margin ) {
- if ( typeof size !== "number" ) {
- return orig[ "outer" + name ].call( this, size );
- }
-
- return this.each(function() {
- $( this).css( type, reduce( this, size, true, margin ) + "px" );
- });
- };
- });
-}
-
-// support: jQuery <1.8
-if ( !$.fn.addBack ) {
- $.fn.addBack = function( selector ) {
- return this.add( selector == null ?
- this.prevObject : this.prevObject.filter( selector )
- );
- };
-}
-
-// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
-if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
- $.fn.removeData = (function( removeData ) {
- return function( key ) {
- if ( arguments.length ) {
- return removeData.call( this, $.camelCase( key ) );
- } else {
- return removeData.call( this );
- }
- };
- })( $.fn.removeData );
-}
-
-
-
-
-
-// deprecated
-$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
-$.support.selectstart = "onselectstart" in document.createElement( "div" );
-$.fn.extend({
- disableSelection: function() {
- return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
- ".ui-disableSelection", function( event ) {
- event.preventDefault();
- });
- },
-
- enableSelection: function() {
- return this.unbind( ".ui-disableSelection" );
- }
-});
-
-$.extend( $.ui, {
- // $.ui.plugin is deprecated. Use $.widget() extensions instead.
- plugin: {
- add: function( module, option, set ) {
- var i,
- proto = $.ui[ module ].prototype;
- for ( i in set ) {
- proto.plugins[ i ] = proto.plugins[ i ] || [];
- proto.plugins[ i ].push( [ option, set[ i ] ] );
- }
- },
- call: function( instance, name, args ) {
- var i,
- set = instance.plugins[ name ];
- if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
- return;
- }
-
- for ( i = 0; i < set.length; i++ ) {
- if ( instance.options[ set[ i ][ 0 ] ] ) {
- set[ i ][ 1 ].apply( instance.element, args );
- }
- }
- }
- },
-
- // only used by resizable
- hasScroll: function( el, a ) {
-
- //If overflow is hidden, the element might have extra content, but the user wants to hide it
- if ( $( el ).css( "overflow" ) === "hidden") {
- return false;
- }
-
- var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
- has = false;
-
- if ( el[ scroll ] > 0 ) {
- return true;
- }
-
- // TODO: determine which cases actually cause this to happen
- // if the element doesn't have the scroll set, see if it's possible to
- // set the scroll
- el[ scroll ] = 1;
- has = ( el[ scroll ] > 0 );
- el[ scroll ] = 0;
- return has;
- }
-});
-
-})( jQuery );
-(function( $, undefined ) {
-
-var uuid = 0,
- slice = Array.prototype.slice,
- _cleanData = $.cleanData;
-$.cleanData = function( elems ) {
- for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
- try {
- $( elem ).triggerHandler( "remove" );
- // http://bugs.jquery.com/ticket/8235
- } catch( e ) {}
- }
- _cleanData( elems );
-};
-
-$.widget = function( name, base, prototype ) {
- var fullName, existingConstructor, constructor, basePrototype,
- // proxiedPrototype allows the provided prototype to remain unmodified
- // so that it can be used as a mixin for multiple widgets (#8876)
- proxiedPrototype = {},
- namespace = name.split( "." )[ 0 ];
-
- name = name.split( "." )[ 1 ];
- fullName = namespace + "-" + name;
-
- if ( !prototype ) {
- prototype = base;
- base = $.Widget;
- }
-
- // create selector for plugin
- $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
- return !!$.data( elem, fullName );
- };
-
- $[ namespace ] = $[ namespace ] || {};
- existingConstructor = $[ namespace ][ name ];
- constructor = $[ namespace ][ name ] = function( options, element ) {
- // allow instantiation without "new" keyword
- if ( !this._createWidget ) {
- return new constructor( options, element );
- }
-
- // allow instantiation without initializing for simple inheritance
- // must use "new" keyword (the code above always passes args)
- if ( arguments.length ) {
- this._createWidget( options, element );
- }
- };
- // extend with the existing constructor to carry over any static properties
- $.extend( constructor, existingConstructor, {
- version: prototype.version,
- // copy the object used to create the prototype in case we need to
- // redefine the widget later
- _proto: $.extend( {}, prototype ),
- // track widgets that inherit from this widget in case this widget is
- // redefined after a widget inherits from it
- _childConstructors: []
- });
-
- basePrototype = new base();
- // we need to make the options hash a property directly on the new instance
- // otherwise we'll modify the options hash on the prototype that we're
- // inheriting from
- basePrototype.options = $.widget.extend( {}, basePrototype.options );
- $.each( prototype, function( prop, value ) {
- if ( !$.isFunction( value ) ) {
- proxiedPrototype[ prop ] = value;
- return;
- }
- proxiedPrototype[ prop ] = (function() {
- var _super = function() {
- return base.prototype[ prop ].apply( this, arguments );
- },
- _superApply = function( args ) {
- return base.prototype[ prop ].apply( this, args );
- };
- return function() {
- var __super = this._super,
- __superApply = this._superApply,
- returnValue;
-
- this._super = _super;
- this._superApply = _superApply;
-
- returnValue = value.apply( this, arguments );
-
- this._super = __super;
- this._superApply = __superApply;
-
- return returnValue;
- };
- })();
- });
- constructor.prototype = $.widget.extend( basePrototype, {
- // TODO: remove support for widgetEventPrefix
- // always use the name + a colon as the prefix, e.g., draggable:start
- // don't prefix for widgets that aren't DOM-based
- widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
- }, proxiedPrototype, {
- constructor: constructor,
- namespace: namespace,
- widgetName: name,
- widgetFullName: fullName
- });
-
- // If this widget is being redefined then we need to find all widgets that
- // are inheriting from it and redefine all of them so that they inherit from
- // the new version of this widget. We're essentially trying to replace one
- // level in the prototype chain.
- if ( existingConstructor ) {
- $.each( existingConstructor._childConstructors, function( i, child ) {
- var childPrototype = child.prototype;
-
- // redefine the child widget using the same prototype that was
- // originally used, but inherit from the new version of the base
- $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
- });
- // remove the list of existing child constructors from the old constructor
- // so the old child constructors can be garbage collected
- delete existingConstructor._childConstructors;
- } else {
- base._childConstructors.push( constructor );
- }
-
- $.widget.bridge( name, constructor );
-};
-
-$.widget.extend = function( target ) {
- var input = slice.call( arguments, 1 ),
- inputIndex = 0,
- inputLength = input.length,
- key,
- value;
- for ( ; inputIndex < inputLength; inputIndex++ ) {
- for ( key in input[ inputIndex ] ) {
- value = input[ inputIndex ][ key ];
- if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
- // Clone objects
- if ( $.isPlainObject( value ) ) {
- target[ key ] = $.isPlainObject( target[ key ] ) ?
- $.widget.extend( {}, target[ key ], value ) :
- // Don't extend strings, arrays, etc. with objects
- $.widget.extend( {}, value );
- // Copy everything else by reference
- } else {
- target[ key ] = value;
- }
- }
- }
- }
- return target;
-};
-
-$.widget.bridge = function( name, object ) {
- var fullName = object.prototype.widgetFullName || name;
- $.fn[ name ] = function( options ) {
- var isMethodCall = typeof options === "string",
- args = slice.call( arguments, 1 ),
- returnValue = this;
-
- // allow multiple hashes to be passed on init
- options = !isMethodCall && args.length ?
- $.widget.extend.apply( null, [ options ].concat(args) ) :
- options;
-
- if ( isMethodCall ) {
- this.each(function() {
- var methodValue,
- instance = $.data( this, fullName );
- if ( !instance ) {
- return $.error( "cannot call methods on " + name + " prior to initialization; " +
- "attempted to call method '" + options + "'" );
- }
- if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
- return $.error( "no such method '" + options + "' for " + name + " widget instance" );
- }
- methodValue = instance[ options ].apply( instance, args );
- if ( methodValue !== instance && methodValue !== undefined ) {
- returnValue = methodValue && methodValue.jquery ?
- returnValue.pushStack( methodValue.get() ) :
- methodValue;
- return false;
- }
- });
- } else {
- this.each(function() {
- var instance = $.data( this, fullName );
- if ( instance ) {
- instance.option( options || {} )._init();
- } else {
- $.data( this, fullName, new object( options, this ) );
- }
- });
- }
-
- return returnValue;
- };
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
- widgetName: "widget",
- widgetEventPrefix: "",
- defaultElement: "<div>",
- options: {
- disabled: false,
-
- // callbacks
- create: null
- },
- _createWidget: function( options, element ) {
- element = $( element || this.defaultElement || this )[ 0 ];
- this.element = $( element );
- this.uuid = uuid++;
- this.eventNamespace = "." + this.widgetName + this.uuid;
- this.options = $.widget.extend( {},
- this.options,
- this._getCreateOptions(),
- options );
-
- this.bindings = $();
- this.hoverable = $();
- this.focusable = $();
-
- if ( element !== this ) {
- $.data( element, this.widgetFullName, this );
- this._on( true, this.element, {
- remove: function( event ) {
- if ( event.target === element ) {
- this.destroy();
- }
- }
- });
- this.document = $( element.style ?
- // element within the document
- element.ownerDocument :
- // element is window or document
- element.document || element );
- this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
- }
-
- this._create();
- this._trigger( "create", null, this._getCreateEventData() );
- this._init();
- },
- _getCreateOptions: $.noop,
- _getCreateEventData: $.noop,
- _create: $.noop,
- _init: $.noop,
-
- destroy: function() {
- this._destroy();
- // we can probably remove the unbind calls in 2.0
- // all event bindings should go through this._on()
- this.element
- .unbind( this.eventNamespace )
- // 1.9 BC for #7810
- // TODO remove dual storage
- .removeData( this.widgetName )
- .removeData( this.widgetFullName )
- // support: jquery <1.6.3
- // http://bugs.jquery.com/ticket/9413
- .removeData( $.camelCase( this.widgetFullName ) );
- this.widget()
- .unbind( this.eventNamespace )
- .removeAttr( "aria-disabled" )
- .removeClass(
- this.widgetFullName + "-disabled " +
- "ui-state-disabled" );
-
- // clean up events and states
- this.bindings.unbind( this.eventNamespace );
- this.hoverable.removeClass( "ui-state-hover" );
- this.focusable.removeClass( "ui-state-focus" );
- },
- _destroy: $.noop,
-
- widget: function() {
- return this.element;
- },
-
- option: function( key, value ) {
- var options = key,
- parts,
- curOption,
- i;
-
- if ( arguments.length === 0 ) {
- // don't return a reference to the internal hash
- return $.widget.extend( {}, this.options );
- }
-
- if ( typeof key === "string" ) {
- // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
- options = {};
- parts = key.split( "." );
- key = parts.shift();
- if ( parts.length ) {
- curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
- for ( i = 0; i < parts.length - 1; i++ ) {
- curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
- curOption = curOption[ parts[ i ] ];
- }
- key = parts.pop();
- if ( arguments.length === 1 ) {
- return curOption[ key ] === undefined ? null : curOption[ key ];
- }
- curOption[ key ] = value;
- } else {
- if ( arguments.length === 1 ) {
- return this.options[ key ] === undefined ? null : this.options[ key ];
- }
- options[ key ] = value;
- }
- }
-
- this._setOptions( options );
-
- return this;
- },
- _setOptions: function( options ) {
- var key;
-
- for ( key in options ) {
- this._setOption( key, options[ key ] );
- }
-
- return this;
- },
- _setOption: function( key, value ) {
- this.options[ key ] = value;
-
- if ( key === "disabled" ) {
- this.widget()
- .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
- .attr( "aria-disabled", value );
- this.hoverable.removeClass( "ui-state-hover" );
- this.focusable.removeClass( "ui-state-focus" );
- }
-
- return this;
- },
-
- enable: function() {
- return this._setOption( "disabled", false );
- },
- disable: function() {
- return this._setOption( "disabled", true );
- },
-
- _on: function( suppressDisabledCheck, element, handlers ) {
- var delegateElement,
- instance = this;
-
- // no suppressDisabledCheck flag, shuffle arguments
- if ( typeof suppressDisabledCheck !== "boolean" ) {
- handlers = element;
- element = suppressDisabledCheck;
- suppressDisabledCheck = false;
- }
-
- // no element argument, shuffle and use this.element
- if ( !handlers ) {
- handlers = element;
- element = this.element;
- delegateElement = this.widget();
- } else {
- // accept selectors, DOM elements
- element = delegateElement = $( element );
- this.bindings = this.bindings.add( element );
- }
-
- $.each( handlers, function( event, handler ) {
- function handlerProxy() {
- // allow widgets to customize the disabled handling
- // - disabled as an array instead of boolean
- // - disabled class as method for disabling individual parts
- if ( !suppressDisabledCheck &&
- ( instance.options.disabled === true ||
- $( this ).hasClass( "ui-state-disabled" ) ) ) {
- return;
- }
- return ( typeof handler === "string" ? instance[ handler ] : handler )
- .apply( instance, arguments );
- }
-
- // copy the guid so direct unbinding works
- if ( typeof handler !== "string" ) {
- handlerProxy.guid = handler.guid =
- handler.guid || handlerProxy.guid || $.guid++;
- }
-
- var match = event.match( /^(\w+)\s*(.*)$/ ),
- eventName = match[1] + instance.eventNamespace,
- selector = match[2];
- if ( selector ) {
- delegateElement.delegate( selector, eventName, handlerProxy );
- } else {
- element.bind( eventName, handlerProxy );
- }
- });
- },
-
- _off: function( element, eventName ) {
- eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
- element.unbind( eventName ).undelegate( eventName );
- },
-
- _delay: function( handler, delay ) {
- function handlerProxy() {
- return ( typeof handler === "string" ? instance[ handler ] : handler )
- .apply( instance, arguments );
- }
- var instance = this;
- return setTimeout( handlerProxy, delay || 0 );
- },
-
- _hoverable: function( element ) {
- this.hoverable = this.hoverable.add( element );
- this._on( element, {
- mouseenter: function( event ) {
- $( event.currentTarget ).addClass( "ui-state-hover" );
- },
- mouseleave: function( event ) {
- $( event.currentTarget ).removeClass( "ui-state-hover" );
- }
- });
- },
-
- _focusable: function( element ) {
- this.focusable = this.focusable.add( element );
- this._on( element, {
- focusin: function( event ) {
- $( event.currentTarget ).addClass( "ui-state-focus" );
- },
- focusout: function( event ) {
- $( event.currentTarget ).removeClass( "ui-state-focus" );
- }
- });
- },
-
- _trigger: function( type, event, data ) {
- var prop, orig,
- callback = this.options[ type ];
-
- data = data || {};
- event = $.Event( event );
- event.type = ( type === this.widgetEventPrefix ?
- type :
- this.widgetEventPrefix + type ).toLowerCase();
- // the original event may come from any element
- // so we need to reset the target on the new event
- event.target = this.element[ 0 ];
-
- // copy original event properties over to the new event
- orig = event.originalEvent;
- if ( orig ) {
- for ( prop in orig ) {
- if ( !( prop in event ) ) {
- event[ prop ] = orig[ prop ];
- }
- }
- }
-
- this.element.trigger( event, data );
- return !( $.isFunction( callback ) &&
- callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
- event.isDefaultPrevented() );
- }
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
- $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
- if ( typeof options === "string" ) {
- options = { effect: options };
- }
- var hasOptions,
- effectName = !options ?
- method :
- options === true || typeof options === "number" ?
- defaultEffect :
- options.effect || defaultEffect;
- options = options || {};
- if ( typeof options === "number" ) {
- options = { duration: options };
- }
- hasOptions = !$.isEmptyObject( options );
- options.complete = callback;
- if ( options.delay ) {
- element.delay( options.delay );
- }
- if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
- element[ method ]( options );
- } else if ( effectName !== method && element[ effectName ] ) {
- element[ effectName ]( options.duration, options.easing, callback );
- } else {
- element.queue(function( next ) {
- $( this )[ method ]();
- if ( callback ) {
- callback.call( element[ 0 ] );
- }
- next();
- });
- }
- };
-});
-
-})( jQuery );
-(function( $, undefined ) {
-
-var mouseHandled = false;
-$( document ).mouseup( function() {
- mouseHandled = false;
-});
-
-$.widget("ui.mouse", {
- version: "1.10.4",
- options: {
- cancel: "input,textarea,button,select,option",
- distance: 1,
- delay: 0
- },
- _mouseInit: function() {
- var that = this;
-
- this.element
- .bind("mousedown."+this.widgetName, function(event) {
- return that._mouseDown(event);
- })
- .bind("click."+this.widgetName, function(event) {
- if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
- $.removeData(event.target, that.widgetName + ".preventClickEvent");
- event.stopImmediatePropagation();
- return false;
- }
- });
-
- this.started = false;
- },
-
- // TODO: make sure destroying one instance of mouse doesn't mess with
- // other instances of mouse
- _mouseDestroy: function() {
- this.element.unbind("."+this.widgetName);
- if ( this._mouseMoveDelegate ) {
- $(document)
- .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
- .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
- }
- },
-
- _mouseDown: function(event) {
- // don't let more than one widget handle mouseStart
- if( mouseHandled ) { return; }
-
- // we may have missed mouseup (out of window)
- (this._mouseStarted && this._mouseUp(event));
-
- this._mouseDownEvent = event;
-
- var that = this,
- btnIsLeft = (event.which === 1),
- // event.target.nodeName works around a bug in IE 8 with
- // disabled inputs (#7620)
- elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
- if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
- return true;
- }
-
- this.mouseDelayMet = !this.options.delay;
- if (!this.mouseDelayMet) {
- this._mouseDelayTimer = setTimeout(function() {
- that.mouseDelayMet = true;
- }, this.options.delay);
- }
-
- if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
- this._mouseStarted = (this._mouseStart(event) !== false);
- if (!this._mouseStarted) {
- event.preventDefault();
- return true;
- }
- }
-
- // Click event may never have fired (Gecko & Opera)
- if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
- $.removeData(event.target, this.widgetName + ".preventClickEvent");
- }
-
- // these delegates are required to keep context
- this._mouseMoveDelegate = function(event) {
- return that._mouseMove(event);
- };
- this._mouseUpDelegate = function(event) {
- return that._mouseUp(event);
- };
- $(document)
- .bind("mousemove."+this.widgetName, this._mouseMoveDelegate)
- .bind("mouseup."+this.widgetName, this._mouseUpDelegate);
-
- event.preventDefault();
-
- mouseHandled = true;
- return true;
- },
-
- _mouseMove: function(event) {
- // IE mouseup check - mouseup happened when mouse was out of window
- if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
- return this._mouseUp(event);
- }
-
- if (this._mouseStarted) {
- this._mouseDrag(event);
- return event.preventDefault();
- }
-
- if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
- this._mouseStarted =
- (this._mouseStart(this._mouseDownEvent, event) !== false);
- (this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
- }
-
- return !this._mouseStarted;
- },
-
- _mouseUp: function(event) {
- $(document)
- .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
- .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
-
- if (this._mouseStarted) {
- this._mouseStarted = false;
-
- if (event.target === this._mouseDownEvent.target) {
- $.data(event.target, this.widgetName + ".preventClickEvent", true);
- }
-
- this._mouseStop(event);
- }
-
- return false;
- },
-
- _mouseDistanceMet: function(event) {
- return (Math.max(
- Math.abs(this._mouseDownEvent.pageX - event.pageX),
- Math.abs(this._mouseDownEvent.pageY - event.pageY)
- ) >= this.options.distance
- );
- },
-
- _mouseDelayMet: function(/* event */) {
- return this.mouseDelayMet;
- },
-
- // These are placeholder methods, to be overriden by extending plugin
- _mouseStart: function(/* event */) {},
- _mouseDrag: function(/* event */) {},
- _mouseStop: function(/* event */) {},
- _mouseCapture: function(/* event */) { return true; }
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.ui = $.ui || {};
-
-var cachedScrollbarWidth,
- max = Math.max,
- abs = Math.abs,
- round = Math.round,
- rhorizontal = /left|center|right/,
- rvertical = /top|center|bottom/,
- roffset = /[\+\-]\d+(\.[\d]+)?%?/,
- rposition = /^\w+/,
- rpercent = /%$/,
- _position = $.fn.position;
-
-function getOffsets( offsets, width, height ) {
- return [
- parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
- parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
- ];
-}
-
-function parseCss( element, property ) {
- return parseInt( $.css( element, property ), 10 ) || 0;
-}
-
-function getDimensions( elem ) {
- var raw = elem[0];
- if ( raw.nodeType === 9 ) {
- return {
- width: elem.width(),
- height: elem.height(),
- offset: { top: 0, left: 0 }
- };
- }
- if ( $.isWindow( raw ) ) {
- return {
- width: elem.width(),
- height: elem.height(),
- offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
- };
- }
- if ( raw.preventDefault ) {
- return {
- width: 0,
- height: 0,
- offset: { top: raw.pageY, left: raw.pageX }
- };
- }
- return {
- width: elem.outerWidth(),
- height: elem.outerHeight(),
- offset: elem.offset()
- };
-}
-
-$.position = {
- scrollbarWidth: function() {
- if ( cachedScrollbarWidth !== undefined ) {
- return cachedScrollbarWidth;
- }
- var w1, w2,
- div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
- innerDiv = div.children()[0];
-
- $( "body" ).append( div );
- w1 = innerDiv.offsetWidth;
- div.css( "overflow", "scroll" );
-
- w2 = innerDiv.offsetWidth;
-
- if ( w1 === w2 ) {
- w2 = div[0].clientWidth;
- }
-
- div.remove();
-
- return (cachedScrollbarWidth = w1 - w2);
- },
- getScrollInfo: function( within ) {
- var overflowX = within.isWindow || within.isDocument ? "" :
- within.element.css( "overflow-x" ),
- overflowY = within.isWindow || within.isDocument ? "" :
- within.element.css( "overflow-y" ),
- hasOverflowX = overflowX === "scroll" ||
- ( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
- hasOverflowY = overflowY === "scroll" ||
- ( overflowY === "auto" && within.height < within.element[0].scrollHeight );
- return {
- width: hasOverflowY ? $.position.scrollbarWidth() : 0,
- height: hasOverflowX ? $.position.scrollbarWidth() : 0
- };
- },
- getWithinInfo: function( element ) {
- var withinElement = $( element || window ),
- isWindow = $.isWindow( withinElement[0] ),
- isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
- return {
- element: withinElement,
- isWindow: isWindow,
- isDocument: isDocument,
- offset: withinElement.offset() || { left: 0, top: 0 },
- scrollLeft: withinElement.scrollLeft(),
- scrollTop: withinElement.scrollTop(),
- width: isWindow ? withinElement.width() : withinElement.outerWidth(),
- height: isWindow ? withinElement.height() : withinElement.outerHeight()
- };
- }
-};
-
-$.fn.position = function( options ) {
- if ( !options || !options.of ) {
- return _position.apply( this, arguments );
- }
-
- // make a copy, we don't want to modify arguments
- options = $.extend( {}, options );
-
- var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
- target = $( options.of ),
- within = $.position.getWithinInfo( options.within ),
- scrollInfo = $.position.getScrollInfo( within ),
- collision = ( options.collision || "flip" ).split( " " ),
- offsets = {};
-
- dimensions = getDimensions( target );
- if ( target[0].preventDefault ) {
- // force left top to allow flipping
- options.at = "left top";
- }
- targetWidth = dimensions.width;
- targetHeight = dimensions.height;
- targetOffset = dimensions.offset;
- // clone to reuse original targetOffset later
- basePosition = $.extend( {}, targetOffset );
-
- // force my and at to have valid horizontal and vertical positions
- // if a value is missing or invalid, it will be converted to center
- $.each( [ "my", "at" ], function() {
- var pos = ( options[ this ] || "" ).split( " " ),
- horizontalOffset,
- verticalOffset;
-
- if ( pos.length === 1) {
- pos = rhorizontal.test( pos[ 0 ] ) ?
- pos.concat( [ "center" ] ) :
- rvertical.test( pos[ 0 ] ) ?
- [ "center" ].concat( pos ) :
- [ "center", "center" ];
- }
- pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
- pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
-
- // calculate offsets
- horizontalOffset = roffset.exec( pos[ 0 ] );
- verticalOffset = roffset.exec( pos[ 1 ] );
- offsets[ this ] = [
- horizontalOffset ? horizontalOffset[ 0 ] : 0,
- verticalOffset ? verticalOffset[ 0 ] : 0
- ];
-
- // reduce to just the positions without the offsets
- options[ this ] = [
- rposition.exec( pos[ 0 ] )[ 0 ],
- rposition.exec( pos[ 1 ] )[ 0 ]
- ];
- });
-
- // normalize collision option
- if ( collision.length === 1 ) {
- collision[ 1 ] = collision[ 0 ];
- }
-
- if ( options.at[ 0 ] === "right" ) {
- basePosition.left += targetWidth;
- } else if ( options.at[ 0 ] === "center" ) {
- basePosition.left += targetWidth / 2;
- }
-
- if ( options.at[ 1 ] === "bottom" ) {
- basePosition.top += targetHeight;
- } else if ( options.at[ 1 ] === "center" ) {
- basePosition.top += targetHeight / 2;
- }
-
- atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
- basePosition.left += atOffset[ 0 ];
- basePosition.top += atOffset[ 1 ];
-
- return this.each(function() {
- var collisionPosition, using,
- elem = $( this ),
- elemWidth = elem.outerWidth(),
- elemHeight = elem.outerHeight(),
- marginLeft = parseCss( this, "marginLeft" ),
- marginTop = parseCss( this, "marginTop" ),
- collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
- collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
- position = $.extend( {}, basePosition ),
- myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
-
- if ( options.my[ 0 ] === "right" ) {
- position.left -= elemWidth;
- } else if ( options.my[ 0 ] === "center" ) {
- position.left -= elemWidth / 2;
- }
-
- if ( options.my[ 1 ] === "bottom" ) {
- position.top -= elemHeight;
- } else if ( options.my[ 1 ] === "center" ) {
- position.top -= elemHeight / 2;
- }
-
- position.left += myOffset[ 0 ];
- position.top += myOffset[ 1 ];
-
- // if the browser doesn't support fractions, then round for consistent results
- if ( !$.support.offsetFractions ) {
- position.left = round( position.left );
- position.top = round( position.top );
- }
-
- collisionPosition = {
- marginLeft: marginLeft,
- marginTop: marginTop
- };
-
- $.each( [ "left", "top" ], function( i, dir ) {
- if ( $.ui.position[ collision[ i ] ] ) {
- $.ui.position[ collision[ i ] ][ dir ]( position, {
- targetWidth: targetWidth,
- targetHeight: targetHeight,
- elemWidth: elemWidth,
- elemHeight: elemHeight,
- collisionPosition: collisionPosition,
- collisionWidth: collisionWidth,
- collisionHeight: collisionHeight,
- offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
- my: options.my,
- at: options.at,
- within: within,
- elem : elem
- });
- }
- });
-
- if ( options.using ) {
- // adds feedback as second argument to using callback, if present
- using = function( props ) {
- var left = targetOffset.left - position.left,
- right = left + targetWidth - elemWidth,
- top = targetOffset.top - position.top,
- bottom = top + targetHeight - elemHeight,
- feedback = {
- target: {
- element: target,
- left: targetOffset.left,
- top: targetOffset.top,
- width: targetWidth,
- height: targetHeight
- },
- element: {
- element: elem,
- left: position.left,
- top: position.top,
- width: elemWidth,
- height: elemHeight
- },
- horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
- vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
- };
- if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
- feedback.horizontal = "center";
- }
- if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
- feedback.vertical = "middle";
- }
- if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
- feedback.important = "horizontal";
- } else {
- feedback.important = "vertical";
- }
- options.using.call( this, props, feedback );
- };
- }
-
- elem.offset( $.extend( position, { using: using } ) );
- });
-};
-
-$.ui.position = {
- fit: {
- left: function( position, data ) {
- var within = data.within,
- withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
- outerWidth = within.width,
- collisionPosLeft = position.left - data.collisionPosition.marginLeft,
- overLeft = withinOffset - collisionPosLeft,
- overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
- newOverRight;
-
- // element is wider than within
- if ( data.collisionWidth > outerWidth ) {
- // element is initially over the left side of within
- if ( overLeft > 0 && overRight <= 0 ) {
- newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
- position.left += overLeft - newOverRight;
- // element is initially over right side of within
- } else if ( overRight > 0 && overLeft <= 0 ) {
- position.left = withinOffset;
- // element is initially over both left and right sides of within
- } else {
- if ( overLeft > overRight ) {
- position.left = withinOffset + outerWidth - data.collisionWidth;
- } else {
- position.left = withinOffset;
- }
- }
- // too far left -> align with left edge
- } else if ( overLeft > 0 ) {
- position.left += overLeft;
- // too far right -> align with right edge
- } else if ( overRight > 0 ) {
- position.left -= overRight;
- // adjust based on position and margin
- } else {
- position.left = max( position.left - collisionPosLeft, position.left );
- }
- },
- top: function( position, data ) {
- var within = data.within,
- withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
- outerHeight = data.within.height,
- collisionPosTop = position.top - data.collisionPosition.marginTop,
- overTop = withinOffset - collisionPosTop,
- overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
- newOverBottom;
-
- // element is taller than within
- if ( data.collisionHeight > outerHeight ) {
- // element is initially over the top of within
- if ( overTop > 0 && overBottom <= 0 ) {
- newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
- position.top += overTop - newOverBottom;
- // element is initially over bottom of within
- } else if ( overBottom > 0 && overTop <= 0 ) {
- position.top = withinOffset;
- // element is initially over both top and bottom of within
- } else {
- if ( overTop > overBottom ) {
- position.top = withinOffset + outerHeight - data.collisionHeight;
- } else {
- position.top = withinOffset;
- }
- }
- // too far up -> align with top
- } else if ( overTop > 0 ) {
- position.top += overTop;
- // too far down -> align with bottom edge
- } else if ( overBottom > 0 ) {
- position.top -= overBottom;
- // adjust based on position and margin
- } else {
- position.top = max( position.top - collisionPosTop, position.top );
- }
- }
- },
- flip: {
- left: function( position, data ) {
- var within = data.within,
- withinOffset = within.offset.left + within.scrollLeft,
- outerWidth = within.width,
- offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
- collisionPosLeft = position.left - data.collisionPosition.marginLeft,
- overLeft = collisionPosLeft - offsetLeft,
- overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
- myOffset = data.my[ 0 ] === "left" ?
- -data.elemWidth :
- data.my[ 0 ] === "right" ?
- data.elemWidth :
- 0,
- atOffset = data.at[ 0 ] === "left" ?
- data.targetWidth :
- data.at[ 0 ] === "right" ?
- -data.targetWidth :
- 0,
- offset = -2 * data.offset[ 0 ],
- newOverRight,
- newOverLeft;
-
- if ( overLeft < 0 ) {
- newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
- if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
- position.left += myOffset + atOffset + offset;
- }
- }
- else if ( overRight > 0 ) {
- newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
- if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
- position.left += myOffset + atOffset + offset;
- }
- }
- },
- top: function( position, data ) {
- var within = data.within,
- withinOffset = within.offset.top + within.scrollTop,
- outerHeight = within.height,
- offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
- collisionPosTop = position.top - data.collisionPosition.marginTop,
- overTop = collisionPosTop - offsetTop,
- overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
- top = data.my[ 1 ] === "top",
- myOffset = top ?
- -data.elemHeight :
- data.my[ 1 ] === "bottom" ?
- data.elemHeight :
- 0,
- atOffset = data.at[ 1 ] === "top" ?
- data.targetHeight :
- data.at[ 1 ] === "bottom" ?
- -data.targetHeight :
- 0,
- offset = -2 * data.offset[ 1 ],
- newOverTop,
- newOverBottom;
- if ( overTop < 0 ) {
- newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
- if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
- position.top += myOffset + atOffset + offset;
- }
- }
- else if ( overBottom > 0 ) {
- newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
- if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
- position.top += myOffset + atOffset + offset;
- }
- }
- }
- },
- flipfit: {
- left: function() {
- $.ui.position.flip.left.apply( this, arguments );
- $.ui.position.fit.left.apply( this, arguments );
- },
- top: function() {
- $.ui.position.flip.top.apply( this, arguments );
- $.ui.position.fit.top.apply( this, arguments );
- }
- }
-};
-
-// fraction support test
-(function () {
- var testElement, testElementParent, testElementStyle, offsetLeft, i,
- body = document.getElementsByTagName( "body" )[ 0 ],
- div = document.createElement( "div" );
-
- //Create a "fake body" for testing based on method used in jQuery.support
- testElement = document.createElement( body ? "div" : "body" );
- testElementStyle = {
- visibility: "hidden",
- width: 0,
- height: 0,
- border: 0,
- margin: 0,
- background: "none"
- };
- if ( body ) {
- $.extend( testElementStyle, {
- position: "absolute",
- left: "-1000px",
- top: "-1000px"
- });
- }
- for ( i in testElementStyle ) {
- testElement.style[ i ] = testElementStyle[ i ];
- }
- testElement.appendChild( div );
- testElementParent = body || document.documentElement;
- testElementParent.insertBefore( testElement, testElementParent.firstChild );
-
- div.style.cssText = "position: absolute; left: 10.7432222px;";
-
- offsetLeft = $( div ).offset().left;
- $.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11;
-
- testElement.innerHTML = "";
- testElementParent.removeChild( testElement );
-})();
-
-}( jQuery ) );
-(function( $, undefined ) {
-
-$.widget("ui.draggable", $.ui.mouse, {
- version: "1.10.4",
- widgetEventPrefix: "drag",
- options: {
- addClasses: true,
- appendTo: "parent",
- axis: false,
- connectToSortable: false,
- containment: false,
- cursor: "auto",
- cursorAt: false,
- grid: false,
- handle: false,
- helper: "original",
- iframeFix: false,
- opacity: false,
- refreshPositions: false,
- revert: false,
- revertDuration: 500,
- scope: "default",
- scroll: true,
- scrollSensitivity: 20,
- scrollSpeed: 20,
- snap: false,
- snapMode: "both",
- snapTolerance: 20,
- stack: false,
- zIndex: false,
-
- // callbacks
- drag: null,
- start: null,
- stop: null
- },
- _create: function() {
-
- if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
- this.element[0].style.position = "relative";
- }
- if (this.options.addClasses){
- this.element.addClass("ui-draggable");
- }
- if (this.options.disabled){
- this.element.addClass("ui-draggable-disabled");
- }
-
- this._mouseInit();
-
- },
-
- _destroy: function() {
- this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
- this._mouseDestroy();
- },
-
- _mouseCapture: function(event) {
-
- var o = this.options;
-
- // among others, prevent a drag on a resizable-handle
- if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
- return false;
- }
-
- //Quit if we're not on a valid handle
- this.handle = this._getHandle(event);
- if (!this.handle) {
- return false;
- }
-
- $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
- $("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
- .css({
- width: this.offsetWidth+"px", height: this.offsetHeight+"px",
- position: "absolute", opacity: "0.001", zIndex: 1000
- })
- .css($(this).offset())
- .appendTo("body");
- });
-
- return true;
-
- },
-
- _mouseStart: function(event) {
-
- var o = this.options;
-
- //Create and append the visible helper
- this.helper = this._createHelper(event);
-
- this.helper.addClass("ui-draggable-dragging");
-
- //Cache the helper size
- this._cacheHelperProportions();
-
- //If ddmanager is used for droppables, set the global draggable
- if($.ui.ddmanager) {
- $.ui.ddmanager.current = this;
- }
-
- /*
- * - Position generation -
- * This block generates everything position related - it's the core of draggables.
- */
-
- //Cache the margins of the original element
- this._cacheMargins();
-
- //Store the helper's css position
- this.cssPosition = this.helper.css( "position" );
- this.scrollParent = this.helper.scrollParent();
- this.offsetParent = this.helper.offsetParent();
- this.offsetParentCssPosition = this.offsetParent.css( "position" );
-
- //The element's absolute position on the page minus margins
- this.offset = this.positionAbs = this.element.offset();
- this.offset = {
- top: this.offset.top - this.margins.top,
- left: this.offset.left - this.margins.left
- };
-
- //Reset scroll cache
- this.offset.scroll = false;
-
- $.extend(this.offset, {
- click: { //Where the click happened, relative to the element
- left: event.pageX - this.offset.left,
- top: event.pageY - this.offset.top
- },
- parent: this._getParentOffset(),
- relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
- });
-
- //Generate the original position
- this.originalPosition = this.position = this._generatePosition(event);
- this.originalPageX = event.pageX;
- this.originalPageY = event.pageY;
-
- //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
- (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
- //Set a containment if given in the options
- this._setContainment();
-
- //Trigger event + callbacks
- if(this._trigger("start", event) === false) {
- this._clear();
- return false;
- }
-
- //Recache the helper size
- this._cacheHelperProportions();
-
- //Prepare the droppable offsets
- if ($.ui.ddmanager && !o.dropBehaviour) {
- $.ui.ddmanager.prepareOffsets(this, event);
- }
-
-
- this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-
- //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
- if ( $.ui.ddmanager ) {
- $.ui.ddmanager.dragStart(this, event);
- }
-
- return true;
- },
-
- _mouseDrag: function(event, noPropagation) {
- // reset any necessary cached properties (see #5009)
- if ( this.offsetParentCssPosition === "fixed" ) {
- this.offset.parent = this._getParentOffset();
- }
-
- //Compute the helpers position
- this.position = this._generatePosition(event);
- this.positionAbs = this._convertPositionTo("absolute");
-
- //Call plugins and callbacks and use the resulting position if something is returned
- if (!noPropagation) {
- var ui = this._uiHash();
- if(this._trigger("drag", event, ui) === false) {
- this._mouseUp({});
- return false;
- }
- this.position = ui.position;
- }
-
- if(!this.options.axis || this.options.axis !== "y") {
- this.helper[0].style.left = this.position.left+"px";
- }
- if(!this.options.axis || this.options.axis !== "x") {
- this.helper[0].style.top = this.position.top+"px";
- }
- if($.ui.ddmanager) {
- $.ui.ddmanager.drag(this, event);
- }
-
- return false;
- },
-
- _mouseStop: function(event) {
-
- //If we are using droppables, inform the manager about the drop
- var that = this,
- dropped = false;
- if ($.ui.ddmanager && !this.options.dropBehaviour) {
- dropped = $.ui.ddmanager.drop(this, event);
- }
-
- //if a drop comes from outside (a sortable)
- if(this.dropped) {
- dropped = this.dropped;
- this.dropped = false;
- }
-
- //if the original element is no longer in the DOM don't bother to continue (see #8269)
- if ( this.options.helper === "original" && !$.contains( this.element[ 0 ].ownerDocument, this.element[ 0 ] ) ) {
- return false;
- }
-
- if((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
- $(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
- if(that._trigger("stop", event) !== false) {
- that._clear();
- }
- });
- } else {
- if(this._trigger("stop", event) !== false) {
- this._clear();
- }
- }
-
- return false;
- },
-
- _mouseUp: function(event) {
- //Remove frame helpers
- $("div.ui-draggable-iframeFix").each(function() {
- this.parentNode.removeChild(this);
- });
-
- //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
- if( $.ui.ddmanager ) {
- $.ui.ddmanager.dragStop(this, event);
- }
-
- return $.ui.mouse.prototype._mouseUp.call(this, event);
- },
-
- cancel: function() {
-
- if(this.helper.is(".ui-draggable-dragging")) {
- this._mouseUp({});
- } else {
- this._clear();
- }
-
- return this;
-
- },
-
- _getHandle: function(event) {
- return this.options.handle ?
- !!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
- true;
- },
-
- _createHelper: function(event) {
-
- var o = this.options,
- helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
-
- if(!helper.parents("body").length) {
- helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
- }
-
- if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
- helper.css("position", "absolute");
- }
-
- return helper;
-
- },
-
- _adjustOffsetFromHelper: function(obj) {
- if (typeof obj === "string") {
- obj = obj.split(" ");
- }
- if ($.isArray(obj)) {
- obj = {left: +obj[0], top: +obj[1] || 0};
- }
- if ("left" in obj) {
- this.offset.click.left = obj.left + this.margins.left;
- }
- if ("right" in obj) {
- this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
- }
- if ("top" in obj) {
- this.offset.click.top = obj.top + this.margins.top;
- }
- if ("bottom" in obj) {
- this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
- }
- },
-
- _getParentOffset: function() {
-
- //Get the offsetParent and cache its position
- var po = this.offsetParent.offset();
-
- // This is a special case where we need to modify a offset calculated on start, since the following happened:
- // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
- // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
- // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
- if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
- po.left += this.scrollParent.scrollLeft();
- po.top += this.scrollParent.scrollTop();
- }
-
- //This needs to be actually done for all browsers, since pageX/pageY includes this information
- //Ugly IE fix
- if((this.offsetParent[0] === document.body) ||
- (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
- po = { top: 0, left: 0 };
- }
-
- return {
- top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
- left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
- };
-
- },
-
- _getRelativeOffset: function() {
-
- if(this.cssPosition === "relative") {
- var p = this.element.position();
- return {
- top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
- left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
- };
- } else {
- return { top: 0, left: 0 };
- }
-
- },
-
- _cacheMargins: function() {
- this.margins = {
- left: (parseInt(this.element.css("marginLeft"),10) || 0),
- top: (parseInt(this.element.css("marginTop"),10) || 0),
- right: (parseInt(this.element.css("marginRight"),10) || 0),
- bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
- };
- },
-
- _cacheHelperProportions: function() {
- this.helperProportions = {
- width: this.helper.outerWidth(),
- height: this.helper.outerHeight()
- };
- },
-
- _setContainment: function() {
-
- var over, c, ce,
- o = this.options;
-
- if ( !o.containment ) {
- this.containment = null;
- return;
- }
-
- if ( o.containment === "window" ) {
- this.containment = [
- $( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
- $( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
- $( window ).scrollLeft() + $( window ).width() - this.helperProportions.width - this.margins.left,
- $( window ).scrollTop() + ( $( window ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
- ];
- return;
- }
-
- if ( o.containment === "document") {
- this.containment = [
- 0,
- 0,
- $( document ).width() - this.helperProportions.width - this.margins.left,
- ( $( document ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
- ];
- return;
- }
-
- if ( o.containment.constructor === Array ) {
- this.containment = o.containment;
- return;
- }
-
- if ( o.containment === "parent" ) {
- o.containment = this.helper[ 0 ].parentNode;
- }
-
- c = $( o.containment );
- ce = c[ 0 ];
-
- if( !ce ) {
- return;
- }
-
- over = c.css( "overflow" ) !== "hidden";
-
- this.containment = [
- ( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
- ( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ) ,
- ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) - this.helperProportions.width - this.margins.left - this.margins.right,
- ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) - this.helperProportions.height - this.margins.top - this.margins.bottom
- ];
- this.relative_container = c;
- },
-
- _convertPositionTo: function(d, pos) {
-
- if(!pos) {
- pos = this.position;
- }
-
- var mod = d === "absolute" ? 1 : -1,
- scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent;
-
- //Cache the scroll
- if (!this.offset.scroll) {
- this.offset.scroll = {top : scroll.scrollTop(), left : scroll.scrollLeft()};
- }
-
- return {
- top: (
- pos.top + // The absolute mouse position
- this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border)
- ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : this.offset.scroll.top ) * mod )
- ),
- left: (
- pos.left + // The absolute mouse position
- this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border)
- ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : this.offset.scroll.left ) * mod )
- )
- };
-
- },
-
- _generatePosition: function(event) {
-
- var containment, co, top, left,
- o = this.options,
- scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent,
- pageX = event.pageX,
- pageY = event.pageY;
-
- //Cache the scroll
- if (!this.offset.scroll) {
- this.offset.scroll = {top : scroll.scrollTop(), left : scroll.scrollLeft()};
- }
-
- /*
- * - Position constraining -
- * Constrain the position to a mix of grid, containment.
- */
-
- // If we are not dragging yet, we won't check for options
- if ( this.originalPosition ) {
- if ( this.containment ) {
- if ( this.relative_container ){
- co = this.relative_container.offset();
- containment = [
- this.containment[ 0 ] + co.left,
- this.containment[ 1 ] + co.top,
- this.containment[ 2 ] + co.left,
- this.containment[ 3 ] + co.top
- ];
- }
- else {
- containment = this.containment;
- }
-
- if(event.pageX - this.offset.click.left < containment[0]) {
- pageX = containment[0] + this.offset.click.left;
- }
- if(event.pageY - this.offset.click.top < containment[1]) {
- pageY = containment[1] + this.offset.click.top;
- }
- if(event.pageX - this.offset.click.left > containment[2]) {
- pageX = containment[2] + this.offset.click.left;
- }
- if(event.pageY - this.offset.click.top > containment[3]) {
- pageY = containment[3] + this.offset.click.top;
- }
- }
-
- if(o.grid) {
- //Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
- top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
- pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
- left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
- pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
- }
-
- }
-
- return {
- top: (
- pageY - // The absolute mouse position
- this.offset.click.top - // Click offset (relative to the element)
- this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.top + // The offsetParent's offset without borders (offset + border)
- ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : this.offset.scroll.top )
- ),
- left: (
- pageX - // The absolute mouse position
- this.offset.click.left - // Click offset (relative to the element)
- this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.left + // The offsetParent's offset without borders (offset + border)
- ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : this.offset.scroll.left )
- )
- };
-
- },
-
- _clear: function() {
- this.helper.removeClass("ui-draggable-dragging");
- if(this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
- this.helper.remove();
- }
- this.helper = null;
- this.cancelHelperRemoval = false;
- },
-
- // From now on bulk stuff - mainly helpers
-
- _trigger: function(type, event, ui) {
- ui = ui || this._uiHash();
- $.ui.plugin.call(this, type, [event, ui]);
- //The absolute position has to be recalculated after plugins
- if(type === "drag") {
- this.positionAbs = this._convertPositionTo("absolute");
- }
- return $.Widget.prototype._trigger.call(this, type, event, ui);
- },
-
- plugins: {},
-
- _uiHash: function() {
- return {
- helper: this.helper,
- position: this.position,
- originalPosition: this.originalPosition,
- offset: this.positionAbs
- };
- }
-
-});
-
-$.ui.plugin.add("draggable", "connectToSortable", {
- start: function(event, ui) {
-
- var inst = $(this).data("ui-draggable"), o = inst.options,
- uiSortable = $.extend({}, ui, { item: inst.element });
- inst.sortables = [];
- $(o.connectToSortable).each(function() {
- var sortable = $.data(this, "ui-sortable");
- if (sortable && !sortable.options.disabled) {
- inst.sortables.push({
- instance: sortable,
- shouldRevert: sortable.options.revert
- });
- sortable.refreshPositions(); // Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
- sortable._trigger("activate", event, uiSortable);
- }
- });
-
- },
- stop: function(event, ui) {
-
- //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
- var inst = $(this).data("ui-draggable"),
- uiSortable = $.extend({}, ui, { item: inst.element });
-
- $.each(inst.sortables, function() {
- if(this.instance.isOver) {
-
- this.instance.isOver = 0;
-
- inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
- this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-
- //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
- if(this.shouldRevert) {
- this.instance.options.revert = this.shouldRevert;
- }
-
- //Trigger the stop of the sortable
- this.instance._mouseStop(event);
-
- this.instance.options.helper = this.instance.options._helper;
-
- //If the helper has been the original item, restore properties in the sortable
- if(inst.options.helper === "original") {
- this.instance.currentItem.css({ top: "auto", left: "auto" });
- }
-
- } else {
- this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
- this.instance._trigger("deactivate", event, uiSortable);
- }
-
- });
-
- },
- drag: function(event, ui) {
-
- var inst = $(this).data("ui-draggable"), that = this;
-
- $.each(inst.sortables, function() {
-
- var innermostIntersecting = false,
- thisSortable = this;
-
- //Copy over some variables to allow calling the sortable's native _intersectsWith
- this.instance.positionAbs = inst.positionAbs;
- this.instance.helperProportions = inst.helperProportions;
- this.instance.offset.click = inst.offset.click;
-
- if(this.instance._intersectsWith(this.instance.containerCache)) {
- innermostIntersecting = true;
- $.each(inst.sortables, function () {
- this.instance.positionAbs = inst.positionAbs;
- this.instance.helperProportions = inst.helperProportions;
- this.instance.offset.click = inst.offset.click;
- if (this !== thisSortable &&
- this.instance._intersectsWith(this.instance.containerCache) &&
- $.contains(thisSortable.instance.element[0], this.instance.element[0])
- ) {
- innermostIntersecting = false;
- }
- return innermostIntersecting;
- });
- }
-
-
- if(innermostIntersecting) {
- //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
- if(!this.instance.isOver) {
-
- this.instance.isOver = 1;
- //Now we fake the start of dragging for the sortable instance,
- //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
- //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
- this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
- this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
- this.instance.options.helper = function() { return ui.helper[0]; };
-
- event.target = this.instance.currentItem[0];
- this.instance._mouseCapture(event, true);
- this.instance._mouseStart(event, true, true);
-
- //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
- this.instance.offset.click.top = inst.offset.click.top;
- this.instance.offset.click.left = inst.offset.click.left;
- this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
- this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-
- inst._trigger("toSortable", event);
- inst.dropped = this.instance.element; //draggable revert needs that
- //hack so receive/update callbacks work (mostly)
- inst.currentItem = inst.element;
- this.instance.fromOutside = inst;
-
- }
-
- //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
- if(this.instance.currentItem) {
- this.instance._mouseDrag(event);
- }
-
- } else {
-
- //If it doesn't intersect with the sortable, and it intersected before,
- //we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
- if(this.instance.isOver) {
-
- this.instance.isOver = 0;
- this.instance.cancelHelperRemoval = true;
-
- //Prevent reverting on this forced stop
- this.instance.options.revert = false;
-
- // The out event needs to be triggered independently
- this.instance._trigger("out", event, this.instance._uiHash(this.instance));
-
- this.instance._mouseStop(event, true);
- this.instance.options.helper = this.instance.options._helper;
-
- //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
- this.instance.currentItem.remove();
- if(this.instance.placeholder) {
- this.instance.placeholder.remove();
- }
-
- inst._trigger("fromSortable", event);
- inst.dropped = false; //draggable revert needs that
- }
-
- }
-
- });
-
- }
-});
-
-$.ui.plugin.add("draggable", "cursor", {
- start: function() {
- var t = $("body"), o = $(this).data("ui-draggable").options;
- if (t.css("cursor")) {
- o._cursor = t.css("cursor");
- }
- t.css("cursor", o.cursor);
- },
- stop: function() {
- var o = $(this).data("ui-draggable").options;
- if (o._cursor) {
- $("body").css("cursor", o._cursor);
- }
- }
-});
-
-$.ui.plugin.add("draggable", "opacity", {
- start: function(event, ui) {
- var t = $(ui.helper), o = $(this).data("ui-draggable").options;
- if(t.css("opacity")) {
- o._opacity = t.css("opacity");
- }
- t.css("opacity", o.opacity);
- },
- stop: function(event, ui) {
- var o = $(this).data("ui-draggable").options;
- if(o._opacity) {
- $(ui.helper).css("opacity", o._opacity);
- }
- }
-});
-
-$.ui.plugin.add("draggable", "scroll", {
- start: function() {
- var i = $(this).data("ui-draggable");
- if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
- i.overflowOffset = i.scrollParent.offset();
- }
- },
- drag: function( event ) {
-
- var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;
-
- if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
-
- if(!o.axis || o.axis !== "x") {
- if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
- i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
- } else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
- i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
- }
- }
-
- if(!o.axis || o.axis !== "y") {
- if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
- i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
- } else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
- i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
- }
- }
-
- } else {
-
- if(!o.axis || o.axis !== "x") {
- if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
- scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
- } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
- scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
- }
- }
-
- if(!o.axis || o.axis !== "y") {
- if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
- scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
- } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
- scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
- }
- }
-
- }
-
- if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
- $.ui.ddmanager.prepareOffsets(i, event);
- }
-
- }
-});
-
-$.ui.plugin.add("draggable", "snap", {
- start: function() {
-
- var i = $(this).data("ui-draggable"),
- o = i.options;
-
- i.snapElements = [];
-
- $(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
- var $t = $(this),
- $o = $t.offset();
- if(this !== i.element[0]) {
- i.snapElements.push({
- item: this,
- width: $t.outerWidth(), height: $t.outerHeight(),
- top: $o.top, left: $o.left
- });
- }
- });
-
- },
- drag: function(event, ui) {
-
- var ts, bs, ls, rs, l, r, t, b, i, first,
- inst = $(this).data("ui-draggable"),
- o = inst.options,
- d = o.snapTolerance,
- x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
- y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
-
- for (i = inst.snapElements.length - 1; i >= 0; i--){
-
- l = inst.snapElements[i].left;
- r = l + inst.snapElements[i].width;
- t = inst.snapElements[i].top;
- b = t + inst.snapElements[i].height;
-
- if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
- if(inst.snapElements[i].snapping) {
- (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
- }
- inst.snapElements[i].snapping = false;
- continue;
- }
-
- if(o.snapMode !== "inner") {
- ts = Math.abs(t - y2) <= d;
- bs = Math.abs(b - y1) <= d;
- ls = Math.abs(l - x2) <= d;
- rs = Math.abs(r - x1) <= d;
- if(ts) {
- ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
- }
- if(bs) {
- ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
- }
- if(ls) {
- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
- }
- if(rs) {
- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
- }
- }
-
- first = (ts || bs || ls || rs);
-
- if(o.snapMode !== "outer") {
- ts = Math.abs(t - y1) <= d;
- bs = Math.abs(b - y2) <= d;
- ls = Math.abs(l - x1) <= d;
- rs = Math.abs(r - x2) <= d;
- if(ts) {
- ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
- }
- if(bs) {
- ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
- }
- if(ls) {
- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
- }
- if(rs) {
- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
- }
- }
-
- if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
- (inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
- }
- inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
-
- }
-
- }
-});
-
-$.ui.plugin.add("draggable", "stack", {
- start: function() {
- var min,
- o = this.data("ui-draggable").options,
- group = $.makeArray($(o.stack)).sort(function(a,b) {
- return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
- });
-
- if (!group.length) { return; }
-
- min = parseInt($(group[0]).css("zIndex"), 10) || 0;
- $(group).each(function(i) {
- $(this).css("zIndex", min + i);
- });
- this.css("zIndex", (min + group.length));
- }
-});
-
-$.ui.plugin.add("draggable", "zIndex", {
- start: function(event, ui) {
- var t = $(ui.helper), o = $(this).data("ui-draggable").options;
- if(t.css("zIndex")) {
- o._zIndex = t.css("zIndex");
- }
- t.css("zIndex", o.zIndex);
- },
- stop: function(event, ui) {
- var o = $(this).data("ui-draggable").options;
- if(o._zIndex) {
- $(ui.helper).css("zIndex", o._zIndex);
- }
- }
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.extend($.ui, { datepicker: { version: "1.10.4" } });
-
-var PROP_NAME = "datepicker",
- instActive;
-
-/* Date picker manager.
- Use the singleton instance of this class, $.datepicker, to interact with the date picker.
- Settings for (groups of) date pickers are maintained in an instance object,
- allowing multiple different settings on the same page. */
-
-function Datepicker() {
- this._curInst = null; // The current instance in use
- this._keyEvent = false; // If the last event was a key event
- this._disabledInputs = []; // List of date picker inputs that have been disabled
- this._datepickerShowing = false; // True if the popup picker is showing , false if not
- this._inDialog = false; // True if showing within a "dialog", false if not
- this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
- this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
- this._appendClass = "ui-datepicker-append"; // The name of the append marker class
- this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
- this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
- this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
- this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
- this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
- this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
- this.regional = []; // Available regional settings, indexed by language code
- this.regional[""] = { // Default regional settings
- closeText: "Done", // Display text for close link
- prevText: "Prev", // Display text for previous month link
- nextText: "Next", // Display text for next month link
- currentText: "Today", // Display text for current month link
- monthNames: ["January","February","March","April","May","June",
- "July","August","September","October","November","December"], // Names of months for drop-down and formatting
- monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
- dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
- dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
- dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
- weekHeader: "Wk", // Column header for week of the year
- dateFormat: "mm/dd/yy", // See format options on parseDate
- firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
- isRTL: false, // True if right-to-left language, false if left-to-right
- showMonthAfterYear: false, // True if the year select precedes month, false for month then year
- yearSuffix: "" // Additional text to append to the year in the month headers
- };
- this._defaults = { // Global defaults for all the date picker instances
- showOn: "focus", // "focus" for popup on focus,
- // "button" for trigger button, or "both" for either
- showAnim: "fadeIn", // Name of jQuery animation for popup
- showOptions: {}, // Options for enhanced animations
- defaultDate: null, // Used when field is blank: actual date,
- // +/-number for offset from today, null for today
- appendText: "", // Display text following the input box, e.g. showing the format
- buttonText: "...", // Text for trigger button
- buttonImage: "", // URL for trigger button image
- buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
- hideIfNoPrevNext: false, // True to hide next/previous month links
- // if not applicable, false to just disable them
- navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
- gotoCurrent: false, // True if today link goes back to current selection instead
- changeMonth: false, // True if month can be selected directly, false if only prev/next
- changeYear: false, // True if year can be selected directly, false if only prev/next
- yearRange: "c-10:c+10", // Range of years to display in drop-down,
- // either relative to today's year (-nn:+nn), relative to currently displayed year
- // (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
- showOtherMonths: false, // True to show dates in other months, false to leave blank
- selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
- showWeek: false, // True to show week of the year, false to not show it
- calculateWeek: this.iso8601Week, // How to calculate the week of the year,
- // takes a Date and returns the number of the week for it
- shortYearCutoff: "+10", // Short year values < this are in the current century,
- // > this are in the previous century,
- // string value starting with "+" for current year + value
- minDate: null, // The earliest selectable date, or null for no limit
- maxDate: null, // The latest selectable date, or null for no limit
- duration: "fast", // Duration of display/closure
- beforeShowDay: null, // Function that takes a date and returns an array with
- // [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
- // [2] = cell title (optional), e.g. $.datepicker.noWeekends
- beforeShow: null, // Function that takes an input field and
- // returns a set of custom settings for the date picker
- onSelect: null, // Define a callback function when a date is selected
- onChangeMonthYear: null, // Define a callback function when the month or year is changed
- onClose: null, // Define a callback function when the datepicker is closed
- numberOfMonths: 1, // Number of months to show at a time
- showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
- stepMonths: 1, // Number of months to step back/forward
- stepBigMonths: 12, // Number of months to step back/forward for the big links
- altField: "", // Selector for an alternate field to store selected dates into
- altFormat: "", // The date format to use for the alternate field
- constrainInput: true, // The input is constrained by the current date format
- showButtonPanel: false, // True to show button panel, false to not show it
- autoSize: false, // True to size the input for the date format, false to leave as is
- disabled: false // The initial disabled state
- };
- $.extend(this._defaults, this.regional[""]);
- this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
-}
-
-$.extend(Datepicker.prototype, {
- /* Class name added to elements to indicate already configured with a date picker. */
- markerClassName: "hasDatepicker",
-
- //Keep track of the maximum number of rows displayed (see #7043)
- maxRows: 4,
-
- // TODO rename to "widget" when switching to widget factory
- _widgetDatepicker: function() {
- return this.dpDiv;
- },
-
- /* Override the default settings for all instances of the date picker.
- * @param settings object - the new settings to use as defaults (anonymous object)
- * @return the manager object
- */
- setDefaults: function(settings) {
- extendRemove(this._defaults, settings || {});
- return this;
- },
-
- /* Attach the date picker to a jQuery selection.
- * @param target element - the target input field or division or span
- * @param settings object - the new settings to use for this date picker instance (anonymous)
- */
- _attachDatepicker: function(target, settings) {
- var nodeName, inline, inst;
- nodeName = target.nodeName.toLowerCase();
- inline = (nodeName === "div" || nodeName === "span");
- if (!target.id) {
- this.uuid += 1;
- target.id = "dp" + this.uuid;
- }
- inst = this._newInst($(target), inline);
- inst.settings = $.extend({}, settings || {});
- if (nodeName === "input") {
- this._connectDatepicker(target, inst);
- } else if (inline) {
- this._inlineDatepicker(target, inst);
- }
- },
-
- /* Create a new instance object. */
- _newInst: function(target, inline) {
- var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
- return {id: id, input: target, // associated target
- selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
- drawMonth: 0, drawYear: 0, // month being drawn
- inline: inline, // is datepicker inline or not
- dpDiv: (!inline ? this.dpDiv : // presentation div
- bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
- },
-
- /* Attach the date picker to an input field. */
- _connectDatepicker: function(target, inst) {
- var input = $(target);
- inst.append = $([]);
- inst.trigger = $([]);
- if (input.hasClass(this.markerClassName)) {
- return;
- }
- this._attachments(input, inst);
- input.addClass(this.markerClassName).keydown(this._doKeyDown).
- keypress(this._doKeyPress).keyup(this._doKeyUp);
- this._autoSize(inst);
- $.data(target, PROP_NAME, inst);
- //If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
- if( inst.settings.disabled ) {
- this._disableDatepicker( target );
- }
- },
-
- /* Make attachments based on settings. */
- _attachments: function(input, inst) {
- var showOn, buttonText, buttonImage,
- appendText = this._get(inst, "appendText"),
- isRTL = this._get(inst, "isRTL");
-
- if (inst.append) {
- inst.append.remove();
- }
- if (appendText) {
- inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
- input[isRTL ? "before" : "after"](inst.append);
- }
-
- input.unbind("focus", this._showDatepicker);
-
- if (inst.trigger) {
- inst.trigger.remove();
- }
-
- showOn = this._get(inst, "showOn");
- if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
- input.focus(this._showDatepicker);
- }
- if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
- buttonText = this._get(inst, "buttonText");
- buttonImage = this._get(inst, "buttonImage");
- inst.trigger = $(this._get(inst, "buttonImageOnly") ?
- $("<img/>").addClass(this._triggerClass).
- attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
- $("<button type='button'></button>").addClass(this._triggerClass).
- html(!buttonImage ? buttonText : $("<img/>").attr(
- { src:buttonImage, alt:buttonText, title:buttonText })));
- input[isRTL ? "before" : "after"](inst.trigger);
- inst.trigger.click(function() {
- if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
- $.datepicker._hideDatepicker();
- } else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
- $.datepicker._hideDatepicker();
- $.datepicker._showDatepicker(input[0]);
- } else {
- $.datepicker._showDatepicker(input[0]);
- }
- return false;
- });
- }
- },
-
- /* Apply the maximum length for the date format. */
- _autoSize: function(inst) {
- if (this._get(inst, "autoSize") && !inst.inline) {
- var findMax, max, maxI, i,
- date = new Date(2009, 12 - 1, 20), // Ensure double digits
- dateFormat = this._get(inst, "dateFormat");
-
- if (dateFormat.match(/[DM]/)) {
- findMax = function(names) {
- max = 0;
- maxI = 0;
- for (i = 0; i < names.length; i++) {
- if (names[i].length > max) {
- max = names[i].length;
- maxI = i;
- }
- }
- return maxI;
- };
- date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
- "monthNames" : "monthNamesShort"))));
- date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
- "dayNames" : "dayNamesShort"))) + 20 - date.getDay());
- }
- inst.input.attr("size", this._formatDate(inst, date).length);
- }
- },
-
- /* Attach an inline date picker to a div. */
- _inlineDatepicker: function(target, inst) {
- var divSpan = $(target);
- if (divSpan.hasClass(this.markerClassName)) {
- return;
- }
- divSpan.addClass(this.markerClassName).append(inst.dpDiv);
- $.data(target, PROP_NAME, inst);
- this._setDate(inst, this._getDefaultDate(inst), true);
- this._updateDatepicker(inst);
- this._updateAlternate(inst);
- //If disabled option is true, disable the datepicker before showing it (see ticket #5665)
- if( inst.settings.disabled ) {
- this._disableDatepicker( target );
- }
- // Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
- // http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
- inst.dpDiv.css( "display", "block" );
- },
-
- /* Pop-up the date picker in a "dialog" box.
- * @param input element - ignored
- * @param date string or Date - the initial date to display
- * @param onSelect function - the function to call when a date is selected
- * @param settings object - update the dialog date picker instance's settings (anonymous object)
- * @param pos int[2] - coordinates for the dialog's position within the screen or
- * event - with x/y coordinates or
- * leave empty for default (screen centre)
- * @return the manager object
- */
- _dialogDatepicker: function(input, date, onSelect, settings, pos) {
- var id, browserWidth, browserHeight, scrollX, scrollY,
- inst = this._dialogInst; // internal instance
-
- if (!inst) {
- this.uuid += 1;
- id = "dp" + this.uuid;
- this._dialogInput = $("<input type='text' id='" + id +
- "' style='position: absolute; top: -100px; width: 0px;'/>");
- this._dialogInput.keydown(this._doKeyDown);
- $("body").append(this._dialogInput);
- inst = this._dialogInst = this._newInst(this._dialogInput, false);
- inst.settings = {};
- $.data(this._dialogInput[0], PROP_NAME, inst);
- }
- extendRemove(inst.settings, settings || {});
- date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
- this._dialogInput.val(date);
-
- this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
- if (!this._pos) {
- browserWidth = document.documentElement.clientWidth;
- browserHeight = document.documentElement.clientHeight;
- scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
- scrollY = document.documentElement.scrollTop || document.body.scrollTop;
- this._pos = // should use actual width/height below
- [(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
- }
-
- // move input on screen for focus, but hidden behind dialog
- this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
- inst.settings.onSelect = onSelect;
- this._inDialog = true;
- this.dpDiv.addClass(this._dialogClass);
- this._showDatepicker(this._dialogInput[0]);
- if ($.blockUI) {
- $.blockUI(this.dpDiv);
- }
- $.data(this._dialogInput[0], PROP_NAME, inst);
- return this;
- },
-
- /* Detach a datepicker from its control.
- * @param target element - the target input field or division or span
- */
- _destroyDatepicker: function(target) {
- var nodeName,
- $target = $(target),
- inst = $.data(target, PROP_NAME);
-
- if (!$target.hasClass(this.markerClassName)) {
- return;
- }
-
- nodeName = target.nodeName.toLowerCase();
- $.removeData(target, PROP_NAME);
- if (nodeName === "input") {
- inst.append.remove();
- inst.trigger.remove();
- $target.removeClass(this.markerClassName).
- unbind("focus", this._showDatepicker).
- unbind("keydown", this._doKeyDown).
- unbind("keypress", this._doKeyPress).
- unbind("keyup", this._doKeyUp);
- } else if (nodeName === "div" || nodeName === "span") {
- $target.removeClass(this.markerClassName).empty();
- }
- },
-
- /* Enable the date picker to a jQuery selection.
- * @param target element - the target input field or division or span
- */
- _enableDatepicker: function(target) {
- var nodeName, inline,
- $target = $(target),
- inst = $.data(target, PROP_NAME);
-
- if (!$target.hasClass(this.markerClassName)) {
- return;
- }
-
- nodeName = target.nodeName.toLowerCase();
- if (nodeName === "input") {
- target.disabled = false;
- inst.trigger.filter("button").
- each(function() { this.disabled = false; }).end().
- filter("img").css({opacity: "1.0", cursor: ""});
- } else if (nodeName === "div" || nodeName === "span") {
- inline = $target.children("." + this._inlineClass);
- inline.children().removeClass("ui-state-disabled");
- inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
- prop("disabled", false);
- }
- this._disabledInputs = $.map(this._disabledInputs,
- function(value) { return (value === target ? null : value); }); // delete entry
- },
-
- /* Disable the date picker to a jQuery selection.
- * @param target element - the target input field or division or span
- */
- _disableDatepicker: function(target) {
- var nodeName, inline,
- $target = $(target),
- inst = $.data(target, PROP_NAME);
-
- if (!$target.hasClass(this.markerClassName)) {
- return;
- }
-
- nodeName = target.nodeName.toLowerCase();
- if (nodeName === "input") {
- target.disabled = true;
- inst.trigger.filter("button").
- each(function() { this.disabled = true; }).end().
- filter("img").css({opacity: "0.5", cursor: "default"});
- } else if (nodeName === "div" || nodeName === "span") {
- inline = $target.children("." + this._inlineClass);
- inline.children().addClass("ui-state-disabled");
- inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
- prop("disabled", true);
- }
- this._disabledInputs = $.map(this._disabledInputs,
- function(value) { return (value === target ? null : value); }); // delete entry
- this._disabledInputs[this._disabledInputs.length] = target;
- },
-
- /* Is the first field in a jQuery collection disabled as a datepicker?
- * @param target element - the target input field or division or span
- * @return boolean - true if disabled, false if enabled
- */
- _isDisabledDatepicker: function(target) {
- if (!target) {
- return false;
- }
- for (var i = 0; i < this._disabledInputs.length; i++) {
- if (this._disabledInputs[i] === target) {
- return true;
- }
- }
- return false;
- },
-
- /* Retrieve the instance data for the target control.
- * @param target element - the target input field or division or span
- * @return object - the associated instance data
- * @throws error if a jQuery problem getting data
- */
- _getInst: function(target) {
- try {
- return $.data(target, PROP_NAME);
- }
- catch (err) {
- throw "Missing instance data for this datepicker";
- }
- },
-
- /* Update or retrieve the settings for a date picker attached to an input field or division.
- * @param target element - the target input field or division or span
- * @param name object - the new settings to update or
- * string - the name of the setting to change or retrieve,
- * when retrieving also "all" for all instance settings or
- * "defaults" for all global defaults
- * @param value any - the new value for the setting
- * (omit if above is an object or to retrieve a value)
- */
- _optionDatepicker: function(target, name, value) {
- var settings, date, minDate, maxDate,
- inst = this._getInst(target);
-
- if (arguments.length === 2 && typeof name === "string") {
- return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
- (inst ? (name === "all" ? $.extend({}, inst.settings) :
- this._get(inst, name)) : null));
- }
-
- settings = name || {};
- if (typeof name === "string") {
- settings = {};
- settings[name] = value;
- }
-
- if (inst) {
- if (this._curInst === inst) {
- this._hideDatepicker();
- }
-
- date = this._getDateDatepicker(target, true);
- minDate = this._getMinMaxDate(inst, "min");
- maxDate = this._getMinMaxDate(inst, "max");
- extendRemove(inst.settings, settings);
- // reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
- if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
- inst.settings.minDate = this._formatDate(inst, minDate);
- }
- if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
- inst.settings.maxDate = this._formatDate(inst, maxDate);
- }
- if ( "disabled" in settings ) {
- if ( settings.disabled ) {
- this._disableDatepicker(target);
- } else {
- this._enableDatepicker(target);
- }
- }
- this._attachments($(target), inst);
- this._autoSize(inst);
- this._setDate(inst, date);
- this._updateAlternate(inst);
- this._updateDatepicker(inst);
- }
- },
-
- // change method deprecated
- _changeDatepicker: function(target, name, value) {
- this._optionDatepicker(target, name, value);
- },
-
- /* Redraw the date picker attached to an input field or division.
- * @param target element - the target input field or division or span
- */
- _refreshDatepicker: function(target) {
- var inst = this._getInst(target);
- if (inst) {
- this._updateDatepicker(inst);
- }
- },
-
- /* Set the dates for a jQuery selection.
- * @param target element - the target input field or division or span
- * @param date Date - the new date
- */
- _setDateDatepicker: function(target, date) {
- var inst = this._getInst(target);
- if (inst) {
- this._setDate(inst, date);
- this._updateDatepicker(inst);
- this._updateAlternate(inst);
- }
- },
-
- /* Get the date(s) for the first entry in a jQuery selection.
- * @param target element - the target input field or division or span
- * @param noDefault boolean - true if no default date is to be used
- * @return Date - the current date
- */
- _getDateDatepicker: function(target, noDefault) {
- var inst = this._getInst(target);
- if (inst && !inst.inline) {
- this._setDateFromField(inst, noDefault);
- }
- return (inst ? this._getDate(inst) : null);
- },
-
- /* Handle keystrokes. */
- _doKeyDown: function(event) {
- var onSelect, dateStr, sel,
- inst = $.datepicker._getInst(event.target),
- handled = true,
- isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
-
- inst._keyEvent = true;
- if ($.datepicker._datepickerShowing) {
- switch (event.keyCode) {
- case 9: $.datepicker._hideDatepicker();
- handled = false;
- break; // hide on tab out
- case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
- $.datepicker._currentClass + ")", inst.dpDiv);
- if (sel[0]) {
- $.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
- }
-
- onSelect = $.datepicker._get(inst, "onSelect");
- if (onSelect) {
- dateStr = $.datepicker._formatDate(inst);
-
- // trigger custom callback
- onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
- } else {
- $.datepicker._hideDatepicker();
- }
-
- return false; // don't submit the form
- case 27: $.datepicker._hideDatepicker();
- break; // hide on escape
- case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
- -$.datepicker._get(inst, "stepBigMonths") :
- -$.datepicker._get(inst, "stepMonths")), "M");
- break; // previous month/year on page up/+ ctrl
- case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
- +$.datepicker._get(inst, "stepBigMonths") :
- +$.datepicker._get(inst, "stepMonths")), "M");
- break; // next month/year on page down/+ ctrl
- case 35: if (event.ctrlKey || event.metaKey) {
- $.datepicker._clearDate(event.target);
- }
- handled = event.ctrlKey || event.metaKey;
- break; // clear on ctrl or command +end
- case 36: if (event.ctrlKey || event.metaKey) {
- $.datepicker._gotoToday(event.target);
- }
- handled = event.ctrlKey || event.metaKey;
- break; // current on ctrl or command +home
- case 37: if (event.ctrlKey || event.metaKey) {
- $.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
- }
- handled = event.ctrlKey || event.metaKey;
- // -1 day on ctrl or command +left
- if (event.originalEvent.altKey) {
- $.datepicker._adjustDate(event.target, (event.ctrlKey ?
- -$.datepicker._get(inst, "stepBigMonths") :
- -$.datepicker._get(inst, "stepMonths")), "M");
- }
- // next month/year on alt +left on Mac
- break;
- case 38: if (event.ctrlKey || event.metaKey) {
- $.datepicker._adjustDate(event.target, -7, "D");
- }
- handled = event.ctrlKey || event.metaKey;
- break; // -1 week on ctrl or command +up
- case 39: if (event.ctrlKey || event.metaKey) {
- $.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
- }
- handled = event.ctrlKey || event.metaKey;
- // +1 day on ctrl or command +right
- if (event.originalEvent.altKey) {
- $.datepicker._adjustDate(event.target, (event.ctrlKey ?
- +$.datepicker._get(inst, "stepBigMonths") :
- +$.datepicker._get(inst, "stepMonths")), "M");
- }
- // next month/year on alt +right
- break;
- case 40: if (event.ctrlKey || event.metaKey) {
- $.datepicker._adjustDate(event.target, +7, "D");
- }
- handled = event.ctrlKey || event.metaKey;
- break; // +1 week on ctrl or command +down
- default: handled = false;
- }
- } else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
- $.datepicker._showDatepicker(this);
- } else {
- handled = false;
- }
-
- if (handled) {
- event.preventDefault();
- event.stopPropagation();
- }
- },
-
- /* Filter entered characters - based on date format. */
- _doKeyPress: function(event) {
- var chars, chr,
- inst = $.datepicker._getInst(event.target);
-
- if ($.datepicker._get(inst, "constrainInput")) {
- chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
- chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
- return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
- }
- },
-
- /* Synchronise manual entry and field/alternate field. */
- _doKeyUp: function(event) {
- var date,
- inst = $.datepicker._getInst(event.target);
-
- if (inst.input.val() !== inst.lastVal) {
- try {
- date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
- (inst.input ? inst.input.val() : null),
- $.datepicker._getFormatConfig(inst));
-
- if (date) { // only if valid
- $.datepicker._setDateFromField(inst);
- $.datepicker._updateAlternate(inst);
- $.datepicker._updateDatepicker(inst);
- }
- }
- catch (err) {
- }
- }
- return true;
- },
-
- /* Pop-up the date picker for a given input field.
- * If false returned from beforeShow event handler do not show.
- * @param input element - the input field attached to the date picker or
- * event - if triggered by focus
- */
- _showDatepicker: function(input) {
- input = input.target || input;
- if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
- input = $("input", input.parentNode)[0];
- }
-
- if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
- return;
- }
-
- var inst, beforeShow, beforeShowSettings, isFixed,
- offset, showAnim, duration;
-
- inst = $.datepicker._getInst(input);
- if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
- $.datepicker._curInst.dpDiv.stop(true, true);
- if ( inst && $.datepicker._datepickerShowing ) {
- $.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
- }
- }
-
- beforeShow = $.datepicker._get(inst, "beforeShow");
- beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
- if(beforeShowSettings === false){
- return;
- }
- extendRemove(inst.settings, beforeShowSettings);
-
- inst.lastVal = null;
- $.datepicker._lastInput = input;
- $.datepicker._setDateFromField(inst);
-
- if ($.datepicker._inDialog) { // hide cursor
- input.value = "";
- }
- if (!$.datepicker._pos) { // position below input
- $.datepicker._pos = $.datepicker._findPos(input);
- $.datepicker._pos[1] += input.offsetHeight; // add the height
- }
-
- isFixed = false;
- $(input).parents().each(function() {
- isFixed |= $(this).css("position") === "fixed";
- return !isFixed;
- });
-
- offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
- $.datepicker._pos = null;
- //to avoid flashes on Firefox
- inst.dpDiv.empty();
- // determine sizing offscreen
- inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
- $.datepicker._updateDatepicker(inst);
- // fix width for dynamic number of date pickers
- // and adjust position before showing
- offset = $.datepicker._checkOffset(inst, offset, isFixed);
- inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
- "static" : (isFixed ? "fixed" : "absolute")), display: "none",
- left: offset.left + "px", top: offset.top + "px"});
-
- if (!inst.inline) {
- showAnim = $.datepicker._get(inst, "showAnim");
- duration = $.datepicker._get(inst, "duration");
- inst.dpDiv.zIndex($(input).zIndex()+1);
- $.datepicker._datepickerShowing = true;
-
- if ( $.effects && $.effects.effect[ showAnim ] ) {
- inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
- } else {
- inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
- }
-
- if ( $.datepicker._shouldFocusInput( inst ) ) {
- inst.input.focus();
- }
-
- $.datepicker._curInst = inst;
- }
- },
-
- /* Generate the date picker content. */
- _updateDatepicker: function(inst) {
- this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
- instActive = inst; // for delegate hover events
- inst.dpDiv.empty().append(this._generateHTML(inst));
- this._attachHandlers(inst);
- inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
-
- var origyearshtml,
- numMonths = this._getNumberOfMonths(inst),
- cols = numMonths[1],
- width = 17;
-
- inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
- if (cols > 1) {
- inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
- }
- inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
- "Class"]("ui-datepicker-multi");
- inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
- "Class"]("ui-datepicker-rtl");
-
- if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
- inst.input.focus();
- }
-
- // deffered render of the years select (to avoid flashes on Firefox)
- if( inst.yearshtml ){
- origyearshtml = inst.yearshtml;
- setTimeout(function(){
- //assure that inst.yearshtml didn't change.
- if( origyearshtml === inst.yearshtml && inst.yearshtml ){
- inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
- }
- origyearshtml = inst.yearshtml = null;
- }, 0);
- }
- },
-
- // #6694 - don't focus the input if it's already focused
- // this breaks the change event in IE
- // Support: IE and jQuery <1.9
- _shouldFocusInput: function( inst ) {
- return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
- },
-
- /* Check positioning to remain on screen. */
- _checkOffset: function(inst, offset, isFixed) {
- var dpWidth = inst.dpDiv.outerWidth(),
- dpHeight = inst.dpDiv.outerHeight(),
- inputWidth = inst.input ? inst.input.outerWidth() : 0,
- inputHeight = inst.input ? inst.input.outerHeight() : 0,
- viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
- viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
-
- offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
- offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
- offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
-
- // now check if datepicker is showing outside window viewport - move to a better place if so.
- offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
- Math.abs(offset.left + dpWidth - viewWidth) : 0);
- offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
- Math.abs(dpHeight + inputHeight) : 0);
-
- return offset;
- },
-
- /* Find an object's position on the screen. */
- _findPos: function(obj) {
- var position,
- inst = this._getInst(obj),
- isRTL = this._get(inst, "isRTL");
-
- while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
- obj = obj[isRTL ? "previousSibling" : "nextSibling"];
- }
-
- position = $(obj).offset();
- return [position.left, position.top];
- },
-
- /* Hide the date picker from view.
- * @param input element - the input field attached to the date picker
- */
- _hideDatepicker: function(input) {
- var showAnim, duration, postProcess, onClose,
- inst = this._curInst;
-
- if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
- return;
- }
-
- if (this._datepickerShowing) {
- showAnim = this._get(inst, "showAnim");
- duration = this._get(inst, "duration");
- postProcess = function() {
- $.datepicker._tidyDialog(inst);
- };
-
- // DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
- if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
- inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
- } else {
- inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
- (showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
- }
-
- if (!showAnim) {
- postProcess();
- }
- this._datepickerShowing = false;
-
- onClose = this._get(inst, "onClose");
- if (onClose) {
- onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
- }
-
- this._lastInput = null;
- if (this._inDialog) {
- this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
- if ($.blockUI) {
- $.unblockUI();
- $("body").append(this.dpDiv);
- }
- }
- this._inDialog = false;
- }
- },
-
- /* Tidy up after a dialog display. */
- _tidyDialog: function(inst) {
- inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
- },
-
- /* Close date picker if clicked elsewhere. */
- _checkExternalClick: function(event) {
- if (!$.datepicker._curInst) {
- return;
- }
-
- var $target = $(event.target),
- inst = $.datepicker._getInst($target[0]);
-
- if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
- $target.parents("#" + $.datepicker._mainDivId).length === 0 &&
- !$target.hasClass($.datepicker.markerClassName) &&
- !$target.closest("." + $.datepicker._triggerClass).length &&
- $.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
- ( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
- $.datepicker._hideDatepicker();
- }
- },
-
- /* Adjust one of the date sub-fields. */
- _adjustDate: function(id, offset, period) {
- var target = $(id),
- inst = this._getInst(target[0]);
-
- if (this._isDisabledDatepicker(target[0])) {
- return;
- }
- this._adjustInstDate(inst, offset +
- (period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
- period);
- this._updateDatepicker(inst);
- },
-
- /* Action for current link. */
- _gotoToday: function(id) {
- var date,
- target = $(id),
- inst = this._getInst(target[0]);
-
- if (this._get(inst, "gotoCurrent") && inst.currentDay) {
- inst.selectedDay = inst.currentDay;
- inst.drawMonth = inst.selectedMonth = inst.currentMonth;
- inst.drawYear = inst.selectedYear = inst.currentYear;
- } else {
- date = new Date();
- inst.selectedDay = date.getDate();
- inst.drawMonth = inst.selectedMonth = date.getMonth();
- inst.drawYear = inst.selectedYear = date.getFullYear();
- }
- this._notifyChange(inst);
- this._adjustDate(target);
- },
-
- /* Action for selecting a new month/year. */
- _selectMonthYear: function(id, select, period) {
- var target = $(id),
- inst = this._getInst(target[0]);
-
- inst["selected" + (period === "M" ? "Month" : "Year")] =
- inst["draw" + (period === "M" ? "Month" : "Year")] =
- parseInt(select.options[select.selectedIndex].value,10);
-
- this._notifyChange(inst);
- this._adjustDate(target);
- },
-
- /* Action for selecting a day. */
- _selectDay: function(id, month, year, td) {
- var inst,
- target = $(id);
-
- if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
- return;
- }
-
- inst = this._getInst(target[0]);
- inst.selectedDay = inst.currentDay = $("a", td).html();
- inst.selectedMonth = inst.currentMonth = month;
- inst.selectedYear = inst.currentYear = year;
- this._selectDate(id, this._formatDate(inst,
- inst.currentDay, inst.currentMonth, inst.currentYear));
- },
-
- /* Erase the input field and hide the date picker. */
- _clearDate: function(id) {
- var target = $(id);
- this._selectDate(target, "");
- },
-
- /* Update the input field with the selected date. */
- _selectDate: function(id, dateStr) {
- var onSelect,
- target = $(id),
- inst = this._getInst(target[0]);
-
- dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
- if (inst.input) {
- inst.input.val(dateStr);
- }
- this._updateAlternate(inst);
-
- onSelect = this._get(inst, "onSelect");
- if (onSelect) {
- onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]); // trigger custom callback
- } else if (inst.input) {
- inst.input.trigger("change"); // fire the change event
- }
-
- if (inst.inline){
- this._updateDatepicker(inst);
- } else {
- this._hideDatepicker();
- this._lastInput = inst.input[0];
- if (typeof(inst.input[0]) !== "object") {
- inst.input.focus(); // restore focus
- }
- this._lastInput = null;
- }
- },
-
- /* Update any alternate field to synchronise with the main field. */
- _updateAlternate: function(inst) {
- var altFormat, date, dateStr,
- altField = this._get(inst, "altField");
-
- if (altField) { // update alternate field too
- altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
- date = this._getDate(inst);
- dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
- $(altField).each(function() { $(this).val(dateStr); });
- }
- },
-
- /* Set as beforeShowDay function to prevent selection of weekends.
- * @param date Date - the date to customise
- * @return [boolean, string] - is this date selectable?, what is its CSS class?
- */
- noWeekends: function(date) {
- var day = date.getDay();
- return [(day > 0 && day < 6), ""];
- },
-
- /* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
- * @param date Date - the date to get the week for
- * @return number - the number of the week within the year that contains this date
- */
- iso8601Week: function(date) {
- var time,
- checkDate = new Date(date.getTime());
-
- // Find Thursday of this week starting on Monday
- checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
-
- time = checkDate.getTime();
- checkDate.setMonth(0); // Compare with Jan 1
- checkDate.setDate(1);
- return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
- },
-
- /* Parse a string value into a date object.
- * See formatDate below for the possible formats.
- *
- * @param format string - the expected format of the date
- * @param value string - the date in the above format
- * @param settings Object - attributes include:
- * shortYearCutoff number - the cutoff year for determining the century (optional)
- * dayNamesShort string[7] - abbreviated names of the days from Sunday (optional)
- * dayNames string[7] - names of the days from Sunday (optional)
- * monthNamesShort string[12] - abbreviated names of the months (optional)
- * monthNames string[12] - names of the months (optional)
- * @return Date - the extracted date value or null if value is blank
- */
- parseDate: function (format, value, settings) {
- if (format == null || value == null) {
- throw "Invalid arguments";
- }
-
- value = (typeof value === "object" ? value.toString() : value + "");
- if (value === "") {
- return null;
- }
-
- var iFormat, dim, extra,
- iValue = 0,
- shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
- shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
- new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
- dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
- dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
- monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
- monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
- year = -1,
- month = -1,
- day = -1,
- doy = -1,
- literal = false,
- date,
- // Check whether a format character is doubled
- lookAhead = function(match) {
- var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
- if (matches) {
- iFormat++;
- }
- return matches;
- },
- // Extract a number from the string value
- getNumber = function(match) {
- var isDoubled = lookAhead(match),
- size = (match === "@" ? 14 : (match === "!" ? 20 :
- (match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
- digits = new RegExp("^\\d{1," + size + "}"),
- num = value.substring(iValue).match(digits);
- if (!num) {
- throw "Missing number at position " + iValue;
- }
- iValue += num[0].length;
- return parseInt(num[0], 10);
- },
- // Extract a name from the string value and convert to an index
- getName = function(match, shortNames, longNames) {
- var index = -1,
- names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
- return [ [k, v] ];
- }).sort(function (a, b) {
- return -(a[1].length - b[1].length);
- });
-
- $.each(names, function (i, pair) {
- var name = pair[1];
- if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
- index = pair[0];
- iValue += name.length;
- return false;
- }
- });
- if (index !== -1) {
- return index + 1;
- } else {
- throw "Unknown name at position " + iValue;
- }
- },
- // Confirm that a literal character matches the string value
- checkLiteral = function() {
- if (value.charAt(iValue) !== format.charAt(iFormat)) {
- throw "Unexpected literal at position " + iValue;
- }
- iValue++;
- };
-
- for (iFormat = 0; iFormat < format.length; iFormat++) {
- if (literal) {
- if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
- literal = false;
- } else {
- checkLiteral();
- }
- } else {
- switch (format.charAt(iFormat)) {
- case "d":
- day = getNumber("d");
- break;
- case "D":
- getName("D", dayNamesShort, dayNames);
- break;
- case "o":
- doy = getNumber("o");
- break;
- case "m":
- month = getNumber("m");
- break;
- case "M":
- month = getName("M", monthNamesShort, monthNames);
- break;
- case "y":
- year = getNumber("y");
- break;
- case "@":
- date = new Date(getNumber("@"));
- year = date.getFullYear();
- month = date.getMonth() + 1;
- day = date.getDate();
- break;
- case "!":
- date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
- year = date.getFullYear();
- month = date.getMonth() + 1;
- day = date.getDate();
- break;
- case "'":
- if (lookAhead("'")){
- checkLiteral();
- } else {
- literal = true;
- }
- break;
- default:
- checkLiteral();
- }
- }
- }
-
- if (iValue < value.length){
- extra = value.substr(iValue);
- if (!/^\s+/.test(extra)) {
- throw "Extra/unparsed characters found in date: " + extra;
- }
- }
-
- if (year === -1) {
- year = new Date().getFullYear();
- } else if (year < 100) {
- year += new Date().getFullYear() - new Date().getFullYear() % 100 +
- (year <= shortYearCutoff ? 0 : -100);
- }
-
- if (doy > -1) {
- month = 1;
- day = doy;
- do {
- dim = this._getDaysInMonth(year, month - 1);
- if (day <= dim) {
- break;
- }
- month++;
- day -= dim;
- } while (true);
- }
-
- date = this._daylightSavingAdjust(new Date(year, month - 1, day));
- if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
- throw "Invalid date"; // E.g. 31/02/00
- }
- return date;
- },
-
- /* Standard date formats. */
- ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
- COOKIE: "D, dd M yy",
- ISO_8601: "yy-mm-dd",
- RFC_822: "D, d M y",
- RFC_850: "DD, dd-M-y",
- RFC_1036: "D, d M y",
- RFC_1123: "D, d M yy",
- RFC_2822: "D, d M yy",
- RSS: "D, d M y", // RFC 822
- TICKS: "!",
- TIMESTAMP: "@",
- W3C: "yy-mm-dd", // ISO 8601
-
- _ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
- Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
-
- /* Format a date object into a string value.
- * The format can be combinations of the following:
- * d - day of month (no leading zero)
- * dd - day of month (two digit)
- * o - day of year (no leading zeros)
- * oo - day of year (three digit)
- * D - day name short
- * DD - day name long
- * m - month of year (no leading zero)
- * mm - month of year (two digit)
- * M - month name short
- * MM - month name long
- * y - year (two digit)
- * yy - year (four digit)
- * @ - Unix timestamp (ms since 01/01/1970)
- * ! - Windows ticks (100ns since 01/01/0001)
- * "..." - literal text
- * '' - single quote
- *
- * @param format string - the desired format of the date
- * @param date Date - the date value to format
- * @param settings Object - attributes include:
- * dayNamesShort string[7] - abbreviated names of the days from Sunday (optional)
- * dayNames string[7] - names of the days from Sunday (optional)
- * monthNamesShort string[12] - abbreviated names of the months (optional)
- * monthNames string[12] - names of the months (optional)
- * @return string - the date in the above format
- */
- formatDate: function (format, date, settings) {
- if (!date) {
- return "";
- }
-
- var iFormat,
- dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
- dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
- monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
- monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
- // Check whether a format character is doubled
- lookAhead = function(match) {
- var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
- if (matches) {
- iFormat++;
- }
- return matches;
- },
- // Format a number, with leading zero if necessary
- formatNumber = function(match, value, len) {
- var num = "" + value;
- if (lookAhead(match)) {
- while (num.length < len) {
- num = "0" + num;
- }
- }
- return num;
- },
- // Format a name, short or long as requested
- formatName = function(match, value, shortNames, longNames) {
- return (lookAhead(match) ? longNames[value] : shortNames[value]);
- },
- output = "",
- literal = false;
-
- if (date) {
- for (iFormat = 0; iFormat < format.length; iFormat++) {
- if (literal) {
- if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
- literal = false;
- } else {
- output += format.charAt(iFormat);
- }
- } else {
- switch (format.charAt(iFormat)) {
- case "d":
- output += formatNumber("d", date.getDate(), 2);
- break;
- case "D":
- output += formatName("D", date.getDay(), dayNamesShort, dayNames);
- break;
- case "o":
- output += formatNumber("o",
- Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
- break;
- case "m":
- output += formatNumber("m", date.getMonth() + 1, 2);
- break;
- case "M":
- output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
- break;
- case "y":
- output += (lookAhead("y") ? date.getFullYear() :
- (date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
- break;
- case "@":
- output += date.getTime();
- break;
- case "!":
- output += date.getTime() * 10000 + this._ticksTo1970;
- break;
- case "'":
- if (lookAhead("'")) {
- output += "'";
- } else {
- literal = true;
- }
- break;
- default:
- output += format.charAt(iFormat);
- }
- }
- }
- }
- return output;
- },
-
- /* Extract all possible characters from the date format. */
- _possibleChars: function (format) {
- var iFormat,
- chars = "",
- literal = false,
- // Check whether a format character is doubled
- lookAhead = function(match) {
- var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
- if (matches) {
- iFormat++;
- }
- return matches;
- };
-
- for (iFormat = 0; iFormat < format.length; iFormat++) {
- if (literal) {
- if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
- literal = false;
- } else {
- chars += format.charAt(iFormat);
- }
- } else {
- switch (format.charAt(iFormat)) {
- case "d": case "m": case "y": case "@":
- chars += "0123456789";
- break;
- case "D": case "M":
- return null; // Accept anything
- case "'":
- if (lookAhead("'")) {
- chars += "'";
- } else {
- literal = true;
- }
- break;
- default:
- chars += format.charAt(iFormat);
- }
- }
- }
- return chars;
- },
-
- /* Get a setting value, defaulting if necessary. */
- _get: function(inst, name) {
- return inst.settings[name] !== undefined ?
- inst.settings[name] : this._defaults[name];
- },
-
- /* Parse existing date and initialise date picker. */
- _setDateFromField: function(inst, noDefault) {
- if (inst.input.val() === inst.lastVal) {
- return;
- }
-
- var dateFormat = this._get(inst, "dateFormat"),
- dates = inst.lastVal = inst.input ? inst.input.val() : null,
- defaultDate = this._getDefaultDate(inst),
- date = defaultDate,
- settings = this._getFormatConfig(inst);
-
- try {
- date = this.parseDate(dateFormat, dates, settings) || defaultDate;
- } catch (event) {
- dates = (noDefault ? "" : dates);
- }
- inst.selectedDay = date.getDate();
- inst.drawMonth = inst.selectedMonth = date.getMonth();
- inst.drawYear = inst.selectedYear = date.getFullYear();
- inst.currentDay = (dates ? date.getDate() : 0);
- inst.currentMonth = (dates ? date.getMonth() : 0);
- inst.currentYear = (dates ? date.getFullYear() : 0);
- this._adjustInstDate(inst);
- },
-
- /* Retrieve the default date shown on opening. */
- _getDefaultDate: function(inst) {
- return this._restrictMinMax(inst,
- this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
- },
-
- /* A date may be specified as an exact value or a relative one. */
- _determineDate: function(inst, date, defaultDate) {
- var offsetNumeric = function(offset) {
- var date = new Date();
- date.setDate(date.getDate() + offset);
- return date;
- },
- offsetString = function(offset) {
- try {
- return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
- offset, $.datepicker._getFormatConfig(inst));
- }
- catch (e) {
- // Ignore
- }
-
- var date = (offset.toLowerCase().match(/^c/) ?
- $.datepicker._getDate(inst) : null) || new Date(),
- year = date.getFullYear(),
- month = date.getMonth(),
- day = date.getDate(),
- pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
- matches = pattern.exec(offset);
-
- while (matches) {
- switch (matches[2] || "d") {
- case "d" : case "D" :
- day += parseInt(matches[1],10); break;
- case "w" : case "W" :
- day += parseInt(matches[1],10) * 7; break;
- case "m" : case "M" :
- month += parseInt(matches[1],10);
- day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
- break;
- case "y": case "Y" :
- year += parseInt(matches[1],10);
- day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
- break;
- }
- matches = pattern.exec(offset);
- }
- return new Date(year, month, day);
- },
- newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
- (typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
-
- newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
- if (newDate) {
- newDate.setHours(0);
- newDate.setMinutes(0);
- newDate.setSeconds(0);
- newDate.setMilliseconds(0);
- }
- return this._daylightSavingAdjust(newDate);
- },
-
- /* Handle switch to/from daylight saving.
- * Hours may be non-zero on daylight saving cut-over:
- * > 12 when midnight changeover, but then cannot generate
- * midnight datetime, so jump to 1AM, otherwise reset.
- * @param date (Date) the date to check
- * @return (Date) the corrected date
- */
- _daylightSavingAdjust: function(date) {
- if (!date) {
- return null;
- }
- date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
- return date;
- },
-
- /* Set the date(s) directly. */
- _setDate: function(inst, date, noChange) {
- var clear = !date,
- origMonth = inst.selectedMonth,
- origYear = inst.selectedYear,
- newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
-
- inst.selectedDay = inst.currentDay = newDate.getDate();
- inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
- inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
- if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
- this._notifyChange(inst);
- }
- this._adjustInstDate(inst);
- if (inst.input) {
- inst.input.val(clear ? "" : this._formatDate(inst));
- }
- },
-
- /* Retrieve the date(s) directly. */
- _getDate: function(inst) {
- var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
- this._daylightSavingAdjust(new Date(
- inst.currentYear, inst.currentMonth, inst.currentDay)));
- return startDate;
- },
-
- /* Attach the onxxx handlers. These are declared statically so
- * they work with static code transformers like Caja.
- */
- _attachHandlers: function(inst) {
- var stepMonths = this._get(inst, "stepMonths"),
- id = "#" + inst.id.replace( /\\\\/g, "\\" );
- inst.dpDiv.find("[data-handler]").map(function () {
- var handler = {
- prev: function () {
- $.datepicker._adjustDate(id, -stepMonths, "M");
- },
- next: function () {
- $.datepicker._adjustDate(id, +stepMonths, "M");
- },
- hide: function () {
- $.datepicker._hideDatepicker();
- },
- today: function () {
- $.datepicker._gotoToday(id);
- },
- selectDay: function () {
- $.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
- return false;
- },
- selectMonth: function () {
- $.datepicker._selectMonthYear(id, this, "M");
- return false;
- },
- selectYear: function () {
- $.datepicker._selectMonthYear(id, this, "Y");
- return false;
- }
- };
- $(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
- });
- },
-
- /* Generate the HTML for the current state of the date picker. */
- _generateHTML: function(inst) {
- var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
- controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
- monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
- selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
- cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
- printDate, dRow, tbody, daySettings, otherMonth, unselectable,
- tempDate = new Date(),
- today = this._daylightSavingAdjust(
- new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
- isRTL = this._get(inst, "isRTL"),
- showButtonPanel = this._get(inst, "showButtonPanel"),
- hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
- navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
- numMonths = this._getNumberOfMonths(inst),
- showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
- stepMonths = this._get(inst, "stepMonths"),
- isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
- currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
- new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
- minDate = this._getMinMaxDate(inst, "min"),
- maxDate = this._getMinMaxDate(inst, "max"),
- drawMonth = inst.drawMonth - showCurrentAtPos,
- drawYear = inst.drawYear;
-
- if (drawMonth < 0) {
- drawMonth += 12;
- drawYear--;
- }
- if (maxDate) {
- maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
- maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
- maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
- while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
- drawMonth--;
- if (drawMonth < 0) {
- drawMonth = 11;
- drawYear--;
- }
- }
- }
- inst.drawMonth = drawMonth;
- inst.drawYear = drawYear;
-
- prevText = this._get(inst, "prevText");
- prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
- this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
- this._getFormatConfig(inst)));
-
- prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
- "<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
- " title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
- (hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
-
- nextText = this._get(inst, "nextText");
- nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
- this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
- this._getFormatConfig(inst)));
-
- next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
- "<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
- " title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
- (hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
-
- currentText = this._get(inst, "currentText");
- gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
- currentText = (!navigationAsDateFormat ? currentText :
- this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
-
- controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
- this._get(inst, "closeText") + "</button>" : "");
-
- buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
- (this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
- ">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
-
- firstDay = parseInt(this._get(inst, "firstDay"),10);
- firstDay = (isNaN(firstDay) ? 0 : firstDay);
-
- showWeek = this._get(inst, "showWeek");
- dayNames = this._get(inst, "dayNames");
- dayNamesMin = this._get(inst, "dayNamesMin");
- monthNames = this._get(inst, "monthNames");
- monthNamesShort = this._get(inst, "monthNamesShort");
- beforeShowDay = this._get(inst, "beforeShowDay");
- showOtherMonths = this._get(inst, "showOtherMonths");
- selectOtherMonths = this._get(inst, "selectOtherMonths");
- defaultDate = this._getDefaultDate(inst);
- html = "";
- dow;
- for (row = 0; row < numMonths[0]; row++) {
- group = "";
- this.maxRows = 4;
- for (col = 0; col < numMonths[1]; col++) {
- selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
- cornerClass = " ui-corner-all";
- calender = "";
- if (isMultiMonth) {
- calender += "<div class='ui-datepicker-group";
- if (numMonths[1] > 1) {
- switch (col) {
- case 0: calender += " ui-datepicker-group-first";
- cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
- case numMonths[1]-1: calender += " ui-datepicker-group-last";
- cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
- default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
- }
- }
- calender += "'>";
- }
- calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
- (/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
- (/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
- this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
- row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
- "</div><table class='ui-datepicker-calendar'><thead>" +
- "<tr>";
- thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
- for (dow = 0; dow < 7; dow++) { // days of the week
- day = (dow + firstDay) % 7;
- thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
- "<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
- }
- calender += thead + "</tr></thead><tbody>";
- daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
- if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
- inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
- }
- leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
- curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
- numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
- this.maxRows = numRows;
- printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
- for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
- calender += "<tr>";
- tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
- this._get(inst, "calculateWeek")(printDate) + "</td>");
- for (dow = 0; dow < 7; dow++) { // create date picker days
- daySettings = (beforeShowDay ?
- beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
- otherMonth = (printDate.getMonth() !== drawMonth);
- unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
- (minDate && printDate < minDate) || (maxDate && printDate > maxDate);
- tbody += "<td class='" +
- ((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
- (otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
- ((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
- (defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
- // or defaultDate is current printedDate and defaultDate is selectedDate
- " " + this._dayOverClass : "") + // highlight selected day
- (unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") + // highlight unselectable days
- (otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
- (printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
- (printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
- ((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "'") + "'" : "") + // cell title
- (unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
- (otherMonth && !showOtherMonths ? " " : // display for other months
- (unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
- (printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
- (printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
- (otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
- "' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
- printDate.setDate(printDate.getDate() + 1);
- printDate = this._daylightSavingAdjust(printDate);
- }
- calender += tbody + "</tr>";
- }
- drawMonth++;
- if (drawMonth > 11) {
- drawMonth = 0;
- drawYear++;
- }
- calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
- ((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
- group += calender;
- }
- html += group;
- }
- html += buttonPanel;
- inst._keyEvent = false;
- return html;
- },
-
- /* Generate the month and year header. */
- _generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
- secondary, monthNames, monthNamesShort) {
-
- var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
- changeMonth = this._get(inst, "changeMonth"),
- changeYear = this._get(inst, "changeYear"),
- showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
- html = "<div class='ui-datepicker-title'>",
- monthHtml = "";
-
- // month selection
- if (secondary || !changeMonth) {
- monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
- } else {
- inMinYear = (minDate && minDate.getFullYear() === drawYear);
- inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
- monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
- for ( month = 0; month < 12; month++) {
- if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
- monthHtml += "<option value='" + month + "'" +
- (month === drawMonth ? " selected='selected'" : "") +
- ">" + monthNamesShort[month] + "</option>";
- }
- }
- monthHtml += "</select>";
- }
-
- if (!showMonthAfterYear) {
- html += monthHtml + (secondary || !(changeMonth && changeYear) ? " " : "");
- }
-
- // year selection
- if ( !inst.yearshtml ) {
- inst.yearshtml = "";
- if (secondary || !changeYear) {
- html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
- } else {
- // determine range of years to display
- years = this._get(inst, "yearRange").split(":");
- thisYear = new Date().getFullYear();
- determineYear = function(value) {
- var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
- (value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
- parseInt(value, 10)));
- return (isNaN(year) ? thisYear : year);
- };
- year = determineYear(years[0]);
- endYear = Math.max(year, determineYear(years[1] || ""));
- year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
- endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
- inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
- for (; year <= endYear; year++) {
- inst.yearshtml += "<option value='" + year + "'" +
- (year === drawYear ? " selected='selected'" : "") +
- ">" + year + "</option>";
- }
- inst.yearshtml += "</select>";
-
- html += inst.yearshtml;
- inst.yearshtml = null;
- }
- }
-
- html += this._get(inst, "yearSuffix");
- if (showMonthAfterYear) {
- html += (secondary || !(changeMonth && changeYear) ? " " : "") + monthHtml;
- }
- html += "</div>"; // Close datepicker_header
- return html;
- },
-
- /* Adjust one of the date sub-fields. */
- _adjustInstDate: function(inst, offset, period) {
- var year = inst.drawYear + (period === "Y" ? offset : 0),
- month = inst.drawMonth + (period === "M" ? offset : 0),
- day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
- date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
-
- inst.selectedDay = date.getDate();
- inst.drawMonth = inst.selectedMonth = date.getMonth();
- inst.drawYear = inst.selectedYear = date.getFullYear();
- if (period === "M" || period === "Y") {
- this._notifyChange(inst);
- }
- },
-
- /* Ensure a date is within any min/max bounds. */
- _restrictMinMax: function(inst, date) {
- var minDate = this._getMinMaxDate(inst, "min"),
- maxDate = this._getMinMaxDate(inst, "max"),
- newDate = (minDate && date < minDate ? minDate : date);
- return (maxDate && newDate > maxDate ? maxDate : newDate);
- },
-
- /* Notify change of month/year. */
- _notifyChange: function(inst) {
- var onChange = this._get(inst, "onChangeMonthYear");
- if (onChange) {
- onChange.apply((inst.input ? inst.input[0] : null),
- [inst.selectedYear, inst.selectedMonth + 1, inst]);
- }
- },
-
- /* Determine the number of months to show. */
- _getNumberOfMonths: function(inst) {
- var numMonths = this._get(inst, "numberOfMonths");
- return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
- },
-
- /* Determine the current maximum date - ensure no time components are set. */
- _getMinMaxDate: function(inst, minMax) {
- return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
- },
-
- /* Find the number of days in a given month. */
- _getDaysInMonth: function(year, month) {
- return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
- },
-
- /* Find the day of the week of the first of a month. */
- _getFirstDayOfMonth: function(year, month) {
- return new Date(year, month, 1).getDay();
- },
-
- /* Determines if we should allow a "next/prev" month display change. */
- _canAdjustMonth: function(inst, offset, curYear, curMonth) {
- var numMonths = this._getNumberOfMonths(inst),
- date = this._daylightSavingAdjust(new Date(curYear,
- curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
-
- if (offset < 0) {
- date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
- }
- return this._isInRange(inst, date);
- },
-
- /* Is the given date in the accepted range? */
- _isInRange: function(inst, date) {
- var yearSplit, currentYear,
- minDate = this._getMinMaxDate(inst, "min"),
- maxDate = this._getMinMaxDate(inst, "max"),
- minYear = null,
- maxYear = null,
- years = this._get(inst, "yearRange");
- if (years){
- yearSplit = years.split(":");
- currentYear = new Date().getFullYear();
- minYear = parseInt(yearSplit[0], 10);
- maxYear = parseInt(yearSplit[1], 10);
- if ( yearSplit[0].match(/[+\-].*/) ) {
- minYear += currentYear;
- }
- if ( yearSplit[1].match(/[+\-].*/) ) {
- maxYear += currentYear;
- }
- }
-
- return ((!minDate || date.getTime() >= minDate.getTime()) &&
- (!maxDate || date.getTime() <= maxDate.getTime()) &&
- (!minYear || date.getFullYear() >= minYear) &&
- (!maxYear || date.getFullYear() <= maxYear));
- },
-
- /* Provide the configuration settings for formatting/parsing. */
- _getFormatConfig: function(inst) {
- var shortYearCutoff = this._get(inst, "shortYearCutoff");
- shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
- new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
- return {shortYearCutoff: shortYearCutoff,
- dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
- monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
- },
-
- /* Format the given date for display. */
- _formatDate: function(inst, day, month, year) {
- if (!day) {
- inst.currentDay = inst.selectedDay;
- inst.currentMonth = inst.selectedMonth;
- inst.currentYear = inst.selectedYear;
- }
- var date = (day ? (typeof day === "object" ? day :
- this._daylightSavingAdjust(new Date(year, month, day))) :
- this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
- return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
- }
-});
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function bindHover(dpDiv) {
- var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
- return dpDiv.delegate(selector, "mouseout", function() {
- $(this).removeClass("ui-state-hover");
- if (this.className.indexOf("ui-datepicker-prev") !== -1) {
- $(this).removeClass("ui-datepicker-prev-hover");
- }
- if (this.className.indexOf("ui-datepicker-next") !== -1) {
- $(this).removeClass("ui-datepicker-next-hover");
- }
- })
- .delegate(selector, "mouseover", function(){
- if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
- $(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
- $(this).addClass("ui-state-hover");
- if (this.className.indexOf("ui-datepicker-prev") !== -1) {
- $(this).addClass("ui-datepicker-prev-hover");
- }
- if (this.className.indexOf("ui-datepicker-next") !== -1) {
- $(this).addClass("ui-datepicker-next-hover");
- }
- }
- });
-}
-
-/* jQuery extend now ignores nulls! */
-function extendRemove(target, props) {
- $.extend(target, props);
- for (var name in props) {
- if (props[name] == null) {
- target[name] = props[name];
- }
- }
- return target;
-}
-
-/* Invoke the datepicker functionality.
- @param options string - a command, optionally followed by additional parameters or
- Object - settings for attaching new datepicker functionality
- @return jQuery object */
-$.fn.datepicker = function(options){
-
- /* Verify an empty collection wasn't passed - Fixes #6976 */
- if ( !this.length ) {
- return this;
- }
-
- /* Initialise the date picker. */
- if (!$.datepicker.initialized) {
- $(document).mousedown($.datepicker._checkExternalClick);
- $.datepicker.initialized = true;
- }
-
- /* Append datepicker main container to body if not exist. */
- if ($("#"+$.datepicker._mainDivId).length === 0) {
- $("body").append($.datepicker.dpDiv);
- }
-
- var otherArgs = Array.prototype.slice.call(arguments, 1);
- if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
- return $.datepicker["_" + options + "Datepicker"].
- apply($.datepicker, [this[0]].concat(otherArgs));
- }
- if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
- return $.datepicker["_" + options + "Datepicker"].
- apply($.datepicker, [this[0]].concat(otherArgs));
- }
- return this.each(function() {
- typeof options === "string" ?
- $.datepicker["_" + options + "Datepicker"].
- apply($.datepicker, [this].concat(otherArgs)) :
- $.datepicker._attachDatepicker(this, options);
- });
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.10.4";
-
-})(jQuery);
-(function( $, undefined ) {
-
-// number of pages in a slider
-// (how many times can you page up/down to go through the whole range)
-var numPages = 5;
-
-$.widget( "ui.slider", $.ui.mouse, {
- version: "1.10.4",
- widgetEventPrefix: "slide",
-
- options: {
- animate: false,
- distance: 0,
- max: 100,
- min: 0,
- orientation: "horizontal",
- range: false,
- step: 1,
- value: 0,
- values: null,
-
- // callbacks
- change: null,
- slide: null,
- start: null,
- stop: null
- },
-
- _create: function() {
- this._keySliding = false;
- this._mouseSliding = false;
- this._animateOff = true;
- this._handleIndex = null;
- this._detectOrientation();
- this._mouseInit();
-
- this.element
- .addClass( "ui-slider" +
- " ui-slider-" + this.orientation +
- " ui-widget" +
- " ui-widget-content" +
- " ui-corner-all");
-
- this._refresh();
- this._setOption( "disabled", this.options.disabled );
-
- this._animateOff = false;
- },
-
- _refresh: function() {
- this._createRange();
- this._createHandles();
- this._setupEvents();
- this._refreshValue();
- },
-
- _createHandles: function() {
- var i, handleCount,
- options = this.options,
- existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
- handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
- handles = [];
-
- handleCount = ( options.values && options.values.length ) || 1;
-
- if ( existingHandles.length > handleCount ) {
- existingHandles.slice( handleCount ).remove();
- existingHandles = existingHandles.slice( 0, handleCount );
- }
-
- for ( i = existingHandles.length; i < handleCount; i++ ) {
- handles.push( handle );
- }
-
- this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
-
- this.handle = this.handles.eq( 0 );
-
- this.handles.each(function( i ) {
- $( this ).data( "ui-slider-handle-index", i );
- });
- },
-
- _createRange: function() {
- var options = this.options,
- classes = "";
-
- if ( options.range ) {
- if ( options.range === true ) {
- if ( !options.values ) {
- options.values = [ this._valueMin(), this._valueMin() ];
- } else if ( options.values.length && options.values.length !== 2 ) {
- options.values = [ options.values[0], options.values[0] ];
- } else if ( $.isArray( options.values ) ) {
- options.values = options.values.slice(0);
- }
- }
-
- if ( !this.range || !this.range.length ) {
- this.range = $( "<div></div>" )
- .appendTo( this.element );
-
- classes = "ui-slider-range" +
- // note: this isn't the most fittingly semantic framework class for this element,
- // but worked best visually with a variety of themes
- " ui-widget-header ui-corner-all";
- } else {
- this.range.removeClass( "ui-slider-range-min ui-slider-range-max" )
- // Handle range switching from true to min/max
- .css({
- "left": "",
- "bottom": ""
- });
- }
-
- this.range.addClass( classes +
- ( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
- } else {
- if ( this.range ) {
- this.range.remove();
- }
- this.range = null;
- }
- },
-
- _setupEvents: function() {
- var elements = this.handles.add( this.range ).filter( "a" );
- this._off( elements );
- this._on( elements, this._handleEvents );
- this._hoverable( elements );
- this._focusable( elements );
- },
-
- _destroy: function() {
- this.handles.remove();
- if ( this.range ) {
- this.range.remove();
- }
-
- this.element
- .removeClass( "ui-slider" +
- " ui-slider-horizontal" +
- " ui-slider-vertical" +
- " ui-widget" +
- " ui-widget-content" +
- " ui-corner-all" );
-
- this._mouseDestroy();
- },
-
- _mouseCapture: function( event ) {
- var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
- that = this,
- o = this.options;
-
- if ( o.disabled ) {
- return false;
- }
-
- this.elementSize = {
- width: this.element.outerWidth(),
- height: this.element.outerHeight()
- };
- this.elementOffset = this.element.offset();
-
- position = { x: event.pageX, y: event.pageY };
- normValue = this._normValueFromMouse( position );
- distance = this._valueMax() - this._valueMin() + 1;
- this.handles.each(function( i ) {
- var thisDistance = Math.abs( normValue - that.values(i) );
- if (( distance > thisDistance ) ||
- ( distance === thisDistance &&
- (i === that._lastChangedValue || that.values(i) === o.min ))) {
- distance = thisDistance;
- closestHandle = $( this );
- index = i;
- }
- });
-
- allowed = this._start( event, index );
- if ( allowed === false ) {
- return false;
- }
- this._mouseSliding = true;
-
- this._handleIndex = index;
-
- closestHandle
- .addClass( "ui-state-active" )
- .focus();
-
- offset = closestHandle.offset();
- mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
- this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
- left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
- top: event.pageY - offset.top -
- ( closestHandle.height() / 2 ) -
- ( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
- ( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
- ( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
- };
-
- if ( !this.handles.hasClass( "ui-state-hover" ) ) {
- this._slide( event, index, normValue );
- }
- this._animateOff = true;
- return true;
- },
-
- _mouseStart: function() {
- return true;
- },
-
- _mouseDrag: function( event ) {
- var position = { x: event.pageX, y: event.pageY },
- normValue = this._normValueFromMouse( position );
-
- this._slide( event, this._handleIndex, normValue );
-
- return false;
- },
-
- _mouseStop: function( event ) {
- this.handles.removeClass( "ui-state-active" );
- this._mouseSliding = false;
-
- this._stop( event, this._handleIndex );
- this._change( event, this._handleIndex );
-
- this._handleIndex = null;
- this._clickOffset = null;
- this._animateOff = false;
-
- return false;
- },
-
- _detectOrientation: function() {
- this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
- },
-
- _normValueFromMouse: function( position ) {
- var pixelTotal,
- pixelMouse,
- percentMouse,
- valueTotal,
- valueMouse;
-
- if ( this.orientation === "horizontal" ) {
- pixelTotal = this.elementSize.width;
- pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
- } else {
- pixelTotal = this.elementSize.height;
- pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
- }
-
- percentMouse = ( pixelMouse / pixelTotal );
- if ( percentMouse > 1 ) {
- percentMouse = 1;
- }
- if ( percentMouse < 0 ) {
- percentMouse = 0;
- }
- if ( this.orientation === "vertical" ) {
- percentMouse = 1 - percentMouse;
- }
-
- valueTotal = this._valueMax() - this._valueMin();
- valueMouse = this._valueMin() + percentMouse * valueTotal;
-
- return this._trimAlignValue( valueMouse );
- },
-
- _start: function( event, index ) {
- var uiHash = {
- handle: this.handles[ index ],
- value: this.value()
- };
- if ( this.options.values && this.options.values.length ) {
- uiHash.value = this.values( index );
- uiHash.values = this.values();
- }
- return this._trigger( "start", event, uiHash );
- },
-
- _slide: function( event, index, newVal ) {
- var otherVal,
- newValues,
- allowed;
-
- if ( this.options.values && this.options.values.length ) {
- otherVal = this.values( index ? 0 : 1 );
-
- if ( ( this.options.values.length === 2 && this.options.range === true ) &&
- ( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
- ) {
- newVal = otherVal;
- }
-
- if ( newVal !== this.values( index ) ) {
- newValues = this.values();
- newValues[ index ] = newVal;
- // A slide can be canceled by returning false from the slide callback
- allowed = this._trigger( "slide", event, {
- handle: this.handles[ index ],
- value: newVal,
- values: newValues
- } );
- otherVal = this.values( index ? 0 : 1 );
- if ( allowed !== false ) {
- this.values( index, newVal );
- }
- }
- } else {
- if ( newVal !== this.value() ) {
- // A slide can be canceled by returning false from the slide callback
- allowed = this._trigger( "slide", event, {
- handle: this.handles[ index ],
- value: newVal
- } );
- if ( allowed !== false ) {
- this.value( newVal );
- }
- }
- }
- },
-
- _stop: function( event, index ) {
- var uiHash = {
- handle: this.handles[ index ],
- value: this.value()
- };
- if ( this.options.values && this.options.values.length ) {
- uiHash.value = this.values( index );
- uiHash.values = this.values();
- }
-
- this._trigger( "stop", event, uiHash );
- },
-
- _change: function( event, index ) {
- if ( !this._keySliding && !this._mouseSliding ) {
- var uiHash = {
- handle: this.handles[ index ],
- value: this.value()
- };
- if ( this.options.values && this.options.values.length ) {
- uiHash.value = this.values( index );
- uiHash.values = this.values();
- }
-
- //store the last changed value index for reference when handles overlap
- this._lastChangedValue = index;
-
- this._trigger( "change", event, uiHash );
- }
- },
-
- value: function( newValue ) {
- if ( arguments.length ) {
- this.options.value = this._trimAlignValue( newValue );
- this._refreshValue();
- this._change( null, 0 );
- return;
- }
-
- return this._value();
- },
-
- values: function( index, newValue ) {
- var vals,
- newValues,
- i;
-
- if ( arguments.length > 1 ) {
- this.options.values[ index ] = this._trimAlignValue( newValue );
- this._refreshValue();
- this._change( null, index );
- return;
- }
-
- if ( arguments.length ) {
- if ( $.isArray( arguments[ 0 ] ) ) {
- vals = this.options.values;
- newValues = arguments[ 0 ];
- for ( i = 0; i < vals.length; i += 1 ) {
- vals[ i ] = this._trimAlignValue( newValues[ i ] );
- this._change( null, i );
- }
- this._refreshValue();
- } else {
- if ( this.options.values && this.options.values.length ) {
- return this._values( index );
- } else {
- return this.value();
- }
- }
- } else {
- return this._values();
- }
- },
-
- _setOption: function( key, value ) {
- var i,
- valsLength = 0;
-
- if ( key === "range" && this.options.range === true ) {
- if ( value === "min" ) {
- this.options.value = this._values( 0 );
- this.options.values = null;
- } else if ( value === "max" ) {
- this.options.value = this._values( this.options.values.length-1 );
- this.options.values = null;
- }
- }
-
- if ( $.isArray( this.options.values ) ) {
- valsLength = this.options.values.length;
- }
-
- $.Widget.prototype._setOption.apply( this, arguments );
-
- switch ( key ) {
- case "orientation":
- this._detectOrientation();
- this.element
- .removeClass( "ui-slider-horizontal ui-slider-vertical" )
- .addClass( "ui-slider-" + this.orientation );
- this._refreshValue();
- break;
- case "value":
- this._animateOff = true;
- this._refreshValue();
- this._change( null, 0 );
- this._animateOff = false;
- break;
- case "values":
- this._animateOff = true;
- this._refreshValue();
- for ( i = 0; i < valsLength; i += 1 ) {
- this._change( null, i );
- }
- this._animateOff = false;
- break;
- case "min":
- case "max":
- this._animateOff = true;
- this._refreshValue();
- this._animateOff = false;
- break;
- case "range":
- this._animateOff = true;
- this._refresh();
- this._animateOff = false;
- break;
- }
- },
-
- //internal value getter
- // _value() returns value trimmed by min and max, aligned by step
- _value: function() {
- var val = this.options.value;
- val = this._trimAlignValue( val );
-
- return val;
- },
-
- //internal values getter
- // _values() returns array of values trimmed by min and max, aligned by step
- // _values( index ) returns single value trimmed by min and max, aligned by step
- _values: function( index ) {
- var val,
- vals,
- i;
-
- if ( arguments.length ) {
- val = this.options.values[ index ];
- val = this._trimAlignValue( val );
-
- return val;
- } else if ( this.options.values && this.options.values.length ) {
- // .slice() creates a copy of the array
- // this copy gets trimmed by min and max and then returned
- vals = this.options.values.slice();
- for ( i = 0; i < vals.length; i+= 1) {
- vals[ i ] = this._trimAlignValue( vals[ i ] );
- }
-
- return vals;
- } else {
- return [];
- }
- },
-
- // returns the step-aligned value that val is closest to, between (inclusive) min and max
- _trimAlignValue: function( val ) {
- if ( val <= this._valueMin() ) {
- return this._valueMin();
- }
- if ( val >= this._valueMax() ) {
- return this._valueMax();
- }
- var step = ( this.options.step > 0 ) ? this.options.step : 1,
- valModStep = (val - this._valueMin()) % step,
- alignValue = val - valModStep;
-
- if ( Math.abs(valModStep) * 2 >= step ) {
- alignValue += ( valModStep > 0 ) ? step : ( -step );
- }
-
- // Since JavaScript has problems with large floats, round
- // the final value to 5 digits after the decimal point (see #4124)
- return parseFloat( alignValue.toFixed(5) );
- },
-
- _valueMin: function() {
- return this.options.min;
- },
-
- _valueMax: function() {
- return this.options.max;
- },
-
- _refreshValue: function() {
- var lastValPercent, valPercent, value, valueMin, valueMax,
- oRange = this.options.range,
- o = this.options,
- that = this,
- animate = ( !this._animateOff ) ? o.animate : false,
- _set = {};
-
- if ( this.options.values && this.options.values.length ) {
- this.handles.each(function( i ) {
- valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
- _set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
- $( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
- if ( that.options.range === true ) {
- if ( that.orientation === "horizontal" ) {
- if ( i === 0 ) {
- that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
- }
- if ( i === 1 ) {
- that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
- }
- } else {
- if ( i === 0 ) {
- that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
- }
- if ( i === 1 ) {
- that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
- }
- }
- }
- lastValPercent = valPercent;
- });
- } else {
- value = this.value();
- valueMin = this._valueMin();
- valueMax = this._valueMax();
- valPercent = ( valueMax !== valueMin ) ?
- ( value - valueMin ) / ( valueMax - valueMin ) * 100 :
- 0;
- _set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
- this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-
- if ( oRange === "min" && this.orientation === "horizontal" ) {
- this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
- }
- if ( oRange === "max" && this.orientation === "horizontal" ) {
- this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
- }
- if ( oRange === "min" && this.orientation === "vertical" ) {
- this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
- }
- if ( oRange === "max" && this.orientation === "vertical" ) {
- this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
- }
- }
- },
-
- _handleEvents: {
- keydown: function( event ) {
- var allowed, curVal, newVal, step,
- index = $( event.target ).data( "ui-slider-handle-index" );
-
- switch ( event.keyCode ) {
- case $.ui.keyCode.HOME:
- case $.ui.keyCode.END:
- case $.ui.keyCode.PAGE_UP:
- case $.ui.keyCode.PAGE_DOWN:
- case $.ui.keyCode.UP:
- case $.ui.keyCode.RIGHT:
- case $.ui.keyCode.DOWN:
- case $.ui.keyCode.LEFT:
- event.preventDefault();
- if ( !this._keySliding ) {
- this._keySliding = true;
- $( event.target ).addClass( "ui-state-active" );
- allowed = this._start( event, index );
- if ( allowed === false ) {
- return;
- }
- }
- break;
- }
-
- step = this.options.step;
- if ( this.options.values && this.options.values.length ) {
- curVal = newVal = this.values( index );
- } else {
- curVal = newVal = this.value();
- }
-
- switch ( event.keyCode ) {
- case $.ui.keyCode.HOME:
- newVal = this._valueMin();
- break;
- case $.ui.keyCode.END:
- newVal = this._valueMax();
- break;
- case $.ui.keyCode.PAGE_UP:
- newVal = this._trimAlignValue( curVal + ( (this._valueMax() - this._valueMin()) / numPages ) );
- break;
- case $.ui.keyCode.PAGE_DOWN:
- newVal = this._trimAlignValue( curVal - ( (this._valueMax() - this._valueMin()) / numPages ) );
- break;
- case $.ui.keyCode.UP:
- case $.ui.keyCode.RIGHT:
- if ( curVal === this._valueMax() ) {
- return;
- }
- newVal = this._trimAlignValue( curVal + step );
- break;
- case $.ui.keyCode.DOWN:
- case $.ui.keyCode.LEFT:
- if ( curVal === this._valueMin() ) {
- return;
- }
- newVal = this._trimAlignValue( curVal - step );
- break;
- }
-
- this._slide( event, index, newVal );
- },
- click: function( event ) {
- event.preventDefault();
- },
- keyup: function( event ) {
- var index = $( event.target ).data( "ui-slider-handle-index" );
-
- if ( this._keySliding ) {
- this._keySliding = false;
- this._stop( event, index );
- this._change( event, index );
- $( event.target ).removeClass( "ui-state-active" );
- }
- }
- }
-
-});
-
-}(jQuery));
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.min.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.min.js
deleted file mode 100755
index ff2e153..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-07-03
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.datepicker.js, jquery.ui.slider.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function(e,t){function i(t,i){var a,n,o,r=t.nodeName.toLowerCase();return"area"===r?(a=t.parentNode,n=a.name,t.href&&n&&"map"===a.nodeName.toLowerCase()?(o=e("img[usemap=#"+n+"]")[0],!!o&&s(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:"a"===r?t.href||i:i)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}var a=0,n=/^ui-id-\d+$/;e.ui=e.ui||{},e.extend(e.ui,{version:"1. [...]
-return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=a?Math.min(m,a.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!n&&g&&v?"":" ")+_),b+="</div>"},_adjustInstDate:function(e,t,i){v [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_af.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_af.js
deleted file mode 100755
index 0922ef7..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_af.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Afrikaans initialisation for the jQuery UI date picker plugin. */
-/* Written by Renier Pretorius. */
-jQuery(function($){
- $.datepicker.regional['af'] = {
- closeText: 'Selekteer',
- prevText: 'Vorige',
- nextText: 'Volgende',
- currentText: 'Vandag',
- monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
- 'Julie','Augustus','September','Oktober','November','Desember'],
- monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
- dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
- dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
- dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['af']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar.js
deleted file mode 100755
index cef0f08..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Arabic Translation for jQuery UI date picker plugin. */
-/* Khaled Alhourani -- me@khaledalhourani.com */
-/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
-jQuery(function($){
- $.datepicker.regional['ar'] = {
- closeText: 'إغلاق',
- prevText: '<السابق',
- nextText: 'التالي>',
- currentText: 'اليوم',
- monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'مايو', 'حزيران',
- 'تموز', 'آب', 'أيلول', 'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
- monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
- dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
- dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
- dayNamesMin: ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'],
- weekHeader: 'أسبوع',
- dateFormat: 'dd/mm/yy',
- firstDay: 6,
- isRTL: true,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ar']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar_DZ.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar_DZ.js
deleted file mode 100755
index 7b175af..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ar_DZ.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
-/* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
-
-jQuery(function($){
- $.datepicker.regional['ar-DZ'] = {
- closeText: 'إغلاق',
- prevText: '<السابق',
- nextText: 'التالي>',
- currentText: 'اليوم',
- monthNames: ['جانفي', 'فيفري', 'مارس', 'أفريل', 'ماي', 'جوان',
- 'جويلية', 'أوت', 'سبتمبر','أكتوبر', 'نوفمبر', 'ديسمبر'],
- monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
- dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
- dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
- dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
- weekHeader: 'أسبوع',
- dateFormat: 'dd/mm/yy',
- firstDay: 6,
- isRTL: true,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ar-DZ']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_az.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_az.js
deleted file mode 100755
index a133a9e..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_az.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Jamil Najafov (necefov33@gmail.com). */
-jQuery(function($) {
- $.datepicker.regional['az'] = {
- closeText: 'Bağla',
- prevText: '<Geri',
- nextText: 'İrəli>',
- currentText: 'Bugün',
- monthNames: ['Yanvar','Fevral','Mart','Aprel','May','İyun',
- 'İyul','Avqust','Sentyabr','Oktyabr','Noyabr','Dekabr'],
- monthNamesShort: ['Yan','Fev','Mar','Apr','May','İyun',
- 'İyul','Avq','Sen','Okt','Noy','Dek'],
- dayNames: ['Bazar','Bazar ertəsi','Çərşənbə axşamı','Çərşənbə','Cümə axşamı','Cümə','Şənbə'],
- dayNamesShort: ['B','Be','Ça','Ç','Ca','C','Ş'],
- dayNamesMin: ['B','B','Ç','С','Ç','C','Ş'],
- weekHeader: 'Hf',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['az']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_be.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_be.js
deleted file mode 100755
index 6ea12f7..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_be.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Belarusian initialisation for the jQuery UI date picker plugin. */
-/* Written by Pavel Selitskas <p....@gmail.com> */
-jQuery(function($){
- $.datepicker.regional['be'] = {
- closeText: 'Зачыніць',
- prevText: '←Папяр.',
- nextText: 'Наст.→',
- currentText: 'Сёньня',
- monthNames: ['Студзень','Люты','Сакавік','Красавік','Травень','Чэрвень',
- 'Ліпень','Жнівень','Верасень','Кастрычнік','Лістапад','Сьнежань'],
- monthNamesShort: ['Сту','Лют','Сак','Кра','Тра','Чэр',
- 'Ліп','Жні','Вер','Кас','Ліс','Сьн'],
- dayNames: ['нядзеля','панядзелак','аўторак','серада','чацьвер','пятніца','субота'],
- dayNamesShort: ['ндз','пнд','аўт','срд','чцв','птн','сбт'],
- dayNamesMin: ['Нд','Пн','Аў','Ср','Чц','Пт','Сб'],
- weekHeader: 'Тд',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['be']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bg.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bg.js
deleted file mode 100755
index 86ab885..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bg.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Bulgarian initialisation for the jQuery UI date picker plugin. */
-/* Written by Stoyan Kyosev (http://svest.org). */
-jQuery(function($){
- $.datepicker.regional['bg'] = {
- closeText: 'затвори',
- prevText: '<назад',
- nextText: 'напред>',
- nextBigText: '>>',
- currentText: 'днес',
- monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
- 'Юли','Август','Септември','Октомври','Ноември','Декември'],
- monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
- 'Юли','Авг','Сеп','Окт','Нов','Дек'],
- dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
- dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
- dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
- weekHeader: 'Wk',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['bg']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bs.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bs.js
deleted file mode 100755
index f08870f..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_bs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Bosnian i18n for the jQuery UI date picker plugin. */
-/* Written by Kenan Konjo. */
-jQuery(function($){
- $.datepicker.regional['bs'] = {
- closeText: 'Zatvori',
- prevText: '<',
- nextText: '>',
- currentText: 'Danas',
- monthNames: ['Januar','Februar','Mart','April','Maj','Juni',
- 'Juli','August','Septembar','Oktobar','Novembar','Decembar'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
- 'Jul','Aug','Sep','Okt','Nov','Dec'],
- dayNames: ['Nedelja','Ponedeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
- dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
- dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
- weekHeader: 'Wk',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['bs']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ca.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ca.js
deleted file mode 100755
index a10b549..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ca.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Inicialització en català per a l'extensió 'UI date picker' per jQuery. */
-/* Writers: (joan.leon@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['ca'] = {
- closeText: 'Tanca',
- prevText: 'Anterior',
- nextText: 'Següent',
- currentText: 'Avui',
- monthNames: ['gener','febrer','març','abril','maig','juny',
- 'juliol','agost','setembre','octubre','novembre','desembre'],
- monthNamesShort: ['gen','feb','març','abr','maig','juny',
- 'jul','ag','set','oct','nov','des'],
- dayNames: ['diumenge','dilluns','dimarts','dimecres','dijous','divendres','dissabte'],
- dayNamesShort: ['dg','dl','dt','dc','dj','dv','ds'],
- dayNamesMin: ['dg','dl','dt','dc','dj','dv','ds'],
- weekHeader: 'Set',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ca']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cs.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cs.js
deleted file mode 100755
index b96b1a5..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Czech initialisation for the jQuery UI date picker plugin. */
-/* Written by Tomas Muller (tomas@tomas-muller.net). */
-jQuery(function($){
- $.datepicker.regional['cs'] = {
- closeText: 'Zavřít',
- prevText: '<Dříve',
- nextText: 'Později>',
- currentText: 'Nyní',
- monthNames: ['leden','únor','březen','duben','květen','červen',
- 'červenec','srpen','září','říjen','listopad','prosinec'],
- monthNamesShort: ['led','úno','bře','dub','kvě','čer',
- 'čvc','srp','zář','říj','lis','pro'],
- dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'],
- dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
- dayNamesMin: ['ne','po','út','st','čt','pá','so'],
- weekHeader: 'Týd',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['cs']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cy.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cy.js
deleted file mode 100755
index cf3a38e..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_cy.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Welsh/UK initialisation for the jQuery UI date picker plugin. */
-/* Written by William Griffiths. */
-jQuery(function($){
- $.datepicker.regional['cy-GB'] = {
- closeText: 'Done',
- prevText: 'Prev',
- nextText: 'Next',
- currentText: 'Today',
- monthNames: ['Ionawr','Chwefror','Mawrth','Ebrill','Mai','Mehefin',
- 'Gorffennaf','Awst','Medi','Hydref','Tachwedd','Rhagfyr'],
- monthNamesShort: ['Ion', 'Chw', 'Maw', 'Ebr', 'Mai', 'Meh',
- 'Gor', 'Aws', 'Med', 'Hyd', 'Tac', 'Rha'],
- dayNames: ['Dydd Sul', 'Dydd Llun', 'Dydd Mawrth', 'Dydd Mercher', 'Dydd Iau', 'Dydd Gwener', 'Dydd Sadwrn'],
- dayNamesShort: ['Sul', 'Llu', 'Maw', 'Mer', 'Iau', 'Gwe', 'Sad'],
- dayNamesMin: ['Su','Ll','Ma','Me','Ia','Gw','Sa'],
- weekHeader: 'Wy',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['cy-GB']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_de.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_de.js
deleted file mode 100755
index abe75c4..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_de.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* German initialisation for the jQuery UI date picker plugin. */
-/* Written by Milian Wolff (mail@milianw.de). */
-jQuery(function($){
- $.datepicker.regional['de'] = {
- closeText: 'Schließen',
- prevText: '<Zurück',
- nextText: 'Vor>',
- currentText: 'Heute',
- monthNames: ['Januar','Februar','März','April','Mai','Juni',
- 'Juli','August','September','Oktober','November','Dezember'],
- monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
- 'Jul','Aug','Sep','Okt','Nov','Dez'],
- dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
- dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
- dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
- weekHeader: 'KW',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['de']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_el.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_el.js
deleted file mode 100755
index 1ac4756..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_el.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Greek (el) initialisation for the jQuery UI date picker plugin. */
-/* Written by Alex Cicovic (http://www.alexcicovic.com) */
-jQuery(function($){
- $.datepicker.regional['el'] = {
- closeText: 'Κλείσιμο',
- prevText: 'Προηγούμενος',
- nextText: 'Επόμενος',
- currentText: 'Τρέχων Μήνας',
- monthNames: ['Ιανουάριος','Φεβρουάριος','Μάρτιος','Απρίλιος','Μάιος','Ιούνιος',
- 'Ιούλιος','Αύγουστος','Σεπτέμβριος','Οκτώβριος','Νοέμβριος','Δεκέμβριος'],
- monthNamesShort: ['Ιαν','Φεβ','Μαρ','Απρ','Μαι','Ιουν',
- 'Ιουλ','Αυγ','Σεπ','Οκτ','Νοε','Δεκ'],
- dayNames: ['Κυριακή','Δευτέρα','Τρίτη','Τετάρτη','Πέμπτη','Παρασκευή','Σάββατο'],
- dayNamesShort: ['Κυρ','Δευ','Τρι','Τετ','Πεμ','Παρ','Σαβ'],
- dayNamesMin: ['Κυ','Δε','Τρ','Τε','Πε','Πα','Σα'],
- weekHeader: 'Εβδ',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['el']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_AU.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_AU.js
deleted file mode 100755
index c1a1020..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_AU.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* English/Australia initialisation for the jQuery UI date picker plugin. */
-/* Based on the en-GB initialisation. */
-jQuery(function($){
- $.datepicker.regional['en-AU'] = {
- closeText: 'Done',
- prevText: 'Prev',
- nextText: 'Next',
- currentText: 'Today',
- monthNames: ['January','February','March','April','May','June',
- 'July','August','September','October','November','December'],
- monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
- dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
- dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['en-AU']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_GB.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_GB.js
deleted file mode 100755
index 16a096e..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_GB.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* English/UK initialisation for the jQuery UI date picker plugin. */
-/* Written by Stuart. */
-jQuery(function($){
- $.datepicker.regional['en-GB'] = {
- closeText: 'Done',
- prevText: 'Prev',
- nextText: 'Next',
- currentText: 'Today',
- monthNames: ['January','February','March','April','May','June',
- 'July','August','September','October','November','December'],
- monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
- dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
- dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['en-GB']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_NZ.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_NZ.js
deleted file mode 100755
index 7819df0..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_en_NZ.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* English/New Zealand initialisation for the jQuery UI date picker plugin. */
-/* Based on the en-GB initialisation. */
-jQuery(function($){
- $.datepicker.regional['en-NZ'] = {
- closeText: 'Done',
- prevText: 'Prev',
- nextText: 'Next',
- currentText: 'Today',
- monthNames: ['January','February','March','April','May','June',
- 'July','August','September','October','November','December'],
- monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
- dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
- dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['en-NZ']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eo.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eo.js
deleted file mode 100755
index 39e44fc..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eo.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Esperanto initialisation for the jQuery UI date picker plugin. */
-/* Written by Olivier M. (olivierweb@ifrance.com). */
-jQuery(function($){
- $.datepicker.regional['eo'] = {
- closeText: 'Fermi',
- prevText: '<Anta',
- nextText: 'Sekv>',
- currentText: 'Nuna',
- monthNames: ['Januaro','Februaro','Marto','Aprilo','Majo','Junio',
- 'Julio','Aŭgusto','Septembro','Oktobro','Novembro','Decembro'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
- 'Jul','Aŭg','Sep','Okt','Nov','Dec'],
- dayNames: ['Dimanĉo','Lundo','Mardo','Merkredo','Ĵaŭdo','Vendredo','Sabato'],
- dayNamesShort: ['Dim','Lun','Mar','Mer','Ĵaŭ','Ven','Sab'],
- dayNamesMin: ['Di','Lu','Ma','Me','Ĵa','Ve','Sa'],
- weekHeader: 'Sb',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['eo']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_es.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_es.js
deleted file mode 100755
index 763d4ce..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_es.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Inicialización en español para la extensión 'UI date picker' para jQuery. */
-/* Traducido por Vester (xvester@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['es'] = {
- closeText: 'Cerrar',
- prevText: '<Ant',
- nextText: 'Sig>',
- currentText: 'Hoy',
- monthNames: ['enero','febrero','marzo','abril','mayo','junio',
- 'julio','agosto','septiembre','octubre','noviembre','diciembre'],
- monthNamesShort: ['ene','feb','mar','abr','may','jun',
- 'jul','ogo','sep','oct','nov','dic'],
- dayNames: ['domingo','lunes','martes','miércoles','jueves','viernes','sábado'],
- dayNamesShort: ['dom','lun','mar','mié','juv','vie','sáb'],
- dayNamesMin: ['D','L','M','X','J','V','S'],
- weekHeader: 'Sm',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['es']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_et.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_et.js
deleted file mode 100755
index 62cbea8..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_et.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Estonian initialisation for the jQuery UI date picker plugin. */
-/* Written by Mart Sõmermaa (mrts.pydev at gmail com). */
-jQuery(function($){
- $.datepicker.regional['et'] = {
- closeText: 'Sulge',
- prevText: 'Eelnev',
- nextText: 'Järgnev',
- currentText: 'Täna',
- monthNames: ['Jaanuar','Veebruar','Märts','Aprill','Mai','Juuni',
- 'Juuli','August','September','Oktoober','November','Detsember'],
- monthNamesShort: ['Jaan', 'Veebr', 'Märts', 'Apr', 'Mai', 'Juuni',
- 'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'],
- dayNames: ['Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'],
- dayNamesShort: ['Pühap', 'Esmasp', 'Teisip', 'Kolmap', 'Neljap', 'Reede', 'Laup'],
- dayNamesMin: ['P','E','T','K','N','R','L'],
- weekHeader: 'näd',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['et']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eu.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eu.js
deleted file mode 100755
index a71db2c..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_eu.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Euskarako oinarria 'UI date picker' jquery-ko extentsioarentzat */
-/* Karrikas-ek itzulia (karrikas@karrikas.com) */
-jQuery(function($){
- $.datepicker.regional['eu'] = {
- closeText: 'Egina',
- prevText: '<Aur',
- nextText: 'Hur>',
- currentText: 'Gaur',
- monthNames: ['urtarrila','otsaila','martxoa','apirila','maiatza','ekaina',
- 'uztaila','abuztua','iraila','urria','azaroa','abendua'],
- monthNamesShort: ['urt.','ots.','mar.','api.','mai.','eka.',
- 'uzt.','abu.','ira.','urr.','aza.','abe.'],
- dayNames: ['igandea','astelehena','asteartea','asteazkena','osteguna','ostirala','larunbata'],
- dayNamesShort: ['ig.','al.','ar.','az.','og.','ol.','lr.'],
- dayNamesMin: ['ig','al','ar','az','og','ol','lr'],
- weekHeader: 'As',
- dateFormat: 'yy-mm-dd',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['eu']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fa.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fa.js
deleted file mode 100755
index bb957f6..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fa.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
-/* Javad Mowlanezhad -- jmowla@gmail.com */
-/* Jalali calendar should supported soon! (Its implemented but I have to test it) */
-jQuery(function($) {
- $.datepicker.regional['fa'] = {
- closeText: 'بستن',
- prevText: '<قبلی',
- nextText: 'بعدی>',
- currentText: 'امروز',
- monthNames: [
- 'فروردين',
- 'ارديبهشت',
- 'خرداد',
- 'تير',
- 'مرداد',
- 'شهريور',
- 'مهر',
- 'آبان',
- 'آذر',
- 'دی',
- 'بهمن',
- 'اسفند'
- ],
- monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
- dayNames: [
- 'يکشنبه',
- 'دوشنبه',
- 'سهشنبه',
- 'چهارشنبه',
- 'پنجشنبه',
- 'جمعه',
- 'شنبه'
- ],
- dayNamesShort: [
- 'ی',
- 'د',
- 'س',
- 'چ',
- 'پ',
- 'ج',
- 'ش'
- ],
- dayNamesMin: [
- 'ی',
- 'د',
- 'س',
- 'چ',
- 'پ',
- 'ج',
- 'ش'
- ],
- weekHeader: 'هف',
- dateFormat: 'yy/mm/dd',
- firstDay: 6,
- isRTL: true,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['fa']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fi.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fi.js
deleted file mode 100755
index e5c554a..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fi.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Finnish initialisation for the jQuery UI date picker plugin. */
-/* Written by Harri Kilpiö (harrikilpio@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['fi'] = {
- closeText: 'Sulje',
- prevText: '«Edellinen',
- nextText: 'Seuraava»',
- currentText: 'Tänään',
- monthNames: ['Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kesäkuu',
- 'Heinäkuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu'],
- monthNamesShort: ['Tammi','Helmi','Maalis','Huhti','Touko','Kesä',
- 'Heinä','Elo','Syys','Loka','Marras','Joulu'],
- dayNamesShort: ['Su','Ma','Ti','Ke','To','Pe','La'],
- dayNames: ['Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai'],
- dayNamesMin: ['Su','Ma','Ti','Ke','To','Pe','La'],
- weekHeader: 'Vk',
- dateFormat: 'd.m.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['fi']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fo.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fo.js
deleted file mode 100755
index cb0e3de..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fo.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Faroese initialisation for the jQuery UI date picker plugin */
-/* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
-jQuery(function($){
- $.datepicker.regional['fo'] = {
- closeText: 'Lat aftur',
- prevText: '<Fyrra',
- nextText: 'Næsta>',
- currentText: 'Í dag',
- monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
- 'Juli','August','September','Oktober','November','Desember'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
- 'Jul','Aug','Sep','Okt','Nov','Des'],
- dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
- dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
- dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
- weekHeader: 'Vk',
- dateFormat: 'dd-mm-yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['fo']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr.js
deleted file mode 100755
index 2d06743..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* French initialisation for the jQuery UI date picker plugin. */
-/* Written by Keith Wood (kbwood{at}iinet.com.au),
- Stéphane Nahmani (sholby@sholby.net),
- Stéphane Raimbault <st...@gmail.com> */
-jQuery(function($){
- $.datepicker.regional['fr'] = {
- closeText: 'Fermer',
- prevText: 'Précédent',
- nextText: 'Suivant',
- currentText: 'Aujourd\'hui',
- monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
- 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
- monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
- 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
- dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
- dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
- dayNamesMin: ['D','L','M','M','J','V','S'],
- weekHeader: 'Sem.',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['fr']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CA.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CA.js
deleted file mode 100755
index e208221..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CA.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Canadian-French initialisation for the jQuery UI date picker plugin. */
-jQuery(function ($) {
- $.datepicker.regional['fr-CA'] = {
- closeText: 'Fermer',
- prevText: 'Précédent',
- nextText: 'Suivant',
- currentText: 'Aujourd\'hui',
- monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
- 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
- monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
- 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
- dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
- dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
- dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
- weekHeader: 'Sem.',
- dateFormat: 'yy-mm-dd',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''
- };
- $.datepicker.setDefaults($.datepicker.regional['fr-CA']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CH.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CH.js
deleted file mode 100755
index 744fe1c..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_fr_CH.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Swiss-French initialisation for the jQuery UI date picker plugin. */
-/* Written Martin Voelkle (martin.voelkle@e-tc.ch). */
-jQuery(function($){
- $.datepicker.regional['fr-CH'] = {
- closeText: 'Fermer',
- prevText: '<Préc',
- nextText: 'Suiv>',
- currentText: 'Courant',
- monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
- 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
- monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
- 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
- dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
- dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
- dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
- weekHeader: 'Sm',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['fr-CH']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_gl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_gl.js
deleted file mode 100755
index 59b989a..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_gl.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Galician localization for 'UI date picker' jQuery extension. */
-/* Translated by Jorge Barreiro <yo...@gmail.com>. */
-jQuery(function($){
- $.datepicker.regional['gl'] = {
- closeText: 'Pechar',
- prevText: '<Ant',
- nextText: 'Seg>',
- currentText: 'Hoxe',
- monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
- 'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
- monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
- 'Xul','Ago','Set','Out','Nov','Dec'],
- dayNames: ['Domingo','Luns','Martes','Mércores','Xoves','Venres','Sábado'],
- dayNamesShort: ['Dom','Lun','Mar','Mér','Xov','Ven','Sáb'],
- dayNamesMin: ['Do','Lu','Ma','Mé','Xo','Ve','Sá'],
- weekHeader: 'Sm',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['gl']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_he.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_he.js
deleted file mode 100755
index b9e8dee..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_he.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Hebrew initialisation for the UI Datepicker extension. */
-/* Written by Amir Hardon (ahardon at gmail dot com). */
-jQuery(function($){
- $.datepicker.regional['he'] = {
- closeText: 'סגור',
- prevText: '<הקודם',
- nextText: 'הבא>',
- currentText: 'היום',
- monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
- 'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
- monthNamesShort: ['ינו','פבר','מרץ','אפר','מאי','יוני',
- 'יולי','אוג','ספט','אוק','נוב','דצמ'],
- dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
- dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
- dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: true,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['he']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hi.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hi.js
deleted file mode 100755
index 6c563b9..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hi.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Hindi initialisation for the jQuery UI date picker plugin. */
-/* Written by Michael Dawart. */
-jQuery(function($){
- $.datepicker.regional['hi'] = {
- closeText: 'बंद',
- prevText: 'पिछला',
- nextText: 'अगला',
- currentText: 'आज',
- monthNames: ['जनवरी ','फरवरी','मार्च','अप्रेल','मई','जून',
- 'जूलाई','अगस्त ','सितम्बर','अक्टूबर','नवम्बर','दिसम्बर'],
- monthNamesShort: ['जन', 'फर', 'मार्च', 'अप्रेल', 'मई', 'जून',
- 'जूलाई', 'अग', 'सित', 'अक्ट', 'नव', 'दि'],
- dayNames: ['रविवार', 'सोमवार', 'मंगलवार', 'बुधवार', 'गुरुवार', 'शुक्रवार', 'शनिवार'],
- dayNamesShort: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'],
- dayNamesMin: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'],
- weekHeader: 'हफ्ता',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['hi']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hr.js
deleted file mode 100755
index 2fe37b6..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hr.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Croatian i18n for the jQuery UI date picker plugin. */
-/* Written by Vjekoslav Nesek. */
-jQuery(function($){
- $.datepicker.regional['hr'] = {
- closeText: 'Zatvori',
- prevText: '<',
- nextText: '>',
- currentText: 'Danas',
- monthNames: ['Siječanj','Veljača','Ožujak','Travanj','Svibanj','Lipanj',
- 'Srpanj','Kolovoz','Rujan','Listopad','Studeni','Prosinac'],
- monthNamesShort: ['Sij','Velj','Ožu','Tra','Svi','Lip',
- 'Srp','Kol','Ruj','Lis','Stu','Pro'],
- dayNames: ['Nedjelja','Ponedjeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
- dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
- dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
- weekHeader: 'Tje',
- dateFormat: 'dd.mm.yy.',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['hr']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hu.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hu.js
deleted file mode 100755
index b28c268..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hu.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Hungarian initialisation for the jQuery UI date picker plugin. */
-/* Written by Istvan Karaszi (jquery@spam.raszi.hu). */
-jQuery(function($){
- $.datepicker.regional['hu'] = {
- closeText: 'bezár',
- prevText: 'vissza',
- nextText: 'előre',
- currentText: 'ma',
- monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június',
- 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
- monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún',
- 'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'],
- dayNames: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
- dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'],
- dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
- weekHeader: 'Hét',
- dateFormat: 'yy.mm.dd.',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['hu']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hy.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hy.js
deleted file mode 100755
index 6d4eca5..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_hy.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Armenian(UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Levon Zakaryan (levon.zakaryan@gmail.com)*/
-jQuery(function($){
- $.datepicker.regional['hy'] = {
- closeText: 'Փակել',
- prevText: '<Նախ.',
- nextText: 'Հաջ.>',
- currentText: 'Այսօր',
- monthNames: ['Հունվար','Փետրվար','Մարտ','Ապրիլ','Մայիս','Հունիս',
- 'Հուլիս','Օգոստոս','Սեպտեմբեր','Հոկտեմբեր','Նոյեմբեր','Դեկտեմբեր'],
- monthNamesShort: ['Հունվ','Փետր','Մարտ','Ապր','Մայիս','Հունիս',
- 'Հուլ','Օգս','Սեպ','Հոկ','Նոյ','Դեկ'],
- dayNames: ['կիրակի','եկուշաբթի','երեքշաբթի','չորեքշաբթի','հինգշաբթի','ուրբաթ','շաբաթ'],
- dayNamesShort: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
- dayNamesMin: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
- weekHeader: 'ՇԲՏ',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['hy']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_id.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_id.js
deleted file mode 100755
index 6327fa6..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_id.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Indonesian initialisation for the jQuery UI date picker plugin. */
-/* Written by Deden Fathurahman (dedenf@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['id'] = {
- closeText: 'Tutup',
- prevText: '<mundur',
- nextText: 'maju>',
- currentText: 'hari ini',
- monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
- 'Juli','Agustus','September','Oktober','Nopember','Desember'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
- 'Jul','Agus','Sep','Okt','Nop','Des'],
- dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
- dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
- dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
- weekHeader: 'Mg',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['id']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_is.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_is.js
deleted file mode 100755
index 4fc4298..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_is.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Icelandic initialisation for the jQuery UI date picker plugin. */
-/* Written by Haukur H. Thorsson (haukur@eskill.is). */
-jQuery(function($){
- $.datepicker.regional['is'] = {
- closeText: 'Loka',
- prevText: '< Fyrri',
- nextText: 'Næsti >',
- currentText: 'Í dag',
- monthNames: ['Janúar','Febrúar','Mars','Apríl','Maí','Júní',
- 'Júlí','Ágúst','September','Október','Nóvember','Desember'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Maí','Jún',
- 'Júl','Ágú','Sep','Okt','Nóv','Des'],
- dayNames: ['Sunnudagur','Mánudagur','Þriðjudagur','Miðvikudagur','Fimmtudagur','Föstudagur','Laugardagur'],
- dayNamesShort: ['Sun','Mán','Þri','Mið','Fim','Fös','Lau'],
- dayNamesMin: ['Su','Má','Þr','Mi','Fi','Fö','La'],
- weekHeader: 'Vika',
- dateFormat: 'dd.mm.yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['is']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_it.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_it.js
deleted file mode 100755
index a01f043..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_it.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Italian initialisation for the jQuery UI date picker plugin. */
-/* Written by Antonello Pasella (antonello.pasella@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['it'] = {
- closeText: 'Chiudi',
- prevText: '<Prec',
- nextText: 'Succ>',
- currentText: 'Oggi',
- monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
- 'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
- monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
- 'Lug','Ago','Set','Ott','Nov','Dic'],
- dayNames: ['Domenica','Lunedì','Martedì','Mercoledì','Giovedì','Venerdì','Sabato'],
- dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
- dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
- weekHeader: 'Sm',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['it']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ja.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ja.js
deleted file mode 100755
index 4d0b63c..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ja.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Japanese initialisation for the jQuery UI date picker plugin. */
-/* Written by Kentaro SATO (kentaro@ranvis.com). */
-jQuery(function($){
- $.datepicker.regional['ja'] = {
- closeText: '閉じる',
- prevText: '<前',
- nextText: '次>',
- currentText: '今日',
- monthNames: ['1月','2月','3月','4月','5月','6月',
- '7月','8月','9月','10月','11月','12月'],
- monthNamesShort: ['1月','2月','3月','4月','5月','6月',
- '7月','8月','9月','10月','11月','12月'],
- dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
- dayNamesShort: ['日','月','火','水','木','金','土'],
- dayNamesMin: ['日','月','火','水','木','金','土'],
- weekHeader: '週',
- dateFormat: 'yy/mm/dd',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: '年'};
- $.datepicker.setDefaults($.datepicker.regional['ja']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ka.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ka.js
deleted file mode 100755
index c10658d..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ka.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Georgian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Lado Lomidze (lado.lomidze@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['ka'] = {
- closeText: 'დახურვა',
- prevText: '< წინა',
- nextText: 'შემდეგი >',
- currentText: 'დღეს',
- monthNames: ['იანვარი','თებერვალი','მარტი','აპრილი','მაისი','ივნისი', 'ივლისი','აგვისტო','სექტემბერი','ოქტომბერი','ნოემბერი','დეკემბერი'],
- monthNamesShort: ['იან','თებ','მარ','აპრ','მაი','ივნ', 'ივლ','აგვ','სექ','ოქტ','ნოე','დეკ'],
- dayNames: ['კვირა','ორშაბათი','სამშაბათი','ოთხშაბათი','ხუთშაბათი','პარასკევი','შაბათი'],
- dayNamesShort: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
- dayNamesMin: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
- weekHeader: 'კვირა',
- dateFormat: 'dd-mm-yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ka']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_kk.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_kk.js
deleted file mode 100755
index dcd6a65..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_kk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Kazakh (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Dmitriy Karasyov (dmitriy.karasyov@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['kk'] = {
- closeText: 'Жабу',
- prevText: '<Алдыңғы',
- nextText: 'Келесі>',
- currentText: 'Бүгін',
- monthNames: ['Қаңтар','Ақпан','Наурыз','Сәуір','Мамыр','Маусым',
- 'Шілде','Тамыз','Қыркүйек','Қазан','Қараша','Желтоқсан'],
- monthNamesShort: ['Қаң','Ақп','Нау','Сәу','Мам','Мау',
- 'Шіл','Там','Қыр','Қаз','Қар','Жел'],
- dayNames: ['Жексенбі','Дүйсенбі','Сейсенбі','Сәрсенбі','Бейсенбі','Жұма','Сенбі'],
- dayNamesShort: ['жкс','дсн','ссн','срс','бсн','жма','снб'],
- dayNamesMin: ['Жк','Дс','Сс','Ср','Бс','Жм','Сн'],
- weekHeader: 'Не',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['kk']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_km.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_km.js
deleted file mode 100755
index f9c4e3a..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_km.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Khmer initialisation for the jQuery calendar extension. */
-/* Written by Chandara Om (chandara.teacher@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['km'] = {
- closeText: 'ធ្វើរួច',
- prevText: 'មុន',
- nextText: 'បន្ទាប់',
- currentText: 'ថ្ងៃនេះ',
- monthNames: ['មករា','កុម្ភៈ','មីនា','មេសា','ឧសភា','មិថុនា',
- 'កក្កដា','សីហា','កញ្ញា','តុលា','វិច្ឆិកា','ធ្នូ'],
- monthNamesShort: ['មករា','កុម្ភៈ','មីនា','មេសា','ឧសភា','មិថុនា',
- 'កក្កដា','សីហា','កញ្ញា','តុលា','វិច្ឆិកា','ធ្នូ'],
- dayNames: ['អាទិត្យ', 'ចន្ទ', 'អង្គារ', 'ពុធ', 'ព្រហស្បតិ៍', 'សុក្រ', 'សៅរ៍'],
- dayNamesShort: ['អា', 'ច', 'អ', 'ពុ', 'ព្រហ', 'សុ', 'សៅ'],
- dayNamesMin: ['អា', 'ច', 'អ', 'ពុ', 'ព្រហ', 'សុ', 'សៅ'],
- weekHeader: 'សប្ដាហ៍',
- dateFormat: 'dd-mm-yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['km']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ko.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ko.js
deleted file mode 100755
index af36f3d..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ko.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Korean initialisation for the jQuery calendar extension. */
-/* Written by DaeKwon Kang (ncrash.dk@gmail.com), Edited by Genie. */
-jQuery(function($){
- $.datepicker.regional['ko'] = {
- closeText: '닫기',
- prevText: '이전달',
- nextText: '다음달',
- currentText: '오늘',
- monthNames: ['1월','2월','3월','4월','5월','6월',
- '7월','8월','9월','10월','11월','12월'],
- monthNamesShort: ['1월','2월','3월','4월','5월','6월',
- '7월','8월','9월','10월','11월','12월'],
- dayNames: ['일요일','월요일','화요일','수요일','목요일','금요일','토요일'],
- dayNamesShort: ['일','월','화','수','목','금','토'],
- dayNamesMin: ['일','월','화','수','목','금','토'],
- weekHeader: 'Wk',
- dateFormat: 'yy-mm-dd',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: '년'};
- $.datepicker.setDefaults($.datepicker.regional['ko']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ky.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ky.js
deleted file mode 100755
index d4466b1..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ky.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Kyrgyz (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Sergey Kartashov (ebishkek@yandex.ru). */
-jQuery(function($){
- $.datepicker.regional['ky'] = {
- closeText: 'Жабуу',
- prevText: '<Мур',
- nextText: 'Кий>',
- currentText: 'Бүгүн',
- monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
- 'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
- monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
- 'Июл','Авг','Сен','Окт','Ноя','Дек'],
- dayNames: ['жекшемби', 'дүйшөмбү', 'шейшемби', 'шаршемби', 'бейшемби', 'жума', 'ишемби'],
- dayNamesShort: ['жек', 'дүй', 'шей', 'шар', 'бей', 'жум', 'ише'],
- dayNamesMin: ['Жк','Дш','Шш','Шр','Бш','Жм','Иш'],
- weekHeader: 'Жум',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''
- };
- $.datepicker.setDefaults($.datepicker.regional['ky']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lb.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lb.js
deleted file mode 100755
index 87c79d5..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lb.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Luxembourgish initialisation for the jQuery UI date picker plugin. */
-/* Written by Michel Weimerskirch <mi...@weimerskirch.net> */
-jQuery(function($){
- $.datepicker.regional['lb'] = {
- closeText: 'Fäerdeg',
- prevText: 'Zréck',
- nextText: 'Weider',
- currentText: 'Haut',
- monthNames: ['Januar','Februar','Mäerz','Abrëll','Mee','Juni',
- 'Juli','August','September','Oktober','November','Dezember'],
- monthNamesShort: ['Jan', 'Feb', 'Mäe', 'Abr', 'Mee', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
- dayNames: ['Sonndeg', 'Méindeg', 'Dënschdeg', 'Mëttwoch', 'Donneschdeg', 'Freideg', 'Samschdeg'],
- dayNamesShort: ['Son', 'Méi', 'Dën', 'Mët', 'Don', 'Fre', 'Sam'],
- dayNamesMin: ['So','Mé','Dë','Më','Do','Fr','Sa'],
- weekHeader: 'W',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['lb']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lt.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lt.js
deleted file mode 100755
index 54eb523..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lt.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Lithuanian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* @author Arturas Paleicikas <ar...@avalon.lt> */
-jQuery(function($){
- $.datepicker.regional['lt'] = {
- closeText: 'Uždaryti',
- prevText: '<Atgal',
- nextText: 'Pirmyn>',
- currentText: 'Šiandien',
- monthNames: ['Sausis','Vasaris','Kovas','Balandis','Gegužė','Birželis',
- 'Liepa','Rugpjūtis','Rugsėjis','Spalis','Lapkritis','Gruodis'],
- monthNamesShort: ['Sau','Vas','Kov','Bal','Geg','Bir',
- 'Lie','Rugp','Rugs','Spa','Lap','Gru'],
- dayNames: ['sekmadienis','pirmadienis','antradienis','trečiadienis','ketvirtadienis','penktadienis','šeštadienis'],
- dayNamesShort: ['sek','pir','ant','tre','ket','pen','šeš'],
- dayNamesMin: ['Se','Pr','An','Tr','Ke','Pe','Še'],
- weekHeader: 'SAV',
- dateFormat: 'yy-mm-dd',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['lt']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lv.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lv.js
deleted file mode 100755
index 3fdf856..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_lv.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Latvian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* @author Arturas Paleicikas <ar...@metasite.net> */
-jQuery(function($){
- $.datepicker.regional['lv'] = {
- closeText: 'Aizvērt',
- prevText: 'Iepr.',
- nextText: 'Nāk.',
- currentText: 'Šodien',
- monthNames: ['Janvāris','Februāris','Marts','Aprīlis','Maijs','Jūnijs',
- 'Jūlijs','Augusts','Septembris','Oktobris','Novembris','Decembris'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jūn',
- 'Jūl','Aug','Sep','Okt','Nov','Dec'],
- dayNames: ['svētdiena','pirmdiena','otrdiena','trešdiena','ceturtdiena','piektdiena','sestdiena'],
- dayNamesShort: ['svt','prm','otr','tre','ctr','pkt','sst'],
- dayNamesMin: ['Sv','Pr','Ot','Tr','Ct','Pk','Ss'],
- weekHeader: 'Ned.',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['lv']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_mk.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_mk.js
deleted file mode 100755
index 0285325..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_mk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Macedonian i18n for the jQuery UI date picker plugin. */
-/* Written by Stojce Slavkovski. */
-jQuery(function($){
- $.datepicker.regional['mk'] = {
- closeText: 'Затвори',
- prevText: '<',
- nextText: '>',
- currentText: 'Денес',
- monthNames: ['Јануари','Февруари','Март','Април','Мај','Јуни',
- 'Јули','Август','Септември','Октомври','Ноември','Декември'],
- monthNamesShort: ['Јан','Фев','Мар','Апр','Мај','Јун',
- 'Јул','Авг','Сеп','Окт','Ное','Дек'],
- dayNames: ['Недела','Понеделник','Вторник','Среда','Четврток','Петок','Сабота'],
- dayNamesShort: ['Нед','Пон','Вто','Сре','Чет','Пет','Саб'],
- dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Са'],
- weekHeader: 'Сед',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['mk']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ml.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ml.js
deleted file mode 100755
index 9b8f460..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ml.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Saji Nediyanchath (saji89@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['ml'] = {
- closeText: 'ശരി',
- prevText: 'മുന്നത്തെ',
- nextText: 'അടുത്തത് ',
- currentText: 'ഇന്ന്',
- monthNames: ['ജനുവരി','ഫെബ്രുവരി','മാര്ച്ച്','ഏപ്രില്','മേയ്','ജൂണ്',
- 'ജൂലൈ','ആഗസ്റ്റ്','സെപ്റ്റംബര്','ഒക്ടോബര്','നവംബര്','ഡിസംബര്'],
- monthNamesShort: ['ജനു', 'ഫെബ്', 'മാര്', 'ഏപ്രി', 'മേയ്', 'ജൂണ്',
- 'ജൂലാ', 'ആഗ', 'സെപ്', 'ഒക്ടോ', 'നവം', 'ഡിസ'],
- dayNames: ['ഞായര്', 'തിങ്കള്', 'ചൊവ്വ', 'ബുധന്', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
- dayNamesShort: ['ഞായ', 'തിങ്ക', 'ചൊവ്വ', 'ബുധ', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
- dayNamesMin: ['ഞാ','തി','ചൊ','ബു','വ്യാ','വെ','ശ'],
- weekHeader: 'ആ',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ml']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ms.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ms.js
deleted file mode 100755
index e70de72..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ms.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Malaysian initialisation for the jQuery UI date picker plugin. */
-/* Written by Mohd Nawawi Mohamad Jamili (nawawi@ronggeng.net). */
-jQuery(function($){
- $.datepicker.regional['ms'] = {
- closeText: 'Tutup',
- prevText: '<Sebelum',
- nextText: 'Selepas>',
- currentText: 'hari ini',
- monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
- 'Julai','Ogos','September','Oktober','November','Disember'],
- monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
- 'Jul','Ogo','Sep','Okt','Nov','Dis'],
- dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
- dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
- dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
- weekHeader: 'Mg',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ms']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nb.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nb.js
deleted file mode 100755
index 845a505..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Norwegian Bokmål initialisation for the jQuery UI date picker plugin. */
-/* Written by Bjørn Johansen (post@bjornjohansen.no). */
-jQuery(function($){
- $.datepicker.regional['nb'] = {
- closeText: 'Lukk',
- prevText: '«Forrige',
- nextText: 'Neste»',
- currentText: 'I dag',
- monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
- monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
- dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
- dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
- dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
- weekHeader: 'Uke',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''
- };
- $.datepicker.setDefaults($.datepicker.regional['nb']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl.js
deleted file mode 100755
index 203f160..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Mathias Bynens <http://mathiasbynens.be/> */
-jQuery(function($){
- $.datepicker.regional.nl = {
- closeText: 'Sluiten',
- prevText: '←',
- nextText: '→',
- currentText: 'Vandaag',
- monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
- 'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
- monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun',
- 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
- dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
- dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
- dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
- weekHeader: 'Wk',
- dateFormat: 'dd-mm-yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional.nl);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl_BE.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl_BE.js
deleted file mode 100755
index 7b3cdf4..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nl_BE.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Dutch (Belgium) initialisation for the jQuery UI date picker plugin. */
-/* David De Sloovere @DavidDeSloovere */
-jQuery(function($){
- $.datepicker.regional['nl-BE'] = {
- closeText: 'Sluiten',
- prevText: '←',
- nextText: '→',
- currentText: 'Vandaag',
- monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
- 'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
- monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun',
- 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
- dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
- dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
- dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['nl-BE']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nn.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nn.js
deleted file mode 100755
index b55245e..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_nn.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Norwegian Nynorsk initialisation for the jQuery UI date picker plugin. */
-/* Written by Bjørn Johansen (post@bjornjohansen.no). */
-jQuery(function($){
- $.datepicker.regional['nn'] = {
- closeText: 'Lukk',
- prevText: '«Førre',
- nextText: 'Neste»',
- currentText: 'I dag',
- monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
- monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
- dayNamesShort: ['sun','mån','tys','ons','tor','fre','lau'],
- dayNames: ['sundag','måndag','tysdag','onsdag','torsdag','fredag','laurdag'],
- dayNamesMin: ['su','må','ty','on','to','fr','la'],
- weekHeader: 'Veke',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''
- };
- $.datepicker.setDefaults($.datepicker.regional['nn']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_no.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_no.js
deleted file mode 100755
index d36e430..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_no.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Norwegian initialisation for the jQuery UI date picker plugin. */
-/* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
-
-jQuery(function($){
- $.datepicker.regional['no'] = {
- closeText: 'Lukk',
- prevText: '«Forrige',
- nextText: 'Neste»',
- currentText: 'I dag',
- monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
- monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
- dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
- dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
- dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
- weekHeader: 'Uke',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''
- };
- $.datepicker.setDefaults($.datepicker.regional['no']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pl.js
deleted file mode 100755
index 0ffc515..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pl.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Polish initialisation for the jQuery UI date picker plugin. */
-/* Written by Jacek Wysocki (jacek.wysocki@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['pl'] = {
- closeText: 'Zamknij',
- prevText: '<Poprzedni',
- nextText: 'Następny>',
- currentText: 'Dziś',
- monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
- 'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
- monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
- 'Lip','Sie','Wrz','Pa','Lis','Gru'],
- dayNames: ['Niedziela','Poniedziałek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
- dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
- dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
- weekHeader: 'Tydz',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['pl']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt.js
deleted file mode 100755
index 4fb16f0..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Portuguese initialisation for the jQuery UI date picker plugin. */
-jQuery(function($){
- $.datepicker.regional['pt'] = {
- closeText: 'Fechar',
- prevText: 'Anterior',
- nextText: 'Seguinte',
- currentText: 'Hoje',
- monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho',
- 'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
- monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
- 'Jul','Ago','Set','Out','Nov','Dez'],
- dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'],
- dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
- dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
- weekHeader: 'Sem',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['pt']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt_BR.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt_BR.js
deleted file mode 100755
index 521967e..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_pt_BR.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Brazilian initialisation for the jQuery UI date picker plugin. */
-/* Written by Leonildo Costa Silva (leocsilva@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['pt-BR'] = {
- closeText: 'Fechar',
- prevText: '<Anterior',
- nextText: 'Próximo>',
- currentText: 'Hoje',
- monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho',
- 'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
- monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
- 'Jul','Ago','Set','Out','Nov','Dez'],
- dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'],
- dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
- dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
- weekHeader: 'Sm',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['pt-BR']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_rm.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_rm.js
deleted file mode 100755
index 22ed216..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_rm.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Romansh initialisation for the jQuery UI date picker plugin. */
-/* Written by Yvonne Gienal (yvonne.gienal@educa.ch). */
-jQuery(function($){
- $.datepicker.regional['rm'] = {
- closeText: 'Serrar',
- prevText: '<Suandant',
- nextText: 'Precedent>',
- currentText: 'Actual',
- monthNames: ['Schaner','Favrer','Mars','Avrigl','Matg','Zercladur', 'Fanadur','Avust','Settember','October','November','December'],
- monthNamesShort: ['Scha','Fev','Mar','Avr','Matg','Zer', 'Fan','Avu','Sett','Oct','Nov','Dec'],
- dayNames: ['Dumengia','Glindesdi','Mardi','Mesemna','Gievgia','Venderdi','Sonda'],
- dayNamesShort: ['Dum','Gli','Mar','Mes','Gie','Ven','Som'],
- dayNamesMin: ['Du','Gl','Ma','Me','Gi','Ve','So'],
- weekHeader: 'emna',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['rm']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ro.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ro.js
deleted file mode 100755
index a988270..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ro.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Romanian initialisation for the jQuery UI date picker plugin.
- *
- * Written by Edmond L. (ll_edmond@walla.com)
- * and Ionut G. Stan (ionut.g.stan@gmail.com)
- */
-jQuery(function($){
- $.datepicker.regional['ro'] = {
- closeText: 'Închide',
- prevText: '« Luna precedentă',
- nextText: 'Luna următoare »',
- currentText: 'Azi',
- monthNames: ['Ianuarie','Februarie','Martie','Aprilie','Mai','Iunie',
- 'Iulie','August','Septembrie','Octombrie','Noiembrie','Decembrie'],
- monthNamesShort: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun',
- 'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- dayNames: ['Duminică', 'Luni', 'Marţi', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă'],
- dayNamesShort: ['Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sâm'],
- dayNamesMin: ['Du','Lu','Ma','Mi','Jo','Vi','Sâ'],
- weekHeader: 'Săpt',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ro']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ru.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ru.js
deleted file mode 100755
index a519714..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ru.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Andrew Stromnov (stromnov@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['ru'] = {
- closeText: 'Закрыть',
- prevText: '<Пред',
- nextText: 'След>',
- currentText: 'Сегодня',
- monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
- 'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
- monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
- 'Июл','Авг','Сен','Окт','Ноя','Дек'],
- dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
- dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
- dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
- weekHeader: 'Нед',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ru']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sk.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sk.js
deleted file mode 100755
index 0cb76c4..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Slovak initialisation for the jQuery UI date picker plugin. */
-/* Written by Vojtech Rinik (vojto@hmm.sk). */
-jQuery(function($){
- $.datepicker.regional['sk'] = {
- closeText: 'Zavrieť',
- prevText: '<Predchádzajúci',
- nextText: 'Nasledujúci>',
- currentText: 'Dnes',
- monthNames: ['január','február','marec','apríl','máj','jún',
- 'júl','august','september','október','november','december'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
- 'Júl','Aug','Sep','Okt','Nov','Dec'],
- dayNames: ['nedeľa','pondelok','utorok','streda','štvrtok','piatok','sobota'],
- dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
- dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
- weekHeader: 'Ty',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['sk']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sl.js
deleted file mode 100755
index 048a47a..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sl.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Slovenian initialisation for the jQuery UI date picker plugin. */
-/* Written by Jaka Jancar (jaka@kubje.org). */
-/* c = č, s = š z = ž C = Č S = Š Z = Ž */
-jQuery(function($){
- $.datepicker.regional['sl'] = {
- closeText: 'Zapri',
- prevText: '<Prejšnji',
- nextText: 'Naslednji>',
- currentText: 'Trenutni',
- monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
- 'Julij','Avgust','September','Oktober','November','December'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
- 'Jul','Avg','Sep','Okt','Nov','Dec'],
- dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','Četrtek','Petek','Sobota'],
- dayNamesShort: ['Ned','Pon','Tor','Sre','Čet','Pet','Sob'],
- dayNamesMin: ['Ne','Po','To','Sr','Če','Pe','So'],
- weekHeader: 'Teden',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['sl']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sq.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sq.js
deleted file mode 100755
index d6086a7..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sq.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Albanian initialisation for the jQuery UI date picker plugin. */
-/* Written by Flakron Bytyqi (flakron@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['sq'] = {
- closeText: 'mbylle',
- prevText: '<mbrapa',
- nextText: 'Përpara>',
- currentText: 'sot',
- monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
- 'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
- monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
- 'Kor','Gus','Sht','Tet','Nën','Dhj'],
- dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
- dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
- dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
- weekHeader: 'Ja',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['sq']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr.js
deleted file mode 100755
index 1349a26..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Serbian i18n for the jQuery UI date picker plugin. */
-/* Written by Dejan Dimić. */
-jQuery(function($){
- $.datepicker.regional['sr'] = {
- closeText: 'Затвори',
- prevText: '<',
- nextText: '>',
- currentText: 'Данас',
- monthNames: ['Јануар','Фебруар','Март','Април','Мај','Јун',
- 'Јул','Август','Септембар','Октобар','Новембар','Децембар'],
- monthNamesShort: ['Јан','Феб','Мар','Апр','Мај','Јун',
- 'Јул','Авг','Сеп','Окт','Нов','Дец'],
- dayNames: ['Недеља','Понедељак','Уторак','Среда','Четвртак','Петак','Субота'],
- dayNamesShort: ['Нед','Пон','Уто','Сре','Чет','Пет','Суб'],
- dayNamesMin: ['Не','По','Ут','Ср','Че','Пе','Су'],
- weekHeader: 'Сед',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['sr']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr_SR.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr_SR.js
deleted file mode 100755
index 810d21d..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sr_SR.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Serbian i18n for the jQuery UI date picker plugin. */
-/* Written by Dejan Dimić. */
-jQuery(function($){
- $.datepicker.regional['sr-SR'] = {
- closeText: 'Zatvori',
- prevText: '<',
- nextText: '>',
- currentText: 'Danas',
- monthNames: ['Januar','Februar','Mart','April','Maj','Jun',
- 'Jul','Avgust','Septembar','Oktobar','Novembar','Decembar'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
- 'Jul','Avg','Sep','Okt','Nov','Dec'],
- dayNames: ['Nedelja','Ponedeljak','Utorak','Sreda','Četvrtak','Petak','Subota'],
- dayNamesShort: ['Ned','Pon','Uto','Sre','Čet','Pet','Sub'],
- dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
- weekHeader: 'Sed',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['sr-SR']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sv.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sv.js
deleted file mode 100755
index cbb5ad1..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_sv.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Swedish initialisation for the jQuery UI date picker plugin. */
-/* Written by Anders Ekdahl ( anders@nomadiz.se). */
-jQuery(function($){
- $.datepicker.regional['sv'] = {
- closeText: 'Stäng',
- prevText: '«Förra',
- nextText: 'Nästa»',
- currentText: 'Idag',
- monthNames: ['Januari','Februari','Mars','April','Maj','Juni',
- 'Juli','Augusti','September','Oktober','November','December'],
- monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
- 'Jul','Aug','Sep','Okt','Nov','Dec'],
- dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'],
- dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'],
- dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'],
- weekHeader: 'Ve',
- dateFormat: 'yy-mm-dd',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['sv']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ta.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ta.js
deleted file mode 100755
index 40431ed..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_ta.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by S A Sureshkumar (saskumar@live.com). */
-jQuery(function($){
- $.datepicker.regional['ta'] = {
- closeText: 'மூடு',
- prevText: 'முன்னையது',
- nextText: 'அடுத்தது',
- currentText: 'இன்று',
- monthNames: ['தை','மாசி','பங்குனி','சித்திரை','வைகாசி','ஆனி',
- 'ஆடி','ஆவணி','புரட்டாசி','ஐப்பசி','கார்த்திகை','மார்கழி'],
- monthNamesShort: ['தை','மாசி','பங்','சித்','வைகா','ஆனி',
- 'ஆடி','ஆவ','புர','ஐப்','கார்','மார்'],
- dayNames: ['ஞாயிற்றுக்கிழமை','திங்கட்கிழமை','செவ்வாய்க்கிழமை','புதன்கிழமை','வியாழக்கிழமை','வெள்ளிக்கிழமை','சனிக்கிழமை'],
- dayNamesShort: ['ஞாயிறு','திங்கள்','செவ்வாய்','புதன்','வியாழன்','வெள்ளி','சனி'],
- dayNamesMin: ['ஞா','தி','செ','பு','வி','வெ','ச'],
- weekHeader: 'Не',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['ta']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_th.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_th.js
deleted file mode 100755
index aecfd27..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_th.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Thai initialisation for the jQuery UI date picker plugin. */
-/* Written by pipo (pipo@sixhead.com). */
-jQuery(function($){
- $.datepicker.regional['th'] = {
- closeText: 'ปิด',
- prevText: '« ย้อน',
- nextText: 'ถัดไป »',
- currentText: 'วันนี้',
- monthNames: ['มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน',
- 'กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'],
- monthNamesShort: ['ม.ค.','ก.พ.','มี.ค.','เม.ย.','พ.ค.','มิ.ย.',
- 'ก.ค.','ส.ค.','ก.ย.','ต.ค.','พ.ย.','ธ.ค.'],
- dayNames: ['อาทิตย์','จันทร์','อังคาร','พุธ','พฤหัสบดี','ศุกร์','เสาร์'],
- dayNamesShort: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
- dayNamesMin: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['th']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tj.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tj.js
deleted file mode 100755
index 9a20e4d..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tj.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Tajiki (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Abdurahmon Saidov (saidovab@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['tj'] = {
- closeText: 'Идома',
- prevText: '<Қафо',
- nextText: 'Пеш>',
- currentText: 'Имрӯз',
- monthNames: ['Январ','Феврал','Март','Апрел','Май','Июн',
- 'Июл','Август','Сентябр','Октябр','Ноябр','Декабр'],
- monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
- 'Июл','Авг','Сен','Окт','Ноя','Дек'],
- dayNames: ['якшанбе','душанбе','сешанбе','чоршанбе','панҷшанбе','ҷумъа','шанбе'],
- dayNamesShort: ['якш','душ','сеш','чор','пан','ҷум','шан'],
- dayNamesMin: ['Як','Дш','Сш','Чш','Пш','Ҷм','Шн'],
- weekHeader: 'Хф',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['tj']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tr.js
deleted file mode 100755
index 75b583a..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_tr.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Turkish initialisation for the jQuery UI date picker plugin. */
-/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
-jQuery(function($){
- $.datepicker.regional['tr'] = {
- closeText: 'kapat',
- prevText: '<geri',
- nextText: 'ileri>',
- currentText: 'bugün',
- monthNames: ['Ocak','Şubat','Mart','Nisan','Mayıs','Haziran',
- 'Temmuz','Ağustos','Eylül','Ekim','Kasım','Aralık'],
- monthNamesShort: ['Oca','Şub','Mar','Nis','May','Haz',
- 'Tem','Ağu','Eyl','Eki','Kas','Ara'],
- dayNames: ['Pazar','Pazartesi','Salı','Çarşamba','Perşembe','Cuma','Cumartesi'],
- dayNamesShort: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
- dayNamesMin: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
- weekHeader: 'Hf',
- dateFormat: 'dd.mm.yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['tr']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_uk.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_uk.js
deleted file mode 100755
index 2bdc82f..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_uk.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Maxim Drogobitskiy (maxdao@gmail.com). */
-/* Corrected by Igor Milla (igor.fsp.milla@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['uk'] = {
- closeText: 'Закрити',
- prevText: '<',
- nextText: '>',
- currentText: 'Сьогодні',
- monthNames: ['Січень','Лютий','Березень','Квітень','Травень','Червень',
- 'Липень','Серпень','Вересень','Жовтень','Листопад','Грудень'],
- monthNamesShort: ['Січ','Лют','Бер','Кві','Тра','Чер',
- 'Лип','Сер','Вер','Жов','Лис','Гру'],
- dayNames: ['неділя','понеділок','вівторок','середа','четвер','п’ятниця','субота'],
- dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'],
- dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'],
- weekHeader: 'Тиж',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['uk']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_vi.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_vi.js
deleted file mode 100755
index b49e7eb..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_vi.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Vietnamese initialisation for the jQuery UI date picker plugin. */
-/* Translated by Le Thanh Huy (lthanhhuy@cit.ctu.edu.vn). */
-jQuery(function($){
- $.datepicker.regional['vi'] = {
- closeText: 'Đóng',
- prevText: '<Trước',
- nextText: 'Tiếp>',
- currentText: 'Hôm nay',
- monthNames: ['Tháng Một', 'Tháng Hai', 'Tháng Ba', 'Tháng Tư', 'Tháng Năm', 'Tháng Sáu',
- 'Tháng Bảy', 'Tháng Tám', 'Tháng Chín', 'Tháng Mười', 'Tháng Mười Một', 'Tháng Mười Hai'],
- monthNamesShort: ['Tháng 1', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6',
- 'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
- dayNames: ['Chủ Nhật', 'Thứ Hai', 'Thứ Ba', 'Thứ Tư', 'Thứ Năm', 'Thứ Sáu', 'Thứ Bảy'],
- dayNamesShort: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
- dayNamesMin: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
- weekHeader: 'Tu',
- dateFormat: 'dd/mm/yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- $.datepicker.setDefaults($.datepicker.regional['vi']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_HK.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_HK.js
deleted file mode 100755
index ef6f4e7..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_HK.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by SCCY (samuelcychan@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['zh-HK'] = {
- closeText: '關閉',
- prevText: '<上月',
- nextText: '下月>',
- currentText: '今天',
- monthNames: ['一月','二月','三月','四月','五月','六月',
- '七月','八月','九月','十月','十一月','十二月'],
- monthNamesShort: ['一月','二月','三月','四月','五月','六月',
- '七月','八月','九月','十月','十一月','十二月'],
- dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
- dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
- dayNamesMin: ['日','一','二','三','四','五','六'],
- weekHeader: '周',
- dateFormat: 'dd-mm-yy',
- firstDay: 0,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: '年'};
- $.datepicker.setDefaults($.datepicker.regional['zh-HK']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_TW.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_TW.js
deleted file mode 100755
index b9105ea..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.10.4.custom_zh_TW.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by Ressol (ressol@gmail.com). */
-jQuery(function($){
- $.datepicker.regional['zh-TW'] = {
- closeText: '關閉',
- prevText: '<上月',
- nextText: '下月>',
- currentText: '今天',
- monthNames: ['一月','二月','三月','四月','五月','六月',
- '七月','八月','九月','十月','十一月','十二月'],
- monthNamesShort: ['一月','二月','三月','四月','五月','六月',
- '七月','八月','九月','十月','十一月','十二月'],
- dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
- dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
- dayNamesMin: ['日','一','二','三','四','五','六'],
- weekHeader: '周',
- dateFormat: 'yy/mm/dd',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: true,
- yearSuffix: '年'};
- $.datepicker.setDefaults($.datepicker.regional['zh-TW']);
-});
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom.js
new file mode 100644
index 0000000..c0f54b6
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-1.13.1.custom.js
@@ -0,0 +1,5928 @@
+/*! jQuery UI - v1.13.1 - 2022-02-09
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, jquery-patch.js, keycode.js, scroll-parent.js, widgets/draggable.js, widgets/datepicker.js, widgets/mouse.js, widgets/slider.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+( function( factory ) {
+ "use strict";
+
+ if ( typeof define === "function" && define.amd ) {
+
+ // AMD. Register as an anonymous module.
+ define( [ "jquery" ], factory );
+ } else {
+
+ // Browser globals
+ factory( jQuery );
+ }
+} )( function( $ ) {
+ "use strict";
+
+ $.ui = $.ui || {};
+
+ var version = $.ui.version = "1.13.1";
+
+
+ /*!
+ * jQuery UI Widget 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Widget
+//>>group: Core
+//>>description: Provides a factory for creating stateful widgets with a common API.
+//>>docs: http://api.jqueryui.com/jQuery.widget/
+//>>demos: http://jqueryui.com/widget/
+
+
+ var widgetUuid = 0;
+ var widgetHasOwnProperty = Array.prototype.hasOwnProperty;
+ var widgetSlice = Array.prototype.slice;
+
+ $.cleanData = ( function( orig ) {
+ return function( elems ) {
+ var events, elem, i;
+ for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
+
+ // Only trigger remove when necessary to save time
+ events = $._data( elem, "events" );
+ if ( events && events.remove ) {
+ $( elem ).triggerHandler( "remove" );
+ }
+ }
+ orig( elems );
+ };
+ } )( $.cleanData );
+
+ $.widget = function( name, base, prototype ) {
+ var existingConstructor, constructor, basePrototype;
+
+ // ProxiedPrototype allows the provided prototype to remain unmodified
+ // so that it can be used as a mixin for multiple widgets (#8876)
+ var proxiedPrototype = {};
+
+ var namespace = name.split( "." )[ 0 ];
+ name = name.split( "." )[ 1 ];
+ var fullName = namespace + "-" + name;
+
+ if ( !prototype ) {
+ prototype = base;
+ base = $.Widget;
+ }
+
+ if ( Array.isArray( prototype ) ) {
+ prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
+ }
+
+ // Create selector for plugin
+ $.expr.pseudos[ fullName.toLowerCase() ] = function( elem ) {
+ return !!$.data( elem, fullName );
+ };
+
+ $[ namespace ] = $[ namespace ] || {};
+ existingConstructor = $[ namespace ][ name ];
+ constructor = $[ namespace ][ name ] = function( options, element ) {
+
+ // Allow instantiation without "new" keyword
+ if ( !this || !this._createWidget ) {
+ return new constructor( options, element );
+ }
+
+ // Allow instantiation without initializing for simple inheritance
+ // must use "new" keyword (the code above always passes args)
+ if ( arguments.length ) {
+ this._createWidget( options, element );
+ }
+ };
+
+ // Extend with the existing constructor to carry over any static properties
+ $.extend( constructor, existingConstructor, {
+ version: prototype.version,
+
+ // Copy the object used to create the prototype in case we need to
+ // redefine the widget later
+ _proto: $.extend( {}, prototype ),
+
+ // Track widgets that inherit from this widget in case this widget is
+ // redefined after a widget inherits from it
+ _childConstructors: []
+ } );
+
+ basePrototype = new base();
+
+ // We need to make the options hash a property directly on the new instance
+ // otherwise we'll modify the options hash on the prototype that we're
+ // inheriting from
+ basePrototype.options = $.widget.extend( {}, basePrototype.options );
+ $.each( prototype, function( prop, value ) {
+ if ( typeof value !== "function" ) {
+ proxiedPrototype[ prop ] = value;
+ return;
+ }
+ proxiedPrototype[ prop ] = ( function() {
+ function _super() {
+ return base.prototype[ prop ].apply( this, arguments );
+ }
+
+ function _superApply( args ) {
+ return base.prototype[ prop ].apply( this, args );
+ }
+
+ return function() {
+ var __super = this._super;
+ var __superApply = this._superApply;
+ var returnValue;
+
+ this._super = _super;
+ this._superApply = _superApply;
+
+ returnValue = value.apply( this, arguments );
+
+ this._super = __super;
+ this._superApply = __superApply;
+
+ return returnValue;
+ };
+ } )();
+ } );
+ constructor.prototype = $.widget.extend( basePrototype, {
+
+ // TODO: remove support for widgetEventPrefix
+ // always use the name + a colon as the prefix, e.g., draggable:start
+ // don't prefix for widgets that aren't DOM-based
+ widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name
+ }, proxiedPrototype, {
+ constructor: constructor,
+ namespace: namespace,
+ widgetName: name,
+ widgetFullName: fullName
+ } );
+
+ // If this widget is being redefined then we need to find all widgets that
+ // are inheriting from it and redefine all of them so that they inherit from
+ // the new version of this widget. We're essentially trying to replace one
+ // level in the prototype chain.
+ if ( existingConstructor ) {
+ $.each( existingConstructor._childConstructors, function( i, child ) {
+ var childPrototype = child.prototype;
+
+ // Redefine the child widget using the same prototype that was
+ // originally used, but inherit from the new version of the base
+ $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor,
+ child._proto );
+ } );
+
+ // Remove the list of existing child constructors from the old constructor
+ // so the old child constructors can be garbage collected
+ delete existingConstructor._childConstructors;
+ } else {
+ base._childConstructors.push( constructor );
+ }
+
+ $.widget.bridge( name, constructor );
+
+ return constructor;
+ };
+
+ $.widget.extend = function( target ) {
+ var input = widgetSlice.call( arguments, 1 );
+ var inputIndex = 0;
+ var inputLength = input.length;
+ var key;
+ var value;
+
+ for ( ; inputIndex < inputLength; inputIndex++ ) {
+ for ( key in input[ inputIndex ] ) {
+ value = input[ inputIndex ][ key ];
+ if ( widgetHasOwnProperty.call( input[ inputIndex ], key ) && value !== undefined ) {
+
+ // Clone objects
+ if ( $.isPlainObject( value ) ) {
+ target[ key ] = $.isPlainObject( target[ key ] ) ?
+ $.widget.extend( {}, target[ key ], value ) :
+
+ // Don't extend strings, arrays, etc. with objects
+ $.widget.extend( {}, value );
+
+ // Copy everything else by reference
+ } else {
+ target[ key ] = value;
+ }
+ }
+ }
+ }
+ return target;
+ };
+
+ $.widget.bridge = function( name, object ) {
+ var fullName = object.prototype.widgetFullName || name;
+ $.fn[ name ] = function( options ) {
+ var isMethodCall = typeof options === "string";
+ var args = widgetSlice.call( arguments, 1 );
+ var returnValue = this;
+
+ if ( isMethodCall ) {
+
+ // If this is an empty collection, we need to have the instance method
+ // return undefined instead of the jQuery instance
+ if ( !this.length && options === "instance" ) {
+ returnValue = undefined;
+ } else {
+ this.each( function() {
+ var methodValue;
+ var instance = $.data( this, fullName );
+
+ if ( options === "instance" ) {
+ returnValue = instance;
+ return false;
+ }
+
+ if ( !instance ) {
+ return $.error( "cannot call methods on " + name +
+ " prior to initialization; " +
+ "attempted to call method '" + options + "'" );
+ }
+
+ if ( typeof instance[ options ] !== "function" ||
+ options.charAt( 0 ) === "_" ) {
+ return $.error( "no such method '" + options + "' for " + name +
+ " widget instance" );
+ }
+
+ methodValue = instance[ options ].apply( instance, args );
+
+ if ( methodValue !== instance && methodValue !== undefined ) {
+ returnValue = methodValue && methodValue.jquery ?
+ returnValue.pushStack( methodValue.get() ) :
+ methodValue;
+ return false;
+ }
+ } );
+ }
+ } else {
+
+ // Allow multiple hashes to be passed on init
+ if ( args.length ) {
+ options = $.widget.extend.apply( null, [ options ].concat( args ) );
+ }
+
+ this.each( function() {
+ var instance = $.data( this, fullName );
+ if ( instance ) {
+ instance.option( options || {} );
+ if ( instance._init ) {
+ instance._init();
+ }
+ } else {
+ $.data( this, fullName, new object( options, this ) );
+ }
+ } );
+ }
+
+ return returnValue;
+ };
+ };
+
+ $.Widget = function( /* options, element */ ) {};
+ $.Widget._childConstructors = [];
+
+ $.Widget.prototype = {
+ widgetName: "widget",
+ widgetEventPrefix: "",
+ defaultElement: "<div>",
+
+ options: {
+ classes: {},
+ disabled: false,
+
+ // Callbacks
+ create: null
+ },
+
+ _createWidget: function( options, element ) {
+ element = $( element || this.defaultElement || this )[ 0 ];
+ this.element = $( element );
+ this.uuid = widgetUuid++;
+ this.eventNamespace = "." + this.widgetName + this.uuid;
+
+ this.bindings = $();
+ this.hoverable = $();
+ this.focusable = $();
+ this.classesElementLookup = {};
+
+ if ( element !== this ) {
+ $.data( element, this.widgetFullName, this );
+ this._on( true, this.element, {
+ remove: function( event ) {
+ if ( event.target === element ) {
+ this.destroy();
+ }
+ }
+ } );
+ this.document = $( element.style ?
+
+ // Element within the document
+ element.ownerDocument :
+
+ // Element is window or document
+ element.document || element );
+ this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow );
+ }
+
+ this.options = $.widget.extend( {},
+ this.options,
+ this._getCreateOptions(),
+ options );
+
+ this._create();
+
+ if ( this.options.disabled ) {
+ this._setOptionDisabled( this.options.disabled );
+ }
+
+ this._trigger( "create", null, this._getCreateEventData() );
+ this._init();
+ },
+
+ _getCreateOptions: function() {
+ return {};
+ },
+
+ _getCreateEventData: $.noop,
+
+ _create: $.noop,
+
+ _init: $.noop,
+
+ destroy: function() {
+ var that = this;
+
+ this._destroy();
+ $.each( this.classesElementLookup, function( key, value ) {
+ that._removeClass( value, key );
+ } );
+
+ // We can probably remove the unbind calls in 2.0
+ // all event bindings should go through this._on()
+ this.element
+ .off( this.eventNamespace )
+ .removeData( this.widgetFullName );
+ this.widget()
+ .off( this.eventNamespace )
+ .removeAttr( "aria-disabled" );
+
+ // Clean up events and states
+ this.bindings.off( this.eventNamespace );
+ },
+
+ _destroy: $.noop,
+
+ widget: function() {
+ return this.element;
+ },
+
+ option: function( key, value ) {
+ var options = key;
+ var parts;
+ var curOption;
+ var i;
+
+ if ( arguments.length === 0 ) {
+
+ // Don't return a reference to the internal hash
+ return $.widget.extend( {}, this.options );
+ }
+
+ if ( typeof key === "string" ) {
+
+ // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+ options = {};
+ parts = key.split( "." );
+ key = parts.shift();
+ if ( parts.length ) {
+ curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+ for ( i = 0; i < parts.length - 1; i++ ) {
+ curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+ curOption = curOption[ parts[ i ] ];
+ }
+ key = parts.pop();
+ if ( arguments.length === 1 ) {
+ return curOption[ key ] === undefined ? null : curOption[ key ];
+ }
+ curOption[ key ] = value;
+ } else {
+ if ( arguments.length === 1 ) {
+ return this.options[ key ] === undefined ? null : this.options[ key ];
+ }
+ options[ key ] = value;
+ }
+ }
+
+ this._setOptions( options );
+
+ return this;
+ },
+
+ _setOptions: function( options ) {
+ var key;
+
+ for ( key in options ) {
+ this._setOption( key, options[ key ] );
+ }
+
+ return this;
+ },
+
+ _setOption: function( key, value ) {
+ if ( key === "classes" ) {
+ this._setOptionClasses( value );
+ }
+
+ this.options[ key ] = value;
+
+ if ( key === "disabled" ) {
+ this._setOptionDisabled( value );
+ }
+
+ return this;
+ },
+
+ _setOptionClasses: function( value ) {
+ var classKey, elements, currentElements;
+
+ for ( classKey in value ) {
+ currentElements = this.classesElementLookup[ classKey ];
+ if ( value[ classKey ] === this.options.classes[ classKey ] ||
+ !currentElements ||
+ !currentElements.length ) {
+ continue;
+ }
+
+ // We are doing this to create a new jQuery object because the _removeClass() call
+ // on the next line is going to destroy the reference to the current elements being
+ // tracked. We need to save a copy of this collection so that we can add the new classes
+ // below.
+ elements = $( currentElements.get() );
+ this._removeClass( currentElements, classKey );
+
+ // We don't use _addClass() here, because that uses this.options.classes
+ // for generating the string of classes. We want to use the value passed in from
+ // _setOption(), this is the new value of the classes option which was passed to
+ // _setOption(). We pass this value directly to _classes().
+ elements.addClass( this._classes( {
+ element: elements,
+ keys: classKey,
+ classes: value,
+ add: true
+ } ) );
+ }
+ },
+
+ _setOptionDisabled: function( value ) {
+ this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
+
+ // If the widget is becoming disabled, then nothing is interactive
+ if ( value ) {
+ this._removeClass( this.hoverable, null, "ui-state-hover" );
+ this._removeClass( this.focusable, null, "ui-state-focus" );
+ }
+ },
+
+ enable: function() {
+ return this._setOptions( { disabled: false } );
+ },
+
+ disable: function() {
+ return this._setOptions( { disabled: true } );
+ },
+
+ _classes: function( options ) {
+ var full = [];
+ var that = this;
+
+ options = $.extend( {
+ element: this.element,
+ classes: this.options.classes || {}
+ }, options );
+
+ function bindRemoveEvent() {
+ var nodesToBind = [];
+
+ options.element.each( function( _, element ) {
+ var isTracked = $.map( that.classesElementLookup, function( elements ) {
+ return elements;
+ } )
+ .some( function( elements ) {
+ return elements.is( element );
+ } );
+
+ if ( !isTracked ) {
+ nodesToBind.push( element );
+ }
+ } );
+
+ that._on( $( nodesToBind ), {
+ remove: "_untrackClassesElement"
+ } );
+ }
+
+ function processClassString( classes, checkOption ) {
+ var current, i;
+ for ( i = 0; i < classes.length; i++ ) {
+ current = that.classesElementLookup[ classes[ i ] ] || $();
+ if ( options.add ) {
+ bindRemoveEvent();
+ current = $( $.uniqueSort( current.get().concat( options.element.get() ) ) );
+ } else {
+ current = $( current.not( options.element ).get() );
+ }
+ that.classesElementLookup[ classes[ i ] ] = current;
+ full.push( classes[ i ] );
+ if ( checkOption && options.classes[ classes[ i ] ] ) {
+ full.push( options.classes[ classes[ i ] ] );
+ }
+ }
+ }
+
+ if ( options.keys ) {
+ processClassString( options.keys.match( /\S+/g ) || [], true );
+ }
+ if ( options.extra ) {
+ processClassString( options.extra.match( /\S+/g ) || [] );
+ }
+
+ return full.join( " " );
+ },
+
+ _untrackClassesElement: function( event ) {
+ var that = this;
+ $.each( that.classesElementLookup, function( key, value ) {
+ if ( $.inArray( event.target, value ) !== -1 ) {
+ that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
+ }
+ } );
+
+ this._off( $( event.target ) );
+ },
+
+ _removeClass: function( element, keys, extra ) {
+ return this._toggleClass( element, keys, extra, false );
+ },
+
+ _addClass: function( element, keys, extra ) {
+ return this._toggleClass( element, keys, extra, true );
+ },
+
+ _toggleClass: function( element, keys, extra, add ) {
+ add = ( typeof add === "boolean" ) ? add : extra;
+ var shift = ( typeof element === "string" || element === null ),
+ options = {
+ extra: shift ? keys : extra,
+ keys: shift ? element : keys,
+ element: shift ? this.element : element,
+ add: add
+ };
+ options.element.toggleClass( this._classes( options ), add );
+ return this;
+ },
+
+ _on: function( suppressDisabledCheck, element, handlers ) {
+ var delegateElement;
+ var instance = this;
+
+ // No suppressDisabledCheck flag, shuffle arguments
+ if ( typeof suppressDisabledCheck !== "boolean" ) {
+ handlers = element;
+ element = suppressDisabledCheck;
+ suppressDisabledCheck = false;
+ }
+
+ // No element argument, shuffle and use this.element
+ if ( !handlers ) {
+ handlers = element;
+ element = this.element;
+ delegateElement = this.widget();
+ } else {
+ element = delegateElement = $( element );
+ this.bindings = this.bindings.add( element );
+ }
+
+ $.each( handlers, function( event, handler ) {
+ function handlerProxy() {
+
+ // Allow widgets to customize the disabled handling
+ // - disabled as an array instead of boolean
+ // - disabled class as method for disabling individual parts
+ if ( !suppressDisabledCheck &&
+ ( instance.options.disabled === true ||
+ $( this ).hasClass( "ui-state-disabled" ) ) ) {
+ return;
+ }
+ return ( typeof handler === "string" ? instance[ handler ] : handler )
+ .apply( instance, arguments );
+ }
+
+ // Copy the guid so direct unbinding works
+ if ( typeof handler !== "string" ) {
+ handlerProxy.guid = handler.guid =
+ handler.guid || handlerProxy.guid || $.guid++;
+ }
+
+ var match = event.match( /^([\w:-]*)\s*(.*)$/ );
+ var eventName = match[ 1 ] + instance.eventNamespace;
+ var selector = match[ 2 ];
+
+ if ( selector ) {
+ delegateElement.on( eventName, selector, handlerProxy );
+ } else {
+ element.on( eventName, handlerProxy );
+ }
+ } );
+ },
+
+ _off: function( element, eventName ) {
+ eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
+ this.eventNamespace;
+ element.off( eventName );
+
+ // Clear the stack to avoid memory leaks (#10056)
+ this.bindings = $( this.bindings.not( element ).get() );
+ this.focusable = $( this.focusable.not( element ).get() );
+ this.hoverable = $( this.hoverable.not( element ).get() );
+ },
+
+ _delay: function( handler, delay ) {
+ function handlerProxy() {
+ return ( typeof handler === "string" ? instance[ handler ] : handler )
+ .apply( instance, arguments );
+ }
+ var instance = this;
+ return setTimeout( handlerProxy, delay || 0 );
+ },
+
+ _hoverable: function( element ) {
+ this.hoverable = this.hoverable.add( element );
+ this._on( element, {
+ mouseenter: function( event ) {
+ this._addClass( $( event.currentTarget ), null, "ui-state-hover" );
+ },
+ mouseleave: function( event ) {
+ this._removeClass( $( event.currentTarget ), null, "ui-state-hover" );
+ }
+ } );
+ },
+
+ _focusable: function( element ) {
+ this.focusable = this.focusable.add( element );
+ this._on( element, {
+ focusin: function( event ) {
+ this._addClass( $( event.currentTarget ), null, "ui-state-focus" );
+ },
+ focusout: function( event ) {
+ this._removeClass( $( event.currentTarget ), null, "ui-state-focus" );
+ }
+ } );
+ },
+
+ _trigger: function( type, event, data ) {
+ var prop, orig;
+ var callback = this.options[ type ];
+
+ data = data || {};
+ event = $.Event( event );
+ event.type = ( type === this.widgetEventPrefix ?
+ type :
+ this.widgetEventPrefix + type ).toLowerCase();
+
+ // The original event may come from any element
+ // so we need to reset the target on the new event
+ event.target = this.element[ 0 ];
+
+ // Copy original event properties over to the new event
+ orig = event.originalEvent;
+ if ( orig ) {
+ for ( prop in orig ) {
+ if ( !( prop in event ) ) {
+ event[ prop ] = orig[ prop ];
+ }
+ }
+ }
+
+ this.element.trigger( event, data );
+ return !( typeof callback === "function" &&
+ callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
+ event.isDefaultPrevented() );
+ }
+ };
+
+ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+ $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+ if ( typeof options === "string" ) {
+ options = { effect: options };
+ }
+
+ var hasOptions;
+ var effectName = !options ?
+ method :
+ options === true || typeof options === "number" ?
+ defaultEffect :
+ options.effect || defaultEffect;
+
+ options = options || {};
+ if ( typeof options === "number" ) {
+ options = { duration: options };
+ } else if ( options === true ) {
+ options = {};
+ }
+
+ hasOptions = !$.isEmptyObject( options );
+ options.complete = callback;
+
+ if ( options.delay ) {
+ element.delay( options.delay );
+ }
+
+ if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+ element[ method ]( options );
+ } else if ( effectName !== method && element[ effectName ] ) {
+ element[ effectName ]( options.duration, options.easing, callback );
+ } else {
+ element.queue( function( next ) {
+ $( this )[ method ]();
+ if ( callback ) {
+ callback.call( element[ 0 ] );
+ }
+ next();
+ } );
+ }
+ };
+ } );
+
+ var widget = $.widget;
+
+
+ /*!
+ * jQuery UI Position 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/position/
+ */
+
+//>>label: Position
+//>>group: Core
+//>>description: Positions elements relative to other elements.
+//>>docs: http://api.jqueryui.com/position/
+//>>demos: http://jqueryui.com/position/
+
+
+ ( function() {
+ var cachedScrollbarWidth,
+ max = Math.max,
+ abs = Math.abs,
+ rhorizontal = /left|center|right/,
+ rvertical = /top|center|bottom/,
+ roffset = /[\+\-]\d+(\.[\d]+)?%?/,
+ rposition = /^\w+/,
+ rpercent = /%$/,
+ _position = $.fn.position;
+
+ function getOffsets( offsets, width, height ) {
+ return [
+ parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+ parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+ ];
+ }
+
+ function parseCss( element, property ) {
+ return parseInt( $.css( element, property ), 10 ) || 0;
+ }
+
+ function isWindow( obj ) {
+ return obj != null && obj === obj.window;
+ }
+
+ function getDimensions( elem ) {
+ var raw = elem[ 0 ];
+ if ( raw.nodeType === 9 ) {
+ return {
+ width: elem.width(),
+ height: elem.height(),
+ offset: { top: 0, left: 0 }
+ };
+ }
+ if ( isWindow( raw ) ) {
+ return {
+ width: elem.width(),
+ height: elem.height(),
+ offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
+ };
+ }
+ if ( raw.preventDefault ) {
+ return {
+ width: 0,
+ height: 0,
+ offset: { top: raw.pageY, left: raw.pageX }
+ };
+ }
+ return {
+ width: elem.outerWidth(),
+ height: elem.outerHeight(),
+ offset: elem.offset()
+ };
+ }
+
+ $.position = {
+ scrollbarWidth: function() {
+ if ( cachedScrollbarWidth !== undefined ) {
+ return cachedScrollbarWidth;
+ }
+ var w1, w2,
+ div = $( "<div style=" +
+ "'display:block;position:absolute;width:200px;height:200px;overflow:hidden;'>" +
+ "<div style='height:300px;width:auto;'></div></div>" ),
+ innerDiv = div.children()[ 0 ];
+
+ $( "body" ).append( div );
+ w1 = innerDiv.offsetWidth;
+ div.css( "overflow", "scroll" );
+
+ w2 = innerDiv.offsetWidth;
+
+ if ( w1 === w2 ) {
+ w2 = div[ 0 ].clientWidth;
+ }
+
+ div.remove();
+
+ return ( cachedScrollbarWidth = w1 - w2 );
+ },
+ getScrollInfo: function( within ) {
+ var overflowX = within.isWindow || within.isDocument ? "" :
+ within.element.css( "overflow-x" ),
+ overflowY = within.isWindow || within.isDocument ? "" :
+ within.element.css( "overflow-y" ),
+ hasOverflowX = overflowX === "scroll" ||
+ ( overflowX === "auto" && within.width < within.element[ 0 ].scrollWidth ),
+ hasOverflowY = overflowY === "scroll" ||
+ ( overflowY === "auto" && within.height < within.element[ 0 ].scrollHeight );
+ return {
+ width: hasOverflowY ? $.position.scrollbarWidth() : 0,
+ height: hasOverflowX ? $.position.scrollbarWidth() : 0
+ };
+ },
+ getWithinInfo: function( element ) {
+ var withinElement = $( element || window ),
+ isElemWindow = isWindow( withinElement[ 0 ] ),
+ isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
+ hasOffset = !isElemWindow && !isDocument;
+ return {
+ element: withinElement,
+ isWindow: isElemWindow,
+ isDocument: isDocument,
+ offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
+ scrollLeft: withinElement.scrollLeft(),
+ scrollTop: withinElement.scrollTop(),
+ width: withinElement.outerWidth(),
+ height: withinElement.outerHeight()
+ };
+ }
+ };
+
+ $.fn.position = function( options ) {
+ if ( !options || !options.of ) {
+ return _position.apply( this, arguments );
+ }
+
+ // Make a copy, we don't want to modify arguments
+ options = $.extend( {}, options );
+
+ var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
+
+ // Make sure string options are treated as CSS selectors
+ target = typeof options.of === "string" ?
+ $( document ).find( options.of ) :
+ $( options.of ),
+
+ within = $.position.getWithinInfo( options.within ),
+ scrollInfo = $.position.getScrollInfo( within ),
+ collision = ( options.collision || "flip" ).split( " " ),
+ offsets = {};
+
+ dimensions = getDimensions( target );
+ if ( target[ 0 ].preventDefault ) {
+
+ // Force left top to allow flipping
+ options.at = "left top";
+ }
+ targetWidth = dimensions.width;
+ targetHeight = dimensions.height;
+ targetOffset = dimensions.offset;
+
+ // Clone to reuse original targetOffset later
+ basePosition = $.extend( {}, targetOffset );
+
+ // Force my and at to have valid horizontal and vertical positions
+ // if a value is missing or invalid, it will be converted to center
+ $.each( [ "my", "at" ], function() {
+ var pos = ( options[ this ] || "" ).split( " " ),
+ horizontalOffset,
+ verticalOffset;
+
+ if ( pos.length === 1 ) {
+ pos = rhorizontal.test( pos[ 0 ] ) ?
+ pos.concat( [ "center" ] ) :
+ rvertical.test( pos[ 0 ] ) ?
+ [ "center" ].concat( pos ) :
+ [ "center", "center" ];
+ }
+ pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+ pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+ // Calculate offsets
+ horizontalOffset = roffset.exec( pos[ 0 ] );
+ verticalOffset = roffset.exec( pos[ 1 ] );
+ offsets[ this ] = [
+ horizontalOffset ? horizontalOffset[ 0 ] : 0,
+ verticalOffset ? verticalOffset[ 0 ] : 0
+ ];
+
+ // Reduce to just the positions without the offsets
+ options[ this ] = [
+ rposition.exec( pos[ 0 ] )[ 0 ],
+ rposition.exec( pos[ 1 ] )[ 0 ]
+ ];
+ } );
+
+ // Normalize collision option
+ if ( collision.length === 1 ) {
+ collision[ 1 ] = collision[ 0 ];
+ }
+
+ if ( options.at[ 0 ] === "right" ) {
+ basePosition.left += targetWidth;
+ } else if ( options.at[ 0 ] === "center" ) {
+ basePosition.left += targetWidth / 2;
+ }
+
+ if ( options.at[ 1 ] === "bottom" ) {
+ basePosition.top += targetHeight;
+ } else if ( options.at[ 1 ] === "center" ) {
+ basePosition.top += targetHeight / 2;
+ }
+
+ atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+ basePosition.left += atOffset[ 0 ];
+ basePosition.top += atOffset[ 1 ];
+
+ return this.each( function() {
+ var collisionPosition, using,
+ elem = $( this ),
+ elemWidth = elem.outerWidth(),
+ elemHeight = elem.outerHeight(),
+ marginLeft = parseCss( this, "marginLeft" ),
+ marginTop = parseCss( this, "marginTop" ),
+ collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) +
+ scrollInfo.width,
+ collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) +
+ scrollInfo.height,
+ position = $.extend( {}, basePosition ),
+ myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+ if ( options.my[ 0 ] === "right" ) {
+ position.left -= elemWidth;
+ } else if ( options.my[ 0 ] === "center" ) {
+ position.left -= elemWidth / 2;
+ }
+
+ if ( options.my[ 1 ] === "bottom" ) {
+ position.top -= elemHeight;
+ } else if ( options.my[ 1 ] === "center" ) {
+ position.top -= elemHeight / 2;
+ }
+
+ position.left += myOffset[ 0 ];
+ position.top += myOffset[ 1 ];
+
+ collisionPosition = {
+ marginLeft: marginLeft,
+ marginTop: marginTop
+ };
+
+ $.each( [ "left", "top" ], function( i, dir ) {
+ if ( $.ui.position[ collision[ i ] ] ) {
+ $.ui.position[ collision[ i ] ][ dir ]( position, {
+ targetWidth: targetWidth,
+ targetHeight: targetHeight,
+ elemWidth: elemWidth,
+ elemHeight: elemHeight,
+ collisionPosition: collisionPosition,
+ collisionWidth: collisionWidth,
+ collisionHeight: collisionHeight,
+ offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+ my: options.my,
+ at: options.at,
+ within: within,
+ elem: elem
+ } );
+ }
+ } );
+
+ if ( options.using ) {
+
+ // Adds feedback as second argument to using callback, if present
+ using = function( props ) {
+ var left = targetOffset.left - position.left,
+ right = left + targetWidth - elemWidth,
+ top = targetOffset.top - position.top,
+ bottom = top + targetHeight - elemHeight,
+ feedback = {
+ target: {
+ element: target,
+ left: targetOffset.left,
+ top: targetOffset.top,
+ width: targetWidth,
+ height: targetHeight
+ },
+ element: {
+ element: elem,
+ left: position.left,
+ top: position.top,
+ width: elemWidth,
+ height: elemHeight
+ },
+ horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+ vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+ };
+ if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+ feedback.horizontal = "center";
+ }
+ if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+ feedback.vertical = "middle";
+ }
+ if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+ feedback.important = "horizontal";
+ } else {
+ feedback.important = "vertical";
+ }
+ options.using.call( this, props, feedback );
+ };
+ }
+
+ elem.offset( $.extend( position, { using: using } ) );
+ } );
+ };
+
+ $.ui.position = {
+ fit: {
+ left: function( position, data ) {
+ var within = data.within,
+ withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+ outerWidth = within.width,
+ collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+ overLeft = withinOffset - collisionPosLeft,
+ overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+ newOverRight;
+
+ // Element is wider than within
+ if ( data.collisionWidth > outerWidth ) {
+
+ // Element is initially over the left side of within
+ if ( overLeft > 0 && overRight <= 0 ) {
+ newOverRight = position.left + overLeft + data.collisionWidth - outerWidth -
+ withinOffset;
+ position.left += overLeft - newOverRight;
+
+ // Element is initially over right side of within
+ } else if ( overRight > 0 && overLeft <= 0 ) {
+ position.left = withinOffset;
+
+ // Element is initially over both left and right sides of within
+ } else {
+ if ( overLeft > overRight ) {
+ position.left = withinOffset + outerWidth - data.collisionWidth;
+ } else {
+ position.left = withinOffset;
+ }
+ }
+
+ // Too far left -> align with left edge
+ } else if ( overLeft > 0 ) {
+ position.left += overLeft;
+
+ // Too far right -> align with right edge
+ } else if ( overRight > 0 ) {
+ position.left -= overRight;
+
+ // Adjust based on position and margin
+ } else {
+ position.left = max( position.left - collisionPosLeft, position.left );
+ }
+ },
+ top: function( position, data ) {
+ var within = data.within,
+ withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+ outerHeight = data.within.height,
+ collisionPosTop = position.top - data.collisionPosition.marginTop,
+ overTop = withinOffset - collisionPosTop,
+ overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+ newOverBottom;
+
+ // Element is taller than within
+ if ( data.collisionHeight > outerHeight ) {
+
+ // Element is initially over the top of within
+ if ( overTop > 0 && overBottom <= 0 ) {
+ newOverBottom = position.top + overTop + data.collisionHeight - outerHeight -
+ withinOffset;
+ position.top += overTop - newOverBottom;
+
+ // Element is initially over bottom of within
+ } else if ( overBottom > 0 && overTop <= 0 ) {
+ position.top = withinOffset;
+
+ // Element is initially over both top and bottom of within
+ } else {
+ if ( overTop > overBottom ) {
+ position.top = withinOffset + outerHeight - data.collisionHeight;
+ } else {
+ position.top = withinOffset;
+ }
+ }
+
+ // Too far up -> align with top
+ } else if ( overTop > 0 ) {
+ position.top += overTop;
+
+ // Too far down -> align with bottom edge
+ } else if ( overBottom > 0 ) {
+ position.top -= overBottom;
+
+ // Adjust based on position and margin
+ } else {
+ position.top = max( position.top - collisionPosTop, position.top );
+ }
+ }
+ },
+ flip: {
+ left: function( position, data ) {
+ var within = data.within,
+ withinOffset = within.offset.left + within.scrollLeft,
+ outerWidth = within.width,
+ offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+ collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+ overLeft = collisionPosLeft - offsetLeft,
+ overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+ myOffset = data.my[ 0 ] === "left" ?
+ -data.elemWidth :
+ data.my[ 0 ] === "right" ?
+ data.elemWidth :
+ 0,
+ atOffset = data.at[ 0 ] === "left" ?
+ data.targetWidth :
+ data.at[ 0 ] === "right" ?
+ -data.targetWidth :
+ 0,
+ offset = -2 * data.offset[ 0 ],
+ newOverRight,
+ newOverLeft;
+
+ if ( overLeft < 0 ) {
+ newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth -
+ outerWidth - withinOffset;
+ if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+ position.left += myOffset + atOffset + offset;
+ }
+ } else if ( overRight > 0 ) {
+ newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset +
+ atOffset + offset - offsetLeft;
+ if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+ position.left += myOffset + atOffset + offset;
+ }
+ }
+ },
+ top: function( position, data ) {
+ var within = data.within,
+ withinOffset = within.offset.top + within.scrollTop,
+ outerHeight = within.height,
+ offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+ collisionPosTop = position.top - data.collisionPosition.marginTop,
+ overTop = collisionPosTop - offsetTop,
+ overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+ top = data.my[ 1 ] === "top",
+ myOffset = top ?
+ -data.elemHeight :
+ data.my[ 1 ] === "bottom" ?
+ data.elemHeight :
+ 0,
+ atOffset = data.at[ 1 ] === "top" ?
+ data.targetHeight :
+ data.at[ 1 ] === "bottom" ?
+ -data.targetHeight :
+ 0,
+ offset = -2 * data.offset[ 1 ],
+ newOverTop,
+ newOverBottom;
+ if ( overTop < 0 ) {
+ newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight -
+ outerHeight - withinOffset;
+ if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
+ position.top += myOffset + atOffset + offset;
+ }
+ } else if ( overBottom > 0 ) {
+ newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset +
+ offset - offsetTop;
+ if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
+ position.top += myOffset + atOffset + offset;
+ }
+ }
+ }
+ },
+ flipfit: {
+ left: function() {
+ $.ui.position.flip.left.apply( this, arguments );
+ $.ui.position.fit.left.apply( this, arguments );
+ },
+ top: function() {
+ $.ui.position.flip.top.apply( this, arguments );
+ $.ui.position.fit.top.apply( this, arguments );
+ }
+ }
+ };
+
+ } )();
+
+ var position = $.ui.position;
+
+
+ /*!
+ * jQuery UI :data 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: :data Selector
+//>>group: Core
+//>>description: Selects elements which have data stored under the specified key.
+//>>docs: http://api.jqueryui.com/data-selector/
+
+
+ var data = $.extend( $.expr.pseudos, {
+ data: $.expr.createPseudo ?
+ $.expr.createPseudo( function( dataName ) {
+ return function( elem ) {
+ return !!$.data( elem, dataName );
+ };
+ } ) :
+
+ // Support: jQuery <1.8
+ function( elem, i, match ) {
+ return !!$.data( elem, match[ 3 ] );
+ }
+ } );
+
+ /*!
+ * jQuery UI Support for jQuery core 1.8.x and newer 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ */
+
+//>>label: jQuery 1.8+ Support
+//>>group: Core
+//>>description: Support version 1.8.x and newer of jQuery core
+
+
+// Support: jQuery 1.9.x or older
+// $.expr[ ":" ] is deprecated.
+ if ( !$.expr.pseudos ) {
+ $.expr.pseudos = $.expr[ ":" ];
+ }
+
+// Support: jQuery 1.11.x or older
+// $.unique has been renamed to $.uniqueSort
+ if ( !$.uniqueSort ) {
+ $.uniqueSort = $.unique;
+ }
+
+// Support: jQuery 2.2.x or older.
+// This method has been defined in jQuery 3.0.0.
+// Code from https://github.com/jquery/jquery/blob/e539bac79e666bba95bba86d690b4e609dca2286/src/selector/escapeSelector.js
+ if ( !$.escapeSelector ) {
+
+ // CSS string/identifier serialization
+ // https://drafts.csswg.org/cssom/#common-serializing-idioms
+ var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
+
+ var fcssescape = function( ch, asCodePoint ) {
+ if ( asCodePoint ) {
+
+ // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+ if ( ch === "\0" ) {
+ return "\uFFFD";
+ }
+
+ // Control characters and (dependent upon position) numbers get escaped as code points
+ return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+ }
+
+ // Other potentially-special ASCII characters get backslash-escaped
+ return "\\" + ch;
+ };
+
+ $.escapeSelector = function( sel ) {
+ return ( sel + "" ).replace( rcssescape, fcssescape );
+ };
+ }
+
+// Support: jQuery 3.4.x or older
+// These methods have been defined in jQuery 3.5.0.
+ if ( !$.fn.even || !$.fn.odd ) {
+ $.fn.extend( {
+ even: function() {
+ return this.filter( function( i ) {
+ return i % 2 === 0;
+ } );
+ },
+ odd: function() {
+ return this.filter( function( i ) {
+ return i % 2 === 1;
+ } );
+ }
+ } );
+ }
+
+ ;
+ /*!
+ * jQuery UI Keycode 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Keycode
+//>>group: Core
+//>>description: Provide keycodes as keynames
+//>>docs: http://api.jqueryui.com/jQuery.ui.keyCode/
+
+
+ var keycode = $.ui.keyCode = {
+ BACKSPACE: 8,
+ COMMA: 188,
+ DELETE: 46,
+ DOWN: 40,
+ END: 35,
+ ENTER: 13,
+ ESCAPE: 27,
+ HOME: 36,
+ LEFT: 37,
+ PAGE_DOWN: 34,
+ PAGE_UP: 33,
+ PERIOD: 190,
+ RIGHT: 39,
+ SPACE: 32,
+ TAB: 9,
+ UP: 38
+ };
+
+
+ /*!
+ * jQuery UI Scroll Parent 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: scrollParent
+//>>group: Core
+//>>description: Get the closest ancestor element that is scrollable.
+//>>docs: http://api.jqueryui.com/scrollParent/
+
+
+ var scrollParent = $.fn.scrollParent = function( includeHidden ) {
+ var position = this.css( "position" ),
+ excludeStaticParent = position === "absolute",
+ overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
+ scrollParent = this.parents().filter( function() {
+ var parent = $( this );
+ if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
+ return false;
+ }
+ return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) +
+ parent.css( "overflow-x" ) );
+ } ).eq( 0 );
+
+ return position === "fixed" || !scrollParent.length ?
+ $( this[ 0 ].ownerDocument || document ) :
+ scrollParent;
+ };
+
+
+
+// This file is deprecated
+ var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+ /*!
+ * jQuery UI Mouse 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Mouse
+//>>group: Widgets
+//>>description: Abstracts mouse-based interactions to assist in creating certain widgets.
+//>>docs: http://api.jqueryui.com/mouse/
+
+
+ var mouseHandled = false;
+ $( document ).on( "mouseup", function() {
+ mouseHandled = false;
+ } );
+
+ var widgetsMouse = $.widget( "ui.mouse", {
+ version: "1.13.1",
+ options: {
+ cancel: "input, textarea, button, select, option",
+ distance: 1,
+ delay: 0
+ },
+ _mouseInit: function() {
+ var that = this;
+
+ this.element
+ .on( "mousedown." + this.widgetName, function( event ) {
+ return that._mouseDown( event );
+ } )
+ .on( "click." + this.widgetName, function( event ) {
+ if ( true === $.data( event.target, that.widgetName + ".preventClickEvent" ) ) {
+ $.removeData( event.target, that.widgetName + ".preventClickEvent" );
+ event.stopImmediatePropagation();
+ return false;
+ }
+ } );
+
+ this.started = false;
+ },
+
+ // TODO: make sure destroying one instance of mouse doesn't mess with
+ // other instances of mouse
+ _mouseDestroy: function() {
+ this.element.off( "." + this.widgetName );
+ if ( this._mouseMoveDelegate ) {
+ this.document
+ .off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+ .off( "mouseup." + this.widgetName, this._mouseUpDelegate );
+ }
+ },
+
+ _mouseDown: function( event ) {
+
+ // don't let more than one widget handle mouseStart
+ if ( mouseHandled ) {
+ return;
+ }
+
+ this._mouseMoved = false;
+
+ // We may have missed mouseup (out of window)
+ if ( this._mouseStarted ) {
+ this._mouseUp( event );
+ }
+
+ this._mouseDownEvent = event;
+
+ var that = this,
+ btnIsLeft = ( event.which === 1 ),
+
+ // event.target.nodeName works around a bug in IE 8 with
+ // disabled inputs (#7620)
+ elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
+ $( event.target ).closest( this.options.cancel ).length : false );
+ if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
+ return true;
+ }
+
+ this.mouseDelayMet = !this.options.delay;
+ if ( !this.mouseDelayMet ) {
+ this._mouseDelayTimer = setTimeout( function() {
+ that.mouseDelayMet = true;
+ }, this.options.delay );
+ }
+
+ if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+ this._mouseStarted = ( this._mouseStart( event ) !== false );
+ if ( !this._mouseStarted ) {
+ event.preventDefault();
+ return true;
+ }
+ }
+
+ // Click event may never have fired (Gecko & Opera)
+ if ( true === $.data( event.target, this.widgetName + ".preventClickEvent" ) ) {
+ $.removeData( event.target, this.widgetName + ".preventClickEvent" );
+ }
+
+ // These delegates are required to keep context
+ this._mouseMoveDelegate = function( event ) {
+ return that._mouseMove( event );
+ };
+ this._mouseUpDelegate = function( event ) {
+ return that._mouseUp( event );
+ };
+
+ this.document
+ .on( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+ .on( "mouseup." + this.widgetName, this._mouseUpDelegate );
+
+ event.preventDefault();
+
+ mouseHandled = true;
+ return true;
+ },
+
+ _mouseMove: function( event ) {
+
+ // Only check for mouseups outside the document if you've moved inside the document
+ // at least once. This prevents the firing of mouseup in the case of IE<9, which will
+ // fire a mousemove event if content is placed under the cursor. See #7778
+ // Support: IE <9
+ if ( this._mouseMoved ) {
+
+ // IE mouseup check - mouseup happened when mouse was out of window
+ if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) &&
+ !event.button ) {
+ return this._mouseUp( event );
+
+ // Iframe mouseup check - mouseup occurred in another document
+ } else if ( !event.which ) {
+
+ // Support: Safari <=8 - 9
+ // Safari sets which to 0 if you press any of the following keys
+ // during a drag (#14461)
+ if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
+ event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
+ this.ignoreMissingWhich = true;
+ } else if ( !this.ignoreMissingWhich ) {
+ return this._mouseUp( event );
+ }
+ }
+ }
+
+ if ( event.which || event.button ) {
+ this._mouseMoved = true;
+ }
+
+ if ( this._mouseStarted ) {
+ this._mouseDrag( event );
+ return event.preventDefault();
+ }
+
+ if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+ this._mouseStarted =
+ ( this._mouseStart( this._mouseDownEvent, event ) !== false );
+ if ( this._mouseStarted ) {
+ this._mouseDrag( event );
+ } else {
+ this._mouseUp( event );
+ }
+ }
+
+ return !this._mouseStarted;
+ },
+
+ _mouseUp: function( event ) {
+ this.document
+ .off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+ .off( "mouseup." + this.widgetName, this._mouseUpDelegate );
+
+ if ( this._mouseStarted ) {
+ this._mouseStarted = false;
+
+ if ( event.target === this._mouseDownEvent.target ) {
+ $.data( event.target, this.widgetName + ".preventClickEvent", true );
+ }
+
+ this._mouseStop( event );
+ }
+
+ if ( this._mouseDelayTimer ) {
+ clearTimeout( this._mouseDelayTimer );
+ delete this._mouseDelayTimer;
+ }
+
+ this.ignoreMissingWhich = false;
+ mouseHandled = false;
+ event.preventDefault();
+ },
+
+ _mouseDistanceMet: function( event ) {
+ return ( Math.max(
+ Math.abs( this._mouseDownEvent.pageX - event.pageX ),
+ Math.abs( this._mouseDownEvent.pageY - event.pageY )
+ ) >= this.options.distance
+ );
+ },
+
+ _mouseDelayMet: function( /* event */ ) {
+ return this.mouseDelayMet;
+ },
+
+ // These are placeholder methods, to be overriden by extending plugin
+ _mouseStart: function( /* event */ ) {},
+ _mouseDrag: function( /* event */ ) {},
+ _mouseStop: function( /* event */ ) {},
+ _mouseCapture: function( /* event */ ) {
+ return true;
+ }
+ } );
+
+
+
+// $.ui.plugin is deprecated. Use $.widget() extensions instead.
+ var plugin = $.ui.plugin = {
+ add: function( module, option, set ) {
+ var i,
+ proto = $.ui[ module ].prototype;
+ for ( i in set ) {
+ proto.plugins[ i ] = proto.plugins[ i ] || [];
+ proto.plugins[ i ].push( [ option, set[ i ] ] );
+ }
+ },
+ call: function( instance, name, args, allowDisconnected ) {
+ var i,
+ set = instance.plugins[ name ];
+
+ if ( !set ) {
+ return;
+ }
+
+ if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode ||
+ instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
+ return;
+ }
+
+ for ( i = 0; i < set.length; i++ ) {
+ if ( instance.options[ set[ i ][ 0 ] ] ) {
+ set[ i ][ 1 ].apply( instance.element, args );
+ }
+ }
+ }
+ };
+
+
+
+ var safeActiveElement = $.ui.safeActiveElement = function( document ) {
+ var activeElement;
+
+ // Support: IE 9 only
+ // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+ try {
+ activeElement = document.activeElement;
+ } catch ( error ) {
+ activeElement = document.body;
+ }
+
+ // Support: IE 9 - 11 only
+ // IE may return null instead of an element
+ // Interestingly, this only seems to occur when NOT in an iframe
+ if ( !activeElement ) {
+ activeElement = document.body;
+ }
+
+ // Support: IE 11 only
+ // IE11 returns a seemingly empty object in some cases when accessing
+ // document.activeElement from an <iframe>
+ if ( !activeElement.nodeName ) {
+ activeElement = document.body;
+ }
+
+ return activeElement;
+ };
+
+
+
+ var safeBlur = $.ui.safeBlur = function( element ) {
+
+ // Support: IE9 - 10 only
+ // If the <body> is blurred, IE will switch windows, see #9420
+ if ( element && element.nodeName.toLowerCase() !== "body" ) {
+ $( element ).trigger( "blur" );
+ }
+ };
+
+
+ /*!
+ * jQuery UI Draggable 1.13.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Draggable
+//>>group: Interactions
+//>>description: Enables dragging functionality for any element.
+//>>docs: http://api.jqueryui.com/draggable/
+//>>demos: http://jqueryui.com/draggable/
+//>>css.structure: ../../themes/base/draggable.css
+
+
+ $.widget( "ui.draggable", $.ui.mouse, {
+ version: "1.13.1",
+ widgetEventPrefix: "drag",
+ options: {
+ addClasses: true,
+ appendTo: "parent",
+ axis: false,
+ connectToSortable: false,
+ containment: false,
+ cursor: "auto",
+ cursorAt: false,
+ grid: false,
+ handle: false,
+ helper: "original",
+ iframeFix: false,
+ opacity: false,
+ refreshPositions: false,
+ revert: false,
+ revertDuration: 500,
+ scope: "default",
+ scroll: true,
+ scrollSensitivity: 20,
+ scrollSpeed: 20,
+ snap: false,
+ snapMode: "both",
+ snapTolerance: 20,
+ stack: false,
+ zIndex: false,
+
+ // Callbacks
+ drag: null,
+ start: null,
+ stop: null
+ },
+ _create: function() {
+
+ if ( this.options.helper === "original" ) {
+ this._setPositionRelative();
+ }
+ if ( this.options.addClasses ) {
+ this._addClass( "ui-draggable" );
+ }
+ this._setHandleClassName();
+
+ this._mouseInit();
+ },
+
+ _setOption: function( key, value ) {
+ this._super( key, value );
+ if ( key === "handle" ) {
+ this._removeHandleClassName();
+ this._setHandleClassName();
+ }
+ },
+
+ _destroy: function() {
+ if ( ( this.helper || this.element ).is( ".ui-draggable-dragging" ) ) {
+ this.destroyOnClear = true;
+ return;
+ }
+ this._removeHandleClassName();
+ this._mouseDestroy();
+ },
+
+ _mouseCapture: function( event ) {
+ var o = this.options;
+
+ // Among others, prevent a drag on a resizable-handle
+ if ( this.helper || o.disabled ||
+ $( event.target ).closest( ".ui-resizable-handle" ).length > 0 ) {
+ return false;
+ }
+
+ //Quit if we're not on a valid handle
+ this.handle = this._getHandle( event );
+ if ( !this.handle ) {
+ return false;
+ }
+
+ this._blurActiveElement( event );
+
+ this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix );
+
+ return true;
+
+ },
+
+ _blockFrames: function( selector ) {
+ this.iframeBlocks = this.document.find( selector ).map( function() {
+ var iframe = $( this );
+
+ return $( "<div>" )
+ .css( "position", "absolute" )
+ .appendTo( iframe.parent() )
+ .outerWidth( iframe.outerWidth() )
+ .outerHeight( iframe.outerHeight() )
+ .offset( iframe.offset() )[ 0 ];
+ } );
+ },
+
+ _unblockFrames: function() {
+ if ( this.iframeBlocks ) {
+ this.iframeBlocks.remove();
+ delete this.iframeBlocks;
+ }
+ },
+
+ _blurActiveElement: function( event ) {
+ var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+ target = $( event.target );
+
+ // Don't blur if the event occurred on an element that is within
+ // the currently focused element
+ // See #10527, #12472
+ if ( target.closest( activeElement ).length ) {
+ return;
+ }
+
+ // Blur any element that currently has focus, see #4261
+ $.ui.safeBlur( activeElement );
+ },
+
+ _mouseStart: function( event ) {
+
+ var o = this.options;
+
+ //Create and append the visible helper
+ this.helper = this._createHelper( event );
+
+ this._addClass( this.helper, "ui-draggable-dragging" );
+
+ //Cache the helper size
+ this._cacheHelperProportions();
+
+ //If ddmanager is used for droppables, set the global draggable
+ if ( $.ui.ddmanager ) {
+ $.ui.ddmanager.current = this;
+ }
+
+ /*
+ * - Position generation -
+ * This block generates everything position related - it's the core of draggables.
+ */
+
+ //Cache the margins of the original element
+ this._cacheMargins();
+
+ //Store the helper's css position
+ this.cssPosition = this.helper.css( "position" );
+ this.scrollParent = this.helper.scrollParent( true );
+ this.offsetParent = this.helper.offsetParent();
+ this.hasFixedAncestor = this.helper.parents().filter( function() {
+ return $( this ).css( "position" ) === "fixed";
+ } ).length > 0;
+
+ //The element's absolute position on the page minus margins
+ this.positionAbs = this.element.offset();
+ this._refreshOffsets( event );
+
+ //Generate the original position
+ this.originalPosition = this.position = this._generatePosition( event, false );
+ this.originalPageX = event.pageX;
+ this.originalPageY = event.pageY;
+
+ //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+ if ( o.cursorAt ) {
+ this._adjustOffsetFromHelper( o.cursorAt );
+ }
+
+ //Set a containment if given in the options
+ this._setContainment();
+
+ //Trigger event + callbacks
+ if ( this._trigger( "start", event ) === false ) {
+ this._clear();
+ return false;
+ }
+
+ //Recache the helper size
+ this._cacheHelperProportions();
+
+ //Prepare the droppable offsets
+ if ( $.ui.ddmanager && !o.dropBehaviour ) {
+ $.ui.ddmanager.prepareOffsets( this, event );
+ }
+
+ // Execute the drag once - this causes the helper not to be visible before getting its
+ // correct position
+ this._mouseDrag( event, true );
+
+ // If the ddmanager is used for droppables, inform the manager that dragging has started
+ // (see #5003)
+ if ( $.ui.ddmanager ) {
+ $.ui.ddmanager.dragStart( this, event );
+ }
+
+ return true;
+ },
+
+ _refreshOffsets: function( event ) {
+ this.offset = {
+ top: this.positionAbs.top - this.margins.top,
+ left: this.positionAbs.left - this.margins.left,
+ scroll: false,
+ parent: this._getParentOffset(),
+ relative: this._getRelativeOffset()
+ };
+
+ this.offset.click = {
+ left: event.pageX - this.offset.left,
+ top: event.pageY - this.offset.top
+ };
+ },
+
+ _mouseDrag: function( event, noPropagation ) {
+
+ // reset any necessary cached properties (see #5009)
+ if ( this.hasFixedAncestor ) {
+ this.offset.parent = this._getParentOffset();
+ }
+
+ //Compute the helpers position
+ this.position = this._generatePosition( event, true );
+ this.positionAbs = this._convertPositionTo( "absolute" );
+
+ //Call plugins and callbacks and use the resulting position if something is returned
+ if ( !noPropagation ) {
+ var ui = this._uiHash();
+ if ( this._trigger( "drag", event, ui ) === false ) {
+ this._mouseUp( new $.Event( "mouseup", event ) );
+ return false;
+ }
+ this.position = ui.position;
+ }
+
+ this.helper[ 0 ].style.left = this.position.left + "px";
+ this.helper[ 0 ].style.top = this.position.top + "px";
+
+ if ( $.ui.ddmanager ) {
+ $.ui.ddmanager.drag( this, event );
+ }
+
+ return false;
+ },
+
+ _mouseStop: function( event ) {
+
+ //If we are using droppables, inform the manager about the drop
+ var that = this,
+ dropped = false;
+ if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+ dropped = $.ui.ddmanager.drop( this, event );
+ }
+
+ //if a drop comes from outside (a sortable)
+ if ( this.dropped ) {
+ dropped = this.dropped;
+ this.dropped = false;
+ }
+
+ if ( ( this.options.revert === "invalid" && !dropped ) ||
+ ( this.options.revert === "valid" && dropped ) ||
+ this.options.revert === true || ( typeof this.options.revert === "function" &&
+ this.options.revert.call( this.element, dropped ) )
+ ) {
+ $( this.helper ).animate(
+ this.originalPosition,
+ parseInt( this.options.revertDuration, 10 ),
+ function() {
+ if ( that._trigger( "stop", event ) !== false ) {
+ that._clear();
+ }
+ }
+ );
+ } else {
+ if ( this._trigger( "stop", event ) !== false ) {
+ this._clear();
+ }
+ }
+
+ return false;
+ },
+
+ _mouseUp: function( event ) {
+ this._unblockFrames();
+
+ // If the ddmanager is used for droppables, inform the manager that dragging has stopped
+ // (see #5003)
+ if ( $.ui.ddmanager ) {
+ $.ui.ddmanager.dragStop( this, event );
+ }
+
+ // Only need to focus if the event occurred on the draggable itself, see #10527
+ if ( this.handleElement.is( event.target ) ) {
+
+ // The interaction is over; whether or not the click resulted in a drag,
+ // focus the element
+ this.element.trigger( "focus" );
+ }
+
+ return $.ui.mouse.prototype._mouseUp.call( this, event );
+ },
+
+ cancel: function() {
+
+ if ( this.helper.is( ".ui-draggable-dragging" ) ) {
+ this._mouseUp( new $.Event( "mouseup", { target: this.element[ 0 ] } ) );
+ } else {
+ this._clear();
+ }
+
+ return this;
+
+ },
+
+ _getHandle: function( event ) {
+ return this.options.handle ?
+ !!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
+ true;
+ },
+
+ _setHandleClassName: function() {
+ this.handleElement = this.options.handle ?
+ this.element.find( this.options.handle ) : this.element;
+ this._addClass( this.handleElement, "ui-draggable-handle" );
+ },
+
+ _removeHandleClassName: function() {
+ this._removeClass( this.handleElement, "ui-draggable-handle" );
+ },
+
+ _createHelper: function( event ) {
+
+ var o = this.options,
+ helperIsFunction = typeof o.helper === "function",
+ helper = helperIsFunction ?
+ $( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
+ ( o.helper === "clone" ?
+ this.element.clone().removeAttr( "id" ) :
+ this.element );
+
+ if ( !helper.parents( "body" ).length ) {
+ helper.appendTo( ( o.appendTo === "parent" ?
+ this.element[ 0 ].parentNode :
+ o.appendTo ) );
+ }
+
+ // Http://bugs.jqueryui.com/ticket/9446
+ // a helper function can return the original element
+ // which wouldn't have been set to relative in _create
+ if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) {
+ this._setPositionRelative();
+ }
+
+ if ( helper[ 0 ] !== this.element[ 0 ] &&
+ !( /(fixed|absolute)/ ).test( helper.css( "position" ) ) ) {
+ helper.css( "position", "absolute" );
+ }
+
+ return helper;
+
+ },
+
+ _setPositionRelative: function() {
+ if ( !( /^(?:r|a|f)/ ).test( this.element.css( "position" ) ) ) {
+ this.element[ 0 ].style.position = "relative";
+ }
+ },
+
+ _adjustOffsetFromHelper: function( obj ) {
+ if ( typeof obj === "string" ) {
+ obj = obj.split( " " );
+ }
+ if ( Array.isArray( obj ) ) {
+ obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
+ }
+ if ( "left" in obj ) {
+ this.offset.click.left = obj.left + this.margins.left;
+ }
+ if ( "right" in obj ) {
+ this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+ }
+ if ( "top" in obj ) {
+ this.offset.click.top = obj.top + this.margins.top;
+ }
+ if ( "bottom" in obj ) {
+ this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+ }
+ },
+
+ _isRootNode: function( element ) {
+ return ( /(html|body)/i ).test( element.tagName ) || element === this.document[ 0 ];
+ },
+
+ _getParentOffset: function() {
+
+ //Get the offsetParent and cache its position
+ var po = this.offsetParent.offset(),
+ document = this.document[ 0 ];
+
+ // This is a special case where we need to modify a offset calculated on start, since the
+ // following happened:
+ // 1. The position of the helper is absolute, so it's position is calculated based on the
+ // next positioned parent
+ // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
+ // the document, which means that the scroll is included in the initial calculation of the
+ // offset of the parent, and never recalculated upon drag
+ if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== document &&
+ $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
+ po.left += this.scrollParent.scrollLeft();
+ po.top += this.scrollParent.scrollTop();
+ }
+
+ if ( this._isRootNode( this.offsetParent[ 0 ] ) ) {
+ po = { top: 0, left: 0 };
+ }
+
+ return {
+ top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+ left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
+ };
+
+ },
+
+ _getRelativeOffset: function() {
+ if ( this.cssPosition !== "relative" ) {
+ return { top: 0, left: 0 };
+ }
+
+ var p = this.element.position(),
+ scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
+
+ return {
+ top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
+ ( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
+ left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
+ ( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
+ };
+
+ },
+
+ _cacheMargins: function() {
+ this.margins = {
+ left: ( parseInt( this.element.css( "marginLeft" ), 10 ) || 0 ),
+ top: ( parseInt( this.element.css( "marginTop" ), 10 ) || 0 ),
+ right: ( parseInt( this.element.css( "marginRight" ), 10 ) || 0 ),
+ bottom: ( parseInt( this.element.css( "marginBottom" ), 10 ) || 0 )
+ };
+ },
+
+ _cacheHelperProportions: function() {
+ this.helperProportions = {
+ width: this.helper.outerWidth(),
+ height: this.helper.outerHeight()
+ };
+ },
+
+ _setContainment: function() {
+
+ var isUserScrollable, c, ce,
+ o = this.options,
+ document = this.document[ 0 ];
+
+ this.relativeContainer = null;
+
+ if ( !o.containment ) {
+ this.containment = null;
+ return;
+ }
+
+ if ( o.containment === "window" ) {
+ this.containment = [
+ $( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
+ $( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
+ $( window ).scrollLeft() + $( window ).width() -
+ this.helperProportions.width - this.margins.left,
+ $( window ).scrollTop() +
+ ( $( window ).height() || document.body.parentNode.scrollHeight ) -
+ this.helperProportions.height - this.margins.top
+ ];
+ return;
+ }
+
+ if ( o.containment === "document" ) {
+ this.containment = [
+ 0,
+ 0,
+ $( document ).width() - this.helperProportions.width - this.margins.left,
+ ( $( document ).height() || document.body.parentNode.scrollHeight ) -
+ this.helperProportions.height - this.margins.top
+ ];
+ return;
+ }
+
+ if ( o.containment.constructor === Array ) {
+ this.containment = o.containment;
+ return;
+ }
+
+ if ( o.containment === "parent" ) {
+ o.containment = this.helper[ 0 ].parentNode;
+ }
+
+ c = $( o.containment );
+ ce = c[ 0 ];
+
+ if ( !ce ) {
+ return;
+ }
+
+ isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) );
+
+ this.containment = [
+ ( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) +
+ ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
+ ( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) +
+ ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
+ ( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
+ ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) -
+ ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) -
+ this.helperProportions.width -
+ this.margins.left -
+ this.margins.right,
+ ( isUserScrollable ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
+ ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) -
+ ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) -
+ this.helperProportions.height -
+ this.margins.top -
+ this.margins.bottom
+ ];
+ this.relativeContainer = c;
+ },
+
+ _convertPositionTo: function( d, pos ) {
+
+ if ( !pos ) {
+ pos = this.position;
+ }
+
+ var mod = d === "absolute" ? 1 : -1,
+ scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
+
+ return {
+ top: (
+
+ // The absolute mouse position
+ pos.top +
+
+ // Only for relative positioned nodes: Relative offset from element to offset parent
+ this.offset.relative.top * mod +
+
+ // The offsetParent's offset without borders (offset + border)
+ this.offset.parent.top * mod -
+ ( ( this.cssPosition === "fixed" ?
+ -this.offset.scroll.top :
+ ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod )
+ ),
+ left: (
+
+ // The absolute mouse position
+ pos.left +
+
+ // Only for relative positioned nodes: Relative offset from element to offset parent
+ this.offset.relative.left * mod +
+
+ // The offsetParent's offset without borders (offset + border)
+ this.offset.parent.left * mod -
+ ( ( this.cssPosition === "fixed" ?
+ -this.offset.scroll.left :
+ ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod )
+ )
+ };
+
+ },
+
+ _generatePosition: function( event, constrainPosition ) {
+
+ var containment, co, top, left,
+ o = this.options,
+ scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] ),
+ pageX = event.pageX,
+ pageY = event.pageY;
+
+ // Cache the scroll
+ if ( !scrollIsRootNode || !this.offset.scroll ) {
+ this.offset.scroll = {
+ top: this.scrollParent.scrollTop(),
+ left: this.scrollParent.scrollLeft()
+ };
+ }
+
+ /*
+ * - Position constraining -
+ * Constrain the position to a mix of grid, containment.
+ */
+
+ // If we are not dragging yet, we won't check for options
+ if ( constrainPosition ) {
+ if ( this.containment ) {
+ if ( this.relativeContainer ) {
+ co = this.relativeContainer.offset();
+ containment = [
+ this.containment[ 0 ] + co.left,
+ this.containment[ 1 ] + co.top,
+ this.containment[ 2 ] + co.left,
+ this.containment[ 3 ] + co.top
+ ];
+ } else {
+ containment = this.containment;
+ }
+
+ if ( event.pageX - this.offset.click.left < containment[ 0 ] ) {
+ pageX = containment[ 0 ] + this.offset.click.left;
+ }
+ if ( event.pageY - this.offset.click.top < containment[ 1 ] ) {
+ pageY = containment[ 1 ] + this.offset.click.top;
+ }
+ if ( event.pageX - this.offset.click.left > containment[ 2 ] ) {
+ pageX = containment[ 2 ] + this.offset.click.left;
+ }
+ if ( event.pageY - this.offset.click.top > containment[ 3 ] ) {
+ pageY = containment[ 3 ] + this.offset.click.top;
+ }
+ }
+
+ if ( o.grid ) {
+
+ //Check for grid elements set to 0 to prevent divide by 0 error causing invalid
+ // argument errors in IE (see ticket #6950)
+ top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY -
+ this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY;
+ pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] ||
+ top - this.offset.click.top > containment[ 3 ] ) ?
+ top :
+ ( ( top - this.offset.click.top >= containment[ 1 ] ) ?
+ top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top;
+
+ left = o.grid[ 0 ] ? this.originalPageX +
+ Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] :
+ this.originalPageX;
+ pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] ||
+ left - this.offset.click.left > containment[ 2 ] ) ?
+ left :
+ ( ( left - this.offset.click.left >= containment[ 0 ] ) ?
+ left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left;
+ }
+
+ if ( o.axis === "y" ) {
+ pageX = this.originalPageX;
+ }
+
+ if ( o.axis === "x" ) {
+ pageY = this.originalPageY;
+ }
+ }
+
+ return {
+ top: (
+
+ // The absolute mouse position
+ pageY -
+
+ // Click offset (relative to the element)
+ this.offset.click.top -
+
+ // Only for relative positioned nodes: Relative offset from element to offset parent
+ this.offset.relative.top -
+
+ // The offsetParent's offset without borders (offset + border)
+ this.offset.parent.top +
+ ( this.cssPosition === "fixed" ?
+ -this.offset.scroll.top :
+ ( scrollIsRootNode ? 0 : this.offset.scroll.top ) )
+ ),
+ left: (
+
+ // The absolute mouse position
+ pageX -
+
+ // Click offset (relative to the element)
+ this.offset.click.left -
+
+ // Only for relative positioned nodes: Relative offset from element to offset parent
+ this.offset.relative.left -
+
+ // The offsetParent's offset without borders (offset + border)
+ this.offset.parent.left +
+ ( this.cssPosition === "fixed" ?
+ -this.offset.scroll.left :
+ ( scrollIsRootNode ? 0 : this.offset.scroll.left ) )
+ )
+ };
+
+ },
+
+ _clear: function() {
+ this._removeClass( this.helper, "ui-draggable-dragging" );
+ if ( this.helper[ 0 ] !== this.element[ 0 ] && !this.cancelHelperRemoval ) {
+ this.helper.remove();
+ }
+ this.helper = null;
+ this.cancelHelperRemoval = false;
+ if ( this.destroyOnClear ) {
+ this.destroy();
+ }
+ },
+
+ // From now on bulk stuff - mainly helpers
+
+ _trigger: function( type, event, ui ) {
+ ui = ui || this._uiHash();
+ $.ui.plugin.call( this, type, [ event, ui, this ], true );
+
+ // Absolute position and offset (see #6884 ) have to be recalculated after plugins
+ if ( /^(drag|start|stop)/.test( type ) ) {
+ this.positionAbs = this._convertPositionTo( "absolute" );
+ ui.offset = this.positionAbs;
+ }
+ return $.Widget.prototype._trigger.call( this, type, event, ui );
+ },
+
+ plugins: {},
+
+ _uiHash: function() {
+ return {
+ helper: this.helper,
+ position: this.position,
+ originalPosition: this.originalPosition,
+ offset: this.positionAbs
+ };
+ }
+
+ } );
+
+ $.ui.plugin.add( "draggable", "connectToSortable", {
+ start: function( event, ui, draggable ) {
+ var uiSortable = $.extend( {}, ui, {
+ item: draggable.element
+ } );
+
+ draggable.sortables = [];
+ $( draggable.options.connectToSortable ).each( function() {
+ var sortable = $( this ).sortable( "instance" );
+
+ if ( sortable && !sortable.options.disabled ) {
+ draggable.sortables.push( sortable );
+
+ // RefreshPositions is called at drag start to refresh the containerCache
+ // which is used in drag. This ensures it's initialized and synchronized
+ // with any changes that might have happened on the page since initialization.
+ sortable.refreshPositions();
+ sortable._trigger( "activate", event, uiSortable );
+ }
+ } );
+ },
+ stop: function( event, ui, draggable ) {
+ var uiSortable = $.extend( {}, ui, {
+ item: draggable.element
+ } );
+
+ draggable.cancelHelperRemoval = false;
+
+ $.each( draggable.sortables, function() {
+ var sortable = this;
+
+ if ( sortable.isOver ) {
+ sortable.isOver = 0;
+
+ // Allow this sortable to handle removing the helper
+ draggable.cancelHelperRemoval = true;
+ sortable.cancelHelperRemoval = false;
+
+ // Use _storedCSS To restore properties in the sortable,
+ // as this also handles revert (#9675) since the draggable
+ // may have modified them in unexpected ways (#8809)
+ sortable._storedCSS = {
+ position: sortable.placeholder.css( "position" ),
+ top: sortable.placeholder.css( "top" ),
+ left: sortable.placeholder.css( "left" )
+ };
+
+ sortable._mouseStop( event );
+
+ // Once drag has ended, the sortable should return to using
+ // its original helper, not the shared helper from draggable
+ sortable.options.helper = sortable.options._helper;
+ } else {
+
+ // Prevent this Sortable from removing the helper.
+ // However, don't set the draggable to remove the helper
+ // either as another connected Sortable may yet handle the removal.
+ sortable.cancelHelperRemoval = true;
+
+ sortable._trigger( "deactivate", event, uiSortable );
+ }
+ } );
+ },
+ drag: function( event, ui, draggable ) {
+ $.each( draggable.sortables, function() {
+ var innermostIntersecting = false,
+ sortable = this;
+
+ // Copy over variables that sortable's _intersectsWith uses
+ sortable.positionAbs = draggable.positionAbs;
+ sortable.helperProportions = draggable.helperProportions;
+ sortable.offset.click = draggable.offset.click;
+
+ if ( sortable._intersectsWith( sortable.containerCache ) ) {
... 7976 lines suppressed ...
[myfaces-tobago] 21/32: cherrypick from 2.x: build: checkstyle enhancements
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 624f4b57512b642af1f83a292f49d2bf8e439664
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Feb 9 16:05:33 2022 +0100
cherrypick from 2.x: build: checkstyle enhancements
---
.../org/apache/myfaces/tobago/TobagoConstants.java | 14 +++++-
.../apache/myfaces/tobago/ajax/api/AjaxUtils.java | 24 +++++-----
.../apache/myfaces/tobago/bean/ResourceMap.java | 2 +-
.../myfaces/tobago/component/ComponentUtil.java | 3 +-
.../myfaces/tobago/component/UIViewRoot.java | 4 +-
.../apache/myfaces/tobago/config/ThemeConfig.java | 3 ++
.../tobago/context/ResourceManagerUtil.java | 10 +++--
.../ValueBindingResetInputActionListener.java | 2 +-
.../myfaces/tobago/internal/taglib/TagUtils.java | 6 ++-
.../myfaces/tobago/internal/util/AccessKeyMap.java | 3 +-
.../tobago/renderkit/html/HtmlRendererUtil.java | 14 ++++--
.../tobago/renderkit/html/HtmlStyleMap.java | 5 ++-
.../renderkit/html/util/CommandRendererHelper.java | 23 +++++-----
.../myfaces/tobago/renderkit/util/JQueryUtils.java | 6 +--
.../apache/myfaces/tobago/util/MessageFactory.java | 21 +++++++++
.../org/apache/myfaces/tobago/util/StringUtil.java | 9 ++++
.../myfaces/tobago/util/VariableResolverUtil.java | 2 +-
.../internal/component/AbstractUINumberSlider.java | 2 +-
.../apache/myfaces/tobago/model/AbstractCrud.java | 13 +++---
.../java/org/apache/myfaces/tobago/model/Crud.java | 30 ++++++-------
.../sandbox/standard/tag/NumberSliderRenderer.java | 52 +++++++++++-----------
.../tobago/security/AuthorizationUtils.java | 2 +-
.../html/speyside/standard/tag/BoxRenderer.java | 28 ++++++------
23 files changed, 169 insertions(+), 109 deletions(-)
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
index 5de657a..cf3b6bf 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
@@ -27,7 +27,7 @@ package org.apache.myfaces.tobago;
* @see org.apache.myfaces.tobago.component.OnComponentCreated
* @see org.apache.myfaces.tobago.renderkit.HtmlUtils
* @see org.apache.myfaces.tobago.util.ComponentUtils
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public final class TobagoConstants {
@@ -674,12 +674,24 @@ public final class TobagoConstants {
@Deprecated
public static final String RENDERER_TYPE_VERBATIM = "Verbatim";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_NAME_REFERENCE = "nameReference";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_DISABLED_REFERENCE = "disabledReference";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_ID_REFERENCE = "idReference";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_TIP_REFERENCE = "tipReference";
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
index e902f95..ecf035b 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.Set;
/**
- * @deprecated since 1.5.0.
+ * @deprecated since 1.5.0.
*/
@Deprecated
public class AjaxUtils {
@@ -39,31 +39,31 @@ public class AjaxUtils {
}
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public static final String AJAX_COMPONENTS = AjaxUtils.class.getName() + ".AJAX_COMPONENTS";
/**
- * @deprecated Please use AjaxInternalUtils.checkParamValidity()
+ * @deprecated Please use AjaxInternalUtils.checkParamValidity()
*/
@Deprecated
public static void checkParamValidity(
- final FacesContext facesContext, final UIComponent uiComponent, final Class compClass) {
+ final FacesContext facesContext, final UIComponent uiComponent, final Class compClass) {
AjaxInternalUtils.checkParamValidity(facesContext, uiComponent, compClass);
}
/**
- * @deprecated Please use AjaxInternalUtils.encodeAjaxComponent()
+ * @deprecated Please use AjaxInternalUtils.encodeAjaxComponent()
*/
@Deprecated
public static void encodeAjaxComponent(final FacesContext facesContext, final UIComponent component)
- throws IOException {
+ throws IOException {
AjaxInternalUtils.encodeAjaxComponent(facesContext, component);
}
/**
- * @deprecated Please use AjaxInternalUtils.parseAndStoreComponents()
+ * @deprecated Please use AjaxInternalUtils.parseAndStoreComponents()
*/
@Deprecated
public static Map<String, UIComponent> parseAndStoreComponents(final FacesContext facesContext) {
@@ -71,7 +71,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use AjaxInternalUtils.getAjaxComponents()
+ * @deprecated Please use AjaxInternalUtils.getAjaxComponents()
*/
@Deprecated
public static Map<String, UIComponent> getAjaxComponents(final FacesContext facesContext) {
@@ -79,7 +79,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest()
*/
@Deprecated
public static boolean isAjaxRequest(final FacesContext facesContext) {
@@ -87,7 +87,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent()
*/
@Deprecated
public static void removeAjaxComponent(final FacesContext facesContext, final String clientId) {
@@ -95,7 +95,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
*/
@Deprecated
public static void addAjaxComponent(final FacesContext facesContext, final String clientId) {
@@ -103,7 +103,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
*/
@Deprecated
public static void addAjaxComponent(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
index 211207e..b0299c3 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
import java.util.Properties;
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public class ResourceMap extends Properties {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
index b045f83..304e3db 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
@@ -500,7 +500,8 @@ public class ComponentUtil {
* @deprecated Since Tobago 1.5 please use {@link ComponentUtils}
*/
@Deprecated
- public static String getValueFromEl(String script) {
+ public static String getValueFromEl(String scriptParameter) {
+ String script = scriptParameter;
if (UIComponentTag.isValueReference(script)) {
final ValueBinding valueBinding = ComponentUtils.createValueBinding(script);
script = (String) valueBinding.getValue(FacesContext.getCurrentInstance());
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
index 97d1531..980fea9 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
@@ -119,7 +119,7 @@ public class UIViewRoot extends javax.faces.component.UIViewRoot {
clearEvents();
}
}
-
+
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
//
@@ -235,7 +235,7 @@ public class UIViewRoot extends javax.faces.component.UIViewRoot {
}
private void decodeActionComponent(final FacesContext facesContext, final AbstractUIPage page, final Map<String,
- UIComponent> ajaxComponents) {
+ UIComponent> ajaxComponents) {
final String actionId = page.getActionId();
UIComponent actionComponent = null;
if (actionId != null) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
index 1c69242..a9ac24e 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
@@ -25,6 +25,9 @@ import org.apache.myfaces.tobago.internal.util.Deprecation;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+/**
+ * @deprecated xxx
+ */
@Deprecated
public class ThemeConfig {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
index 27aa678..cff55b0 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
@@ -50,7 +50,7 @@ public class ResourceManagerUtil {
@Deprecated
public static String getPropertyNotNull(final FacesContext facesContext, final String bundle, final String key) {
final String result
- = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
+ = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
if (result == null) {
return "???" + key + "???";
} else {
@@ -60,6 +60,7 @@ public class ResourceManagerUtil {
/**
* Searches for an image and return it with the context path
+ *
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
@@ -69,11 +70,12 @@ public class ResourceManagerUtil {
/**
* Searches for an image and return it with the context path
+ *
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
public static String getImageWithPath(
- final FacesContext facesContext, final String name, final boolean ignoreMissing) {
+ final FacesContext facesContext, final String name, final boolean ignoreMissing) {
return ResourceManagerUtils.getImageWithPath(facesContext, name, ignoreMissing);
}
@@ -178,7 +180,7 @@ public class ResourceManagerUtil {
*/
@Deprecated
public static Measure getThemeMeasure(
- final FacesContext facesContext, final Configurable configurable, final String name) {
+ final FacesContext facesContext, final Configurable configurable, final String name) {
return ResourceManagerUtils.getThemeMeasure(facesContext, configurable, name);
}
@@ -189,5 +191,5 @@ public class ResourceManagerUtil {
public static boolean isAbsoluteResource(final String value) {
return ResourceManagerUtils.isAbsoluteResource(value);
}
-
+
}
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
index f7e042b..92acb35 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
@@ -54,7 +54,7 @@ public class ValueBindingResetInputActionListener extends AbstractResetInputActi
public void processAction(final ActionEvent event) {
final Object obj = clientIdsBinding.getValue(FacesContext.getCurrentInstance());
- final String [] clientIds;
+ final String[] clientIds;
if (obj instanceof String[]) {
clientIds = (String[]) obj;
} else if (obj instanceof String) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
index 64c465e..7c11e07 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
@@ -59,7 +59,8 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setIntegerProperty(final UIComponent component, final String name, String value) {
+ public static void setIntegerProperty(final UIComponent component, final String name, final String valueParameter) {
+ String value = valueParameter;
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -313,7 +314,8 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static String getValueFromEl(String script) {
+ public static String getValueFromEl(final String scriptParameter) {
+ String script = scriptParameter;
if (UIComponentTag.isValueReference(script)) {
final ValueBinding valueBinding = createValueBinding(script);
script = (String) valueBinding.getValue(FacesContext.getCurrentInstance());
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
index 7b2b66f..3c43baa 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
@@ -67,7 +67,8 @@ public final class AccessKeyMap {
duplicated = duplicated.append(key);
}
- public static boolean addAccessKey(final FacesContext facesContext, Character key) {
+ public static boolean addAccessKey(final FacesContext facesContext, final Character keyParameter) {
+ Character key = keyParameter;
key = key.toString().toLowerCase(Locale.ENGLISH).charAt(0);
final AccessKeyMap instance = getInstance(facesContext);
if (instance.getSet().contains(key)) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
index f6f596d..16b380a 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
@@ -253,8 +253,9 @@ public final class HtmlRendererUtil {
* @deprecated Please use HtmlRendererUtils
*/
@Deprecated
- public static String replaceStyleAttribute(String style, final String name,
+ public static String replaceStyleAttribute(String styleParameter, final String name,
final String value) {
+ String style = styleParameter;
style = removeStyleAttribute(style != null ? style : "", name);
return style + " " + name + ": " + value + ";";
}
@@ -287,11 +288,17 @@ public final class HtmlRendererUtil {
StyleClasses.ensureStyleClasses(component).addFullQualifiedClass(clazz);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static void createHeaderAndBodyStyles(final FacesContext facesContext, final UIComponent component) {
Deprecation.LOG.error("HtmlRendererUtils.createHeaderAndBodyStyles() no longer supported");
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static void createHeaderAndBodyStyles(
final FacesContext facesContext, final UIComponent component, final boolean width) {
@@ -327,7 +334,7 @@ public final class HtmlRendererUtil {
}
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public static void addImageSources(
@@ -434,7 +441,8 @@ public final class HtmlRendererUtil {
* @deprecated Please use HtmlRendererUtils
*/
@Deprecated
- public static String addTip(String title, final Object tip) {
+ public static String addTip(String titleParameter, final Object tip) {
+ String title = titleParameter;
if (tip != null) {
if (title != null && title.length() > 0) {
title += " :: ";
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
index 034460b..9f4d2ed 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * @deprecated
+ * @deprecated xxx
* @see org.apache.myfaces.tobago.renderkit.css.Style
*/
@Deprecated
@@ -35,7 +35,8 @@ public class HtmlStyleMap extends HashMap<String, Object> {
private static final Logger LOG = LoggerFactory.getLogger(HtmlStyleMap.class);
private static final long serialVersionUID = 342607693971417143L;
- public Object put(final String s, Object o) {
+ public Object put(final String s, Object oParameter) {
+ Object o = oParameter;
if (o instanceof String && (s.equals("height") || s.equals("width"))) {
final String str = (String) o;
if (str.endsWith("px")) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
index 7105110..0b9fd08 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
@@ -107,8 +107,8 @@ public class CommandRendererHelper {
} else {
final String clientId = command.getClientId(facesContext);
- final String target = ComponentUtils.getStringAttribute(command, Attributes.TARGET);
- onclick = HtmlRendererUtils.createSubmitAction(clientId, transition, target, null);
+ final String t = ComponentUtils.getStringAttribute(command, Attributes.TARGET);
+ onclick = HtmlRendererUtils.createSubmitAction(clientId, transition, t, null);
}
if (command.getAttributes().get(Attributes.POPUP_CLOSE) != null
@@ -132,26 +132,27 @@ public class CommandRendererHelper {
return null;
}
final AbstractUICommand command = (AbstractUICommand) base;
- String onclick = command.getOnclick();
- if (onclick.contains("@autoId")) {
- onclick = StringUtils.replace(onclick, "@autoId", command.getClientId(facesContext));
+ String click = command.getOnclick();
+ if (click.contains("@autoId")) {
+ click = StringUtils.replace(click, "@autoId", command.getClientId(facesContext));
}
- return onclick;
+ return click;
}
- private String appendConfirmationScript(String onclick, final UIComponent component) {
+ private String appendConfirmationScript(String onclickParameter, final UIComponent component) {
+ String click = onclickParameter;
final ValueHolder confirmation = (ValueHolder) component.getFacet(Facets.CONFIRMATION);
if (confirmation != null) {
final StringBuilder script = new StringBuilder("return confirm('");
script.append(confirmation.getValue());
script.append("')");
- if (onclick != null) {
+ if (click != null) {
script.append(" && ");
- script.append(onclick);
+ script.append(click);
}
- onclick = script.toString();
+ click = script.toString();
}
- return onclick;
+ return click;
}
public String getOnclick() {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java
index 4174a55..d23962e 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java
@@ -31,7 +31,7 @@ public class JQueryUtils {
/**
* Puts two backslashes before : and . to escape them.
- * Two are needed, because of JavaScript string literals.
+ * Two are needed, because of JavaScript string literals.
*/
public static String escapeId(final String id) {
return id.replaceAll("([\\:\\.])", "\\\\\\\\$1");
@@ -39,7 +39,7 @@ public class JQueryUtils {
/**
* Puts one backslashes before \ to escape it.
- * It is needed, because of JavaScript string literals.
+ * It is needed, because of JavaScript string literals.
*/
public static String escapeValue(final String value) {
return value.replaceAll("\\\\", "\\\\\\\\");
@@ -48,7 +48,7 @@ public class JQueryUtils {
/**
* Puts two backslashes before #;&,.+*~':"!^$[]()=>|/ to escape them.
* Two are needed, because of JavaScript string literals.
- * Puts three backslashes before a \ itself, to escape it.
+ * Puts three backslashes before a \ itself, to escape it.
*/
public static String escapeSelector(final String value) {
final StringBuilder builder = new StringBuilder();
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
index b6282a1..363cab4 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
@@ -42,18 +42,27 @@ public final class MessageFactory {
private static final Map<Locale, ResourceBundle> FACES_MESSAGES_MAP = new HashMap<Locale, ResourceBundle>();
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String key, final FacesMessage.Severity severity, final Object[] args) {
return createFacesMessage(facesContext, "tobago", key, severity, args);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String key, final FacesMessage.Severity severity) {
return createFacesMessage(facesContext, key, severity, new Object[0]);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String bundle, final String key, final FacesMessage.Severity severity,
@@ -75,6 +84,9 @@ public final class MessageFactory {
return new FacesMessage(severity, summary != null ? summary : key, detail);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static Locale getLocale(final FacesContext facesContext) {
final UIViewRoot root = facesContext.getViewRoot();
@@ -87,12 +99,18 @@ public final class MessageFactory {
return locale;
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String bundle, final String key, final FacesMessage.Severity severity) {
return createFacesMessage(facesContext, bundle, key, severity, new Object[0]);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static String getMessageText(
final FacesContext facesContext, final String bundle, final String key) {
@@ -108,6 +126,9 @@ public final class MessageFactory {
return message;
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static ResourceBundle getFacesMessages(final Locale locale) {
ResourceBundle facesMessages = FACES_MESSAGES_MAP.get(locale);
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
index 9ab2102..67819f1 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
@@ -34,6 +34,9 @@ public class StringUtil {
private StringUtil() {
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static String firstToUpperCase(final String string) {
if (Deprecation.LOG.isWarnEnabled()) {
@@ -42,6 +45,9 @@ public class StringUtil {
return StringUtils.firstToUpperCase(string);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static List<Integer> parseIntegerList(final String integerList)
throws NumberFormatException {
@@ -51,6 +57,9 @@ public class StringUtil {
return StringUtils.parseIntegerList(integerList);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static <T> String toString(final List<T> list) {
if (Deprecation.LOG.isWarnEnabled()) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
index 5e13cd7..4a0281d 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
@@ -51,7 +51,7 @@ public final class VariableResolverUtil {
public static ClientProperties resolveClientProperties(final FacesContext facesContext) {
return (ClientProperties) resolveVariable(facesContext, ClientProperties.MANAGED_BEAN_NAME);
}
-
+
/**
* Clears the value of the variable.
* Useful for cleaning up e.g. a session or application variable
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
index ab8368c..24ed3d7 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
@@ -32,7 +32,7 @@ public abstract class AbstractUINumberSlider extends javax.faces.component.UIInp
public abstract Integer getMax();
public abstract boolean isReadonly();
-
+
public abstract boolean isDisabled();
public void validate(final FacesContext context) {
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
index 8b8d2cc..35c62d7 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
@@ -60,7 +60,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doDeleteItem();
@@ -90,7 +90,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doShowItem();
@@ -111,7 +111,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doCreateItem();
@@ -131,7 +131,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doSaveItem();
@@ -163,9 +163,8 @@ public abstract class AbstractCrud implements Crud {
/**
* Set the outcome for all actions of the crud component.
- *
- * @param defaultOutcome
- * The outcome for all actions of the crud component
+ *
+ * @param defaultOutcome The outcome for all actions of the crud component
*/
public final void setDefaultOutcome(final String defaultOutcome) {
this.defaultOutcome = defaultOutcome;
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
index a20aac8..832fcf9 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
@@ -23,63 +23,63 @@ public interface Crud {
/**
* Indicates if the crud component should show the crud detail view
- * otherwise the crud master view is shown
- *
+ * otherwise the crud master view is shown
+ *
* @return True if the detail view should be shown, false if the master view
- * should be shown
+ * should be shown
*/
boolean getShowDetail();
/**
* Managed bean (controller) method to delete an selected item.
- *
+ *
* @return The outcome after the method was executed
*/
String deleteItem();
/**
* Managed bean (controller) method to show an selected item on the CRUD
- * detail view.
- *
+ * detail view.
+ *
* @return The outcome after the method was executed
*/
String showItem();
/**
* Managed bean (controller) method to show and edit an selected item on the
- * CRUD detail view.
- *
+ * CRUD detail view.
+ *
* @return The outcome after the method was executed
*/
String editItem();
/**
* Managed bean (controller) method to create a new item on the CRUD detail
- * view.
- *
+ * view.
+ *
* @return The outcome after the method was executed
*/
String createItem();
/**
* Managed bean (controller) method to save changes to a existing item or
- * save a newly created item on the crud detail view.
- *
+ * save a newly created item on the crud detail view.
+ *
* @return The outcome after the method was executed
*/
String saveItem();
/**
* Managed bean (controller) method to exit the crud detail view without
- * saving.
- *
+ * saving.
+ *
* @return The outcome after the method was executed
*/
String cancelItem();
/**
* Indicates wether an item shown in the CRUD detail view is editable.
- *
+ *
* @return true if the shown item is editable, false if not
*/
boolean isItemEditable();
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
index 63fa4ee..1c8326a 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
@@ -56,7 +56,7 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUINumberSlider slider = (AbstractUINumberSlider) component;
-
+
final String id = slider.getClientId(facesContext);
final String currentValue = getCurrentValue(facesContext, slider);
final boolean readonly = slider.isReadonly();
@@ -67,14 +67,14 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
final Style style = new Style(facesContext, slider);
final int width = -1;
- int sliderWidthPerc
- = getResourceManager().getThemeMeasure(facesContext, slider, SLIDER_WIDTH_PERCENT).getPixel();
- if (sliderWidthPerc <= 25) {
- sliderWidthPerc = 25;
- }
- if (sliderWidthPerc >= 75) {
- sliderWidthPerc = 75;
- }
+ int sliderWidthPerc
+ = getResourceManager().getThemeMeasure(facesContext, slider, SLIDER_WIDTH_PERCENT).getPixel();
+ if (sliderWidthPerc <= 25) {
+ sliderWidthPerc = 25;
+ }
+ if (sliderWidthPerc >= 75) {
+ sliderWidthPerc = 75;
+ }
int sliderWidth = 100; // fixme
int inputWidth = 50; // fixme;
if (style.getWidth() != null && style.getWidth().getPixel() >= 0) {
@@ -182,7 +182,7 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
private String getAbsoluteImagePath(final FacesContext facesContext, final String relativeImagePath) {
return facesContext.getExternalContext().getRequestContextPath()
- + ResourceManagerUtils.getImage(facesContext, relativeImagePath);
+ + ResourceManagerUtils.getImage(facesContext, relativeImagePath);
}
private String getIdForInputField(final FacesContext context, final UIComponent component) {
@@ -201,8 +201,8 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
}
private void writeSliderJavaScript(
- final FacesContext context, final UIComponent component, final TobagoResponseWriter writer)
- throws IOException {
+ final FacesContext context, final UIComponent component, final TobagoResponseWriter writer)
+ throws IOException {
final String trackId = getIdForSliderTrack(context, component);
final String handleId = getIdForSliderHandle(context, component);
final String inputId = getIdForInputField(context, component);
@@ -210,20 +210,20 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
final Integer min = ComponentUtils.getIntAttribute(component, "min");
final Integer max = ComponentUtils.getIntAttribute(component, "max");
final String script = " var slider_" + jsId + " = new Control.Slider('" + handleId + "', '" + trackId + "', {\n"
- + " sliderValue:$('" + inputId + "').value,\n"
- + " range : $R(" + min + ", " + max + "),\n"
- + " values: $R(" + min + ", " + max + ").toArray(),\n"
- + " onSlide:function(v) {\n"
- + " $('" + inputId + "').value = v;\n"
- + " },\n"
- + " onChange:function(v) {\n"
- + " $('" + inputId + "').value = v;\n"
- + " }\n"
- + " });\n"
- + "\n"
- + " Event.observe('value', 'change', function() {\n"
- + " slider_" + jsId + ".setValue($('" + inputId + "').value);\n"
- + " });\n";
+ + " sliderValue:$('" + inputId + "').value,\n"
+ + " range : $R(" + min + ", " + max + "),\n"
+ + " values: $R(" + min + ", " + max + ").toArray(),\n"
+ + " onSlide:function(v) {\n"
+ + " $('" + inputId + "').value = v;\n"
+ + " },\n"
+ + " onChange:function(v) {\n"
+ + " $('" + inputId + "').value = v;\n"
+ + " }\n"
+ + " });\n"
+ + "\n"
+ + " Event.observe('value', 'change', function() {\n"
+ + " slider_" + jsId + ".setValue($('" + inputId + "').value);\n"
+ + " });\n";
writer.writeJavascript(script);
}
diff --git a/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java b/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
index b0dd3ed..b11830e 100644
--- a/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
+++ b/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
@@ -62,7 +62,7 @@ public class AuthorizationUtils {
return false;
}
if (securityAnnotation instanceof RolesAllowed) {
- final String [] roles = ((RolesAllowed) securityAnnotation).value();
+ final String[] roles = ((RolesAllowed) securityAnnotation).value();
if (LOG.isDebugEnabled()) {
LOG.debug("RolesAllowed " + Arrays.asList(((RolesAllowed) securityAnnotation).value()));
}
diff --git a/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java b/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
index 807f63e..9c2691b 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
+++ b/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
@@ -43,9 +43,9 @@ import java.io.IOException;
public class BoxRenderer extends BoxRendererBase {
/*
-
+
with shadow
-
+
<div class="tobago-box" style="width: 100px; height: 100px">
<div class="tobago-box-shadow" style="width: 99px; height: 99px">
<div class="tobago-box-border" style="width: 97px; height: 97px">
@@ -89,10 +89,10 @@ without shadow
}
private void encodeBox(final FacesContext facesContext, final TobagoResponseWriter writer, final UIBox box)
- throws IOException {
+ throws IOException {
// todo: shadow = 0px means, that shadow is disabled, but it may be better, if we can set a boolean in the config.
- // todo: this is possible after fixing
+ // todo: this is possible after fixing
final Measure measure = getResourceManager().getThemeMeasure(facesContext, box, "shadow");
final boolean hasShadow = measure.greaterThan(Measure.ZERO);
@@ -103,11 +103,11 @@ without shadow
final Style shadow = new Style();
Measure boxCurrentWidth = box.getCurrentWidth();
- if (boxCurrentWidth!=null) {
+ if (boxCurrentWidth != null) {
shadow.setWidth(boxCurrentWidth.subtract(1));
}
Measure boxCurrentHeight = box.getCurrentHeight();
- if (boxCurrentHeight!=null) {
+ if (boxCurrentHeight != null) {
shadow.setHeight(boxCurrentHeight.subtract(1));
}
writer.writeStyleAttribute(shadow);
@@ -117,10 +117,10 @@ without shadow
writer.writeClassAttribute(Classes.create(box, "border"));
final Style border = new Style();
- if (boxCurrentWidth!=null) {
+ if (boxCurrentWidth != null) {
border.setWidth(boxCurrentWidth.subtract(3));
}
- if (boxCurrentHeight!=null) {
+ if (boxCurrentHeight != null) {
border.setHeight(boxCurrentHeight.subtract(3));
}
writer.writeStyleAttribute(border);
@@ -137,7 +137,7 @@ without shadow
if (toolbar != null) {
renderToolbar(facesContext, writer, box, toolbar);
}
-
+
if (hasShadow) {
// border end
writer.endElement(HtmlElements.DIV);
@@ -152,10 +152,10 @@ without shadow
final Measure borderRight = box.getBorderRight();
final Measure borderTop = box.getBorderTop();
final Measure borderBottom = box.getBorderBottom();
- if (style.getWidth()!=null) {
+ if (style.getWidth() != null) {
style.setWidth(style.getWidth().subtract(borderLeft).subtract(borderRight));
}
- if (style.getHeight()!=null) {
+ if (style.getHeight() != null) {
style.setHeight(style.getHeight().subtract(borderTop).subtract(borderBottom));
}
style.setLeft(borderLeft);
@@ -164,7 +164,7 @@ without shadow
}
protected void renderBoxHeader(FacesContext facesContext, TobagoResponseWriter writer, UIComponent box)
- throws IOException {
+ throws IOException {
final UIComponent label = box.getFacet(Facets.LABEL);
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "header"));
@@ -185,8 +185,8 @@ without shadow
}
protected void renderToolbar(
- final FacesContext facesContext, final TobagoResponseWriter writer, final UIBox box, final UIPanel toolbar)
- throws IOException {
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UIBox box, final UIPanel toolbar)
+ throws IOException {
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "headerToolBar"));
toolbar.setRendererType(RendererTypes.BOX_TOOL_BAR);
[myfaces-tobago] 31/32: cherrypick from 2.x: build(deps): bump xml-maven-plugin from 1.0 to 1.0.2
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b98bbde9bddc9fcf7da034cecfb8ba4c108e3feb
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Feb 10 17:16:32 2022 +0000
cherrypick from 2.x: build(deps): bump xml-maven-plugin from 1.0 to 1.0.2
Bumps [xml-maven-plugin](https://github.com/mojohaus/xml-maven-plugin) from 1.0 to 1.0.2.
- [Release notes](https://github.com/mojohaus/xml-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/xml-maven-plugin/compare/xml-maven-plugin-1.0...xml-maven-plugin-1.0.2)
---
updated-dependencies:
- dependency-name: org.codehaus.mojo:xml-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
tobago-example/tobago-example-demo/pom.xml | 2 +-
tobago-example/tobago-example-test/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 7b7fef3..086f46c 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.0.2</version>
<executions>
<execution>
<phase>generate-resources</phase>
diff --git a/tobago-example/tobago-example-test/pom.xml b/tobago-example/tobago-example-test/pom.xml
index 04d449a..c1c77e7 100644
--- a/tobago-example/tobago-example-test/pom.xml
+++ b/tobago-example/tobago-example-test/pom.xml
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.0.2</version>
<executions>
<execution>
<phase>generate-resources</phase>
[myfaces-tobago] 02/32: cherrypick from 2.x: build: CVE fix
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 207670bd836bcfe907aa2142db23b9a07fa5af89
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon Aug 30 10:19:51 2021 +0200
cherrypick from 2.x: build: CVE fix
* update ant (because of CVE-2021-36373, CVE-2021-36374)
* ignore jdom2 via suppression list
---
pom.xml | 2 +-
tobago-tool/tobago-tool-apt/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0b79919..7b9d648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <checkstyle-rules.version>13</checkstyle-rules.version>
+ <checkstyle-rules.version>15-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
diff --git a/tobago-tool/tobago-tool-apt/pom.xml b/tobago-tool/tobago-tool-apt/pom.xml
index 50c6cb8..4554df7 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.9</version>
+ <version>1.10.11</version>
<scope>compile</scope>
<exclusions>
<exclusion>
[myfaces-tobago] 13/32: cherrypick from 2.x: build(deps): bump geronimo-el_2.2_spec from 1.0.4 to 1.1
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit db0be853f139ac7e5e4fa1a420db399052d2887c
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 2 15:54:45 2022 +0000
cherrypick from 2.x: build(deps): bump geronimo-el_2.2_spec from 1.0.4 to 1.1
Bumps geronimo-el_2.2_spec from 1.0.4 to 1.1.
---
updated-dependencies:
- dependency-name: org.apache.geronimo.specs:geronimo-el_2.2_spec
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 574b1de..1f09678 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,7 +512,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
[myfaces-tobago] 01/32: cherrypick from 2.x: style: checkstyle
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b65f04ca5eb767783a0b9cee257c474d9bb21c96
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Aug 25 17:17:02 2021 +0200
cherrypick from 2.x: style: checkstyle
---
.../myfaces/tobago/apt/processor/FacesConfigGenerator.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
index 033da60..fde1419 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
@@ -284,7 +284,8 @@ public class FacesConfigGenerator extends AbstractGenerator {
return getEqualElement(components, newElement) != null;
}
- private org.jdom2.Element getEqualElement(final List<org.jdom2.Element> components, final org.jdom2.Element newElement) {
+ private org.jdom2.Element getEqualElement(
+ final List<org.jdom2.Element> components, final org.jdom2.Element newElement) {
for (final org.jdom2.Element element : components) {
if (equals(element, newElement)) {
return element;
@@ -545,7 +546,8 @@ public class FacesConfigGenerator extends AbstractGenerator {
}
}
- private void addFacets(final UIComponentTag componentTag, final Namespace namespace, final org.jdom2.Element element) {
+ private void addFacets(
+ final UIComponentTag componentTag, final Namespace namespace, final org.jdom2.Element element) {
final Facet[] facets = componentTag.facets();
for (final Facet facet : facets) {
final org.jdom2.Element facetElement = new org.jdom2.Element(FACET, namespace);
@@ -559,7 +561,8 @@ public class FacesConfigGenerator extends AbstractGenerator {
facetName.setText(facet.name());
facetElement.addContent(facetName);
final org.jdom2.Element facetExtension = new org.jdom2.Element(FACET_EXTENSION, namespace);
- final org.jdom2.Element elementAllowedChildComponents = new org.jdom2.Element(ALLOWED_CHILD_COMPONENTS, namespace);
+ final org.jdom2.Element elementAllowedChildComponents
+ = new org.jdom2.Element(ALLOWED_CHILD_COMPONENTS, namespace);
final String[] allowedChildComponents = facet.allowedChildComponenents();
String allowedComponentTypes = "";
for (final String componentType : allowedChildComponents) {
[myfaces-tobago] 09/32: cherrypick from 2.x: build: update some lib versions
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit f3d1a50fbb3b4c9585578220abbf27855e5abdf9
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jan 26 14:40:56 2022 +0100
cherrypick from 2.x: build: update some lib versions
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5346d81..952e7ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,17 +35,17 @@
<inceptionYear>2002</inceptionYear>
<properties>
- <myfaces20.version>2.0.24</myfaces20.version>
+ <myfaces20.version>2.0.25</myfaces20.version>
<myfaces21.version>2.1.18</myfaces21.version>
- <myfaces22.version>2.2.13</myfaces22.version>
- <myfaces23.version>2.3.8</myfaces23.version>
+ <myfaces22.version>2.2.14</myfaces22.version>
+ <myfaces23.version>2.3.9</myfaces23.version>
<mojarra20.version>2.0.11-04</mojarra20.version>
- <mojarra21.version>2.1.29-08</mojarra21.version>
- <mojarra22.version>2.2.16</mojarra22.version>
- <slf4j.version>1.7.30</slf4j.version>
+ <mojarra21.version>2.1.29-11</mojarra21.version>
+ <mojarra22.version>2.2.20</mojarra22.version>
+ <slf4j.version>1.7.35</slf4j.version>
<logback.version>1.2.10</logback.version>
<log4j.version>2.17.1</log4j.version>
- <commons-io.version>2.8.0</commons-io.version>
+ <commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.1.1</commons-logging.version>
<commons-collection.version>3.2.2</commons-collection.version>
[myfaces-tobago] 08/32: cherrypick from 2.x: build: update checkstyle-rules to release version
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 7b92eb8907e7f2f1c34c7d4c9b428e903db56dcb
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Jan 4 12:05:02 2022 +0100
cherrypick from 2.x: build: update checkstyle-rules to release version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2a0e8bc..5346d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
+ <checkstyle-rules.version>15</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
[myfaces-tobago] 18/32: cherrypick from 2.x: chore: Remove Maven Reporting Section
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 14f8e3128bd752e0079ed5829bfccd29882e4a36
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 9 11:32:11 2022 +0100
cherrypick from 2.x: chore: Remove Maven Reporting Section
issue: TOBAGO-2106
---
pom.xml | 255 ----------------------------------------------------------------
1 file changed, 255 deletions(-)
diff --git a/pom.xml b/pom.xml
index 43e3185..f7ac60a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,261 +138,6 @@
</mailingList>
</mailingLists>
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <plugins>
-
- <!--<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>simian-report-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <configuration>
- <minimumThreshold>2</minimumThreshold>
- </configuration>
- </plugin>
- -->
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <tags>
- <tag>TODO</tag>
- <tag>FIXME</tag>
- <tag>XXX</tag>
- <tag>TBD</tag>
- <tag>@deprecated</tag>
- </tags>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <configLocation>tobago/checkstyle.xml</configLocation>
- <headerLocation>default/myfaces-header.txt</headerLocation>
- <xrefLocation>xref</xrefLocation>
- <excludes>**/package-info.java</excludes>
- <indentSize>2</indentSize>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <linksource>true</linksource>
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <source>${maven.compile.source}</source>
- <charset>${maven.compile.encoding}</charset>
- <links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://download.oracle.com/javaee/5/api/</link>
- <link>http://jakarta.apache.org/commons/collections/api-${commons-collection.version}/</link>
- <link>http://jakarta.apache.org/commons/lang/api-${commons-lang.version}/</link>
- <link>http://jakarta.apache.org/commons/io/api-${commons-io.version}/</link>
- <link>http://jakarta.apache.org/commons/logging/commons-logging-${commons-logging.version}/apidocs/</link>
- <link>http://www.slf4j.org/apidocs</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- </links>
- <excludePackageNames>org.apache.myfaces.tobago.internal.*:org.apache.myfaces.tobago.internal.taglib12.*</excludePackageNames>
- <docletArtifact>
- <groupId>com.google.doclava</groupId>
- <artifactId>doclava</artifactId>
- <version>1.0.3</version>
- </docletArtifact>
- <doclet>com.google.doclava.Doclava</doclet>
- <!--
- | bootclasspath required by Sun's JVM
- -->
- <bootclasspath>${sun.boot.class.path}</bootclasspath>
- <additionalparam>
- -quiet
- -federate JDK http://download.oracle.com/javase/6/docs/api/index.html?
- -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml
- -hdf project.name "${project.name}"
- -d ${project.build.directory}/apidocs
- -Xdoclint:none
- </additionalparam>
- <useStandardDocletOptions>false</useStandardDocletOptions>
- <!--
- | Apple's JVM sometimes requires more memory
- -->
- <additionalJOption>-J-Xmx1024m</additionalJOption>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <!--plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.7.1</version>
- <reportSets>
- <reportSet>
- <configuration>
- <statusIds>Open,In Progress,Reopened</statusIds>
- </configuration>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin-->
-
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <basedir>${basedir}</basedir>
- </configuration>
- </plugin>
-
- <!--
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <configuration>
- <category>web-framework</category>
- <language>Java</language>
- <shortdesc>Set of user interface components based on JSF.</shortdesc>
- <pmc>http://myfaces.apache.org</pmc>
- </configuration>
- </plugin>
- -->
-
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <minSeverity>info</minSeverity>
- <excludes>
- <exclude>org/apache/myfaces/tobago/example/**</exclude>
- <exclude>org/apache/myfaces/tobago/ant/**</exclude>
- <exclude>org/apache/myfaces/tobago/apt/**</exclude>
- </excludes>
- </configuration>
- </plugin-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.4</version>
- <configuration>
- <rulesets>
- <!-- FIXME: currently only possible to build in project build -->
- <ruleset>${basedir}/tobago-pmd-config.xml</ruleset>
- </rulesets>
- <linkXRef>true</linkXRef>
- <targetJdk>${maven.compile.source}</targetJdk>
- <aggregate>true</aggregate>
-<!--
- <allowCommentedBlocks>true</allowCommentedBlocks>
--->
- </configuration>
- </plugin>
-
- <!-- TODO test dashboard plugin -->
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId>
- <version>1.0.0-beta-1</version>
- </plugin-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <threshold>Low</threshold>
- <effort>Max</effort>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
-
- <!-- http://jira.codehaus.org/browse/MJNCSS-4
- JavaNCSS still has problems with annotations for local variables -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <excludes>
- <exclude>org/apache/myfaces/tobago/internal/layout/Grid.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>analyze-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-linkcheck-plugin</artifactId>
- <version>1.0.1</version>
- </plugin-->
-
- </plugins>
-
- </reporting>
-
<dependencyManagement>
<dependencies>
<dependency>
[myfaces-tobago] 19/32: cherrypick from 2.x: build: checkstyle enhancements
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit c6e69bf326c2b8be87d8ab611b8a8902b558ad93
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 9 12:42:02 2022 +0100
cherrypick from 2.x: build: checkstyle enhancements
---
.../org/apache/myfaces/tobago/ajax/AjaxUtils.java | 4 +-
.../tobago/application/ActionListenerImpl.java | 2 +-
.../myfaces/tobago/application/ProjectStage.java | 12 +-
.../apache/myfaces/tobago/compat/FacesUtilsEL.java | 10 +-
.../myfaces/tobago/component/Attributes.java | 84 ++++++++++----
.../myfaces/tobago/component/ComponentTypes.java | 3 +
.../apache/myfaces/tobago/component/Facets.java | 3 +-
.../myfaces/tobago/component/InputSuggest2.java | 2 +-
.../component/MethodBindingToMethodExpression.java | 8 +-
.../apache/myfaces/tobago/component/Position.java | 4 +-
.../myfaces/tobago/component/RendererTypes.java | 2 +-
.../apache/myfaces/tobago/component/Sorter.java | 16 +--
.../apache/myfaces/tobago/config/Configurable.java | 9 +-
.../apache/myfaces/tobago/context/Capability.java | 5 +-
.../myfaces/tobago/context/ClientProperties.java | 31 +++--
.../org/apache/myfaces/tobago/context/Markup.java | 21 ++--
.../myfaces/tobago/context/MarkupConfig.java | 4 +-
.../myfaces/tobago/context/MarkupEditor.java | 8 +-
.../myfaces/tobago/context/ResourceManager.java | 29 ++++-
.../tobago/context/ResourceManagerUtils.java | 19 ++--
.../apache/myfaces/tobago/context/ThemeImpl.java | 20 ++--
.../myfaces/tobago/context/TobagoBundle.java | 6 +-
.../myfaces/tobago/context/TobagoContext.java | 4 +-
.../tobago/context/TobagoMessageBundle.java | 6 +-
.../tobago/context/TobagoResourceBundle.java | 6 +-
.../tobago/context/TransientStateHolder.java | 4 +-
.../apache/myfaces/tobago/context/UserAgent.java | 29 ++---
.../myfaces/tobago/convert/DurationConverter.java | 2 +-
.../myfaces/tobago/convert/ThemeConverter.java | 4 +-
.../event/MethodExpressionTabChangeListener.java | 2 +-
.../apache/myfaces/tobago/event/PageAction.java | 3 +-
.../myfaces/tobago/event/PageActionEvent.java | 5 +-
.../myfaces/tobago/event/PopupActionListener.java | 4 +-
.../tobago/event/PopupFacetActionListener.java | 4 +-
.../tobago/event/ResetFormActionListener.java | 2 +-
.../tobago/event/ResetInputActionListener.java | 4 +-
.../tobago/event/SheetStateChangeEvent.java | 2 +-
.../myfaces/tobago/event/TabChangeEvent.java | 10 +-
.../myfaces/tobago/event/TreeExpansionEvent.java | 2 +-
.../tobago/event/TreeExpansionListener.java | 2 +-
.../ValueExpressionResetInputActionListener.java | 4 +-
.../ValueExpressionSheetStateChangeListener.java | 2 +-
.../event/ValueExpressionTabChangeListener.java | 2 +-
.../myfaces/tobago/facelets/ContentTypeRule.java | 2 +-
.../tobago/facelets/DeprecatedDimensionRule.java | 4 +-
.../facelets/FixCharacterEncodingFilter.java | 4 +-
.../facelets/GridLayoutConstraintHandler.java | 9 +-
.../myfaces/tobago/facelets/LoadBundleHandler.java | 2 +-
.../MetaInfResourcesClasspathResourceResolver.java | 7 +-
.../tobago/facelets/PopupReferenceHandler.java | 2 +-
.../myfaces/tobago/facelets/PositionRule.java | 4 +-
.../facelets/ResetInputActionListenerHandler.java | 2 +-
.../apache/myfaces/tobago/facelets/Resource.java | 9 +-
.../facelets/SheetStateChangeSourceRule.java | 2 +-
.../tobago/facelets/SortActionSourceRule.java | 4 +-
.../myfaces/tobago/facelets/SuggestMethodRule.java | 2 +-
.../tobago/facelets/SupportsMarkupRule.java | 2 +-
.../facelets/SupportsRenderedPartiallyRule.java | 2 +-
.../tobago/facelets/TabChangeSourceRule.java | 2 +-
.../extension/MenuRadioExtensionHandler.java | 2 +-
.../SelectOneListboxExtensionHandler.java | 3 +-
.../extension/TobagoMenuExtensionHandler.java | 2 +-
.../tobago/internal/ajax/AjaxInternalUtils.java | 4 +-
.../tobago/internal/ajax/AjaxNavigationState.java | 3 +-
.../myfaces/tobago/internal/ajax/AjaxRenderer.java | 2 +-
.../tobago/internal/ajax/AjaxResponseRenderer.java | 5 +-
.../tobago/internal/component/AbstractUIData.java | 22 ++--
.../internal/component/AbstractUIDatePicker.java | 4 +-
.../internal/component/AbstractUIFileDrop.java | 6 +-
.../internal/component/AbstractUIFlowLayout.java | 2 +-
.../internal/component/AbstractUIGridLayout.java | 12 +-
.../internal/component/AbstractUIMessages.java | 4 +-
.../tobago/internal/component/AbstractUIPage.java | 15 +--
.../tobago/internal/component/AbstractUIPopup.java | 2 +-
.../component/AbstractUISelectBooleanCheckbox.java | 2 +-
.../component/AbstractUISelectManyShuttle.java | 2 +-
.../component/AbstractUISelectOneBase.java | 2 +-
.../tobago/internal/component/AbstractUISheet.java | 76 +++++++------
.../internal/component/AbstractUISheetLayout.java | 8 +-
.../internal/component/AbstractUISplitLayout.java | 9 +-
.../internal/component/AbstractUITabGroup.java | 2 +-
.../component/AbstractUITabGroupLayout.java | 2 +-
.../tobago/internal/component/AbstractUITree.java | 10 +-
.../internal/component/AbstractUITreeNode.java | 32 +++---
.../internal/component/AbstractUITreeSelect.java | 5 +-
.../internal/config/ContentSecurityPolicy.java | 4 +-
.../tobago/internal/config/RendererConfig.java | 2 +-
.../config/TobagoConfigEntityResolver.java | 3 +
.../internal/config/TobagoConfigFragment.java | 12 +-
.../tobago/internal/config/TobagoConfigMerger.java | 2 +-
.../internal/config/TobagoConfigVersion.java | 4 +-
.../internal/context/ClientPropertiesKey.java | 4 +-
.../tobago/internal/context/MeasureValue.java | 2 +-
.../tobago/internal/context/ResourceLocator.java | 33 +++---
.../internal/context/ResourceManagerImpl.java | 113 +++++++++++-------
.../internal/context/ResponseWriterDivider.java | 32 +++---
.../tobago/internal/context/StringValue.java | 2 +-
.../internal/context/ThemeConfigCacheKey.java | 4 +-
.../myfaces/tobago/internal/layout/BankHead.java | 4 +-
.../myfaces/tobago/internal/layout/Cell.java | 4 +-
.../myfaces/tobago/internal/layout/Grid.java | 35 +++---
.../tobago/internal/layout/LayoutContext.java | 2 +-
.../tobago/internal/layout/LayoutUtils.java | 8 +-
.../myfaces/tobago/internal/layout/MathUtils.java | 7 +-
.../myfaces/tobago/internal/package-info.java | 5 +-
.../tobago/internal/taglib/TobagoELTag.java | 2 -
.../internal/taglib/component/AttributeTag.java | 33 ++----
.../taglib/component/BoxToolBarTagDeclaration.java | 2 +-
.../taglib/component/CellTagDeclaration.java | 9 +-
.../taglib/component/ColumnNodeTagDeclaration.java | 4 +-
.../taglib/component/ColumnTagDeclaration.java | 12 +-
.../taglib/component/CommandTagDeclaration.java | 7 +-
.../internal/taglib/component/ConverterTag.java | 16 ++-
.../taglib/component/DataAttributeTag.java | 10 +-
.../taglib/component/DatePickerTagDeclaration.java | 10 +-
.../taglib/component/DateTagDeclaration.java | 8 +-
.../component/ExtensionPanelDeclaration.java | 2 +-
.../taglib/component/FileDropTagDeclaration.java | 13 +--
.../taglib/component/FileTagDeclaration.java | 4 +-
.../taglib/component/FlowLayoutTagDeclaration.java | 13 +--
.../taglib/component/FormTagDeclaration.java | 10 +-
.../taglib/component/GridLayoutConstraintTag.java | 4 +-
.../taglib/component/ImageTagDeclaration.java | 5 +-
.../taglib/component/InTagDeclaration.java | 8 +-
.../internal/taglib/component/LoadBundleTag.java | 22 ++--
.../taglib/component/MediatorTagDeclaration.java | 4 +-
.../taglib/component/MenuBarTagDeclaration.java | 8 +-
.../component/MenuCommandTagDeclaration.java | 2 +-
.../taglib/component/MessagesTagDeclaration.java | 24 ++--
.../taglib/component/ObjectTagDeclaration.java | 8 +-
.../taglib/component/OutTagDeclaration.java | 10 +-
.../taglib/component/PageTagDeclaration.java | 28 +++--
.../taglib/component/PanelTagDeclaration.java | 9 +-
.../taglib/component/PopupReferenceTag.java | 11 +-
.../taglib/component/PopupTagDeclaration.java | 10 +-
.../taglib/component/ProgressTagDeclaration.java | 6 +-
.../taglib/component/ReloadTagDeclaration.java | 6 +-
.../component/ResetInputActionListenerTag.java | 12 +-
.../taglib/component/ScriptTagDeclaration.java | 1 +
.../SelectBooleanCheckboxTagDeclaration.java | 10 +-
.../taglib/component/SelectItemTagDeclaration.java | 11 +-
.../component/SelectItemsTagDeclaration.java | 14 +--
.../component/SelectOneChoiceTagDeclaration.java | 25 ++--
.../component/SelectOneListboxTagDeclaration.java | 25 ++--
.../component/SelectOneRadioTagDeclaration.java | 25 ++--
.../component/SelectReferenceTagDeclaration.java | 3 +-
.../taglib/component/SheetTagDeclaration.java | 56 ++++-----
.../component/SplitLayoutTagDeclaration.java | 17 ++-
.../taglib/component/StyleTagDeclaration.java | 1 +
.../taglib/component/SuggestTagDeclaration.java | 14 +--
.../taglib/component/TabChangeListenerTag.java | 20 ++--
.../taglib/component/TabGroupTagDeclaration.java | 7 +-
.../component/TabGroupToolBarTagDeclaration.java | 2 +-
.../taglib/component/ToolBarTagDeclaration.java | 16 +--
.../taglib/component/TreeDataTagDeclaration.java | 4 +-
.../component/TreeListboxTagDeclaration.java | 3 +-
.../taglib/component/TreeMenuTagDeclaration.java | 7 +-
.../taglib/component/TreeNodeTagDeclaration.java | 7 +-
.../taglib/component/TreeSelectTagDeclaration.java | 8 +-
.../taglib/component/TreeTagDeclaration.java | 8 +-
.../taglib/component/ValidateFileItemTag.java | 4 +-
.../component/ValidateSubmittedValueLengthTag.java | 7 +-
.../taglib/component/WizardTagDeclaration.java | 2 +-
.../internal/taglib/declaration/Component.java | 12 +-
.../internal/taglib/declaration/HasAction.java | 11 +-
.../taglib/declaration/HasActionListener.java | 7 +-
.../taglib/declaration/HasColumnLayout.java | 5 +-
.../internal/taglib/declaration/HasConverter.java | 10 +-
.../taglib/declaration/HasCurrentMarkup.java | 6 +-
.../internal/taglib/declaration/HasFieldId.java | 4 +-
.../tobago/internal/taglib/declaration/HasId.java | 4 +-
.../internal/taglib/declaration/HasLabel.java | 4 +-
.../internal/taglib/declaration/HasLabelWidth.java | 5 +-
.../internal/taglib/declaration/HasLink.java | 2 +-
.../internal/taglib/declaration/HasMargin.java | 4 +-
.../internal/taglib/declaration/HasMarkup.java | 7 +-
.../internal/taglib/declaration/HasOnchange.java | 5 +-
.../internal/taglib/declaration/HasOnclick.java | 2 -
.../taglib/declaration/HasPlaceholder.java | 5 +-
.../taglib/declaration/HasRenderedPartially.java | 6 +-
.../internal/taglib/declaration/HasResource.java | 11 +-
.../internal/taglib/declaration/HasRowLayout.java | 5 +-
.../internal/taglib/declaration/HasSanitize.java | 5 +-
.../internal/taglib/declaration/HasSpacing.java | 7 +-
.../taglib/declaration/HasSuggestMethod.java | 9 +-
.../declaration/HasTabChangeListenerType.java | 3 +-
.../internal/taglib/declaration/HasTabIndex.java | 14 +--
.../internal/taglib/declaration/HasTarget.java | 3 +-
.../internal/taglib/declaration/HasValidator.java | 8 +-
.../taglib/declaration/HasValueChangeListener.java | 9 +-
.../tobago/internal/taglib/declaration/HasVar.java | 5 +-
.../taglib/declaration/IsDefaultCommand.java | 4 +-
.../internal/taglib/declaration/IsDraggable.java | 3 +-
.../declaration/IsGridLayoutComponentBase.java | 6 +-
.../IsGridLayoutComponentWithDimension.java | 12 +-
.../taglib/declaration/IsImmediateCommand.java | 7 +-
.../tobago/internal/taglib/declaration/IsOmit.java | 10 +-
.../internal/taglib/declaration/IsPassword.java | 4 +-
.../internal/taglib/declaration/IsRendered.java | 4 +-
.../internal/taglib/declaration/IsRequired.java | 5 +-
.../taglib/declaration/IsRequiredForSelect.java | 5 +-
.../internal/taglib/declaration/IsShowRoot.java | 5 +-
.../taglib/declaration/IsShowRootJunction.java | 4 +-
.../internal/taglib/declaration/IsTransition.java | 3 +-
.../taglib/extension/DateExtensionTag.java | 83 ++++++--------
.../taglib/extension/ExtensionPanelTag.java | 6 +-
.../taglib/extension/FileExtensionTag.java | 56 ++++-----
.../internal/taglib/extension/InExtensionTag.java | 89 +++++++--------
.../taglib/extension/LabelExtensionTag.java | 28 ++---
.../taglib/extension/MenuCheckboxExtensionTag.java | 62 ++++------
.../taglib/extension/MenuRadioExtensionTag.java | 68 +++++------
.../internal/taglib/extension/OutExtensionTag.java | 43 +++----
.../SelectBooleanCheckboxExtensionTag.java | 71 +++++-------
.../extension/SelectManyCheckboxExtensionTag.java | 67 +++++------
.../extension/SelectManyListboxExtensionTag.java | 69 +++++------
.../extension/SelectManyShuttleExtensionTag.java | 59 ++++------
.../extension/SelectOneChoiceExtensionTag.java | 67 +++++------
.../extension/SelectOneListboxExtensionTag.java | 67 +++++------
.../extension/SelectOneRadioExtensionTag.java | 68 +++++------
.../taglib/extension/SeparatorExtensionTag.java | 18 ++-
.../taglib/extension/TextareaExtensionTag.java | 73 +++++-------
.../taglib/extension/TimeExtensionTag.java | 73 +++++-------
.../extension/TobagoExtensionBodyTagSupport.java | 6 +-
.../internal/util/ComponentAttributeUtils.java | 12 +-
.../tobago/internal/util/DateFormatUtils.java | 4 +-
.../myfaces/tobago/internal/util/Deprecation.java | 7 +-
.../tobago/internal/util/FacesContextUtils.java | 4 +-
.../tobago/internal/util/FindComponentUtils.java | 5 +-
.../tobago/internal/util/HtmlWriterUtils.java | 4 +-
.../internal/util/JavascriptWriterUtils.java | 4 +-
.../tobago/internal/util/JsonWriterUtils.java | 4 +-
.../myfaces/tobago/internal/util/NumberUtils.java | 2 +-
.../myfaces/tobago/internal/util/PartUtils.java | 86 ++++++--------
.../tobago/internal/util/ResponseUtils.java | 2 +-
.../tobago/internal/util/ResponseWriterBuffer.java | 18 +--
.../myfaces/tobago/internal/util/StringUtils.java | 13 +--
.../myfaces/tobago/internal/util/WriterUtils.java | 23 ++--
.../webapp/DebugResponseWriterWrapper.java | 9 ++
.../tobago/internal/webapp/HtmlResponseWriter.java | 13 ++-
.../tobago/internal/webapp/JsonResponseWriter.java | 8 +-
.../internal/webapp/TobagoResponseWriterBase.java | 50 ++++----
.../webapp/TobagoResponseWriterWrapper.java | 9 ++
.../myfaces/tobago/layout/AutoLayoutToken.java | 2 +-
.../apache/myfaces/tobago/layout/LayoutBase.java | 16 +++
.../apache/myfaces/tobago/layout/LayoutBox.java | 8 ++
.../myfaces/tobago/layout/LayoutComponent.java | 5 +
.../myfaces/tobago/layout/LayoutContainer.java | 3 +
.../org/apache/myfaces/tobago/layout/Measure.java | 4 +-
.../myfaces/tobago/layout/MeasureEditor.java | 8 +-
.../apache/myfaces/tobago/layout/Orientation.java | 4 +-
.../apache/myfaces/tobago/layout/PixelMeasure.java | 8 +-
.../apache/myfaces/tobago/model/ExpandedState.java | 11 +-
.../java/org/apache/myfaces/tobago/model/Node.java | 10 +-
.../org/apache/myfaces/tobago/model/PageState.java | 16 ++-
.../apache/myfaces/tobago/model/PageStateImpl.java | 4 +-
.../apache/myfaces/tobago/model/SelectItem.java | 1 +
.../apache/myfaces/tobago/model/Selectable.java | 3 +-
.../apache/myfaces/tobago/model/SelectedState.java | 7 +-
.../myfaces/tobago/model/TreeNodeDataModel.java | 21 ++--
.../org/apache/myfaces/tobago/model/TreePath.java | 14 ++-
.../myfaces/tobago/model/TreeSelectable.java | 2 +-
.../org/apache/myfaces/tobago/model/Wizard.java | 5 +-
.../myfaces/tobago/portlet/PortletUtils.java | 4 +-
.../renderkit/AbstractRendererBaseWrapper.java | 8 +-
.../apache/myfaces/tobago/renderkit/HtmlUtils.java | 17 ++-
.../tobago/renderkit/LabelWithAccessKey.java | 13 ++-
.../myfaces/tobago/renderkit/RendererBase.java | 2 +-
.../tobago/renderkit/SelectManyRendererBase.java | 126 +++++++++------------
.../tobago/renderkit/SelectOneRendererBase.java | 2 +-
.../myfaces/tobago/renderkit/css/Classes.java | 12 +-
.../apache/myfaces/tobago/renderkit/css/Style.java | 13 +--
.../tobago/renderkit/html/DataAttributes.java | 63 +++++++----
.../tobago/renderkit/html/HtmlAttributes.java | 52 ++++++---
.../tobago/renderkit/html/HtmlElements.java | 3 +
.../myfaces/tobago/sanitizer/JsoupSanitizer.java | 2 +-
.../tobago/servlet/NonFacesRequestServlet.java | 3 +-
.../myfaces/tobago/servlet/ResourceServlet.java | 6 +-
.../apache/myfaces/tobago/util/BeanComparator.java | 4 +-
.../apache/myfaces/tobago/util/ComparatorBase.java | 2 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 122 ++++++++++----------
.../myfaces/tobago/util/ContextCallback.java | 2 +-
.../myfaces/tobago/util/CreateComponentUtils.java | 29 ++++-
.../myfaces/tobago/util/DebugActionListener.java | 4 +-
.../tobago/util/DebugNavigationHandler.java | 2 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 8 +-
.../org/apache/myfaces/tobago/util/DebugUtils.java | 2 +-
.../myfaces/tobago/util/EncodeAjaxCallback.java | 24 ++--
.../apache/myfaces/tobago/util/FacesVersion.java | 4 +
.../org/apache/myfaces/tobago/util/LayoutInfo.java | 9 +-
.../apache/myfaces/tobago/util/LocaleUtils.java | 6 +-
.../apache/myfaces/tobago/util/MessageUtils.java | 4 +-
.../tobago/util/ProcessValidationsCallback.java | 2 +-
.../tobago/util/UpdateModelValuesCallback.java | 2 +-
.../tobago/util/ValueBindingComparator.java | 2 +-
.../tobago/util/ValueExpressionComparator.java | 2 +-
.../myfaces/tobago/util/VariableResolverUtils.java | 8 +-
.../org/apache/myfaces/tobago/util/XmlUtils.java | 8 +-
.../validator/ClearValidatorsActionListener.java | 7 +-
.../validator/SubmittedValueLengthValidator.java | 5 +-
.../org/apache/myfaces/tobago/webapp/Secret.java | 10 +-
.../tobago/webapp/SecretSessionListener.java | 2 +-
.../tobago/webapp/TobagoResponseWriter.java | 18 ++-
.../myfaces/tobago/component/SorterUnitTest.java | 50 ++++----
.../myfaces/tobago/component/UISheetUnitTest.java | 6 +-
.../myfaces/tobago/context/MarkupUnitTest.java | 46 ++++----
.../myfaces/tobago/context/UserAgentUnitTest.java | 14 +--
.../internal/config/AbstractTobagoTestBase.java | 3 +-
.../context/ResponseWriterDividerUnitTest.java | 2 +-
.../internal/context/ThemeParserUnitTest.java | 2 +-
.../tobago/internal/layout/MathUtilsUnitTest.java | 20 ++--
.../mock/servlet/MockHttpServletRequest.java | 11 +-
.../mock/servlet/MockHttpServletResponse.java | 15 ++-
.../internal/mock/servlet/MockHttpSession.java | 7 +-
.../internal/mock/servlet/MockPageContext.java | 6 +-
.../internal/taglib/component/DummyBean.java | 4 +-
.../tobago/internal/util/PartUtilsUnitTest.java | 2 +-
.../tobago/layout/IntervalListUnitTest.java | 38 ++-----
.../tobago/model/MixedTreeModelUnitTest.java | 14 +--
.../apache/myfaces/tobago/model/NodeUnitTest.java | 15 +--
.../tobago/renderkit/css/ClassesUnitTest.java | 4 +-
.../myfaces/tobago/util/RangeParserUnitTest.java | 8 +-
.../webapp/TobagoResponseWriterUnitTest.java | 13 ++-
.../tobago/example/addressbook/Address.java | 2 +-
.../DerbyShutdownServletContextListener.java | 2 +-
.../tobago/example/addressbook/EmailAddress.java | 2 +-
.../tobago/example/addressbook/JpaAddressDao.java | 6 +-
.../example/addressbook/OpenJpaLoadTimeWeaver.java | 6 +-
.../tobago/example/addressbook/Picture.java | 2 +-
.../tobago/example/addressbook/web/Controller.java | 13 +--
.../tobago/example/addressbook/web/Layout.java | 2 +-
.../example/addressbook/web/PictureServlet.java | 2 +-
.../tobago/example/addressbook/Address.java | 2 +-
.../DerbyShutdownServletContextListener.java | 2 +-
.../tobago/example/addressbook/EmailAddress.java | 2 +-
.../tobago/example/addressbook/JpaAddressDao.java | 6 +-
.../example/addressbook/OpenJpaLoadTimeWeaver.java | 26 ++---
.../tobago/example/addressbook/Picture.java | 2 +-
.../example/addressbook/web/AppenderModel.java | 2 +-
.../tobago/example/addressbook/web/Controller.java | 13 +--
.../tobago/example/addressbook/web/Layout.java | 2 +-
.../example/addressbook/web/LoggingController.java | 39 ++++---
.../example/addressbook/web/PictureServlet.java | 2 +-
.../tobago/example/data/CantorInterval.java | 20 ++--
.../apache/myfaces/tobago/example/demo/Bird.java | 4 +-
.../tobago/example/demo/BirdController.java | 6 +-
...lePageDeclarationLanguageNavigationHandler.java | 6 +-
.../tobago/example/demo/NavigationTree.java | 7 +-
.../example/demo/PartialReloadController.java | 2 +-
.../tobago/example/demo/TobagoDemoController.java | 10 +-
.../myfaces/tobago/example/demo/TreeEditor.java | 2 +-
.../tobago/example/demo/UniversalLoggingInfo.java | 6 +-
.../demo/clientConfig/ClientConfigController.java | 6 +-
.../tobago/example/demo/jsp/AbstractConverter.java | 6 +-
.../tobago/example/demo/jsp/JspTagConverter.java | 2 +-
.../tobago/example/demo/jsp/StringExpression.java | 4 +-
.../tobago/example/demo/overview/SheetConfig.java | 2 +-
.../myfaces/tobago/example/demo/sudoku/Sudoku.java | 10 +-
.../tobago/example/security/Controller.java | 8 +-
.../myfaces/tobago/example/test/Attribute.java | 2 +-
.../example/test/ClientConfigController.java | 8 +-
.../tobago/example/test/FilterController.java | 6 +-
.../myfaces/tobago/example/test/Immediate.java | 16 +--
.../example/test/InputSuggestController.java | 2 +-
.../myfaces/tobago/example/test/KillSession.java | 2 +-
.../myfaces/tobago/example/test/MeasureBean.java | 2 +-
.../example/test/PopupReferenceController.java | 8 +-
.../apache/myfaces/tobago/example/test/Reload.java | 4 +-
.../example/test/SelectBooleanCheckboxBean.java | 50 ++++----
.../tobago/example/test/SheetSortController.java | 7 +-
.../tobago/example/test/TreeController.java | 2 +-
.../tobago/example/test/AutomaticSeleniumTest.java | 6 +-
.../tobago/example/test/TobagoSelenium.java | 24 ++--
.../tobago/compat/FacesInvokeOnComponent12.java | 3 +-
.../tobago/context/ResourceManagerUtil.java | 2 +
.../event/ValueBindingTabChangeListener.java | 2 +-
.../internal/lifecycle/PhaseListenerManager.java | 4 +-
.../renderkit/html/util/CommandRendererHelper.java | 2 +-
.../apache/myfaces/tobago/util/StringUtils.java | 1 +
.../sandbox/standard/tag/NumberSliderRenderer.java | 4 +-
.../security/CheckAuthorisationMethodBinding.java | 12 +-
.../CheckAuthorisationMethodExpression.java | 2 +-
.../myfaces/tobago/renderkit/html/Command.java | 35 +++---
.../myfaces/tobago/renderkit/html/JsonUtils.java | 4 +-
.../html/standard/standard/tag/BoxRenderer.java | 2 +-
.../standard/standard/tag/CalendarRenderer.java | 4 +-
.../html/standard/standard/tag/ColumnRenderer.java | 10 +-
.../standard/standard/tag/DatePickerRenderer.java | 4 +-
.../standard/standard/tag/FileDropRenderer.java | 10 +-
.../html/standard/standard/tag/FileRenderer.java | 4 +-
.../html/standard/standard/tag/ImageRenderer.java | 4 +-
.../html/standard/standard/tag/LabelRenderer.java | 4 +-
.../html/standard/standard/tag/LinkRenderer.java | 2 +-
.../standard/standard/tag/MediatorRenderer.java | 6 +-
.../standard/standard/tag/MenuCommandRenderer.java | 4 +-
.../html/standard/standard/tag/OutRenderer.java | 4 +-
.../html/standard/standard/tag/PanelRenderer.java | 6 +-
.../standard/tag/SelectManyCheckboxRenderer.java | 2 +-
.../standard/tag/SelectManyListboxRenderer.java | 2 +-
.../standard/tag/SelectManyShuttleRenderer.java | 2 +-
.../standard/tag/SelectOneRadioRenderer.java | 4 +-
.../standard/tag/SelectReferenceRenderer.java | 6 +-
.../standard/standard/tag/SeparatorRenderer.java | 6 +-
.../html/standard/standard/tag/SheetRenderer.java | 32 +++---
.../standard/standard/tag/SplitLayoutRenderer.java | 13 +--
.../standard/standard/tag/SubviewRenderer.java | 6 +-
.../standard/tag/TabGroupLayoutRenderer.java | 4 +-
.../standard/standard/tag/TabGroupRenderer.java | 2 +-
.../html/standard/standard/tag/TabRenderer.java | 2 +-
.../standard/standard/tag/TextareaRenderer.java | 2 +-
.../standard/standard/tag/ToolBarRendererBase.java | 14 ++-
.../standard/standard/tag/TreeListboxRenderer.java | 2 +-
.../html/standard/standard/tag/TreeRenderer.java | 2 +-
.../standard/standard/tag/TreeSelectRenderer.java | 4 +-
.../standard/standard/tag/VerbatimRenderer.java | 6 +-
.../renderkit/html/util/HtmlRendererUtils.java | 17 ++-
.../myfaces/tobago/renderkit/util/RenderUtils.java | 2 +-
.../tobago/maven/plugin/IndexThemeMojo.java | 5 +-
.../apt/annotation/BodyContentDescription.java | 5 +-
.../myfaces/tobago/apt/annotation/Converter.java | 3 +-
.../tobago/apt/annotation/DynamicExpression.java | 16 ++-
.../tobago/apt/annotation/ExtensionTag.java | 2 +-
.../myfaces/tobago/apt/annotation/Facet.java | 9 +-
.../myfaces/tobago/apt/annotation/Preliminary.java | 6 +-
.../tobago/apt/annotation/TagAttribute.java | 8 +-
.../myfaces/tobago/apt/annotation/Taglib.java | 6 +-
.../tobago/apt/annotation/UIComponentTag.java | 11 +-
.../apt/annotation/UIComponentTagAttribute.java | 20 ++--
.../myfaces/tobago/apt/annotation/Validator.java | 3 +-
.../tobago/apt/annotation/ValidatorTag.java | 1 +
.../tobago/apt/generate/ComponentPropertyInfo.java | 4 +-
.../myfaces/tobago/apt/generate/PropertyInfo.java | 4 +-
.../tobago/apt/processor/ClassesGenerator.java | 4 +-
.../tobago/apt/processor/TaglibGenerator.java | 2 +-
433 files changed, 2471 insertions(+), 2537 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
index 95c07c6..dd19aa5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
@@ -104,11 +104,11 @@ public final class AjaxUtils {
boolean added = false;
if (clientIds.hasNext()) { // messages in the partial part
- for (final String componentClientId: list) {
+ for (final String componentClientId : list) {
added = AjaxInternalUtils.addNextPossibleAjaxComponent(context, componentClientId);
}
} else { // checking for an existing shown error on page
- for (final String componentClientId: list) {
+ for (final String componentClientId : list) {
if (context.getExternalContext().getRequestParameterMap().containsKey(
componentClientId + ComponentUtils.SUB_SEPARATOR + "messagesExists")) {
added = AjaxInternalUtils.addNextPossibleAjaxComponent(context, componentClientId);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
index e811b9c..91cd73e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
@@ -79,7 +79,7 @@ public class ActionListenerImpl implements ActionListener {
// Retrieve the NavigationHandler instance..
final NavigationHandler navHandler = application.getNavigationHandler();
// Invoke nav handling..
- final String navBinding = (null != expression) ? expression.getExpressionString() : null;
+ final String navBinding = null != expression ? expression.getExpressionString() : null;
navHandler.handleNavigation(facesContext, navBinding, errorOutcome);
// Trigger a switch to Render Response if needed
facesContext.renderResponse();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java
index d2a3c48..50b187d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ProjectStage.java
@@ -21,12 +21,12 @@ package org.apache.myfaces.tobago.application;
public enum ProjectStage {
- Development,
- Production,
- SystemTest,
- UnitTest;
+ Development,
+ Production,
+ SystemTest,
+ UnitTest;
- public static final String PROJECT_STAGE_JNDI_NAME = "java:comp/env/jsf/ProjectStage";
+ public static final String PROJECT_STAGE_JNDI_NAME = "java:comp/env/jsf/ProjectStage";
- public static final String PROJECT_STAGE_PARAM_NAME = "javax.faces.PROJECT_STAGE";
+ public static final String PROJECT_STAGE_PARAM_NAME = "javax.faces.PROJECT_STAGE";
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
index 8cbe0b2..3a1425a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
@@ -55,6 +55,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static boolean invokeOnComponent(
final FacesContext context, final UIComponent component, final String clientId, final ContextCallback callback) {
final String thisClientId = component.getClientId(context);
@@ -68,7 +69,7 @@ public final class FacesUtilsEL {
// Otherwise we know the client id we're looking for is not in this naming container,
// so for improved performance short circuit and return false.
if (clientId.startsWith(thisClientId)
- && (clientId.charAt(thisClientId.length()) == UINamingContainer.getSeparatorChar(context))) {
+ && clientId.charAt(thisClientId.length()) == UINamingContainer.getSeparatorChar(context)) {
if (invokeOnComponentFacetsAndChildren(context, component, clientId, callback)) {
return true;
}
@@ -199,6 +200,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static void setValidator(final EditableValueHolder editableValueHolder, final Object validator) {
if (validator instanceof MethodExpression) {
editableValueHolder.addValidator(new MethodExpressionValidator((MethodExpression) validator));
@@ -210,6 +212,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static void setConverter(final ValueHolder valueHolder, final Object converterExpression) {
if (converterExpression instanceof ValueExpression) {
final ValueExpression expression = (ValueExpression) converterExpression;
@@ -225,6 +228,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static void setBindingOrExpression(
final UIComponent component, final String name, final Object valueBindingOrExpression) {
component.setValueExpression(name, (ValueExpression) valueBindingOrExpression);
@@ -233,6 +237,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static void addBindingOrExpressionTabChangeListener(
final TabChangeSource source, final String type, final Object bindingOrExpression) {
if (bindingOrExpression instanceof ValueExpression) {
@@ -243,6 +248,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static Comparator getBindingOrExpressionComparator(
final FacesContext facesContext, final UIComponent child, final String var, final boolean descending,
final Comparator comparator) {
@@ -253,6 +259,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static void addBindingOrExpressionPopupActionListener(
final ActionSource actionSource, final Object bindingOrExpression) {
actionSource.addActionListener(new ValueExpressionPopupActionListener((ValueExpression) bindingOrExpression));
@@ -261,6 +268,7 @@ public final class FacesUtilsEL {
/**
* @deprecated since 2.0.0
*/
+ @Deprecated
public static void addBindingOrExpressionResetActionListener(
final ActionSource actionSource, final Object bindingOrExpression) {
actionSource.addActionListener(new ValueExpressionResetInputActionListener((ValueExpression) bindingOrExpression));
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
index 9718ef2..037d00f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
@@ -33,16 +33,26 @@ public final class Attributes {
public static final String AUTO_RELOAD = "autoReload";
public static final String BODY_CONTENT = "bodyContent";
public static final String BORDER = "border";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String BORDER_BOTTOM = "borderBottom";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String BORDER_LEFT = "borderLeft";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String BORDER_RIGHT = "borderRight";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String BORDER_TOP = "borderTop";
public static final String CHARSET = "charset";
- /** @deprecated */
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String CELLSPACING = "cellspacing";
public static final String CLIENT_PROPERTIES = "clientProperties";
@@ -52,7 +62,9 @@ public final class Attributes {
public static final String CONVERTER = "converter";
public static final String CREATE_SPAN = "createSpan";
public static final String CSS_CLASSES_BLOCKS = "cssClassesBlocks";
- /** @deprecated since 2.0.0 */
+ /**
+ * @deprecated since 2.0.0
+ */
@Deprecated
public static final String DATE_INPUT_ID = "dateInputId";
public static final String DATE_STYLE = "dateStyle";
@@ -83,10 +95,14 @@ public final class Attributes {
public static final String IMMEDIATE = "immediate";
public static final String IMAGE = "image";
public static final String INLINE = "inline";
- /** @deprecated */
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String INNER_HEIGHT = "innerHeight";
- /** @deprecated */
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String INNER_WIDTH = "innerWidth";
public static final String ITEM_DESCRIPTION = "itemDescription";
@@ -103,16 +119,26 @@ public final class Attributes {
public static final String LAYOUT_WIDTH = "layoutWidth";
public static final String LEFT = "left";
public static final String LINK = "link";
- /** @deprecated */
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String MARGIN = "margin";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String MARGIN_BOTTOM = "marginBottom";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String MARGIN_LEFT = "marginLeft";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String MARGIN_RIGHT = "marginRight";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String MARGIN_TOP = "marginTop";
public static final String MARKED = "marked";
public static final String MARKUP = "markup";
@@ -133,23 +159,37 @@ public final class Attributes {
public static final String NAVIGATE = "navigate";
public static final String NUMBER_STYLE = "numberStyle";
public static final String OMIT = "omit";
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
public static final String ONCHANGE = "onchange";
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
public static final String ONCLICK = "onclick";
public static final String ORDER_BY = "orderBy";
public static final String ORIENTATION = "orientation";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String PADDING_BOTTOM = "paddingBottom";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String PADDING_LEFT = "paddingLeft";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String PADDING_RIGHT = "paddingRight";
- /** Used by a layout manager */
+ /**
+ * Used by a layout manager
+ */
public static final String PADDING_TOP = "paddingTop";
- /** @deprecated Since 2.0.6. No longer needed. */
+ /**
+ * @deprecated Since 2.0.6. No longer needed.
+ */
@Deprecated
public static final String PAGE_MENU = "pageMenu";
public static final String PASSWORD = "password";
@@ -202,7 +242,9 @@ public final class Attributes {
public static final String STATE = "state";
public static final String STATE_PREVIEW = "statePreview";
public static final String STYLE = "style";
- /** @deprecated */
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String STYLE_CLASS = "styleClass";
public static final String SUPPRESS_TOOLBAR_CONTAINER = "suppressToolbarContainer";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
index 7bc5fac..9c9d33f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
@@ -28,6 +28,9 @@ public final class ComponentTypes {
public static final String BOX = "org.apache.myfaces.tobago.Box";
public static final String BUTTON = "org.apache.myfaces.tobago.Button";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String CELL = "org.apache.myfaces.tobago.Cell";
public static final String COLUMN = "org.apache.myfaces.tobago.Column";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
index f08f808..cca7044 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
@@ -48,8 +48,7 @@ public final class Facets {
}
/**
- * @deprecated since 2.0.0. Please use {@link #POPUP}
- * Using compatible names for backward compatibility.
+ * @deprecated since 2.0.0. Please use {@link #POPUP} Using compatible names for backward compatibility.
*/
@Deprecated
public static final String PICKER_POPUP = POPUP;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
index 1d2160b..43ebf5a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.component;
import javax.el.MethodExpression;
public interface InputSuggest2 extends InputSuggest {
-
+
MethodExpression getSuggestMethodExpression();
void setSuggestMethodExpression(MethodExpression suggestExpression);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
index b418607..3ee172e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
@@ -49,6 +49,7 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
/**
* Creates a new instance of MethodBindingToMethodExpression
+ *
* @param methodBinding The MethodBinding to wrap.
*/
public MethodBindingToMethodExpression(final MethodBinding methodBinding) {
@@ -58,6 +59,7 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
/**
* Return the wrapped MethodBinding.
+ *
* @return the wrapped MethodBinding
*/
public MethodBinding getMethodBinding() {
@@ -142,8 +144,8 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
}
}
- public void setTransient(final boolean transientFlag) {
- this.transientFlag = transientFlag;
+ public void setTransient(final boolean transientParameter) {
+ this.transientFlag = transientParameter;
}
public boolean isTransient() {
@@ -154,7 +156,7 @@ public class MethodBindingToMethodExpression extends MethodExpression implements
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((methodBinding == null) ? 0 : methodBinding.hashCode());
+ result = prime * result + (methodBinding == null ? 0 : methodBinding.hashCode());
return result;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java
index 5a47d86..860c4e7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Position.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.component;
import org.apache.myfaces.tobago.layout.Measure;
/**
- * This interface indicates that the component has a position like e. g. UIPopup.
- * XXX Warning: It is to discussed, if this is a good solution.
+ * This interface indicates that the component has a position like e. g. UIPopup. XXX Warning: It is to discussed, if
+ * this is a good solution.
*/
public interface Position {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
index bc0ff1f6..18f8d13 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
@@ -61,7 +61,7 @@ public final class RendererTypes {
public static final String SELECT_MANY_BOX = "SelectManyBox";
public static final String SELECT_MANY_CHECKBOX = "SelectManyCheckbox";
public static final String SELECT_MANY_LISTBOX = "SelectManyListbox";
- public static final String SELECT_MANY_SHUTTLE = "SelectManyShuttle";;
+ public static final String SELECT_MANY_SHUTTLE = "SelectManyShuttle";
public static final String SELECT_ONE_CHOICE = "SelectOneChoice";
public static final String SELECT_ONE_RADIO = "SelectOneRadio";
public static final String SELECT_ONE_LISTBOX = "SelectOneListbox";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
index 35e5b5f..c97f868 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
@@ -99,9 +99,9 @@ public class Sorter {
if (child.getValueExpression(attributeName) != null) {
final String var = data.getVar();
if (var == null) {
- LOG.error("No sorting performed. Property var of sheet is not set!");
- unsetSortableAttribute(column);
- return;
+ LOG.error("No sorting performed. Property var of sheet is not set!");
+ unsetSortableAttribute(column);
+ return;
}
String expressionString = child.getValueExpression(attributeName).getExpressionString();
if (isSimpleProperty(expressionString)) {
@@ -126,9 +126,9 @@ public class Sorter {
actualComparator = new ValueExpressionComparator(facesContext, var, expression, descending, comparator);
}
} else {
- LOG.error("No sorting performed. No Expression target found for sorting!");
- unsetSortableAttribute(column);
- return;
+ LOG.error("No sorting performed. No Expression target found for sorting!");
+ unsetSortableAttribute(column);
+ return;
}
} else {
LOG.error("No sorting performed. Value is not instanceof List or Object[]!");
@@ -229,8 +229,8 @@ public class Sorter {
if (child instanceof UISelectMany
|| child instanceof UISelectOne
|| child instanceof UISelectBoolean
- || (child instanceof AbstractUICommand && child.getChildren().isEmpty())
- || (child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType()))) {
+ || child instanceof AbstractUICommand && child.getChildren().isEmpty()
+ || child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType())) {
continue;
// look for a better component if any
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java
index b83e990..a477599 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/Configurable.java
@@ -24,11 +24,12 @@ import org.apache.myfaces.tobago.context.Markup;
public interface Configurable {
/**
- * The renderer is an id that is used by Tobago to gather information about the components which are
- * configured in the theme configuration files. E. g. the preferredWidth of a component.
+ * The renderer is an id that is used by Tobago to gather information about the components which are configured in the
+ * theme configuration files. E. g. the preferredWidth of a component.
+ *
* @return The renderer type.
*/
- String getRendererType();
-
+ String getRendererType();
+
Markup getCurrentMarkup();
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java
index 0d006c6..a27a4eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Capability.java
@@ -32,9 +32,8 @@ public enum Capability {
CONTENT_TYPE_XHTML,
/**
- * In IE 8 and later, a compatibility mode can be activated in the user agent.
- * For Tobago pages this should not be activated. So this property can be used to
- * decide, if a warning should be rendered.
+ * In IE 8 and later, a compatibility mode can be activated in the user agent. For Tobago pages this should not be
+ * activated. So this property can be used to decide, if a warning should be rendered.
*/
IE_COMPATIBILITY_MODE
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
index 91f64e5..d793c68 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
@@ -33,13 +33,13 @@ import java.io.Serializable;
import java.util.Locale;
/**
- * The ClientProperties contains data, which are individual for each user.
- * It is stored in the session by default, but the application can override this in the faces-config.xml.
+ * The ClientProperties contains data, which are individual for each user. It is stored in the session by default, but
+ * the application can override this in the faces-config.xml.
* <p/>
* The managed bean name which is Tobago using for the instance is {@link #MANAGED_BEAN_NAME}.
* <p/>
- * Please use {@link ClientProperties#getInstance(javax.faces.context.FacesContext)}
- * to access to the users client properties.
+ * Please use {@link ClientProperties#getInstance(javax.faces.context.FacesContext)} to access to the users client
+ * properties.
*/
public class ClientProperties implements Serializable {
@@ -57,7 +57,9 @@ public class ClientProperties implements Serializable {
private Theme theme;
private UserAgent userAgent = UserAgent.DEFAULT;
- /** @deprecated since Tobago 1.5.14 */
+ /**
+ * @deprecated since Tobago 1.5.14
+ */
@Deprecated
private boolean debugMode;
@@ -67,7 +69,7 @@ public class ClientProperties implements Serializable {
private Measure pageWidth;
private Measure pageHeight;
- /**
+ /**
* managed bean constructor
*/
public ClientProperties() {
@@ -120,7 +122,7 @@ public class ClientProperties implements Serializable {
public Theme getTheme() {
return theme;
}
-
+
public void setTheme(final Theme theme) {
this.theme = theme;
reset();
@@ -135,13 +137,17 @@ public class ClientProperties implements Serializable {
reset();
}
- /** @deprecated since Tobago 1.5.14 */
+ /**
+ * @deprecated since Tobago 1.5.14
+ */
@Deprecated
public boolean isDebugMode() {
return debugMode;
}
- /** @deprecated since Tobago 1.5.14 */
+ /**
+ * @deprecated since Tobago 1.5.14
+ */
@Deprecated
public void setDebugMode(final boolean debugMode) {
this.debugMode = debugMode;
@@ -150,16 +156,17 @@ public class ClientProperties implements Serializable {
/**
* @deprecated since 2.0.0, please use {@link javax.faces.component.UIViewRoot#getLocale()}
*/
+ @Deprecated
public Locale getLocale() {
Deprecation.LOG.warn("Please get locale via UIViewRoot.");
return FacesContext.getCurrentInstance().getViewRoot().getLocale();
}
/**
- * @deprecated since 2.0.0
- * This setter should not be called from the application directly,
- * but via {@link javax.faces.component.UIViewRoot#setLocale(Locale locale)}
+ * @deprecated since 2.0.0 This setter should not be called from the application directly, but via {@link
+ * javax.faces.component.UIViewRoot#setLocale(Locale locale)}
*/
+ @Deprecated
public void setLocale(final Locale locale) {
Deprecation.LOG.warn("Please set locale via UIViewRoot.");
FacesContext.getCurrentInstance().getViewRoot().setLocale(locale);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
index a20107a..0a4094d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
@@ -32,10 +32,9 @@ import java.util.Iterator;
import java.util.List;
/**
- * A markup signs a component to be rendered different from the normal.
- * E. g. <code>markup="emphasized"</code> might be rendered bold
- * or a <code>markup="deleted"</code> might be rendered with line-through style.
- * The concrete rendering depends from the theme.
+ * A markup signs a component to be rendered different from the normal. E. g. <code>markup="emphasized"</code> might be
+ * rendered bold or a <code>markup="deleted"</code> might be rendered with line-through style. The concrete rendering
+ * depends from the theme.
* <p/>
* The markup can also hold more than one value, e. g. <code>markup="emphasized, deleted"</code>.
* <p/>
@@ -191,8 +190,8 @@ public final class Markup implements Serializable, Iterable<String> {
}
/**
- * Adds one markup to an other.
- * Attention: The markup itself is not modified, you need to use the result of this operation.
+ * Adds one markup to an other. Attention: The markup itself is not modified, you need to use the result of this
+ * operation.
*/
public Markup add(final Markup markup) {
if (markup == null) {
@@ -295,12 +294,12 @@ public final class Markup implements Serializable, Iterable<String> {
if (value != null) {
return value.equals(markup);
}
- for (final String value : values) {
- if (value.equals(markup)) {
- return true;
- }
+ for (final String v : values) {
+ if (v.equals(markup)) {
+ return true;
}
- return false;
+ }
+ return false;
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java
index 2136b4a..91b357b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupConfig.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.context;
-import java.util.Set;
-import java.util.HashSet;
import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
public class MarkupConfig implements Serializable {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
index 165af6e..7267ee5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
@@ -26,8 +26,8 @@ import java.beans.PropertyEditorSupport;
*/
public class MarkupEditor extends PropertyEditorSupport {
- @Override
- public void setAsText(final String text) throws IllegalArgumentException {
- setValue(Markup.valueOf(text));
- }
+ @Override
+ public void setAsText(final String text) throws IllegalArgumentException {
+ setValue(Markup.valueOf(text));
+ }
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java
index bd08639..2972266 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManager.java
@@ -28,29 +28,47 @@ import javax.faces.render.Renderer;
public interface ResourceManager {
+ /**
+ * @deprecated by API
+ */
@Deprecated
String getJsp(UIViewRoot viewRoot, String name);
+ /**
+ * @deprecated by API
+ */
@Deprecated
String getProperty(UIViewRoot viewRoot, String bundle, String propertyKey);
String getProperty(FacesContext facesContext, String bundle, String propertyKey);
+ /**
+ * @deprecated by API
+ */
@Deprecated
Renderer getRenderer(UIViewRoot viewRoot, String rendererType);
Renderer getRenderer(FacesContext facesContext, String rendererType);
+ /**
+ * @deprecated by API
+ */
@Deprecated
String[] getScripts(UIViewRoot viewRoot, String name);
String[] getScripts(FacesContext facesContext, String name);
+ /**
+ * @deprecated by API
+ */
@Deprecated
String[] getStyles(UIViewRoot viewRoot, String name);
String[] getStyles(FacesContext facesContext, String name);
+ /**
+ * @deprecated by API
+ */
@Deprecated
String getThemeProperty(UIViewRoot viewRoot, String bundle, String propertyKey);
@@ -58,6 +76,9 @@ public interface ResourceManager {
Measure getThemeMeasure(FacesContext facesContext, String rendererType, Markup markup, String name);
+ /**
+ * @deprecated by API
+ */
@Deprecated
String getImage(UIViewRoot viewRoot, String name);
@@ -67,6 +88,9 @@ public interface ResourceManager {
@Deprecated
String getImage(FacesContext facesContext, String name);
+ /**
+ * @deprecated by API
+ */
@Deprecated
String getImage(UIViewRoot viewRoot, String name, boolean ignoreMissing);
@@ -75,8 +99,7 @@ public interface ResourceManager {
* @param nameWithExtension The name with extension
* @param ignoreMissing if set to false, an error message will be logged, when image is missing
* @return the full file path
- *
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
String getImage(FacesContext facesContext, String nameWithExtension, boolean ignoreMissing);
@@ -91,4 +114,4 @@ public interface ResourceManager {
String getImage(
FacesContext facesContext, String name, String extension, boolean ignoreMissing);
- }
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
index 77bc8fa..2d8c662 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
@@ -96,9 +96,8 @@ public final class ResourceManagerUtils {
}
/**
- * Searches for an image and return it with the context path.
- * The extension of the image will be automatically extended (.png, .gif, .jpg).
- * A missing image will be logged as an error.
+ * Searches for an image and return it with the context path. The extension of the image will be automatically
+ * extended (.png, .gif, .jpg). A missing image will be logged as an error.
*
* @param facesContext the current FacesContext
* @param name the name of the image without extension
@@ -109,8 +108,8 @@ public final class ResourceManagerUtils {
}
/**
- * Searches for an image and return it with the context path.
- * The extension of the image will be automatically extended (.png, .gif, .jpg)
+ * Searches for an image and return it with the context path. The extension of the image will be automatically
+ * extended (.png, .gif, .jpg)
*
* @param facesContext the current FacesContext
* @param name the name of the image without extension
@@ -195,7 +194,7 @@ public final class ResourceManagerUtils {
}
public static String getDisabledImage(final FacesContext facesContext, final String image,
- final boolean ignoreMissing) {
+ final boolean ignoreMissing) {
return getImage(facesContext, image + "Disabled", ignoreMissing);
}
@@ -230,10 +229,10 @@ public final class ResourceManagerUtils {
return true;
}
final String upper = value.toUpperCase(Locale.ENGLISH);
- return (upper.startsWith("/")
+ return upper.startsWith("/")
|| upper.startsWith("HTTP:")
|| upper.startsWith("HTTPS:")
- || upper.startsWith("FTP:"));
+ || upper.startsWith("FTP:");
}
public static int indexOfExtension(final String value) {
@@ -254,7 +253,7 @@ public final class ResourceManagerUtils {
}
public static String getImageOrDisabledImageWithPath(
- final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
+ final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
String imageWithPath = null;
if (disabled) {
imageWithPath = ResourceManagerUtils.getDisabledImageWithPath(facesContext, image, false);
@@ -271,7 +270,7 @@ public final class ResourceManagerUtils {
}
public static String getImageOrDisabledImage(
- final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
+ final FacesContext facesContext, final String image, final boolean disabled, final boolean ignoreMissing) {
String imageWithPath = null;
if (disabled) {
imageWithPath = ResourceManagerUtils.getDisabledImage(facesContext, image, false);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
index fbeb785..6537cb2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
@@ -144,14 +144,14 @@ public class ThemeImpl implements Theme, Serializable {
renderersConfig = new RenderersConfigImpl();
}
if (!renderersConfig.isMerged()) {
- final ThemeImpl fallback = getFallback();
- if (fallback != null) {
- fallback.resolveRendererConfig(rendererConfigFromTobagoConfig);
- final RenderersConfigImpl fallbackRenderersConfig = fallback.getRenderersConfigImpl();
+ final ThemeImpl fallbackTheme = getFallback();
+ if (fallbackTheme != null) {
+ fallbackTheme.resolveRendererConfig(rendererConfigFromTobagoConfig);
+ final RenderersConfigImpl fallbackRenderersConfig = fallbackTheme.getRenderersConfigImpl();
if (fallbackRenderersConfig != null) {
renderersConfig.merge(fallbackRenderersConfig, false);
if (LOG.isDebugEnabled()) {
- LOG.debug("merge markupconfig from {} for {}", fallback.getName(), getName());
+ LOG.debug("merge markupconfig from {} for {}", fallbackTheme.getName(), getName());
}
}
}
@@ -167,11 +167,11 @@ public class ThemeImpl implements Theme, Serializable {
public void resolveResources() {
checkLocked();
- final ThemeImpl fallback = getFallback();
- if (fallback != null) {
- fallback.resolveResources();
- addResources(fallback.getProductionResources());
- addResources(fallback.getResources());
+ final ThemeImpl fallbackTheme = getFallback();
+ if (fallbackTheme != null) {
+ fallbackTheme.resolveResources();
+ addResources(fallbackTheme.getProductionResources());
+ addResources(fallbackTheme.getResources());
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
index e8fca4f..88babf6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
@@ -28,9 +28,9 @@ import java.util.Enumeration;
import java.util.ResourceBundle;
/**
- * This class works like the Java resource bundle mechanism for a named resource bundle
- * and adds the functionality of the tobago themes and also supports XML properties files.
- * This class might be used in the faces-config.xml as an alternative to the tc:loadBundle tag.
+ * This class works like the Java resource bundle mechanism for a named resource bundle and adds the functionality of
+ * the tobago themes and also supports XML properties files. This class might be used in the faces-config.xml as an
+ * alternative to the tc:loadBundle tag.
*
* @since 1.5.0
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
index 9c57f2b..4443119 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
@@ -39,8 +39,8 @@ public class TobagoContext {
}
/**
- * Returns the dimension of the page. Might be useful to set the size of a popup.
- * E. g. <code>width="#{tobagoContext.pageDimension.width.pixel - 100}"</code>
+ * Returns the dimension of the page. Might be useful to set the size of a popup. E. g.
+ * <code>width="#{tobagoContext.pageDimension.width.pixel - 100}"</code>
*/
public Dimension getPageDimension() {
final FacesContext facesContext = FacesContext.getCurrentInstance();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java
index ffc13b9..22ded91 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoMessageBundle.java
@@ -20,9 +20,9 @@
package org.apache.myfaces.tobago.context;
/**
- * This ResourceBundle encapsulate the messages (e. g. validation) of Tobago components.
- * This class works like the Java resource bundle mechanism for the resource bundle "tobago-message"
- * and adds the functionality of the tobago themes and also supports XML properties files.
+ * This ResourceBundle encapsulate the messages (e. g. validation) of Tobago components. This class works like the Java
+ * resource bundle mechanism for the resource bundle "tobago-message" and adds the functionality of the tobago themes
+ * and also supports XML properties files.
*
* @since 1.5.0
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
index 1205c5d..ecb84b0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
@@ -20,9 +20,9 @@
package org.apache.myfaces.tobago.context;
/**
- * This ResourceBundle encapsulate string resources of Tobago components.
- * This class works like the Java resource bundle mechanism for the resource bundle "tobago"
- * and adds the functionality of the tobago themes and also supports XML properties files.
+ * This ResourceBundle encapsulate string resources of Tobago components. This class works like the Java resource bundle
+ * mechanism for the resource bundle "tobago" and adds the functionality of the tobago themes and also supports XML
+ * properties files.
*/
public class TobagoResourceBundle extends TobagoBundle {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
index 82a3a5a..1338239 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
@@ -42,8 +42,8 @@ public class TransientStateHolder implements StateHolder, Serializable {
return null;
}
- public void put(final Object object) {
- this.object = object;
+ public void put(final Object objectParameter) {
+ this.object = objectParameter;
}
public boolean isEmpty() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
index 9d681cf..35222f8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
@@ -104,6 +104,7 @@ public final class UserAgent implements Serializable {
/**
* @deprecated no longer supported, since Tobago 1.5. Please use {@link #PRESTO}.
*/
+ @Deprecated
public static final UserAgent OPERA = new UserAgent("opera", null);
/**
@@ -189,8 +190,8 @@ public final class UserAgent implements Serializable {
private final String name;
/**
- * @deprecated Version shouldn't be used in the future. Use capability instead, even better
- * use same code on the server when possible and use capability via JavaScript.
+ * @deprecated Version shouldn't be used in the future. Use capability instead, even better use same code on the
+ * server when possible and use capability via JavaScript.
*/
@Deprecated
private final String version;
@@ -348,16 +349,16 @@ public final class UserAgent implements Serializable {
: name;
}
- private static enum CspHeader {
+ private enum CspHeader {
- NOT_SUPPORTED(new String[] {}),
- X(new String[] {"Content-Security-Policy", "X-Content-Security-Policy"}),
- WEBKIT(new String[] {"Content-Security-Policy", "X-WebKit-CSP"}),
- STANDARD(new String[] {"Content-Security-Policy"});
+ NOT_SUPPORTED(new String[]{}),
+ X(new String[]{"Content-Security-Policy", "X-Content-Security-Policy"}),
+ WEBKIT(new String[]{"Content-Security-Policy", "X-WebKit-CSP"}),
+ STANDARD(new String[]{"Content-Security-Policy"});
private String[] names;
- private CspHeader(final String[] names) {
+ CspHeader(final String[] names) {
this.names = names;
}
@@ -366,16 +367,16 @@ public final class UserAgent implements Serializable {
}
}
- private static enum CsproHeader {
+ private enum CsproHeader {
- NOT_SUPPORTED(new String[] {}),
- X(new String[] {"Content-Security-Policy-Report-Only", "X-Content-Security-Policy-Report-Only"}),
- WEBKIT(new String[] {"Content-Security-Policy-Report-Only", "X-WebKit-CSP-Report-Only"}),
- STANDARD(new String[] {"Content-Security-Policy-Report-Only"});
+ NOT_SUPPORTED(new String[]{}),
+ X(new String[]{"Content-Security-Policy-Report-Only", "X-Content-Security-Policy-Report-Only"}),
+ WEBKIT(new String[]{"Content-Security-Policy-Report-Only", "X-WebKit-CSP-Report-Only"}),
+ STANDARD(new String[]{"Content-Security-Policy-Report-Only"});
private String[] names;
- private CsproHeader(final String[] names) {
+ CsproHeader(final String[] names) {
this.names = names;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
index 4dbb216..408d5e8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.convert;
+import org.apache.myfaces.tobago.component.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.component.Attributes;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
index 6c766e2..4bd4701 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.convert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.Theme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
index cfa4837..e873843 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
@@ -40,7 +40,7 @@ public class MethodExpressionTabChangeListener implements TabChangeListener, Sta
}
public void processTabChange(final TabChangeEvent actionEvent) throws AbortProcessingException {
- FacesUtilsEL.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
+ FacesUtilsEL.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
}
public void restoreState(final FacesContext context, final Object state) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java
index 250934d..368e47a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageAction.java
@@ -63,7 +63,7 @@ public enum PageAction {
public String getToken() {
return token;
}
-
+
private static final Map<String, PageAction> MAPPING;
static {
@@ -75,7 +75,6 @@ public enum PageAction {
}
/**
- *
* @param name Name of the PageAction
* @return The matching page action (can't be null).
* @throws IllegalArgumentException When the name doesn't match any PageAction.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
index 0718f3e..001aae9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.event.ActionEvent;
import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
public class PageActionEvent extends ActionEvent {
@@ -48,8 +48,7 @@ public class PageActionEvent extends ActionEvent {
}
/**
- * Returns the value for action types {@link PageAction#TO_ROW}
- * and {@link PageAction#TO_PAGE}.
+ * Returns the value for action types {@link PageAction#TO_ROW} and {@link PageAction#TO_PAGE}.
*/
public int getValue() {
return value;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
index 2a7ec81..da49c76 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
index ecfbc1e..b0dbc33 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
index bc03180..1047ffa 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
@@ -25,7 +25,7 @@ import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import java.io.Serializable;
-public class ResetFormActionListener extends AbstractResetInputActionListener implements Serializable{
+public class ResetFormActionListener extends AbstractResetInputActionListener implements Serializable {
public void processAction(final ActionEvent actionEvent) throws AbortProcessingException {
UIComponent component = actionEvent.getComponent();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
index 908e8bb..90beae1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
@@ -29,7 +29,7 @@ import java.util.Collection;
public class ResetInputActionListener extends AbstractResetInputActionListener implements StateHolder {
- private String [] clientIds;
+ private String[] clientIds;
public ResetInputActionListener() {
}
@@ -39,7 +39,7 @@ public class ResetInputActionListener extends AbstractResetInputActionListener i
}
public ResetInputActionListener(final Collection<String> clientIds) {
- this.clientIds = clientIds.toArray(new String[clientIds.size()]);
+ this.clientIds = clientIds.toArray(new String[clientIds.size()]);
}
public void processAction(final ActionEvent event) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
index 132f0d3..80f004b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.event;
import javax.faces.component.UIComponent;
-import javax.faces.event.FacesListener;
import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesListener;
public class SheetStateChangeEvent extends ActionEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
index 7e3c882..2875237 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
@@ -35,7 +35,7 @@ public class TabChangeEvent extends ActionEvent {
this.oldTabIndex = oldTabIndex;
this.newTabIndex = newTabIndex;
}
-
+
/**
* @deprecated Please use {@link TabChangeEvent(UIComponent, Integer, Integer)}
*/
@@ -76,8 +76,8 @@ public class TabChangeEvent extends ActionEvent {
* @deprecated Not supported anymore
*/
@Deprecated
- public void setOldState(final Object oldTabIndex) {
- this.oldTabIndex = oldTabIndex instanceof Integer ? (Integer) oldTabIndex : -1;
+ public void setOldState(final Object oldTabIndexParameter) {
+ this.oldTabIndex = oldTabIndexParameter instanceof Integer ? (Integer) oldTabIndexParameter : -1;
}
/**
@@ -92,7 +92,7 @@ public class TabChangeEvent extends ActionEvent {
* @deprecated Not supported anymore
*/
@Deprecated
- public void setNewState(final Object newTabIndex) {
- this.newTabIndex = newTabIndex instanceof Integer ? (Integer) newTabIndex : -1;
+ public void setNewState(final Object newTabIndexParameter) {
+ this.newTabIndex = newTabIndexParameter instanceof Integer ? (Integer) newTabIndexParameter : -1;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
index 9ddad16..67c2553 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
@@ -43,7 +43,7 @@ public class TreeExpansionEvent extends FacesEvent {
public void processListener(final FacesListener facesListener) {
if (facesListener instanceof TreeExpansionListener) {
if (oldExpanded && !newExpanded) {
- //todo ((TreeExpansionListener) facesListener).treeCollapsed(this);
+ //todo ((TreeExpansionListener) facesListener).treeCollapsed(this);
((TreeExpansionListener) facesListener).treeExpanded(this);
} else if (!oldExpanded && newExpanded) {
((TreeExpansionListener) facesListener).treeExpanded(this);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
index 5eedf7a..92234c0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.event;
import javax.faces.event.FacesListener;
-public interface TreeExpansionListener extends FacesListener {
+public interface TreeExpansionListener extends FacesListener {
void treeExpanded(TreeExpansionEvent event);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
index 57fa451..0518c8b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
@@ -50,11 +50,11 @@ public class ValueExpressionResetInputActionListener extends AbstractResetInputA
public void processAction(final ActionEvent event) {
final Object obj = clientIdsExpression.getValue(FacesContext.getCurrentInstance().getELContext());
- final String [] clientIds;
+ final String[] clientIds;
if (obj instanceof String[]) {
clientIds = (String[]) obj;
} else if (obj instanceof String) {
- clientIds= StringUtils.split((String) obj, ", ");
+ clientIds = StringUtils.split((String) obj, ", ");
} else {
LOG.error("Ignore unknown value of " + obj + " for reset.");
return;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
index afd5e9b..fea23c9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
@@ -93,7 +93,7 @@ public class ValueExpressionSheetStateChangeListener implements SheetStateChange
private SheetStateChangeListener createSheetStateChangeListener(final String className) {
try {
final Class clazz = getClass().getClassLoader().loadClass(className);
- return ((SheetStateChangeListener) clazz.newInstance());
+ return (SheetStateChangeListener) clazz.newInstance();
} catch (final Exception e) {
LOG.error("", e);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
index 788d760..9e700dd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
@@ -93,7 +93,7 @@ public class ValueExpressionTabChangeListener implements TabChangeListener, Stat
private TabChangeListener createTabChangeListener(final String className) {
try {
final Class clazz = getClass().getClassLoader().loadClass(className);
- return ((TabChangeListener) clazz.newInstance());
+ return (TabChangeListener) clazz.newInstance();
} catch (final Exception e) {
LOG.error("", e);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
index 89be81e..341772b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
@@ -43,7 +43,7 @@ public class ContentTypeRule extends MetaRule {
private final TagAttribute attribute;
- public ContentTypeRuleMapper(final TagAttribute attribute) {
+ ContentTypeRuleMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
index 3d79d0b..21e87c6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
@@ -32,7 +32,7 @@ import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;
public class DeprecatedDimensionRule extends MetaRule {
-
+
public static final DeprecatedDimensionRule INSTANCE = new DeprecatedDimensionRule();
public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
@@ -71,7 +71,7 @@ public class DeprecatedDimensionRule extends MetaRule {
public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
- ((DeprecatedDimension) instance).setHeight(Measure.parse(attribute.getValue()));
+ ((DeprecatedDimension) instance).setHeight(Measure.parse(attribute.getValue()));
} else {
final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.HEIGHT, expression);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
index be94af8..9f928d7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
@@ -20,11 +20,11 @@
package org.apache.myfaces.tobago.facelets;
import javax.servlet.Filter;
+import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.FilterChain;
import java.io.IOException;
public class FixCharacterEncodingFilter implements Filter {
@@ -33,7 +33,7 @@ public class FixCharacterEncodingFilter implements Filter {
}
public void doFilter(final ServletRequest servletRequest,
- final ServletResponse servletResponse, final FilterChain filterChain)
+ final ServletResponse servletResponse, final FilterChain filterChain)
throws IOException, ServletException {
if (servletRequest.getCharacterEncoding() == null) {
servletRequest.setCharacterEncoding("UTF-8");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
index 676b019..61abb17 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
@@ -95,12 +95,13 @@ public class GridLayoutConstraintHandler extends TagHandler {
paddingBottom = getAttribute(Attributes.PADDING_BOTTOM);
}
- public void apply(final FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parentComponent) throws IOException {
+ UIComponent parent = parentComponent;
if (parent.getParent() != null && parent.getParent() instanceof UIExtensionPanel) {
- parent = parent.getParent();
+ parent = parent.getParent();
} else if (parent.getAttributes().get("tobago.panel") != null
- && parent.getAttributes().get("tobago.panel") instanceof UIExtensionPanel) {
- parent = (UIComponent) parent.getAttributes().get("tobago.panel");
+ && parent.getAttributes().get("tobago.panel") instanceof UIExtensionPanel) {
+ parent = (UIComponent) parent.getAttributes().get("tobago.panel");
}
if (parent instanceof LayoutBase) {
final LayoutBase component = (LayoutBase) parent;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
index ca817d6..4afbc97 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
@@ -47,6 +47,6 @@ public class LoadBundleHandler extends TagHandler {
// TODO find a better way
facesContext.getExternalContext().
getSessionMap().put(var.getValue(faceletContext), map);
- //getRequestMap().put(var.getValue(faceletContext), map);
+ //getRequestMap().put(var.getValue(faceletContext), map);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
index 30a0f1d..60b825a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
@@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory;
import java.net.URL;
/**
- * Provides facelets from the directory "META-INF/resources/" of any jar file in the classpath.
- * With the Servlet 3.0 specification this is no longer needed.
+ * Provides facelets from the directory "META-INF/resources/" of any jar file in the classpath. With the Servlet 3.0
+ * specification this is no longer needed.
* <p/>
* To configure this ResourceResolver put this code into the web.xml file:
* <pre>
@@ -49,7 +49,8 @@ public class MetaInfResourcesClasspathResourceResolver extends DefaultResourceRe
}
}
- public URL resolveUrl(String path) {
+ public URL resolveUrl(final String pathParameter) {
+ String path = pathParameter;
URL url = super.resolveUrl(path);
if (LOG.isDebugEnabled()) {
LOG.debug("default url='" + url + "'");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
index ddb5eac..8d9f68d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
@@ -47,7 +47,7 @@ public class PopupReferenceHandler extends TagHandler {
if (parent instanceof ActionSource) {
if (ComponentHandler.isNew(parent)) {
final ActionSource actionSource = (ActionSource) parent;
- if (forComponent.isLiteral()) {
+ if (forComponent.isLiteral()) {
actionSource.addActionListener(new PopupActionListener(forComponent.getValue()));
} else {
final ValueExpression forValueExpression = forComponent.getValueExpression(faceletContext, String.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
index 885ac2f..acbb804 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
@@ -32,7 +32,7 @@ import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;
public class PositionRule extends MetaRule {
-
+
public static final PositionRule INSTANCE = new PositionRule();
public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
@@ -71,7 +71,7 @@ public class PositionRule extends MetaRule {
public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
- ((Position) instance).setTop(Measure.parse(attribute.getValue()));
+ ((Position) instance).setTop(Measure.parse(attribute.getValue()));
} else {
final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.TOP, expression);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
index ce10e94..4047660 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
@@ -51,7 +51,7 @@ public class ResetInputActionListenerHandler extends TagHandler {
final ActionSource actionSource = (ActionSource) parent;
if (execute == null) {
actionSource.addActionListener(new ResetFormActionListener());
- } else if (execute.isLiteral()) {
+ } else if (execute.isLiteral()) {
actionSource.addActionListener(new ResetInputActionListener(ComponentUtils.splitList(execute.getValue())));
} else {
final ValueExpression forValueExpression = execute.getValueExpression(faceletContext, String.class);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
index 61ed904..ee96070 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
@@ -47,14 +47,13 @@ public final class Resource {
* Get an URL of an internal resource. First, {@link javax.faces.context.ExternalContext#getResource(String)} is
* checked for an non-null URL return value. In the case of a null return value (as it is the case for Weblogic 8.1
* for a packed war), a URL with a special URL handler is constructed, which can be used for <em>opening</em> a
- * serlvet resource later. Internally, this special URL handler will call
- * {@link javax.servlet.ServletContext#getResourceAsStream(String)} when an inputstream is requested.
- * This works even on Weblogic 8.1
+ * serlvet resource later. Internally, this special URL handler will call {@link
+ * javax.servlet.ServletContext#getResourceAsStream(String)} when an inputstream is requested. This works even on
+ * Weblogic 8.1
*
- * @param ctx the faces context from which to retrieve the resource
+ * @param ctx the faces context from which to retrieve the resource
* @param path an URL path
* @return an url representing the URL and on which getInputStream() can be called to get the resource
- * @throws java.net.MalformedURLException
*/
public static URL getResourceUrl(final FacesContext ctx, final String path) throws MalformedURLException {
final ExternalContext externalContext = ctx.getExternalContext();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
index 5b75934..4c46d05 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
@@ -48,7 +48,7 @@ public class SheetStateChangeSourceRule extends MetaRule {
private final TagAttribute attribute;
- public SheetStateChangeListenerMapper(final TagAttribute attribute) {
+ SheetStateChangeListenerMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
index bfc6753..c67e11d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
@@ -36,7 +36,7 @@ public class SortActionSourceRule extends MetaRule {
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
public Metadata applyRule(final String name, final TagAttribute attribute,
- final MetadataTarget metadataTarget) {
+ final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(SortActionSource.class)) {
if ("sortActionListener".equals(name)) {
return new SortActionListenerMapper(attribute);
@@ -49,7 +49,7 @@ public class SortActionSourceRule extends MetaRule {
private final TagAttribute attribute;
- public SortActionListenerMapper(final TagAttribute attribute) {
+ SortActionListenerMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
index 9ccb0b1..5304e18 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
@@ -55,7 +55,7 @@ public class SuggestMethodRule extends MetaRule {
static final class SuggestMethodMapper extends Metadata {
private final TagAttribute attribute;
- public SuggestMethodMapper(final TagAttribute attribute) {
+ SuggestMethodMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
index a3ff01e..01e486f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
@@ -48,7 +48,7 @@ public class SupportsMarkupRule extends MetaRule {
private final TagAttribute attribute;
- public SupportsMarkupMapper(final TagAttribute attribute) {
+ SupportsMarkupMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
index e10c65f..fdbc32c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
@@ -48,7 +48,7 @@ public class SupportsRenderedPartiallyRule extends MetaRule {
private final TagAttribute attribute;
- public SupportsRenderedPartiallyMapper(final TagAttribute attribute) {
+ SupportsRenderedPartiallyMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
index 3985a24..520a623 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
@@ -45,7 +45,7 @@ public class TabChangeSourceRule extends MetaRule {
private final TagAttribute attribute;
- public TabChangeListenerMapper(final TagAttribute attribute) {
+ TabChangeListenerMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
index 8f809f5..2337994 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
@@ -57,5 +57,5 @@ public class MenuRadioExtensionHandler extends TobagoMenuExtensionHandler {
protected String getFacetName() {
return Facets.RADIO;
}
-
+
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
index 2c8b86b..c58deae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import javax.faces.view.facelets.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneListbox;
+import javax.faces.view.facelets.ComponentConfig;
+
public class SelectOneListboxExtensionHandler extends TobagoLabelExtensionHandler {
public SelectOneListboxExtensionHandler(final ComponentConfig config) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
index 8866236..1cd9467 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
@@ -89,7 +89,7 @@ public abstract class TobagoMenuExtensionHandler extends ComponentHandler {
protected MetaRuleset createSubComponentMetaRuleset(final Class aClass) {
final MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
- final TagAttribute [] attrs = tag.getAttributes().getAll();
+ final TagAttribute[] attrs = tag.getAttributes().getAll();
for (int i = 0; i < attrs.length; i++) {
final TagAttribute attr = attrs[i];
if (!(attr.getLocalName().equals(Attributes.CONVERTER)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
index 54f876f..97ec942 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
@@ -64,7 +64,7 @@ public final class AjaxInternalUtils {
}
//if (compClass != null && !(compClass.isAssignableFrom(uiComponent.getClass())))
// why isAssignableFrom with additional getClass method call if isInstance does the same?
- if (compClass != null && !(compClass.isInstance(uiComponent))) {
+ if (compClass != null && !compClass.isInstance(uiComponent)) {
throw new IllegalArgumentException("uiComponent : "
+ uiComponent.getClass().getName() + " is not instance of "
+ compClass.getName() + " as it should be");
@@ -106,7 +106,7 @@ public final class AjaxInternalUtils {
}
public static List<String> getMessagesClientIds(final FacesContext facesContext) {
- return (List<String>) facesContext.getAttributes().get(TOBAGO_MESSAGES_CLIENT_IDS);
+ return (List<String>) facesContext.getAttributes().get(TOBAGO_MESSAGES_CLIENT_IDS);
}
public static List<String> getMessagesComponentIds(final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
index 6932eac..13e7b69 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.internal.ajax;
import org.apache.myfaces.tobago.ajax.AjaxUtils;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -165,7 +164,7 @@ public final class AjaxNavigationState {
try {
final ExternalContext externalContext = facesContext.getExternalContext();
final String url = externalContext.getRequestContextPath()
- + externalContext.getRequestServletPath() + externalContext.getRequestPathInfo();
+ + externalContext.getRequestServletPath() + externalContext.getRequestPathInfo();
AjaxUtils.redirect(facesContext, url);
facesContext.responseComplete();
} catch (IOException e1) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
index 740343f..4074d56 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
@@ -27,5 +27,5 @@ import java.io.IOException;
* !! copy of sandbox org.apache.myfaces.custom.ajax.api.AjaxRenderer !!
*/
public interface AjaxRenderer {
- void encodeAjax(FacesContext context, UIComponent component) throws IOException;
+ void encodeAjax(FacesContext context, UIComponent component) throws IOException;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
index 3d7c915..d4ac64e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
@@ -74,7 +74,7 @@ public class AjaxResponseRenderer {
}
private void renderComponent(final FacesContext facesContext, final RenderKit renderKit, final String charset,
- final String clientId, final UIComponent component)
+ final String clientId, final UIComponent component)
throws IOException {
final PrintWriter writer = getPrintWriter(facesContext);
final JsonResponseWriter jsonWriter = getJsonResponseWriter(renderKit, writer, charset);
@@ -116,7 +116,8 @@ public class AjaxResponseRenderer {
}
private static void ensureContentTypeHeader(
- final FacesContext facesContext, String charset, final String contentType) {
+ final FacesContext facesContext, final String charsetParameter, final String contentType) {
+ String charset = charsetParameter;
final StringBuilder sb = new StringBuilder(contentType);
if (charset == null) {
charset = "UTF-8";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
index 1a492c0..e039b24 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
@@ -104,11 +104,11 @@ public abstract class AbstractUIData extends javax.faces.component.UIData {
}
/**
- * Creates the TreeDataModel which should be used.
- * Override this method to use a custom model for an unsupported tree model.
- * (Currently Tobago supports {@link TreeNode} out of the box.
- * @param value The reference to the data model
- * (comes from the value attribute of the {@link javax.faces.component.UIData})
+ * Creates the TreeDataModel which should be used. Override this method to use a custom model for an unsupported tree
+ * model. (Currently Tobago supports {@link TreeNode} out of the box.
+ *
+ * @param value The reference to the data model (comes from the value attribute of the {@link
+ * javax.faces.component.UIData})
* @param showRoot comes from the showRoot attribute.
*/
protected void createTreeDataModel(final Object value, final boolean showRoot) {
@@ -133,8 +133,8 @@ public abstract class AbstractUIData extends javax.faces.component.UIData {
public abstract SelectedState getSelectedState();
/**
- * @deprecated The name of this method is ambiguous.
- * You may use the inverse of {@link #isRowsUnlimited()}. Deprecated since 1.5.5.
+ * @deprecated The name of this method is ambiguous. You may use the inverse of {@link #isRowsUnlimited()}. Deprecated
+ * since 1.5.5.
*/
@Deprecated
public boolean hasRows() {
@@ -174,10 +174,10 @@ public abstract class AbstractUIData extends javax.faces.component.UIData {
}
/**
- * The value describes, if the UIData renderer creates container elements to hold the row information.
- * This information is important for the TreeNodeRenderer to set the visible state in the output or not.
- * Typically the Sheet returns true and a Tree returns false, because the sheet renders the HTML TR tags,
- * the the sheet also is responsible for the visible state.
+ * The value describes, if the UIData renderer creates container elements to hold the row information. This
+ * information is important for the TreeNodeRenderer to set the visible state in the output or not. Typically the
+ * Sheet returns true and a Tree returns false, because the sheet renders the HTML TR tags, the the sheet also is
+ * responsible for the visible state.
*/
public boolean isRendersRowContainer() {
return false;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java
index 69a6b05..202f039 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDatePicker.java
@@ -32,8 +32,8 @@ import javax.faces.event.FacesEvent;
import javax.faces.render.Renderer;
/**
- * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now.
- * Set backward compatibility mode via classic-date-time-picker.
+ * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now. Set backward
+ * compatibility mode via classic-date-time-picker.
*/
@Deprecated
public abstract class AbstractUIDatePicker extends AbstractUILink implements OnComponentCreated {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java
index a6f1b04..e0db76e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFileDrop.java
@@ -19,11 +19,10 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
-
import javax.faces.component.ActionSource2;
import javax.faces.event.ActionListener;
@@ -53,6 +52,7 @@ public abstract class AbstractUIFileDrop extends AbstractUIFile implements Suppo
enum PropertyKeys {height}
public abstract String getDropZoneId();
+
public abstract String getVisibleType();
public void addActionListener(ActionListener listener) {
@@ -64,7 +64,7 @@ public abstract class AbstractUIFileDrop extends AbstractUIFile implements Suppo
}
public ActionListener[] getActionListeners() {
- return (ActionListener[]) ((ActionListener[]) this.getFacesListeners(ActionListener.class));
+ return (ActionListener[]) this.getFacesListeners(ActionListener.class);
}
// not a file drop attribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
index 5da45a2..39b4ad5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
@@ -37,7 +37,7 @@ public abstract class AbstractUIFlowLayout extends AbstractUILayoutBase implemen
}
public void mainProcessing(final Orientation orientation) {
-
+
}
public void postProcessing(final Orientation orientation) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
index 11d03a2..78013c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
@@ -166,7 +166,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
}
if (token instanceof AutoLayoutToken || token instanceof RelativeLayoutToken) {
- if ((component.isRendered() || isRigid())) {
+ if (component.isRendered() || isRigid()) {
if (origin.getSpan(orientation) == 1) {
intervalList.add(new Interval(component, orientation));
} else {
@@ -190,7 +190,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
} else {
heads[i].setCurrent(Measure.valueOf(100));
LOG.warn("Found an 'auto' token in {} definition, but there is no component inside with span = 1! "
- + "So the value for 'auto' can't be evaluated (clientId={}). Using 100px.",
+ + "So the value for 'auto' can't be evaluated (clientId={}). Using 100px.",
orientation == Orientation.HORIZONTAL ? "columns" : "rows",
getClientId(getFacesContext()));
}
@@ -416,8 +416,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
}
/**
- * Compute the sum of the space between the cells.
- * There is one "space" less than cells that are not void.
+ * Compute the sum of the space between the cells. There is one "space" less than cells that are not void.
*/
private Measure computeSpacing(final Orientation orientation, final int startIndex, final int length) {
@@ -425,7 +424,7 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
int count = 0;
for (int i = startIndex; i < startIndex + length; i++) {
- if ((heads[i].isRendered())
+ if (heads[i].isRendered()
&& (heads[i].getCurrent() == null || heads[i].getCurrent().greaterThan(Measure.ZERO))) {
count++;
}
@@ -445,6 +444,9 @@ public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implemen
public abstract void setColumns(String columns);
+ /**
+ * @deprecated by API
+ */
@Deprecated
public abstract Measure getCellspacing();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
index 41acf4c..fa7c5bb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
@@ -56,7 +56,7 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
private List<Item> collectMessageList(final FacesContext facesContext, final Iterator clientIds) {
final List<Item> messages = new ArrayList<Item>();
- while(clientIds.hasNext()) {
+ while (clientIds.hasNext()) {
final String clientId = (String) clientIds.next();
final Iterator<FacesMessage> i = facesContext.getMessages(clientId);
while (i.hasNext()) {
@@ -121,7 +121,7 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
public abstract String getFor();
*/
- public static enum OrderBy {
+ public enum OrderBy {
OCCURRENCE,
SEVERITY;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
index 2c8a8e5..0d61780 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
@@ -160,14 +160,13 @@ public abstract class AbstractUIPage extends AbstractUIForm
}
private void decodeActionComponent(
- final FacesContext facesContext, final AbstractUIPage page, final Map<String,
- UIComponent> ajaxComponents) {
- final String actionId = page.getActionId();
+ final FacesContext facesContext, final AbstractUIPage page, final Map<String, UIComponent> ajaxComponents) {
+ final String id = page.getActionId();
UIComponent actionComponent = null;
- if (actionId != null) {
- actionComponent = findComponent(actionId);
+ if (id != null) {
+ actionComponent = findComponent(id);
if (actionComponent == null && FacesVersion.supports20() && FacesVersion.isMyfaces()) {
- final String bugActionId = actionId.replaceAll(":\\d+:", ":");
+ final String bugActionId = id.replaceAll(":\\d+:", ":");
try {
actionComponent = findComponent(bugActionId);
//LOG.info("command = \"" + actionComponent + "\"", new Exception());
@@ -188,7 +187,7 @@ public abstract class AbstractUIPage extends AbstractUIForm
component = component.getParent();
}
}
- invokeOnComponent(facesContext, actionId, APPLY_REQUEST_VALUES_CALLBACK);
+ invokeOnComponent(facesContext, id, APPLY_REQUEST_VALUES_CALLBACK);
}
@@ -322,6 +321,7 @@ public abstract class AbstractUIPage extends AbstractUIForm
/**
* @deprecated since 1.5.7 and 2.0.0
*/
+ @Deprecated
public String getDefaultActionId() {
Deprecation.LOG.error("The default action handling has been changed!");
return null;
@@ -330,6 +330,7 @@ public abstract class AbstractUIPage extends AbstractUIForm
/**
* @deprecated since 1.5.7 and 2.0.0
*/
+ @Deprecated
public void setDefaultActionId(final String defaultActionId) {
Deprecation.LOG.error("The default action handling has been changed!");
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
index 11341aa..15a9224 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
@@ -196,7 +196,7 @@ public abstract class AbstractUIPopup extends AbstractUIPanelBase
public boolean isLayoutChildren() {
return isRendered();
}
-
+
public abstract Measure getWidth();
public abstract void setWidth(Measure width);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
index 95511fd..864e424 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
@@ -36,7 +36,7 @@ public abstract class AbstractUISelectBooleanCheckbox extends UISelectBoolean
value = getValue();
}
if (value instanceof Boolean) {
- return ((Boolean) value);
+ return (Boolean) value;
} else {
return value != null && Boolean.valueOf(value.toString());
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
index d6f9757..0fcbaef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
@@ -26,6 +26,6 @@ public abstract class AbstractUISelectManyShuttle extends AbstractUISelectMany {
public abstract String getUnselectedLabel();
public boolean hasLabel() {
- return getSelectedLabel() != null || getUnselectedLabel() != null;
+ return getSelectedLabel() != null || getUnselectedLabel() != null;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
index e2eae91..a710f46 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
@@ -33,7 +33,7 @@ public abstract class AbstractUISelectOneBase extends javax.faces.component.UISe
public static final String MESSAGE_VALUE_REQUIRED = "tobago.SelectOne.MESSAGE_VALUE_REQUIRED";
public void validate(final FacesContext facesContext) {
- if (isRequired() && !isReadonly()) {
+ if (isRequired() && !isReadonly()) {
final Object submittedValue = getSubmittedValue();
if (submittedValue == null || "".equals(submittedValue)) {
if (getRequiredMessage() != null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
index 9a2291d..17f6967 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
@@ -76,13 +76,15 @@ public abstract class AbstractUISheet extends AbstractUIData
/**
* @see org.apache.myfaces.tobago.component.Facets
- * @deprecated Please use Facets instead. Will be removed after Tobago 1.5.0 */
+ * @deprecated Please use Facets instead. Will be removed after Tobago 1.5.0
+ */
@Deprecated
public static final String FACET_SORTER = "sorter";
public static final String SORTER_ID = "sorter";
/**
* @see org.apache.myfaces.tobago.component.Attributes
- * @deprecated Please use Attributes instead. Will be removed after Tobago 1.5.0 */
+ * @deprecated Please use Attributes instead. Will be removed after Tobago 1.5.0
+ */
@Deprecated
public static final String ATTR_SCROLL_POSITION = "attrScrollPosition";
@@ -106,8 +108,8 @@ public abstract class AbstractUISheet extends AbstractUIData
@Override
public void encodeBegin(final FacesContext facesContext) throws IOException {
- final SheetState state = getSheetState(facesContext);
- final int first = state.getFirst();
+ final SheetState sheetState = getSheetState(facesContext);
+ final int first = sheetState.getFirst();
if (first > -1 && (!hasRowCount() || first < getRowCount())) {
final ValueExpression expression = getValueExpression(Attributes.FIRST);
if (expression != null) {
@@ -161,21 +163,21 @@ public abstract class AbstractUISheet extends AbstractUIData
}
/**
- * Remove the (by user) resized column widths. An application may provide a button to access it.
- * Since 1.0.26.
+ * Remove the (by user) resized column widths. An application may provide a button to access it. Since 1.0.26.
*/
public void resetColumnWidths() {
- final SheetState state = getState();
- if (state != null) {
- state.setColumnWidths(null);
+ final SheetState sheetState = getState();
+ if (sheetState != null) {
+ sheetState.setColumnWidths(null);
}
getAttributes().remove(Attributes.WIDTH_LIST_STRING);
}
/**
- * @deprecated The name of this method is ambiguous.
- * You may use {@link #getLastRowIndexOfCurrentPage()}. Deprecated since 1.5.5.
+ * @deprecated The name of this method is ambiguous. You may use {@link #getLastRowIndexOfCurrentPage()}. Deprecated
+ * since 1.5.5.
*/
+ @Deprecated
public int getLast() {
final int last = getFirst() + getRows();
return last < getRowCount() ? last : getRowCount();
@@ -183,8 +185,9 @@ public abstract class AbstractUISheet extends AbstractUIData
/**
* The rowIndex of the last row on the current page plus one (because of zero based iterating).
- * @throws IllegalArgumentException If the number of rows in the model returned
- * by {@link #getRowCount()} is -1 (undefined).
+ *
+ * @throws IllegalArgumentException If the number of rows in the model returned by {@link #getRowCount()} is -1
+ * (undefined).
*/
public int getLastRowIndexOfCurrentPage() {
if (!hasRowCount()) {
@@ -211,10 +214,10 @@ public abstract class AbstractUISheet extends AbstractUIData
if (hasRowCount() && first >= getRowCount()) {
return getPages() - 1; // last page
} else {
- return (first / rows);
+ return first / rows;
}
}
-
+
/**
* @return returns the current page (based by 1).
* @deprecated Please use {@link #getCurrentPage()} which returns the value zero-based. Deprecated since 1.5.5.
@@ -226,8 +229,9 @@ public abstract class AbstractUISheet extends AbstractUIData
/**
* The number of pages to render.
- * @throws IllegalArgumentException If the number of rows in the model returned
- * by {@link #getRowCount()} is -1 (undefined).
+ *
+ * @throws IllegalArgumentException If the number of rows in the model returned by {@link #getRowCount()} is -1
+ * (undefined).
*/
public int getPages() {
if (isRowsUnlimited()) {
@@ -265,8 +269,8 @@ public abstract class AbstractUISheet extends AbstractUIData
}
/**
- * @return Should the paging controls be rendered? Either because of the need of paging or because
- * the show is enforced by {@link #isShowPagingAlways()}
+ * @return Should the paging controls be rendered? Either because of the need of paging or because the show is
+ * enforced by {@link #isShowPagingAlways()}
*/
public boolean isPagingVisible() {
return isShowPagingAlways() || needMoreThanOnePage();
@@ -300,8 +304,8 @@ public abstract class AbstractUISheet extends AbstractUIData
}
/**
- * @deprecated The name of this method is ambiguous.
- * You may use {@link #getFirstRowIndexOfLastPage()}. Deprecated since 1.5.5.
+ * @deprecated The name of this method is ambiguous. You may use {@link #getFirstRowIndexOfLastPage()}. Deprecated
+ * since 1.5.5.
*/
@Deprecated
public int getLastPageIndex() {
@@ -313,11 +317,12 @@ public abstract class AbstractUISheet extends AbstractUIData
}
/**
- * Determines the beginning of the last page in the model.
- * If the number of rows to display on one page is unlimited, the value is 0 (there is only one page).
+ * Determines the beginning of the last page in the model. If the number of rows to display on one page is unlimited,
+ * the value is 0 (there is only one page).
+ *
* @return The index of the first row of the last paging page.
- * @throws IllegalArgumentException If the number of rows in the model returned
- * by {@link #getRowCount()} is -1 (undefined).
+ * @throws IllegalArgumentException If the number of rows in the model returned by {@link #getRowCount()} is -1
+ * (undefined).
*/
public int getFirstRowIndexOfLastPage() {
if (isRowsUnlimited()) {
@@ -340,8 +345,8 @@ public abstract class AbstractUISheet extends AbstractUIData
}
private void updateSheetState(final FacesContext facesContext) {
- final SheetState state = getSheetState(facesContext);
- if (state != null) {
+ final SheetState sheetState = getSheetState(facesContext);
+ if (sheetState != null) {
// ensure sortActionListener
// getSortActionListener();
// state.setSortedColumn(sortActionListener != null ? sortActionListener.getColumn() : -1);
@@ -349,9 +354,9 @@ public abstract class AbstractUISheet extends AbstractUIData
final Map attributes = getAttributes();
//noinspection unchecked
final List<Integer> list = (List<Integer>) attributes.get(Attributes.SELECTED_LIST_STRING);
- state.setSelectedRows(list != null ? list : Collections.<Integer>emptyList());
- state.setColumnWidths((String) attributes.get(Attributes.WIDTH_LIST_STRING));
- state.setScrollPosition((Integer[]) attributes.get(Attributes.SCROLL_POSITION));
+ sheetState.setSelectedRows(list != null ? list : Collections.<Integer>emptyList());
+ sheetState.setColumnWidths((String) attributes.get(Attributes.WIDTH_LIST_STRING));
+ sheetState.setScrollPosition((Integer[]) attributes.get(Attributes.SCROLL_POSITION));
attributes.remove(Attributes.SELECTED_LIST_STRING);
attributes.remove(Attributes.SCROLL_POSITION);
}
@@ -390,7 +395,7 @@ public abstract class AbstractUISheet extends AbstractUIData
if (all || child.isRendered()) {
if (child instanceof AbstractUIColumn) {
result.add((AbstractUIColumn) child);
- } else if (child instanceof AbstractUIData){
+ } else if (child instanceof AbstractUIData) {
// ignore nested sheets
} else {
findColumns(child, result, all);
@@ -459,7 +464,8 @@ public abstract class AbstractUISheet extends AbstractUIData
}
}
- protected void sort(FacesContext facesContext, SortActionEvent event) {
+ protected void sort(final FacesContext facesContext, final SortActionEvent eventParameter) {
+ SortActionEvent event = eventParameter;
final SheetState sheetState = getSheetState(getFacesContext());
if (sheetState.isToBeSorted()) {
final MethodExpression expression = getSortActionListenerExpression();
@@ -501,7 +507,6 @@ public abstract class AbstractUISheet extends AbstractUIData
}
-
public Integer[] getScrollPosition() {
Integer[] scrollPosition = (Integer[]) getAttributes().get(Attributes.SCROLL_POSITION);
if (scrollPosition == null) {
@@ -516,7 +521,8 @@ public abstract class AbstractUISheet extends AbstractUIData
return super.findComponent(stripRowIndex(searchId));
}
- public String stripRowIndex(String searchId) {
+ public String stripRowIndex(final String searchIdParameter) {
+ String searchId = searchIdParameter;
if (searchId.length() > 0 && Character.isDigit(searchId.charAt(0))) {
for (int i = 1; i < searchId.length(); ++i) {
final char c = searchId.charAt(i);
@@ -542,7 +548,7 @@ public abstract class AbstractUISheet extends AbstractUIData
Integer[] scrollPosition = getScrollPosition();
if (scrollPosition == null) {
- scrollPosition = new Integer[] {0, 0};
+ scrollPosition = new Integer[]{0, 0};
}
scrollPosition[1] = 0;
switch (pageEvent.getAction()) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
index 9153f1f..034b378 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
@@ -50,7 +50,7 @@ import java.util.Map;
/**
* XXX: Not completely implemented yet.
- */
+ */
public abstract class AbstractUISheetLayout extends AbstractUILayoutBase implements LayoutManager {
private static final Logger LOG = LoggerFactory.getLogger(AbstractUISheetLayout.class);
@@ -118,7 +118,7 @@ public abstract class AbstractUISheetLayout extends AbstractUILayoutBase impleme
public void mainProcessing(final Orientation orientation) {
// find *
- if (orientation == Orientation.HORIZONTAL && !horizontalAuto
+ if (orientation == Orientation.HORIZONTAL && !horizontalAuto
|| orientation == Orientation.VERTICAL && !verticalAuto) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -204,7 +204,7 @@ public abstract class AbstractUISheetLayout extends AbstractUILayoutBase impleme
private LayoutContainer getLayoutContainer() {
// todo: check with instanceof and do something in the error case
- return ((LayoutContainer) getParent());
+ return (LayoutContainer) getParent();
}
@Override
@@ -420,7 +420,7 @@ public abstract class AbstractUISheetLayout extends AbstractUILayoutBase impleme
rows.addToken(AutoLayoutToken.INSTANCE);
final Grid grid = new Grid(columns, rows);
- for(final UIComponent child : header.getChildren()) {
+ for (final UIComponent child : header.getChildren()) {
if (child instanceof LayoutComponent) {
if (child.isRendered()) {
final LayoutComponent c = (LayoutComponent) child;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
index 1889c89..4548f31 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
@@ -65,7 +65,9 @@ public abstract class AbstractUISplitLayout extends AbstractUIGridLayout {
}
// TODO: MathUtils
- public static int gcd(int a, int b) {
+ public static int gcd(final int aParameter, final int bParameter) {
+ int a = aParameter;
+ int b = bParameter;
if (a < 0) {
a = -a;
}
@@ -102,7 +104,7 @@ public abstract class AbstractUISplitLayout extends AbstractUIGridLayout {
return orientation == Orientation.HORIZONTAL ? getColumnSpacing() : getRowSpacing();
}
-@Override
+ @Override
public void setColumns(final String columns) {
}
@@ -142,6 +144,9 @@ public abstract class AbstractUISplitLayout extends AbstractUIGridLayout {
public abstract String getOrientation();
+ /**
+ * @deprecated by API
+ */
@Deprecated
public abstract Measure getCellspacing();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index f5423eb..8dc8c23 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -255,7 +255,7 @@ public abstract class AbstractUITabGroup extends AbstractUIPanelBase
public boolean isSwitchTypeClient() {
final String switchType = getSwitchType();
- return (switchType == null || switchType.equals(SWITCH_TYPE_CLIENT));
+ return switchType == null || switchType.equals(SWITCH_TYPE_CLIENT);
}
public void removeTabChangeListener(final TabChangeListener listener) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
index f895a4a..5ba52c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
@@ -127,7 +127,7 @@ public abstract class AbstractUITabGroupLayout extends AbstractUILayoutBase impl
private LayoutContainer getLayoutContainer() {
// todo: check with instanceof and do something in the error case
- return ((LayoutContainer) getParent());
+ return (LayoutContainer) getParent();
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
index a8fde78..38eb451 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
@@ -210,12 +210,12 @@ public abstract class AbstractUITree extends AbstractUIData
final ValueExpression expression = getValueExpression(Attributes.STATE);
if (expression != null) {
- TreeState state = (TreeState) expression.getValue(elContext);
- if (state == null) {
- state = new TreeState(new ExpandedState(2), new SelectedState());
- expression.setValue(elContext, state);
+ TreeState treeState = (TreeState) expression.getValue(elContext);
+ if (treeState == null) {
+ treeState = new TreeState(new ExpandedState(2), new SelectedState());
+ expression.setValue(elContext, treeState);
}
- return state;
+ return treeState;
}
state = new TreeState(new ExpandedState(2), new SelectedState());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
index fe53c60..51c6589 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
@@ -49,8 +49,8 @@ public abstract class AbstractUITreeNode
}
/**
- * Returns the level of the tree node inside of the virtual tree. The root node has level 0.
- * The children of the root note have level 1, and so on.
+ * Returns the level of the tree node inside of the virtual tree. The root node has level 0. The children of the root
+ * note have level 1, and so on.
*/
public int getLevel() {
final TreeDataModel model = ComponentUtils.findAncestor(this, AbstractUIData.class).getTreeDataModel();
@@ -178,18 +178,18 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public MethodBinding getTreeExpansionListener(){
- Deprecation.LOG.error("treeExpansionListener!");
- return null;
- }
+ public MethodBinding getTreeExpansionListener() {
+ Deprecation.LOG.error("treeExpansionListener!");
+ return null;
+ }
/**
* @deprecated since 2.0.0
*/
@Deprecated
- public void setTreeExpansionListener(final MethodBinding treeExpansionListener){
- Deprecation.LOG.error("treeExpansionListener!");
- }
+ public void setTreeExpansionListener(final MethodBinding treeExpansionListener) {
+ Deprecation.LOG.error("treeExpansionListener!");
+ }
/**
* @deprecated since 2.0.0
@@ -220,18 +220,18 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public MethodBinding getTreeMarkedListener(){
- Deprecation.LOG.error("treeMarkedListener!");
- return null;
- }
+ public MethodBinding getTreeMarkedListener() {
+ Deprecation.LOG.error("treeMarkedListener!");
+ return null;
+ }
/**
* @deprecated since 2.0.0
*/
@Deprecated
- public void setTreeMarkedListener(final MethodBinding treeMarkedListener){
- Deprecation.LOG.error("treeMarkedListener!");
- }
+ public void setTreeMarkedListener(final MethodBinding treeMarkedListener) {
+ Deprecation.LOG.error("treeMarkedListener!");
+ }
/**
* @deprecated since 2.0.0
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
index 4eecf43..7ed61d8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
@@ -34,8 +34,9 @@ public abstract class AbstractUITreeSelect extends UISelectBoolean implements Co
}
/**
- * The value is stored in the state of the parent UITree, if the value attribute has not a value expression.
- * The value is stored normally, if there is a value expression.
+ * The value is stored in the state of the parent UITree, if the value attribute has not a value expression. The value
+ * is stored normally, if there is a value expression.
+ *
* @return Is the value stored in the state of the UITree parent object?
*/
public boolean isValueStoredInState() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
index 6c2df90..9200cb5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
@@ -63,14 +63,14 @@ public class ContentSecurityPolicy {
return mode;
}
- public static enum Mode {
+ public enum Mode {
ON("on"),
OFF("off"),
REPORT_ONLY("report-only");
private final String value;
- private Mode(final String value) {
+ Mode(final String value) {
this.value = value;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
index 2212c2e..dbb13fd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
@@ -65,7 +65,7 @@ public class RendererConfig implements Serializable {
}
public void merge(final RendererConfig rendererConfig) {
- supportedMarkups = supportedMarkups.add(rendererConfig.supportedMarkups);
+ supportedMarkups = supportedMarkups.add(rendererConfig.supportedMarkups);
}
public String toString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
index 9f14c3b..1b8fbb6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
@@ -35,6 +35,9 @@ public class TobagoConfigEntityResolver extends DefaultHandler {
private static final String TOBAGO_CONFIG_DTD_1_0_30 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd";
private static final String TOBAGO_CONFIG_DTD_1_0_34 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.34.dtd";
protected static final String TOBAGO_CONFIG_XSD_1_5 = "/org/apache/myfaces/tobago/config/tobago-config-1.5.xsd";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
protected static final String TOBAGO_CONFIG_XSD_1_6 = "/org/apache/myfaces/tobago/config/tobago-config-1.6.xsd";
protected static final String TOBAGO_CONFIG_XSD_2_0 = "/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
index a50b417..26098eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
@@ -64,8 +64,8 @@ public class TobagoConfigFragment {
mimeTypes = new HashMap<String, String>();
}
- public void addSupportedThemeName(final String name) {
- supportedThemeNames.add(name);
+ public void addSupportedThemeName(final String nameParameter) {
+ supportedThemeNames.add(nameParameter);
}
public List<String> getSupportedThemeNames() {
@@ -113,16 +113,16 @@ public class TobagoConfigFragment {
return before;
}
- public void addBefore(final String name) {
- before.add(name);
+ public void addBefore(final String nameParameter) {
+ before.add(nameParameter);
}
public List<String> getAfter() {
return after;
}
- public void addAfter(final String name) {
- after.add(name);
+ public void addAfter(final String nameParameter) {
+ after.add(nameParameter);
}
public void addThemeDefinition(final ThemeImpl theme) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java
index 4070aea..f1adeca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMerger.java
@@ -37,7 +37,7 @@ public class TobagoConfigMerger {
private final List<TobagoConfigFragment> list;
public TobagoConfigMerger(final List<TobagoConfigFragment> list) {
- this.list = list;
+ this.list = list;
}
public TobagoConfigImpl merge() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
index 89e77fa..d58d620 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
@@ -32,7 +32,9 @@ import java.net.URL;
public class TobagoConfigVersion extends TobagoConfigEntityResolver {
- /** Schema or DTD? */
+ /**
+ * Schema or DTD?
+ */
private boolean schema;
private String version;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
index 4b7cc18..582b45e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
@@ -32,7 +32,7 @@ import java.util.Map;
public final class ClientPropertiesKey implements Serializable {
private static final String KEY_IN_FACES_CONTEXT = ClientPropertiesKey.class.getName();
-
+
private final String contentType;
private final Theme theme;
private final UserAgent userAgent;
@@ -55,7 +55,7 @@ public final class ClientPropertiesKey implements Serializable {
final Map<Object, Object> attributes = facesContext.getAttributes();
attributes.remove(KEY_IN_FACES_CONTEXT);
}
-
+
private ClientPropertiesKey(final ClientProperties clientProperties, final UIViewRoot viewRoot) {
contentType = clientProperties.getContentType();
theme = clientProperties.getTheme();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
index 019c51e..759fd5f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
@@ -58,7 +58,7 @@ public final class MeasureValue {
@Override
public int hashCode() {
- return (value != null ? value.hashCode() : 0);
+ return value != null ? value.hashCode() : 0;
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
index d07f74c..feefda1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
@@ -45,8 +45,7 @@ import java.util.zip.ZipInputStream;
/**
* <p>
- * This class helps to locate all resources of the ResourceManager.
- * It will be called in the initialization phase.
+ * This class helps to locate all resources of the ResourceManager. It will be called in the initialization phase.
* </p>
* <p>
* Basically it looks at the following places:
@@ -71,7 +70,7 @@ class ResourceLocator {
private ResourceManagerImpl resourceManager;
private ThemeBuilder themeBuilder;
- public ResourceLocator(
+ ResourceLocator(
final ServletContext servletContext, final ResourceManagerImpl resourceManager, final ThemeBuilder themeBuilder) {
this.servletContext = servletContext;
this.resourceManager = resourceManager;
@@ -87,9 +86,9 @@ class ResourceLocator {
}
private void locateResourcesInWar(
- final ServletContext servletContext, final ResourceManagerImpl resources, String path)
+ final ServletContext servletContextParameter, final ResourceManagerImpl resources, final String pathParameter)
throws ServletException {
-
+ String path = pathParameter;
if (path.startsWith("/WEB-INF/")) {
return; // ignore
}
@@ -97,7 +96,7 @@ class ResourceLocator {
if (path.endsWith("/") && path.length() > 1) {
path = path.substring(0, path.length() - 1);
}
- final Set<String> resourcePaths = servletContext.getResourcePaths(path);
+ final Set<String> resourcePaths = servletContextParameter.getResourcePaths(path);
if (resourcePaths == null || resourcePaths.isEmpty()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Skipping empty resource path: path='{}'", path);
@@ -111,19 +110,19 @@ class ResourceLocator {
if (LOG.isDebugEnabled()) {
LOG.debug("childPath dir {}", childPath);
}
- locateResourcesInWar(servletContext, resources, childPath);
+ locateResourcesInWar(servletContextParameter, resources, childPath);
}
} else {
//Log.debug("add resc " + childPath);
if (childPath.endsWith(".properties")) {
- final InputStream inputStream = servletContext.getResourceAsStream(childPath);
+ final InputStream inputStream = servletContextParameter.getResourceAsStream(childPath);
try {
addProperties(inputStream, resources, childPath, false, 0);
} finally {
IoUtils.closeQuietly(inputStream);
}
} else if (childPath.endsWith(".properties.xml")) {
- final InputStream inputStream = servletContext.getResourceAsStream(childPath);
+ final InputStream inputStream = servletContextParameter.getResourceAsStream(childPath);
try {
addProperties(inputStream, resources, childPath, true, 0);
} catch (final RuntimeException e) {
@@ -174,8 +173,8 @@ class ResourceLocator {
}
/**
- * Searches the /WEB-INF/lib directory for *.jar files which contains /META-INF/resources directory
- * to hold resources and add them to the ResourceManager.
+ * Searches the /WEB-INF/lib directory for *.jar files which contains /META-INF/resources directory to hold resources
+ * and add them to the ResourceManager.
*
* @param resources Resource Manager which collects all the resources.
* @throws ServletException An error while accessing the resource.
@@ -232,8 +231,6 @@ class ResourceLocator {
LOG.info("resourceIndex='" + resourceIndex + "'");
-
-
final URL resource = findMatchingResourceIndexUrl(themeUrl);
@@ -246,8 +243,8 @@ class ResourceLocator {
}
/**
- * Find a matching tobago-resource-index.txt to the given tobago-config.xml
- * We look here all possible URL from ClassLoader, because an AppServer may protect direct access...
+ * Find a matching tobago-resource-index.txt to the given tobago-config.xml We look here all possible URL from
+ * ClassLoader, because an AppServer may protect direct access...
*/
private URL findMatchingResourceIndexUrl(final URL themeUrl) throws IOException {
final String themeProtocol = themeUrl.getProtocol();
@@ -278,10 +275,11 @@ class ResourceLocator {
}
private void addResourcesFromZip(
- final ResourceManagerImpl resources, String fileName, final String protocol,
+ final ResourceManagerImpl resources, final String fileNameParameter, final String protocol,
final String prefix, final int skipPrefix)
throws ServletException, IOException {
+ String fileName = fileNameParameter;
final int exclamationPoint = fileName.indexOf("!");
if (exclamationPoint != -1) {
fileName = fileName.substring(0, exclamationPoint);
@@ -366,7 +364,8 @@ class ResourceLocator {
}
}
- private String ensureSlash(String resourcePath) {
+ private String ensureSlash(final String resourcePathParameter) {
+ String resourcePath = resourcePathParameter;
if (!resourcePath.startsWith("/")) {
resourcePath = '/' + resourcePath;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
index 252c806..4aaa84f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
@@ -57,27 +57,27 @@ public class ResourceManagerImpl implements ResourceManager {
public static final String[] EXT_JPG = new String[]{".jpg"};
public static final String[] EXT_ICO = new String[]{".ico"};
public static final String[] EXT_IMAGES = new String[]{".svg", ".png", ".gif", ".jpg"};
- public static final String[] EXT_JSP= new String[]{".jsp"};
- public static final String[] EXT_JSPX= new String[]{".jspx"};
- public static final String[] EXT_XHTML= new String[]{".xhtml"};
- public static final String[] EXT_SVG= new String[]{".svg"};
+ public static final String[] EXT_JSP = new String[]{".jsp"};
+ public static final String[] EXT_JSPX = new String[]{".jspx"};
+ public static final String[] EXT_XHTML = new String[]{".xhtml"};
+ public static final String[] EXT_SVG = new String[]{".svg"};
private boolean production;
- private final Map<String, String> resourceList
+ private final Map<String, String> resourceList
= new ConcurrentHashMap<String, String>(100, 0.75f, 1);
- private final Map<RendererCacheKey, Renderer> rendererCache
+ private final Map<RendererCacheKey, Renderer> rendererCache
= new ConcurrentHashMap<RendererCacheKey, Renderer>(100, 0.75f, 1);
- private final Map<ImageCacheKey, StringValue> imageCache
+ private final Map<ImageCacheKey, StringValue> imageCache
= new ConcurrentHashMap<ImageCacheKey, StringValue>(100, 0.75f, 1);
- private final Map<JspCacheKey, String> jspCache
+ private final Map<JspCacheKey, String> jspCache
= new ConcurrentHashMap<JspCacheKey, String>(100, 0.75f, 1);
- private final Map<MiscCacheKey, String[]> miscCache
+ private final Map<MiscCacheKey, String[]> miscCache
= new ConcurrentHashMap<MiscCacheKey, String[]>(100, 0.75f, 1);
- private final Map<PropertyCacheKey, StringValue> propertyCache
+ private final Map<PropertyCacheKey, StringValue> propertyCache
= new ConcurrentHashMap<PropertyCacheKey, StringValue>(100, 0.75f, 1);
- private final Map<ThemeConfigCacheKey, MeasureValue> themeCache
+ private final Map<ThemeConfigCacheKey, MeasureValue> themeCache
= new ConcurrentHashMap<ThemeConfigCacheKey, MeasureValue>(100, 0.75f, 1);
private final Map<String, String[]> extensionCache
= new ConcurrentHashMap<String, String[]>(10, 0.75f, 1);
@@ -115,6 +115,9 @@ public class ResourceManagerImpl implements ResourceManager {
resourceList.put(resourceKey, value);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public String getJsp(final UIViewRoot viewRoot, final String name) {
String result = null;
@@ -128,7 +131,7 @@ public class ResourceManagerImpl implements ResourceManager {
return result;
}
try {
- result = (String) getPaths(clientKey, "",
+ result = (String) getPaths(clientKey,
JSP, name, EXT_NONE, false, true, true, null, true, false).get(0);
jspCache.put(cacheKey, result);
} catch (final Exception e) {
@@ -138,6 +141,11 @@ public class ResourceManagerImpl implements ResourceManager {
return result;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @deprecated by API
+ */
@Deprecated
public String getProperty(final UIViewRoot viewRoot, final String bundle, final String propertyKey) {
return getProperty(FacesContext.getCurrentInstance(), bundle, propertyKey);
@@ -148,11 +156,11 @@ public class ResourceManagerImpl implements ResourceManager {
if (bundle != null && propertyKey != null) {
final ClientPropertiesKey clientKey = ClientPropertiesKey.get(facesContext);
final PropertyCacheKey cacheKey = new PropertyCacheKey(clientKey, bundle, propertyKey);
-
+
StringValue result = propertyCache.get(cacheKey);
if (result == null) {
final List properties
- = getPaths(clientKey, "", PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, false);
+ = getPaths(clientKey, PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, false);
if (properties != null) {
result = new StringValue((String) properties.get(0));
} else {
@@ -165,6 +173,11 @@ public class ResourceManagerImpl implements ResourceManager {
return null;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @deprecated by API
+ */
@Deprecated
public Renderer getRenderer(final UIViewRoot viewRoot, final String rendererType) {
return getRenderer(FacesContext.getCurrentInstance(), rendererType);
@@ -185,7 +198,7 @@ public class ResourceManagerImpl implements ResourceManager {
try {
simpleClassName = getRendererClassName(rendererType);
final List<Class> classes
- = getPaths(clientKey, "", TAG, simpleClassName, EXT_NONE, false, true, true, null, false, false);
+ = getPaths(clientKey, TAG, simpleClassName, EXT_NONE, false, true, true, null, false, false);
if (classes != null && !classes.isEmpty()) {
final Class clazz = classes.get(0);
renderer = (Renderer) clazz.newInstance();
@@ -201,16 +214,22 @@ public class ResourceManagerImpl implements ResourceManager {
}
return renderer;
}
-
+
+ /**
+ * @deprecated by API
+ */
@Deprecated
public String[] getScripts(final UIViewRoot viewRoot, final String name) {
return getScripts(FacesContext.getCurrentInstance(), name);
}
-
+
public String[] getScripts(final FacesContext facesContext, final String name) {
return getStrings(facesContext, name, null);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public String[] getStyles(final UIViewRoot viewRoot, final String name) {
return getStyles(FacesContext.getCurrentInstance(), name);
@@ -220,6 +239,9 @@ public class ResourceManagerImpl implements ResourceManager {
return getStrings(facesContext, name, null);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public String getThemeProperty(final UIViewRoot viewRoot, final String bundle, final String propertyKey) {
if (bundle != null && propertyKey != null) {
@@ -230,7 +252,7 @@ public class ResourceManagerImpl implements ResourceManager {
StringValue result = propertyCache.get(cacheKey);
if (result == null) {
final List properties
- = getPaths(clientKey, "", PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, true);
+ = getPaths(clientKey, PROPERTY, bundle, EXT_NONE, false, true, false, propertyKey, true, true);
if (properties != null) {
result = new StringValue((String) properties.get(0));
} else {
@@ -256,7 +278,7 @@ public class ResourceManagerImpl implements ResourceManager {
MeasureValue result = themeCache.get(cacheKey);
if (result == null) {
- final List properties = getPaths(clientKey, "", PROPERTY, "tobago-theme-config", EXT_NONE,
+ final List properties = getPaths(clientKey, PROPERTY, "tobago-theme-config", EXT_NONE,
false, true, false, rendererType + "." + name, true, true);
Measure measure = null;
@@ -266,7 +288,7 @@ public class ResourceManagerImpl implements ResourceManager {
if (markup != null) {
for (final String m : markup) {
- final List mProperties = getPaths(clientKey, "", PROPERTY, "tobago-theme-config", EXT_NONE,
+ final List mProperties = getPaths(clientKey, PROPERTY, "tobago-theme-config", EXT_NONE,
false, true, false, rendererType + "[" + m + "]" + "." + name, true, true);
if (mProperties != null) {
final Measure summand = Measure.valueOf(mProperties.get(0));
@@ -285,16 +307,27 @@ public class ResourceManagerImpl implements ResourceManager {
return result.getValue();
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public String getImage(final UIViewRoot viewRoot, final String name) {
return getImage(FacesContext.getCurrentInstance(), name);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public String getImage(final FacesContext facesContext, final String name) {
return getImage(facesContext, name, false);
}
+ /**
+ * {@inheritDoc}
+ *
+ * @deprecated by API
+ */
@Deprecated
public String getImage(final UIViewRoot viewRoot, final String name, final boolean ignoreMissing) {
return getImage(FacesContext.getCurrentInstance(), name, ignoreMissing);
@@ -302,6 +335,8 @@ public class ResourceManagerImpl implements ResourceManager {
/**
* {@inheritDoc}
+ *
+ * @deprecated by API
*/
@Deprecated
public String getImage(
@@ -336,7 +371,7 @@ public class ResourceManagerImpl implements ResourceManager {
StringValue result = imageCache.get(cacheKey);
if (result == null) {
final List paths
- = getPaths(clientKey, "", null, name, extensions, false, true, true, null, true, ignoreMissing);
+ = getPaths(clientKey, null, name, extensions, false, true, true, null, true, ignoreMissing);
if (paths != null) {
result = new StringValue((String) paths.get(0));
} else {
@@ -357,9 +392,10 @@ public class ResourceManagerImpl implements ResourceManager {
}
private List getPaths(
- final ClientPropertiesKey clientKey, final String prefix, final String subDir, final String name,
+ final ClientPropertiesKey clientKey, final String subDir, final String name,
final String[] extensions, final boolean reverseOrder, final boolean single, final boolean returnKey,
- final String key, final boolean returnStrings, boolean ignoreMissing) {
+ final String key, final boolean returnStrings, final boolean ignoreMissingParameter) {
+ boolean ignoreMissing = ignoreMissingParameter;
final List matches = new ArrayList();
final String contentType = clientKey.getContentType();
final Theme theme = clientKey.getTheme();
@@ -370,20 +406,20 @@ public class ResourceManagerImpl implements ResourceManager {
for (final String localeSuffix : locales) {
for (final String extension : extensions) {
if (production) {
- boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+ boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
name, MINIMIZE_SUFFIX, localeSuffix, extension, key);
if (found && (single || !returnStrings)) {
return matches;
}
if (!found) {
- found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+ found = checkPath(reverseOrder, returnKey, returnStrings, matches,
name, null, localeSuffix, extension, key);
if (found && (single || !returnStrings)) {
return matches;
}
}
} else {
- final boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+ final boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
name, null, localeSuffix, extension, key);
if (found && (single || !returnStrings)) {
return matches;
@@ -400,14 +436,14 @@ public class ResourceManagerImpl implements ResourceManager {
for (final String localeSuffix : locales) { // locale loop
for (final String extension : extensions) { // extensions loop
if (production) {
- boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+ boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
resourceDirectory, contentType, currentTheme, browserType, subDir, name, MINIMIZE_SUFFIX,
localeSuffix, extension, key);
if (found && (single || !returnStrings)) {
return matches;
}
if (!found) {
- found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+ found = checkPath(reverseOrder, returnKey, returnStrings, matches,
resourceDirectory, contentType, currentTheme, browserType, subDir, name, null,
localeSuffix, extension, key);
if (found && (single || !returnStrings)) {
@@ -415,7 +451,7 @@ public class ResourceManagerImpl implements ResourceManager {
}
}
} else {
- final boolean found = checkPath(prefix, reverseOrder, returnKey, returnStrings, matches,
+ final boolean found = checkPath(reverseOrder, returnKey, returnStrings, matches,
resourceDirectory, contentType, currentTheme, browserType, subDir, name, null,
localeSuffix, extension, key);
if (found && (single || !returnStrings)) {
@@ -455,16 +491,12 @@ public class ResourceManagerImpl implements ResourceManager {
}
private boolean checkPath(
- final String prefix, final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
+ final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
final List matches, final String name, final String minimizeSuffix, final String localeSuffix,
final String extension, final String key) {
String path = makePath(name, minimizeSuffix, localeSuffix, extension, key);
if (returnStrings && resourceList.containsKey(path)) {
- final String result =
- returnKey
- ? prefix + path
- : prefix + resourceList.get(path);
-
+ final String result = returnKey ? path : resourceList.get(path);
if (reverseOrder) {
matches.add(0, result);
} else {
@@ -499,7 +531,7 @@ public class ResourceManagerImpl implements ResourceManager {
}
private boolean checkPath(
- final String prefix, final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
+ final boolean reverseOrder, final boolean returnKey, final boolean returnStrings,
final List matches, final String resourceDirectory, final String contentType, final Theme currentTheme,
final String browserType, final String subDir, final String name, final String minimizeSuffix,
final String localeSuffix, final String extension, final String key) {
@@ -507,12 +539,11 @@ public class ResourceManagerImpl implements ResourceManager {
localeSuffix, extension, key, null);
if (returnStrings && resourceList.containsKey(path)) {
final String result;
- if (prefix.length() == 0 && returnKey && resourceDirectory.equals(currentTheme.getResourcePath())) {
+ if (returnKey && resourceDirectory.equals(currentTheme.getResourcePath())) {
result = makePath(resourceDirectory, contentType, currentTheme, browserType, subDir, name, minimizeSuffix,
localeSuffix, extension, key, currentTheme.getVersion());
} else {
- result = returnKey
- ? prefix + path : prefix + resourceList.get(path);
+ result = returnKey ? path : resourceList.get(path);
}
if (reverseOrder) {
matches.add(0, result);
@@ -645,7 +676,7 @@ public class ResourceManagerImpl implements ResourceManager {
return cacheResult;
}
try {
- final List matches = getPaths(key, "", type,
+ final List matches = getPaths(key, type,
nameWithoutExtension, extensions, true, false, true, null, true, false);
if (matches != null) {
result = (String[]) matches.toArray(new String[matches.size()]);
@@ -664,7 +695,7 @@ public class ResourceManagerImpl implements ResourceManager {
if (cached != null) {
extensions = cached;
} else {
- extensions = new String[] {extension};
+ extensions = new String[]{extension};
extensionCache.put(extension, extensions);
if (LOG.isInfoEnabled()) {
LOG.info("Adding extension '{}' to cache.", extension);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
index 8b705c0..366956a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.internal.context;
+import org.apache.myfaces.tobago.internal.util.FastStringWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.internal.util.FastStringWriter;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -31,8 +31,8 @@ import java.util.List;
import java.util.Map;
/**
- * In some cases the rendered output must be places in the Response in a different order than it was rendered.
- * The <code>ResponseWriterDivider</code> helps to manage a list of buffers which holds the temporary output.
+ * In some cases the rendered output must be places in the Response in a different order than it was rendered. The
+ * <code>ResponseWriterDivider</code> helps to manage a list of buffers which holds the temporary output.
*
* @deprecated Since Tobago 2.0.9, no longer needed.
*/
@@ -43,11 +43,11 @@ public final class ResponseWriterDivider {
private List<ResponseWriter> writers;
private List<FastStringWriter> buffers;
-
+
private ResponseWriter original;
-
+
private int current;
-
+
private String nameInRequest;
public static ResponseWriterDivider getInstance(final FacesContext facesContext, final String nameInRequest) {
@@ -57,7 +57,7 @@ public final class ResponseWriterDivider {
divider = new ResponseWriterDivider(facesContext);
map.put(nameInRequest, divider);
divider.nameInRequest = nameInRequest;
-
+
}
return divider;
}
@@ -70,10 +70,10 @@ public final class ResponseWriterDivider {
}
/**
- * Create (if needed) and activate a new branch.
- * After this call, all output will be stored in this new branch.
+ * Create (if needed) and activate a new branch. After this call, all output will be stored in this new branch.
* <p>
* It is usually needed to get the response writer again with HtmlRendererUtils.getTobagoResponseWriter();
+ *
* @return true if the branch was not created new. So the branch was already existent.
*/
public boolean activateBranch(final FacesContext facesContext) {
@@ -95,18 +95,19 @@ public final class ResponseWriterDivider {
}
return created;
}
-
+
/**
- * Passivate the current branch.
- * After this call, all output will be written in the former branch (if any) or into the original writer.
+ * Passivate the current branch. After this call, all output will be written in the former branch (if any) or into the
+ * original writer.
* <p>
* It is usually needed to get the response writer again with HtmlRendererUtils.getTobagoResponseWriter();
- * @return true, if the current writer is not the original writer. So the "stack" is at the bottom.
+ *
+ * @return true, if the current writer is not the original writer. So the "stack" is at the bottom.
*/
public boolean passivateBranch(final FacesContext facesContext) {
assert writers.size() == buffers.size();
-
+
current--;
if (current >= 0) {
facesContext.setResponseWriter(writers.get(current));
@@ -124,8 +125,7 @@ public final class ResponseWriterDivider {
}
/**
- * Write the collected stuff in the original writer.
- * This is always the last call on this object.
+ * Write the collected stuff in the original writer. This is always the last call on this object.
*/
public void writeOutAndCleanUp(final FacesContext facesContext) throws IOException {
facesContext.setResponseWriter(original);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java
index 3e8318f..7844385 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/StringValue.java
@@ -56,6 +56,6 @@ public final class StringValue {
@Override
public int hashCode() {
- return (value != null ? value.hashCode() : 0);
+ return value != null ? value.hashCode() : 0;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java
index f695ccc..675a401 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeConfigCacheKey.java
@@ -73,12 +73,12 @@ public final class ThemeConfigCacheKey {
result = 31 * result + (markup != null ? markup.hashCode() : 0);
return result;
}
-
+
@Override
public int hashCode() {
return hashCode;
}
-
+
@Override
public String toString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
index 0f43596..a162f90 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
@@ -23,8 +23,8 @@ import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.Measure;
/**
- * BankHead represents the head information of a bank like the token for this bank, the computed
- * "current" and "minimum" measure and if it will be rendered. A bank is a generalization for columns and rows.
+ * BankHead represents the head information of a bank like the token for this bank, the computed "current" and "minimum"
+ * measure and if it will be rendered. A bank is a generalization for columns and rows.
*/
public class BankHead {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
index 0926e10..fd85385 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.internal.layout;
import org.apache.myfaces.tobago.layout.LayoutComponent;
/**
- * To support horizontal and vertical spans, at each position will be a cell as a represantive.
- * Either a "origin cell" for the first position or a "span cell" for spanned other positions.
+ * To support horizontal and vertical spans, at each position will be a cell as a represantive. Either a "origin cell"
+ * for the first position or a "span cell" for spanned other positions.
*/
public interface Cell {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
index 5329495..b377dfc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.internal.layout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Orientation;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
@@ -57,9 +57,9 @@ public class Grid {
assert columns.getSize() > 0;
assert rows.getSize() > 0;
- this.columnCount = columns.getSize();
- this.rowCount = rows.getSize();
-
+ this.columnCount = columns.getSize();
+ this.rowCount = rows.getSize();
+
this.columnHeads = new BankHead[columnCount];
for (int i = 0; i < columnCount; i++) {
columnHeads[i] = new BankHead(columns.get(i));
@@ -75,11 +75,12 @@ public class Grid {
}
}
- public void add(final OriginCell cell, int columnSpan, final int rowSpan) {
+ public void add(final OriginCell cell, final int columnSpanParameter, final int rowSpan) {
- assert columnSpan > 0;
+ assert columnSpanParameter > 0;
assert rowSpan > 0;
+ int columnSpan = columnSpanParameter;
boolean error = false;
if (columnSpan + columnCursor > columnCount) {
@@ -156,9 +157,9 @@ public class Grid {
public BankHead[] getBankHeads(final Orientation orientation) {
return orientation == Orientation.HORIZONTAL ? columnHeads : rowHeads;
}
-
+
private void enlarge(final int newRows) {
-
+
// process cells
for (int i = 0; i < newRows; i++) {
for (int j = 0; j < columnCount; j++) {
@@ -171,7 +172,7 @@ public class Grid {
System.arraycopy(rowHeads, 0, newRowHeads, 0, rowHeads.length);
rowHeads = newRowHeads;
// todo: shorter in jdk 1.6: rowHeads = Arrays.copyOf(rowHeads, rowHeads.length + newRows);
-
+
for (int i = rowCount; i < rowCount + newRows; i++) {
rowHeads[i] = new BankHead(RelativeLayoutToken.DEFAULT_INSTANCE);
}
@@ -230,18 +231,8 @@ public class Grid {
}
/**
- * Prints the state of the grid as an Unicode shape like this:
- * ┏━┳━┳━┳━┯━┓
- * ┃█┃█┃█┃█│➞┃
- * ┠─╂─╊━╇━┿━┫
- * ┃⬇┃⬇┃█│➞│➞┃
- * ┣━╉─╊━╈━╈━┫
- * ┃█┃⬇┃█┃█┃█┃
- * ┣━╇━╇━╉─╊━┩
- * ┃█│➞│➞┃⬇┃◌│
- * ┡━┿━┿━╉─╂─┤
- * │◌│◌│◌┃⬇┃◌│
- * └─┴─┴─┺━┹─┘
+ * Prints the state of the grid as an Unicode shape like this: ┏━┳━┳━┳━┯━┓ ┃█┃█┃█┃█│➞┃ ┠─╂─╊━╇━┿━┫ ┃⬇┃⬇┃█│➞│➞┃
+ * ┣━╉─╊━╈━╈━┫ ┃█┃⬇┃█┃█┃█┃ ┣━╇━╇━╉─╊━┩ ┃█│➞│➞┃⬇┃◌│ ┡━┿━┿━╉─╂─┤ │◌│◌│◌┃⬇┃◌│ └─┴─┴─┺━┹─┘
*/
public String gridAsString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
index 9a4309e..70448c4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.internal.layout;
-import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.LayoutBase;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
index 7cc33d6..9171d26 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
@@ -66,7 +66,7 @@ public final class LayoutUtils {
if (child instanceof LayoutComponent) {
result.add((LayoutComponent) child);
} else {
- // Child seems to be transparent for layout, like UIForm.
+ // Child seems to be transparent for layout, like UIForm.
// So we try to add the inner components.
addLayoutChildren(child, result);
}
@@ -102,7 +102,11 @@ public final class LayoutUtils {
return orientation == Orientation.HORIZONTAL ? component.getCurrentWidth() : component.getCurrentHeight();
}
- public static void setCurrentSize(final Orientation orientation, final LayoutBase component, Measure size) {
+ public static void setCurrentSize(
+ final Orientation orientation, final LayoutBase component, final Measure sizeParameter) {
+
+ Measure size = sizeParameter;
+
if (orientation == Orientation.HORIZONTAL) {
final Measure width = component.getWidth();
if (width != null) { // to not override set sizes
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java
index 654eb87..67c4895 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/MathUtils.java
@@ -30,10 +30,11 @@ public final class MathUtils {
}
/**
- * Adjusts the list of double values to rounded values with the same sum.
- * E. g. 2.3, 2.4, 2.5, 2.8 -> 2.0, 2.0, 3.0, 3.0
+ * Adjusts the list of double values to rounded values with the same sum. E. g. 2.3, 2.4, 2.5, 2.8 -> 2.0, 2.0, 3.0,
+ * 3.0
*/
- public static void adjustRemainders(final double[] list, double bias) {
+ public static void adjustRemainders(final double[] list, final double biasParameter) {
+ double bias = biasParameter;
for (final double ignored : list) {
final double lastBias;
if (bias < 0.0) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java
index e8539e4..855b2c5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/package-info.java
@@ -20,9 +20,6 @@
package org.apache.myfaces.tobago.internal;
/**
- * Package of internal classes.
- * <br/>
- * Classes of this package will normally not used by applications directly.
- * <br/>
+ * Package of internal classes. <br/> Classes of this package will normally not used by applications directly. <br/>
* Classes of this package may be changed without any deprecation warnings.
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
index af1fac4..3305456 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
@@ -59,7 +59,6 @@ public abstract class TobagoELTag extends UIComponentELTag {
}
/**
- *
* @deprecated Not supported anymore
*/
@Deprecated
@@ -70,7 +69,6 @@ public abstract class TobagoELTag extends UIComponentELTag {
}
/**
- *
* @deprecated Not supported anymore
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
index 2899be6..b7d73b2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
@@ -38,8 +38,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
/**
- * Add an attribute on the UIComponent
- * associated with the closest parent UIComponent custom action.
+ * Add an attribute on the UIComponent associated with the closest parent UIComponent custom action.
*/
@Tag(name = "attribute")
@SimpleTag(
@@ -67,7 +66,7 @@ public abstract class AttributeTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
final UIComponent component = tag.getComponentInstance();
@@ -78,7 +77,7 @@ public abstract class AttributeTag extends TagSupport {
final ELContext elContext = FacesContext.getCurrentInstance().getELContext();
- final String attributeName = (String) name.getValue(elContext);
+ final String attributeName = (String) name.getValue(elContext);
if (!value.isLiteralText()) {
component.setValueExpression(attributeName, value);
@@ -91,7 +90,7 @@ public abstract class AttributeTag extends TagSupport {
} else {
component.getAttributes().put(attributeName, value.getValue(elContext));
}
- return (SKIP_BODY);
+ return SKIP_BODY;
}
@Override
@@ -105,7 +104,7 @@ public abstract class AttributeTag extends TagSupport {
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- public void setName(final ValueExpression name){
+ public void setName(final ValueExpression name) {
this.name = name;
}
@@ -113,25 +112,17 @@ public abstract class AttributeTag extends TagSupport {
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- public void setValue(final ValueExpression value){
+ public void setValue(final ValueExpression value) {
this.value = value;
}
/**
- * Warning: The mode is only available when using Facelets.
- * Allowed values are "action", "actionListener", "actionFromValue", "isNotSet", "isSet", "valueIfSet".
- * <br/>
- * "action" (method binding) evaluate the expression to find the method binding which is referenced with the template.
- * <br/>
- * "actionListener" same as "action" but for the method signature of ActionListeners.
- * <br/>
- * "isSet" (boolean) checks, if the expression is set from the composition caller.
- * <br/>
- * "isNotSet" (boolean) negation of "isSet"
- * <br/>
- * "actionFromValue" Evaluates the ValueBinding to get an outcome set directly (no action method)
- * <br/>
- * "valueIfSet" set the attribute only if the value is set.
+ * Warning: The mode is only available when using Facelets. Allowed values are "action", "actionListener",
+ * "actionFromValue", "isNotSet", "isSet", "valueIfSet". <br/> "action" (method binding) evaluate the expression to
+ * find the method binding which is referenced with the template. <br/> "actionListener" same as "action" but for the
+ * method signature of ActionListeners. <br/> "isSet" (boolean) checks, if the expression is set from the composition
+ * caller. <br/> "isNotSet" (boolean) negation of "isSet" <br/> "actionFromValue" Evaluates the ValueBinding to get an
+ * outcome set directly (no action method) <br/> "valueIfSet" set the attribute only if the value is set.
*/
@TagAttribute(name = "mode")
public void setMode(final ValueExpression mode) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
index 01ca32c..a7ad80c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
@@ -34,5 +34,5 @@ import javax.faces.component.UIPanel;
"org.apache.myfaces.tobago.SelectOneCommand",
"org.apache.myfaces.tobago.SelectBooleanCommand",
"org.apache.myfaces.tobago.Command"})
-public interface BoxToolBarTagDeclaration extends ToolBarTagDeclaration{
+public interface BoxToolBarTagDeclaration extends ToolBarTagDeclaration {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
index b1e47b4..c42a423 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
@@ -33,8 +33,9 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
import javax.faces.component.UIPanel;
/**
- * Renders a panel-like layout element with the ability to span over more than
- * one layout cell. A cell may only contain one child.
+ * Renders a panel-like layout element with the ability to span over more than one layout cell. A cell may only contain
+ * one child.
+ *
* @deprecated The Cell is deprecated since Tobago 1.5.0
*/
@Deprecated
@@ -45,7 +46,7 @@ import javax.faces.component.UIPanel;
uiComponentFacesClass = "javax.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.CELL)
-public interface CellTagDeclaration
+public interface CellTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
@UIComponentTagAttribute(
@@ -75,7 +76,7 @@ public interface CellTagDeclaration
@UIComponentTagAttribute(
type = {"java.lang.Integer"},
defaultValue = "1",
- generate = false)
+ generate = false)
void setSpanY(String spanY);
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
index 4513cde..298cbc8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
@@ -37,8 +37,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
import javax.faces.component.UIColumn;
/**
- * Creates a tree node inside of a sheet (also known as tree table).
- * This component represents a single node inside a tree structure.
+ * Creates a tree node inside of a sheet (also known as tree table). This component represents a single node inside a
+ * tree structure.
*/
@SuppressWarnings("ALL")
@Tag(name = "columnNode")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
index c64930f..d7d6c65 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
@@ -36,8 +36,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
import javax.faces.component.UIColumn;
/**
- * Renders a UIComponent that represents a single column of data within a
- * parent UISheet component.
+ * Renders a UIComponent that represents a single column of data within a parent UISheet component.
*/
@Tag(name = "column")
@UIComponentTag(
@@ -60,8 +59,8 @@ public interface ColumnTagDeclaration
void setAlign(String align);
/**
- * Flag indicating whether or not this column is sortable.
- * To make a column sortable the data of the sheet must be one of
+ * Flag indicating whether or not this column is sortable. To make a column sortable the data of the sheet must be one
+ * of
* <code>java.util.List</code> or <code>Object[]</code>.
*/
@TagAttribute
@@ -76,9 +75,8 @@ public interface ColumnTagDeclaration
void setResizable(String resizable);
/**
- * The layout token for this column.
- * Allowd layout tokens ('*', '<x>*', '<x>px' or '<x>%').
- * Where '*' is equivalent to '1*'.
+ * The layout token for this column. Allowd layout tokens ('*', '<x>*', '<x>px' or '<x>%'). Where '*' is
+ * equivalent to '1*'.
*/
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
index 1fc2ca2..a43860d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
@@ -36,11 +36,11 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
import javax.faces.component.UICommand;
/**
- * Use this tag only as a facet for click, change in selectOneRadio,
- * selectBooleanCheckbox, selectManyCheckbox and selectOneChoice
+ * Use this tag only as a facet for click, change in selectOneRadio, selectBooleanCheckbox, selectManyCheckbox and
+ * selectOneChoice
*/
@Tag(
- name = "command",
+ name = "command",
tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UICommand",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommand",
@@ -58,5 +58,4 @@ public interface CommandTagDeclaration
HasCurrentMarkup, HasLabel {
-
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
index 4dc7a3c..4782af0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
@@ -36,8 +36,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
/**
- * Register an Converter instance on the UIComponent
- * associated with the closest parent UIComponent.
+ * Register an Converter instance on the UIComponent associated with the closest parent UIComponent.
*/
@Tag(name = "converter")
@SimpleTag(
@@ -50,11 +49,10 @@ public abstract class ConverterTag extends TagSupport {
private ValueExpression converterId;
/**
- * Create a new instance of the specified {@link javax.faces.convert.Converter}
- * class, and register it with the {@link javax.faces.component.UIComponent} instance associated
- * with our most immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if
- * the {@link javax.faces.component.UIComponent} instance was created by this execution of the
- * containing JSP page.
+ * Create a new instance of the specified {@link javax.faces.convert.Converter} class, and register it with the {@link
+ * javax.faces.component.UIComponent} instance associated with our most immediately surrounding {@link
+ * javax.faces.webapp.UIComponentELTag} instance, if the {@link javax.faces.component.UIComponent} instance was
+ * created by this execution of the containing JSP page.
*
* @throws javax.servlet.jsp.JspException if a JSP error occurs
*/
@@ -69,7 +67,7 @@ public abstract class ConverterTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
final UIComponent component = tag.getComponentInstance();
@@ -109,7 +107,7 @@ public abstract class ConverterTag extends TagSupport {
}
}
- return (SKIP_BODY);
+ return SKIP_BODY;
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
index e89bc64..d0d876a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
@@ -35,10 +35,8 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
/**
- * Add an data attribute on the UIComponent
- * associated with the closest parent UIComponent custom action.
- * Data attributes will be passed through the renderers into the DOM of the user agent and
- * can be used by scripts.
+ * Add an data attribute on the UIComponent associated with the closest parent UIComponent custom action. Data
+ * attributes will be passed through the renderers into the DOM of the user agent and can be used by scripts.
*/
@Preliminary
@Tag(name = "dataAttribute")
@@ -72,7 +70,7 @@ public abstract class DataAttributeTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
final UIComponent component = tag.getComponentInstance();
@@ -88,7 +86,7 @@ public abstract class DataAttributeTag extends TagSupport {
ComponentUtils.putDataAttribute(component, attributeName, attributeValue);
- return (SKIP_BODY);
+ return SKIP_BODY;
}
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
index 435ccb1..31d6880 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
@@ -33,13 +33,11 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
import javax.faces.component.UICommand;
/**
- * Renders a date picker.
- * The component needs a DateFormat Pattern from a converter. The converter
- * should be an instance of DateTimeConverter and return a valid pattern from
- * the method getPattern()
+ * Renders a date picker. The component needs a DateFormat Pattern from a converter. The converter should be an instance
+ * of DateTimeConverter and return a valid pattern from the method getPattern()
*
- * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now.
- * Set backward compatibility mode via classic-date-time-picker.
+ * @deprecated Since 2.0.0. It's no longer needed, because this is resolved by JavaScript now. Set backward
+ * compatibility mode via classic-date-time-picker.
*/
@Deprecated
@Tag(name = "datePicker")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
index 8831e4c..9fb3a5d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
@@ -50,10 +50,10 @@ import javax.faces.component.UIInput;
rendererType = RendererTypes.DATE,
allowedChildComponenents = "NONE",
facets = {
- @Facet(name = Facets.CHANGE,
- description =
- "This facet can contain a UICommand that is invoked in a case of a change event from the component")
- })
+ @Facet(name = Facets.CHANGE,
+ description =
+ "This facet can contain a UICommand that is invoked in a case of a change event from the component")
+ })
public interface DateTagDeclaration
extends InputTagDeclaration, HasIdBindingAndRendered, IsReadonly,
IsDisabled, HasConverter, HasLabel,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
index 7847670..6736f94 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
@@ -37,6 +37,6 @@ import javax.faces.component.UIPanel;
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.PANEL)
public interface ExtensionPanelDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent,
- IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
+ IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java
index f4db455..dde0853 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileDropTagDeclaration.java
@@ -50,9 +50,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import javax.faces.component.UIInput;
/**
- * Renders a file drop component.
- * This component always makes a partial (ajax) upload!
- * <p />
+ * Renders a file drop component. This component always makes a partial (ajax) upload!
+ * <p/>
* For content constraints please use <a href="validateFileItem.html">tc:validateFileItem</a>.
*/
@Tag(name = "fileDrop")
@@ -76,7 +75,7 @@ public interface FileDropTagDeclaration
*/
@TagAttribute()
@UIComponentTagAttribute(
- type = { "javax.servlet.http.Part", "org.apache.commons.fileupload.FileItem[]" },
+ type = {"javax.servlet.http.Part", "org.apache.commons.fileupload.FileItem[]"},
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
@@ -115,7 +114,7 @@ public interface FileDropTagDeclaration
* Indicate the highlighted file drop area.
* </p>
* <p>
- * You should use:
+ * You should use:
* <ul>
* <li>a clientId (absolute or relative see setRenderedPartially)</li>
* <li>@this to use only the layouted space of this tc:fileDrop</li>
@@ -123,7 +122,6 @@ public interface FileDropTagDeclaration
* <li>@panel to use the layouted space of the next parent tc:panel</li>
* </ul>
* </p>
- *
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.String")
@@ -134,7 +132,7 @@ public interface FileDropTagDeclaration
* Indicate visible component style.
* </p>
* <p>
- * Possible values:
+ * Possible values:
* <ul>
* <li>DROP_ZONE</li>
* <li>FILE</li>
@@ -146,7 +144,6 @@ public interface FileDropTagDeclaration
* <p>
* Default is DROP_ZONE.
* </p>
- *
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.String")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
index 8a699b2..7f838c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
@@ -51,7 +51,7 @@ import javax.faces.component.UIInput;
/**
* Renders a file input field.
- * <p />
+ * <p/>
* For content constraints please use <a href="validateFileItem.html">tc:validateFileItem</a>.
*/
@Tag(name = "file")
@@ -79,7 +79,7 @@ public interface FileTagDeclaration
*/
@TagAttribute()
@UIComponentTagAttribute(
- type = { "javax.servlet.http.Part", "javax.servlet.http.Part[]" },
+ type = {"javax.servlet.http.Part", "javax.servlet.http.Part[]"},
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
index 0ef5b61..ae37183 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
@@ -34,8 +34,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.layout.TextAlign;
/**
- * XXX Warning: Still in progress! Please do not use it until other announcement.
- * Renders a FlowLayout that positions the content components in there natural order.
+ * XXX Warning: Still in progress! Please do not use it until other announcement. Renders a FlowLayout that positions
+ * the content components in there natural order.
*/
@Tag(name = "flowLayout")
@UIComponentTag(
@@ -48,15 +48,12 @@ import org.apache.myfaces.tobago.layout.TextAlign;
public interface FlowLayoutTagDeclaration
extends HasId,
/*HasSpacing, TODO*/
- HasMargin, HasMargins, /*todo: do we need the margin here? Or should be use the margin from the container? */
+ HasMargin, HasMargins, /*todo: do we need the margin here? Or should be use the margin from the container? */
HasBinding, HasMarkup, HasCurrentMarkup {
/**
- * The alignment of the elements inside of the container, possible values are:
- * {@value TextAlign#STRING_LEFT},
- * {@value TextAlign#STRING_RIGHT},
- * {@value TextAlign#STRING_CENTER} und
- * {@value TextAlign#STRING_JUSTIFY}.
+ * The alignment of the elements inside of the container, possible values are: {@value TextAlign#STRING_LEFT}, {@value
+ * TextAlign#STRING_RIGHT}, {@value TextAlign#STRING_CENTER} und {@value TextAlign#STRING_JUSTIFY}.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
index b168d90..a2c4731 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
@@ -40,10 +40,10 @@ import javax.faces.component.UIForm;
public interface FormTagDeclaration extends HasBinding, HasId {
/**
- *
+ *
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.String")
- void setNotFor(String notFor);
- */
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.String")
+ void setNotFor(String notFor);
+ */
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
index 7a33d73..2a14058 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
@@ -87,7 +87,7 @@ public abstract class GridLayoutConstraintTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
UIComponent component = tag.getComponentInstance();
@@ -314,7 +314,7 @@ public abstract class GridLayoutConstraintTag extends TagSupport {
}
}
- return (SKIP_BODY);
+ return SKIP_BODY;
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
index ffef3f7..02c801f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
@@ -51,9 +51,8 @@ public interface ImageTagDeclaration
IsGridLayoutComponentWithDimension, IsGridLayoutContainer {
/**
- * Absolute url to an image or image name to lookup in tobago resource path.
- * In the second case, there is no need to set the extension (like .gif or .png).
- * If you leave it out, you can use different extension in different themes.
+ * Absolute url to an image or image name to lookup in tobago resource path. In the second case, there is no need to
+ * set the extension (like .gif or .png). If you leave it out, you can use different extension in different themes.
*/
@TagAttribute(required = true)
@UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
index 3974acc..1f5cf0e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
@@ -57,10 +57,10 @@ import javax.faces.component.UIInput;
"org.apache.myfaces.tobago.Suggest"
},
facets = {
- @Facet(name = Facets.CHANGE,
- description =
- "This facet can contain a UICommand that is invoked in a case of a change event from the component")
- })
+ @Facet(name = Facets.CHANGE,
+ description =
+ "This facet can contain a UICommand that is invoked in a case of a change event from the component")
+ })
public interface InTagDeclaration
extends HasIdBindingAndRendered, HasConverter, IsReadonly, IsDisabled, IsRequired, HasTip, IsPassword,
HasSuggestMethod, HasMarkup, HasCurrentMarkup, InputTagDeclaration, HasInputLabel,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
index e93a9e6..cbeb048 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
@@ -34,15 +34,14 @@ import javax.servlet.jsp.tagext.TagSupport;
import java.util.Map;
/**
- * Load a resource bundle localized for the locale of the current view
- * from the tobago resource path, and expose it (as a Map) in the session
- * attributes (session scope is needed to support ajax requests).
- * <p />
- * The main difference to the JSF tag f:localBundle is the support of Tobago themes and
- * the XML formal for properties files.
- * <p />
- * Since JSF 1.2 it is possible to use a {@link org.apache.myfaces.tobago.context.TobagoBundle}
- * and configure it in the faces-config.xml.
+ * Load a resource bundle localized for the locale of the current view from the tobago resource path, and expose it (as
+ * a Map) in the session attributes (session scope is needed to support ajax requests).
+ * <p/>
+ * The main difference to the JSF tag f:localBundle is the support of Tobago themes and the XML formal for properties
+ * files.
+ * <p/>
+ * Since JSF 1.2 it is possible to use a {@link org.apache.myfaces.tobago.context.TobagoBundle} and configure it in the
+ * faces-config.xml.
*/
@Tag(name = "loadBundle")
@SimpleTag(
@@ -82,12 +81,11 @@ public abstract class LoadBundleTag extends TagSupport {
}
/**
- * Name of a session-scope attribute under which the bundle data
- * will be exposed.
+ * Name of a session-scope attribute under which the bundle data will be exposed.
*/
@TagAttribute(required = true, name = "var")
@UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
- public void setVar(final String var){
+ public void setVar(final String var) {
this.var = var;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
index 0eeaf27..4064945 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
@@ -32,8 +32,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
import javax.faces.component.UIPanel;
/**
- * Component to put other components from other frameworks into.
- * Gives the possibility, to interchange layout information.
+ * Component to put other components from other frameworks into. Gives the possibility, to interchange layout
+ * information.
*/
@Tag(name = "mediator")
@UIComponentTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
index 9623596..3dca659 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
@@ -31,10 +31,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
import javax.faces.component.UIPanel;
/**
-* Renders a menu bar.<br />
-* Add menu bar as facet name="menuBar" to page tag or use it anywhere
-* on page.<br />
-*/
+ * Renders a menu bar.<br /> Add menu bar as facet name="menuBar" to page tag or use it anywhere on page.<br />
+ */
@Tag(name = "menuBar")
@BodyContentDescription(
anyClassOf = {"org.apache.myfaces.tobago.internal.taglib.MenuTag",
@@ -55,7 +53,7 @@ import javax.faces.component.UIPanel;
"org.apache.myfaces.tobago.SelectBooleanCommand",
"org.apache.myfaces.tobago.MenuSelectOne",
"org.apache.myfaces.tobago.MenuSeparator"
- })
+ })
public interface MenuBarTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
index 7efd662..acefd07 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
@@ -36,7 +36,7 @@ import javax.faces.component.UICommand;
/**
* Renders a menu item. (This tag was renamed from tc:menuItem since Tobago 1.5.0)
*/
-@Tag(name = "menuCommand",
+@Tag(name = "menuCommand",
tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
index dbdfe86..5d14005 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
@@ -49,8 +49,8 @@ public interface MessagesTagDeclaration
extends HasIdBindingAndRendered, HasFor, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup {
/**
- * Flag indicating that only messages that are not associated to any
- * particular UIComponent should be displayed. That are messages without clientId.
+ * Flag indicating that only messages that are not associated to any particular UIComponent should be displayed. That
+ * are messages without clientId.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "false")
@@ -70,7 +70,7 @@ public interface MessagesTagDeclaration
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
void setShowSummary(String showSummary);
- /**
+ /**
* Sets the mininum severity to be shown. E. g. "warn" shows only "warn", "error" and "fatal".
*/
@TagAttribute
@@ -78,37 +78,35 @@ public interface MessagesTagDeclaration
defaultCode = "javax.faces.application.FacesMessage.SEVERITY_INFO")
void setMinSeverity(String minSeverity);
- /**
- * Sets the maximum severity to be shown. E. g. "warn" shows only "warn" and "info".
- * When setting this attribute you usually shoud take care, that you have a second message tag to show the
- * higher severity levels.
+ /**
+ * Sets the maximum severity to be shown. E. g. "warn" shows only "warn" and "info". When setting this attribute you
+ * usually shoud take care, that you have a second message tag to show the higher severity levels.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.application.FacesMessage$Severity", defaultValue = "fatal",
defaultCode = "javax.faces.application.FacesMessage.SEVERITY_FATAL")
void setMaxSeverity(String maxSeverity);
- /**
+ /**
* Sets the maximum number of messages to show.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "2147483647")
void setMaxNumber(String maxNumber);
- /**
+ /**
* Sets the order of the messages.
*/
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.component.UIMessages$OrderBy",
allowedValues = {AbstractUIMessages.OrderBy.OCCURRENCE_STRING, AbstractUIMessages.OrderBy.SEVERITY_STRING},
- defaultValue = AbstractUIMessages.OrderBy.OCCURRENCE_STRING,
+ defaultValue = AbstractUIMessages.OrderBy.OCCURRENCE_STRING,
defaultCode = "org.apache.myfaces.tobago.internal.component.AbstractUIMessages.OrderBy.OCCURRENCE")
void setOrderBy(String orderBy);
/**
- * Has the user to confirm this message?
- * This attributes handles the case, if the application wants to warn the user about a problem,
- * and the user has to confirm the message before he/she can continue.
+ * Has the user to confirm this message? This attributes handles the case, if the application wants to warn the user
+ * about a problem, and the user has to confirm the message before he/she can continue.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
index d47be20..3b816b4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
@@ -32,8 +32,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutCompone
import javax.faces.component.UIOutput;
/**
- * Show external content inside of an application.
- * This will typically renders an iframe tag.
+ * Show external content inside of an application. This will typically renders an iframe tag.
*/
@Tag(name = "object")
@UIComponentTag(
@@ -54,9 +53,8 @@ public interface ObjectTagDeclaration extends HasIdBindingAndRendered, IsGridLay
void setSrc(String src);
/**
- * Name of the element.
- * If not set the id will be used as name. The id in JSF normally contains colons.
- * This doesn't work in Internet Explorer 9 and lower when using window.open(src, target).
+ * Name of the element. If not set the id will be used as name. The id in JSF normally contains colons. This doesn't
+ * work in Internet Explorer 9 and lower when using window.open(src, target).
*/
@TagAttribute
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
index 8336a74..37e6892 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
@@ -54,18 +54,16 @@ public interface OutTagDeclaration
HasMarkup, HasCurrentMarkup, HasSanitize {
/**
- * Flag indicating that characters that are
- * sensitive in HTML and XML markup must be escaped.
+ * Flag indicating that characters that are sensitive in HTML and XML markup must be escaped.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
void setEscape(String escape);
/**
- * Indicates that the renderer should create an element in the output language
- * (e. g. an span or div tag around the output text).
- * Use true, if you enable the possibility to apply styles to the output.
- * Use false, if you want to keep the code small (especially inside of sheets).
+ * Indicates that the renderer should create an element in the output language (e. g. an span or div tag around the
+ * output text). Use true, if you enable the possibility to apply styles to the output. Use false, if you want to keep
+ * the code small (especially inside of sheets).
*/
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
void setCreateSpan(String createSpan);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
index d1466a2..98d552d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
@@ -48,16 +48,16 @@ import javax.faces.component.UIForm;
componentFamily = UIForm.COMPONENT_FAMILY,
rendererType = RendererTypes.PAGE,
facets =
- { @Facet(name = Facets.ACTION,
- description ="Contains an instance of UICommand (tc:command) for an auto-action",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
- @Facet(name = Facets.RESIZE,
- description ="Contains an instance of UICommand which will be executed when the"
+ {@Facet(name = Facets.ACTION,
+ description = "Contains an instance of UICommand (tc:command) for an auto-action",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+ @Facet(name = Facets.RESIZE,
+ description = "Contains an instance of UICommand which will be executed when the"
+ "size of the user agent was changed. Typically a <tc:command immediate='true' />",
allowedChildComponenents = {"org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.Form"}),
- @Facet(name = Facets.MENUBAR, description = "Menubar",
+ @Facet(name = Facets.MENUBAR, description = "Menubar",
allowedChildComponenents = "javax.faces.component.UIPanel"), //fake
- @Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
+ @Facet(name = Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
public interface PageTagDeclaration
@@ -65,18 +65,16 @@ public interface PageTagDeclaration
IsGridLayoutComponentWithDimension, IsGridLayoutContainer {
/**
- * Contains the id of the component which should have the focus after
- * loading the page.
- * Set to empty string for disabling setting of focus.
- * Default (null) enables the "auto focus" feature.
+ * Contains the id of the component which should have the focus after loading the page. Set to empty string for
+ * disabling setting of focus. Default (null) enables the "auto focus" feature.
*/
@TagAttribute
@UIComponentTagAttribute()
void setFocusId(String focusId);
/**
- * Absolute URL to an image or image name to lookup in tobago resource path
- * representing the application. In HTML it is used as a favicon.
+ * Absolute URL to an image or image name to lookup in tobago resource path representing the application. In HTML it
+ * is used as a favicon.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -85,8 +83,8 @@ public interface PageTagDeclaration
/**
* <strong>ValueBindingExpression</strong> pointing to a object to save the
* component's state.
- * @deprecated since Tobago 1.5.0. Please set the min/max values with e. g.
- * a tc:gridLayoutConstraint tag.
+ *
+ * @deprecated since Tobago 1.5.0. Please set the min/max values with e. g. a tc:gridLayoutConstraint tag.
*/
@Deprecated
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
index 7068f59..c772a69 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
@@ -34,8 +34,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
import javax.faces.component.UIPanel;
/**
- * Intended for use in situations when only one UIComponent child can be
- * nested, such as in the case of facets.
+ * Intended for use in situations when only one UIComponent child can be nested, such as in the case of facets.
*/
@Tag(name = "panel")
@UIComponentTag(
@@ -46,10 +45,10 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.PANEL,
interfaces = "org.apache.myfaces.tobago.component.SupportsMarkup",
facets = {
- @Facet(name= Facets.RELOAD, description = "Contains an instance of UIReload",
+ @Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
- @Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
+ @Facet(name = Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
-public interface PanelTagDeclaration
+public interface PanelTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
index e7bdfc9..e96c2eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
@@ -35,8 +35,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
/**
- * Register an PopupActionListener instance on the UIComponent
- * associated with the closest parent UIComponent.
+ * Register an PopupActionListener instance on the UIComponent associated with the closest parent UIComponent.
*/
@Tag(name = "popupReference")
@SimpleTag(
@@ -58,7 +57,7 @@ public abstract class PopupReferenceTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
final UIComponent component = tag.getComponentInstance();
@@ -80,15 +79,15 @@ public abstract class PopupReferenceTag extends TagSupport {
} else {
component.setValueExpression(Attributes.FOR, forValue);
}
- return (SKIP_BODY);
+ return SKIP_BODY;
}
/**
* The id of a Popup.
*/
@TagAttribute(required = true, name = "for", type = "java.lang.String")
- public void setFor(final ValueExpression forValue) {
- this.forValue = forValue;
+ public void setFor(final ValueExpression forValueParameter) {
+ this.forValue = forValueParameter;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
index 1c8e52f..1272443 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
@@ -35,10 +35,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContain
import javax.faces.component.UIPanel;
/**
- * Renders a popup panel.
- * The popup gets a grid layout manager with columns="auto" and rows="auto" as definition.
- * So a popup should contain only one layout component.
- * The default layout manager can be overwritten with the layout facet.
+ * Renders a popup panel. The popup gets a grid layout manager with columns="auto" and rows="auto" as definition. So a
+ * popup should contain only one layout component. The default layout manager can be overwritten with the layout facet.
*/
@Tag(name = "popup")
@UIComponentTag(
@@ -52,14 +50,14 @@ import javax.faces.component.UIPanel;
description = "Contains an instance of AbstractUILayoutBase",
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")}
)
-public interface PopupTagDeclaration
+public interface PopupTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponentWithDimension, IsGridLayoutContainer,
HasMarkup, HasCurrentMarkup {
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
void setModal(String modal);
-
+
/**
* This value will usually be set by the layout manager.
*
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
index a29d040..b870303 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
@@ -47,11 +47,11 @@ import javax.faces.component.UIOutput;
rendererType = RendererTypes.PROGRESS,
allowedChildComponenents = "NONE",
facets = {@Facet(
- name= Facets.COMPLETE,
+ name = Facets.COMPLETE,
description =
"Contains an instance of UICommand (tc:command). The action is invoked if the full progress has reached",
allowedChildComponenents = "org.apache.myfaces.tobago.Command")})
-
+
public interface ProgressTagDeclaration
extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent {
@@ -60,7 +60,7 @@ public interface ProgressTagDeclaration
*/
@TagAttribute
@UIComponentTagAttribute(
- type = { "javax.swing.BoundedRangeModel" },
+ type = {"javax.swing.BoundedRangeModel"},
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
index a2c716e..4c53556 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
@@ -52,10 +52,8 @@ public interface ReloadTagDeclaration extends HasIdBindingAndRendered {
void setUpdate(String update);
/**
- * Flag indicating that
- * the update check should be performed
- * immediately (that is, during Apply Request Values phase) rather than
- * waiting until Render Response phase.
+ * Flag indicating that the update check should be performed immediately (that is, during Apply Request Values phase)
+ * rather than waiting until Render Response phase.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
index e963e62..ae8483a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
@@ -39,8 +39,8 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
/**
- * A ResetInputActionListener is a declarative way to allow an action source to reset all EditableValueHolder
- * of a page or in a sub-form or part of the component tree.
+ * A ResetInputActionListener is a declarative way to allow an action source to reset all EditableValueHolder of a page
+ * or in a sub-form or part of the component tree.
*/
@Tag(name = "resetInputActionListener")
@SimpleTag(
@@ -62,7 +62,7 @@ public abstract class ResetInputActionListenerTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
final UIComponent component = tag.getComponentInstance();
@@ -86,7 +86,7 @@ public abstract class ResetInputActionListenerTag extends TagSupport {
} else {
actionSource.addActionListener(new ValueExpressionResetInputActionListener(execute));
}
- return (SKIP_BODY);
+ return SKIP_BODY;
}
@Override
@@ -96,8 +96,8 @@ public abstract class ResetInputActionListenerTag extends TagSupport {
}
/**
- * A list of ids of components. For each id, the surrounding (virtual) UIForm will be searched, and for each of
- * them, all containing EditableValueHolder will be reset.
+ * A list of ids of components. For each id, the surrounding (virtual) UIForm will be searched, and for each of them,
+ * all containing EditableValueHolder will be reset.
*/
@TagAttribute(required = false, name = Attributes.EXECUTE, type = "java.lang.String")
public void setExecute(final javax.el.ValueExpression execute) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
index 9265c23..fd7162c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
@@ -44,6 +44,7 @@ public interface ScriptTagDeclaration extends HasIdBindingAndRendered {
/**
* File name to include into the rendered page.
+ *
* @param file A JavaScript file.
*/
@TagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
index 829ce7e..bc0654b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
@@ -62,20 +62,20 @@ import javax.faces.component.UISelectBoolean;
rendererType = RendererTypes.SELECT_BOOLEAN_CHECKBOX,
allowedChildComponenents = "NONE",
facets = {
- @Facet(name= Facets.CLICK,
+ @Facet(name = Facets.CLICK,
description =
"This facet can contain a UICommand that is invoked in case of a click event from the component",
allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
- @Facet(name=Facets.CHANGE,
+ @Facet(name = Facets.CHANGE,
description =
"This facet can contain a UICommand that is invoked in case of a change event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command")
- })
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+ })
public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex,
IsRequiredForSelect, HasConverter, IsFocus,
HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage, IsGridLayoutComponent, HasItemLabel {
- // IsImmediateComponent
+ // IsImmediateComponent
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
index fc56a1a..78e9d57 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
@@ -31,9 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
/**
- * Add a child UISelectItem component to the UIComponent
- * associated with the closed parent UIComponent custom
- * action.
+ * Add a child UISelectItem component to the UIComponent associated with the closed parent UIComponent custom action.
*/
@Tag(name = "selectItem")
@UIComponentTag(
@@ -45,6 +43,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup,
/**
* Description of an item, might be rendered as a tool tip.
+ *
* @deprecated since 2.0.0, please use itemTip.
*/
@Deprecated
@@ -53,8 +52,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup,
void setItemDescription(String itemDescription);
/**
- * Flag indicating whether the option created
- * by this component is disabled.
+ * Flag indicating whether the option created by this component is disabled.
*/
@TagAttribute
@UIComponentTagAttribute(type = {"boolean"}, defaultValue = "false")
@@ -68,8 +66,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup,
void setItemValue(String itemValue);
/**
- * Value binding expression pointing at a SelectItem instance containing
- * the information for this option.
+ * Value binding expression pointing at a SelectItem instance containing the information for this option.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
index e7938f2..15891a1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
@@ -29,9 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
/**
- * Add a child UISelectItems component to the UIComponent
- * associated with the closed parent UIComponent custom
- * action.
+ * Add a child UISelectItems component to the UIComponent associated with the closed parent UIComponent custom action.
*/
@Tag(name = "selectItems")
@UIComponentTag(
@@ -43,8 +41,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLabel {
/**
- * Value binding expression pointing at a List or array of SelectItem instances containing
- * the information for this option.
+ * Value binding expression pointing at a List or array of SelectItem instances containing the information for this
+ * option.
*/
@TagAttribute
@UIComponentTagAttribute(
@@ -53,16 +51,14 @@ public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLab
void setValue(String value);
/**
- * Name of a variable under which the iterated data will be exposed.
- * It may be referred to in EL of other attributes.
+ * Name of a variable under which the iterated data will be exposed. It may be referred to in EL of other attributes.
*/
@TagAttribute
@UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
void setVar(final String var);
/**
- * Flag indicating whether the option created
- * by this component is disabled.
+ * Flag indicating whether the option created by this component is disabled.
*/
@TagAttribute
@UIComponentTagAttribute(type = {"boolean"}, defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
index b3ff946..86f5913 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
@@ -53,25 +53,24 @@ import javax.faces.component.UISelectOne;
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
- },
+ },
facets = {
- @Facet(name= Facets.CLICK,
- description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
- @Facet(name=Facets.CHANGE,
- description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command")
- })
+ @Facet(name = Facets.CLICK,
+ description =
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+ @Facet(name = Facets.CHANGE,
+ description =
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+ })
public interface SelectOneChoiceTagDeclaration
extends SelectOneTagDeclaration, HasId, IsDisabled,
IsReadonly, HasLabel, IsRendered, HasConverter, HasBinding, HasTip, Select2 {
/**
- * Flag indicating that selecting an Item representing a value is required.
- * If an SelectItem was chosen which underling value is an empty string an
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that selecting an Item representing a value is required. If an SelectItem was chosen which
+ * underling value is an empty string an ValidationError occurs and a Error Message is rendered.
*/
@TagAttribute()
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
index 5a81fb5..884139a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
@@ -52,24 +52,23 @@ import javax.faces.component.UISelectOne;
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
- },
+ },
facets = {
- @Facet(name=Facets.CLICK,
- description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
- @Facet(name= Facets.CHANGE,
- description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command")
- })
+ @Facet(name = Facets.CLICK,
+ description =
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+ @Facet(name = Facets.CHANGE,
+ description =
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+ })
public interface SelectOneListboxTagDeclaration extends SelectOneTagDeclaration, HasId, IsDisabled,
IsReadonly, HasLabel, IsRendered, HasBinding, HasTip, HasConverter {
/**
- * Flag indicating that selecting an Item representing a Value is Required.
- * If an SelectItem was chosen which underling value is an empty string an
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that selecting an Item representing a Value is Required. If an SelectItem was chosen which
+ * underling value is an empty string an ValidationError occurs and a Error Message is rendered.
*/
@TagAttribute()
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
index 56f3588..88dea9e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
@@ -54,24 +54,23 @@ import javax.faces.component.UISelectOne;
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
- },
+ },
facets = {
- @Facet(name= Facets.CLICK,
- description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
- @Facet(name=Facets.CHANGE,
- description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command")
- })
+ @Facet(name = Facets.CLICK,
+ description =
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+ @Facet(name = Facets.CHANGE,
+ description =
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+ })
public interface SelectOneRadioTagDeclaration extends SelectOneTagDeclaration, IsDisabled, IsReadonly, HasId,
HasTip, IsInline, HasRenderRange, IsRendered, HasBinding, HasConverter, HasInputLabel {
/**
- * Flag indicating that selecting an Item representing a Value is Required.
- * If an SelectItem was chosen which underling value is an empty string an
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that selecting an Item representing a Value is Required. If an SelectItem was chosen which
+ * underling value is an empty string an ValidationError occurs and a Error Message is rendered.
*/
@TagAttribute()
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
index 6af56ad..91aa0b5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
@@ -29,8 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import javax.faces.component.UIOutput;
/**
- * Renders a set of option related to and same type as the <strong>for</strong>
- * component.
+ * Renders a set of option related to and same type as the <strong>for</strong> component.
*/
@Tag(name = "selectReference")
@UIComponentTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
index 1d0e0ca..8594fa1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
@@ -56,13 +56,13 @@ import javax.faces.component.UIData;
"javax.faces.Column",
"org.apache.myfaces.tobago.ColumnSelector"},
facets = {@Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
- allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
-public interface SheetTagDeclaration
+ allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
+public interface SheetTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup,
HasRenderedPartially, IsShowRoot, IsShowRootJunction, HasVar {
/**
- * LayoutConstraints for column layout.
- * Semicolon separated list of layout tokens ('<x>*', '<x>px' or '<x>%').
+ * LayoutConstraints for column layout. Semicolon separated list of layout tokens ('<x>*', '<x>px' or
+ * '<x>%').
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -76,10 +76,8 @@ public interface SheetTagDeclaration
void setShowHeader(String showHeader);
/**
- * The number of rows to display, starting with the one identified by the
- * "first" property.
- * <br/> The default has been changed from 100 to 0 because this is the default
- * in the JSF standard (since Tobago 1.5).
+ * The number of rows to display, starting with the one identified by the "first" property. <br/> The default has been
+ * changed from 100 to 0 because this is the default in the JSF standard (since Tobago 1.5).
*/
@TagAttribute
@UIComponentTagAttribute(
@@ -131,8 +129,8 @@ public interface SheetTagDeclaration
void setDirectLinkCount(String directLinkCount);
/**
- * Flag indicating whether or not this sheet should reserve space for
- * vertical toolbar when calculating column width's.<br />
+ * Flag indicating whether or not this sheet should reserve space for vertical toolbar when calculating column
+ * width's.<br />
* Possible values are: <pre>
* 'auto' : sheet try to estimate the need of scrollbar.
* 'true' : space for scrollbar is reserved.
@@ -145,8 +143,7 @@ public interface SheetTagDeclaration
void setForceVerticalScrollbar(String forceVerticalScrollbar);
/**
- * Flag indicating whether or not a range of direct paging links should be
- * rendered in the sheet's footer.
+ * Flag indicating whether or not a range of direct paging links should be rendered in the sheet's footer.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "center",
@@ -154,9 +151,8 @@ public interface SheetTagDeclaration
void setShowDirectLinks(String showDirectLinks);
/**
- * Flag indicating whether and where the range pages should
- * rendered in the sheet's footer. Rendering this range also offers the
- * capability to enter the index displayed page directly.
+ * Flag indicating whether and where the range pages should rendered in the sheet's footer. Rendering this range also
+ * offers the capability to enter the index displayed page directly.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "right",
@@ -164,9 +160,8 @@ public interface SheetTagDeclaration
void setShowPageRange(String showPageRange);
/**
- * Flag indicating whether or not the range of displayed rows should
- * rendered in the sheet's footer. Rendering this range also offers the
- * capability to enter the index of the start row directly.
+ * Flag indicating whether or not the range of displayed rows should rendered in the sheet's footer. Rendering this
+ * range also offers the capability to enter the index of the start row directly.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "left",
@@ -192,10 +187,9 @@ public interface SheetTagDeclaration
void setState(String state);
/**
- * Method binding representing a stateChangeListener method that will be
- * notified when the state was changed by the user.
- * The expression must evaluate to a public method that takes a
- * SheetStateChangeEvent parameter, with a return type of void.
+ * Method binding representing a stateChangeListener method that will be notified when the state was changed by the
+ * user. The expression must evaluate to a public method that takes a SheetStateChangeEvent parameter, with a return
+ * type of void.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
@@ -204,16 +198,12 @@ public interface SheetTagDeclaration
void setStateChangeListener(String stateChangeListener);
/**
- * Method binding representing an actionListener method that will be
- * invoked when sorting was requested by the user.
- * Use this if your application needs special handling for sorting columns.
- * If this is not set and the sortable attribute column is set to true the sheet
- * implementation will use a default sort method.
- * The expression must evaluate to a public method which takes an
- * ActionEvent as parameter and with a return type of void.
- * The method will receive a {@link org.apache.myfaces.tobago.event.SortActionEvent}.
- * The method should sort according to the sortColumnId and direction getting from
- * the sheet's {@link org.apache.myfaces.tobago.model.SheetState} object.
+ * Method binding representing an actionListener method that will be invoked when sorting was requested by the user.
+ * Use this if your application needs special handling for sorting columns. If this is not set and the sortable
+ * attribute column is set to true the sheet implementation will use a default sort method. The expression must
+ * evaluate to a public method which takes an ActionEvent as parameter and with a return type of void. The method will
+ * receive a {@link org.apache.myfaces.tobago.event.SortActionEvent}. The method should sort according to the
+ * sortColumnId and direction getting from the sheet's {@link org.apache.myfaces.tobago.model.SheetState} object.
*/
@TagAttribute
@UIComponentTagAttribute(
@@ -224,6 +214,7 @@ public interface SheetTagDeclaration
/**
* Flag indicating if paging arrows are shown near direct links
+ *
* @since 2.0.0
*/
@TagAttribute
@@ -232,6 +223,7 @@ public interface SheetTagDeclaration
/**
* Flag indicating if paging arrows are shown near page range
+ *
* @since 2.0.0
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java
index 89a6256..e37bbdc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SplitLayoutTagDeclaration.java
@@ -33,11 +33,10 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasMargins;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasSpacing;
- /**
- * Renders a SplitLayout.
- * A area with two child components rendered horizontally or vertically and allows to change the
- * layout relation of this two components on the client.
- */
+/**
+ * Renders a SplitLayout. A area with two child components rendered horizontally or vertically and allows to change the
+ * layout relation of this two components on the client.
+ */
@Tag(name = "splitLayout")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISplitLayout",
@@ -50,17 +49,15 @@ public interface SplitLayoutTagDeclaration extends HasId, HasBorder, HasSpacing,
HasMargins, HasBinding, HasMarkup, HasCurrentMarkup {
/**
- * This value defines the layout constraints for the layout.
- * It is two layout tokens separated by a semicolon. See GridLayout.
- * Example: '2*;*'.
+ * This value defines the layout constraints for the layout. It is two layout tokens separated by a semicolon. See
+ * GridLayout. Example: '2*;*'.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "1*;1*")
void setLayout(String rows);
/**
- * This value defines the orientation of the split layout.
- * Possible values are 'HORIZONTAL' and 'VERTICAL'.
+ * This value defines the orientation of the split layout. Possible values are 'HORIZONTAL' and 'VERTICAL'.
*/
@TagAttribute(required = true)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
index ddf3d4e..897d3e2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
@@ -53,6 +53,7 @@ public interface StyleTagDeclaration extends HasIdBindingAndRendered {
/**
* stylesheet to add to page.
+ *
* @deprecated inline styles are deprecated because of CSP
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
index 6e2f59f..6ee02da 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
@@ -34,7 +34,7 @@ import javax.faces.component.UIInput;
/**
* Renders a list of suggested texts for a given input field.
- *
+ * <p>
* Basic features:
* <ul>
* <li>provide a list directly while rendering (not AJAX needed) [todo]</li>
@@ -76,9 +76,8 @@ public interface SuggestTagDeclaration extends HasIdBindingAndRendered, HasMarku
void setSuggestMethod(String suggestMethod);
/**
- * Minimum number of characters to type before the list will be requested.
- * If the value is 0, there will be send an initial list to the client.
- * So, if you set <pre>update="false"</pre> this value should be 0.
+ * Minimum number of characters to type before the list will be requested. If the value is 0, there will be send an
+ * initial list to the client. So, if you set <pre>update="false"</pre> this value should be 0.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "1")
@@ -99,10 +98,9 @@ public interface SuggestTagDeclaration extends HasIdBindingAndRendered, HasMarku
void setMaximumItems(String maximumItems);
/**
- * The real size of the result list.
- * Typically the result list will be cropped (in the backend) to save memory.
- * This value can be set, to show the user there are more results for the given string.
- * If the value is -1, no hint will be displayed.
+ * The real size of the result list. Typically the result list will be cropped (in the backend) to save memory. This
+ * value can be set, to show the user there are more results for the given string. If the value is -1, no hint will be
+ * displayed.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "-1")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
index 6df8e08..e86b35c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
@@ -36,8 +36,8 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
/**
- * Register an TabChangedListener instance on the UIComponent
- * associated with the closest parent UIComponent custom action.
+ * Register an TabChangedListener instance on the UIComponent associated with the closest parent UIComponent custom
+ * action.
*/
@Tag(name = "tabChangeListener")
@SimpleTag(
@@ -50,8 +50,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
private ValueExpression binding;
/**
- * Fully qualified Java class name of a TabChangeListener to be
- * created and registered.
+ * Fully qualified Java class name of a TabChangeListener to be created and registered.
*/
@TagAttribute(required = true, name = "type", type = "java.lang.String")
public void setType(final ValueExpression type) {
@@ -68,10 +67,9 @@ public abstract class TabChangeListenerTag extends TagSupport {
/**
* <p>Create a new instance of the specified {@link TabChangeListener}
- * class, and register it with the {@link javax.faces.component.UIComponent} instance associated
- * with our most immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if
- * the {@link javax.faces.component.UIComponent} instance was created by this execution of the
- * containing JSP page.</p>
+ * class, and register it with the {@link javax.faces.component.UIComponent} instance associated with our most
+ * immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if the {@link
+ * javax.faces.component.UIComponent} instance was created by this execution of the containing JSP page.</p>
*
* @throws JspException if a JSP error occurs
*/
@@ -86,7 +84,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
}
if (!tag.getCreated()) {
- return (SKIP_BODY);
+ return SKIP_BODY;
}
final UIComponent component = tag.getComponentInstance();
@@ -126,7 +124,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
}
}
- return (SKIP_BODY);
+ return SKIP_BODY;
}
/**
@@ -138,7 +136,7 @@ public abstract class TabChangeListenerTag extends TagSupport {
protected TabChangeListener createTabChangeListener(final String className) throws JspException {
try {
final Class clazz = getClass().getClassLoader().loadClass(className);
- return ((TabChangeListener) clazz.newInstance());
+ return (TabChangeListener) clazz.newInstance();
} catch (final Exception e) {
throw new JspException(e);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
index 3f2458f..86c99eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
@@ -76,20 +76,19 @@ public interface TabGroupTagDeclaration
* <dt>reloadTab</dt>
* <dd>Tab switching is done by server request. Only the Tab is reloaded.</dd>
* </dl>
+ *
* @param switchType Sets the switching type.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.String",
allowedValues = {AbstractUITabGroup.SWITCH_TYPE_CLIENT, AbstractUITabGroup.SWITCH_TYPE_RELOAD_PAGE,
- AbstractUITabGroup.SWITCH_TYPE_RELOAD_TAB},
+ AbstractUITabGroup.SWITCH_TYPE_RELOAD_TAB},
defaultValue = AbstractUITabGroup.SWITCH_TYPE_CLIENT)
void setSwitchType(String switchType);
/**
- *
* <strong>ValueBindingExpression</strong> pointing to a Integer to save the
* component's selected Tab.
- *
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "0")
@@ -101,7 +100,7 @@ public interface TabGroupTagDeclaration
@UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "0")
void setRenderedIndex(String renderedIndex);
- @TagAttribute
+ @TagAttribute
@UIComponentTagAttribute(
type = {},
expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
index e3e9fce..d2dfdf2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
@@ -32,5 +32,5 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.TAB_GROUP_TOOL_BAR,
allowedChildComponenents = {
"org.apache.myfaces.tobago.Command"})
-public interface TabGroupToolBarTagDeclaration extends ToolBarTagDeclaration{
+public interface TabGroupToolBarTagDeclaration extends ToolBarTagDeclaration {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
index 40490c7..d2a5261 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
@@ -31,16 +31,12 @@ import javax.faces.component.UIPanel;
/**
* <p/>
- * Renders a toolbar.<p />
- * Allowed subcomponents are subtypes of UICommand i.e.
+ * Renders a toolbar.<p /> Allowed subcomponents are subtypes of UICommand i.e.
* <code>'button'</code> and <code>'link'</code> tags.
- * These are rendered by ToolbarRenderer, so the result has
- * no difference.<p />
- * To add an drop down menu to a button add a facet <code>'dropDownMenu'</code>
- * containing a
+ * These are rendered by ToolbarRenderer, so the result has no difference.<p /> To add an drop down menu to a button add
+ * a facet <code>'dropDownMenu'</code> containing a
* <a href="menu.html"><code><tc:menu></code></a>
- * tag to the button. Label's and Image's on those menu tag's are ignored
- * and replaced by the renderer.
+ * tag to the button. Label's and Image's on those menu tag's are ignored and replaced by the renderer.
* <pre>
* <tc:button onclick="alert('test 0')"
* label="Alert 0" >
@@ -69,8 +65,8 @@ import javax.faces.component.UIPanel;
"org.apache.myfaces.tobago.Command"})
public interface ToolBarTagDeclaration extends PanelTagDeclaration {
/**
- * Position of the button label, possible values are: right, bottom, off.
- * If toolbar is facet of box: bottom is changed to right!
+ * Position of the button label, possible values are: right, bottom, off. If toolbar is facet of box: bottom is
+ * changed to right!
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = AbstractUIToolBar.LABEL_BOTTOM,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
index 551653e..f9bfb2a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
@@ -30,8 +30,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
import javax.faces.component.UIInput;
/**
- * Describes a sub tree of nodes.
- * The value has to be a javax.swing.tree.TreeNode object to use as rootNode in the tree.
+ * Describes a sub tree of nodes. The value has to be a javax.swing.tree.TreeNode object to use as rootNode in the
+ * tree.
*
* @deprecated since 2.0.0. Please use the "var" and "value" attribute of the parent tree tag.
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
index 5e98f0a..5a2968d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
@@ -56,8 +56,7 @@ public interface TreeListboxTagDeclaration
IsRequired {
/**
- * Flag indicating whether or not this component should be render selectable items.
- * Possible values are:
+ * Flag indicating whether or not this component should be render selectable items. Possible values are:
* <ul>
* <li><strong>single</strong> : a single section tree is rendered</li>
* <li><strong>multiLeafOnly</strong> : a multi section tree is rendered,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
index d078353..8df7114 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
@@ -37,8 +37,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRoot;
import javax.faces.component.UIData;
/**
- * A tree which will be displayed like a flat menu.
- * This menu is often used for navigation on the left side of an application.
+ * A tree which will be displayed like a flat menu. This menu is often used for navigation on the left side of an
+ * application.
*/
@Tag(name = "treeMenu")
@BodyContentDescription(anyTagOf = "<tc:treeData>")
@@ -51,13 +51,12 @@ import javax.faces.component.UIData;
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode",
"org.apache.myfaces.tobago.TreeData"
- })
+ })
public interface TreeMenuTagDeclaration
extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup,
IsShowRoot {
/**
- *
* <strong>ValueBindingExpression</strong> pointing to a object to save the
* component's state.
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
index c19b06d..3fb9ee9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
@@ -52,11 +52,12 @@ import javax.faces.component.UIColumn;
"org.apache.myfaces.tobago.TreeData"
})
public interface
- TreeNodeTagDeclaration
+TreeNodeTagDeclaration
extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, IsGridLayoutContainer {
/**
* Flag indicating if the subnodes are to be displayed.
+ *
* @deprecated since 2.0.0. Please use the state attribute of the tree with a TreeState
*/
@Deprecated
@@ -66,6 +67,7 @@ public interface
/**
* Flag indicating if the node is marked, and should be displayed in a special way.
+ *
* @deprecated since 2.0.0. Please use the state attribute of the tree with a TreeState
*/
@Deprecated
@@ -75,6 +77,7 @@ public interface
/**
* Flag indicating if the node is selected (only possible, when the tree component allows it).
+ *
* @deprecated since 2.0.0. Please use <code><tc:treeSelect></code>
*/
@Deprecated
@@ -94,8 +97,10 @@ public interface
/**
* Method binding representing a markedListener method that ....
+ *
* @deprecated since 2.0.0.
*/
+ @Deprecated
@TagAttribute
@UIComponentTagAttribute(type = {},
generate = false,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
index 1957352..d6afbed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
@@ -53,12 +53,12 @@ import javax.faces.component.UISelectBoolean;
allowedChildComponenents = "NONE")
public interface TreeSelectTagDeclaration
extends HasIdBindingAndRendered, HasLabel, HasTip, HasMarkup, HasCurrentMarkup, HasValue, HasValueChangeListener,
- IsDisabled, IsRequiredForSelect, HasConverter,
- HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage {
+ IsDisabled, IsRequiredForSelect, HasConverter,
+ HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage {
/**
- * Show a checkbox to visualize the selection state.
- * This is useful to hide the checkbox, e. g. dependent of the type of the node.
+ * Show a checkbox to visualize the selection state. This is useful to hide the checkbox, e. g. dependent of the type
+ * of the node.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
index 6fd99bd..98d550b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
@@ -38,8 +38,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRootJunction;
import javax.faces.component.UIData;
/**
- * A tree with classical look.
- * Usually used with icons and junction lines to open folder, etc.
+ * A tree with classical look. Usually used with icons and junction lines to open folder, etc.
*/
@Tag(name = "tree")
@BodyContentDescription(anyTagOf = "<tc:treeData>")
@@ -52,14 +51,13 @@ import javax.faces.component.UIData;
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode",
"org.apache.myfaces.tobago.TreeData"
- })
+ })
public interface TreeTagDeclaration
extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup,
IsShowRoot, IsShowRootJunction {
/**
- * Flag indicating whether or not this component should be render selectable items.
- * Possible values are:
+ * Flag indicating whether or not this component should be render selectable items. Possible values are:
* <ul>
* <li><strong>none</strong> : not selectable</li>
* <li><strong>multi</strong> : a multi section tree is rendered</li>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
index adb5e43..e106d7b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
@@ -36,8 +36,8 @@ import javax.faces.webapp.ValidatorELTag;
import javax.servlet.jsp.JspException;
/**
- * Register an FileItemValidator instance on the UIComponent
- * associated with the closest parent UIComponent custom action.
+ * Register an FileItemValidator instance on the UIComponent associated with the closest parent UIComponent custom
+ * action.
*/
@Tag(name = "validateFileItem")
@ValidatorTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
index 2521019..d50d9b8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
@@ -33,10 +33,9 @@ import javax.faces.webapp.ValidatorELTag;
import javax.servlet.jsp.JspException;
/**
- * Register an SubmittedValueLengthValidator instance on the UIComponent
- * associated with the closest parent UIComponent custom action.
- * The standard LengthValidator validate the length on the converted value.toString()
- * not on the submitted value. Sometime you need to check the length of the submitted value.
+ * Register an SubmittedValueLengthValidator instance on the UIComponent associated with the closest parent UIComponent
+ * custom action. The standard LengthValidator validate the length on the converted value.toString() not on the
+ * submitted value. Sometime you need to check the length of the submitted value.
*/
@Tag(name = "validateSubmittedValueLength")
@ValidatorTag(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
index 3144496..8070cf5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
@@ -47,7 +47,7 @@ import javax.faces.component.UIPanel;
uiComponentFacesClass = "javax.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.WIZARD)
-public interface WizardTagDeclaration
+public interface WizardTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
@TagAttribute(required = true)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
index 3a2b24b..88e163d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
@@ -29,21 +29,15 @@ public interface Component {
void setId(String s);
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
- *
- * @param s
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
void setRendered(String s);
/**
- * The value binding expression linking this component to a property
- * in a backing bean
- *
- * @param binding
- * @throws JspException
+ * The value binding expression linking this component to a property in a backing bean
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
index 1d1c39e..33f6e4a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
@@ -25,13 +25,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasAction {
/**
- * Action to invoke when clicked.
- * This must be a MethodBinding or a String representing the application action to invoke when
- * this component is activated by the user.
- * The MethodBinding must evaluate to a public method that takes no parameters,
- * and returns a String (the logical outcome) which is passed to the
- * NavigationHandler for this application.
- * The string is directly passed to the navigation handler.
+ * Action to invoke when clicked. This must be a MethodBinding or a String representing the application action to
+ * invoke when this component is activated by the user. The MethodBinding must evaluate to a public method that takes
+ * no parameters, and returns a String (the logical outcome) which is passed to the NavigationHandler for this
+ * application. The string is directly passed to the navigation handler.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
index 881f1cb..9bc9a52 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
@@ -25,10 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasActionListener {
/**
- * MethodBinding representing an action listener method that will be
- * notified when this component is activated by the user.
- * The expression must evaluate to a public method that takes an ActionEvent
- * parameter, with a return type of void.
+ * MethodBinding representing an action listener method that will be notified when this component is activated by the
+ * user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of
+ * void.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java
index fd5f191..9de75c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasColumnLayout.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasColumnLayout {
/**
- * This value defines the layout constraints for column layout.
- * It is a semicolon separated list of layout tokens '[<n>]*', '<n>px' or 'auto'.
- * Where <n> is a non negative integer and the square brackets means optional.
+ * This value defines the layout constraints for column layout. It is a semicolon separated list of layout tokens
+ * '[<n>]*', '<n>px' or 'auto'. Where <n> is a non negative integer and the square brackets means optional.
* Example: '2*;*;100px;auto'.
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
index a68239a..798dced 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
@@ -25,13 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasConverter {
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java
index 099e5c2..e79a109 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCurrentMarkup.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasCurrentMarkup {
-
+
/**
- * The current markup is the current internal state of the markup.
- * It is the same as markup plus additional values like "required", "error", "selected", ....
+ * The current markup is the current internal state of the markup. It is the same as markup plus additional values
+ * like "required", "error", "selected", ....
*/
@UIComponentTagAttribute(
type = "org.apache.myfaces.tobago.context.Markup",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java
index 32ea162..df39050 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasFieldId.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasFieldId {
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java
index 958eaa0..5090f4c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasId.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasId {
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute(type = "java.lang.String")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java
index c1d20b1..68ebe71 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabel.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasLabel {
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey (if configured so and possible).
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey (if
+ * configured so and possible).
*/
@TagAttribute
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java
index 6d7f2b2..e21de3f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLabelWidth.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasLabelWidth {
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java
index 3c49935..b0a821a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasLink.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasLink {
/**
* Link to an arbitrary URL, either an internal link or an external link.
-
+ *
* <dl>
* <dt>internal absolute link</dt>
* <dd>Starts with a slash '/' character. The context path will be added.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java
index 2469542..e78ef1a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMargin.java
@@ -22,7 +22,9 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-/** @deprecated since Tobago 2.0.9. Please use {@link HasMargins} */
+/**
+ * @deprecated since Tobago 2.0.9. Please use {@link HasMargins}
+ */
@Deprecated
public interface HasMargin {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java
index 7a40e3b..5fa7ef6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasMarkup.java
@@ -23,11 +23,10 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasMarkup {
-
+
/**
- * Indicate markup of this component.
- * The allowed markups can be defined or overridden in the theme.
- * The value 'none' should not be used any longer. Just leave the attribute empty, or use a NULL pointer.
+ * Indicate markup of this component. The allowed markups can be defined or overridden in the theme. The value 'none'
+ * should not be used any longer. Just leave the attribute empty, or use a NULL pointer.
*/
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.context.Markup")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
index b633fd9..501ddaf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
@@ -22,12 +22,15 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-/** @deprecated Since 2.0.0. This attribute work not with SCP */
+/**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
public interface HasOnchange {
/**
* Client side script function to add to this component's onchange handler.
+ *
* @deprecated Since 2.0.0. This attribute work not with SCP
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
index 452d094..744caa1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
@@ -29,8 +29,6 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasOnclick {
/**
* Script to be invoked when clicked
- *
- * @param onclick
*/
@TagAttribute
@UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java
index d229e13..c5a2a83 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasPlaceholder.java
@@ -25,10 +25,11 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasPlaceholder {
/**
- * Displays a short text in the input field, that describes the meaning of this field.
- * This is part of HTML 5, the theme should emulate the behaviour, when the browser doesn't support it.
+ * Displays a short text in the input field, that describes the meaning of this field. This is part of HTML 5, the
+ * theme should emulate the behaviour, when the browser doesn't support it.
* <p/>
* The text will not be displayed, when the input field is readonly or disabled.
+ *
* @param placeholder The text to display
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
index 88b4044..6a3ecfc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRenderedPartially.java
@@ -55,7 +55,7 @@ public interface HasRenderedPartially {
* You can also use @this for the component itself.
* </p>
*/
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.String[]")
- void setRenderedPartially(String componentIds);
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.String[]")
+ void setRenderedPartially(String componentIds);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java
index 8fb8269..f0e8208 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasResource.java
@@ -24,10 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasResource {
/**
- * Link to an internal resource.
- * Resources will be processed by the resource management.
- * E. g. define help.html and it will be served help_es.html or help_de.html if available.
- * For JSF-Pages you have to set the jsfResource attribute.
+ * Link to an internal resource. Resources will be processed by the resource management. E. g. define help.html and it
+ * will be served help_es.html or help_de.html if available. For JSF-Pages you have to set the jsfResource attribute.
*
* @param resource The internal resource.
* @see #setJsfResource(String)
@@ -37,9 +35,8 @@ public interface HasResource {
void setResource(String resource);
/**
- * Flag indicating that the resource referenced by the resource attribute is a jsf resource.
- * That means that the url has to be processed to change the prefix or suffix (e. g. *.jsf or
- * /faces/*). Default is false.
+ * Flag indicating that the resource referenced by the resource attribute is a jsf resource. That means that the url
+ * has to be processed to change the prefix or suffix (e. g. *.jsf or /faces/*). Default is false.
*
* @param jsfResource Is the Resource a JSF page or not?
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java
index 795ee0f..809a969 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRowLayout.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasRowLayout {
/**
- * This value defines the layout constraints for column layout.
- * It is a semicolon separated list of layout tokens '[<n>]*', '<n>px' or 'auto'.
- * Where <n> is a non negative integer and the square brackets means optional.
+ * This value defines the layout constraints for column layout. It is a semicolon separated list of layout tokens
+ * '[<n>]*', '<n>px' or 'auto'. Where <n> is a non negative integer and the square brackets means optional.
* Example: '2*;*;100px;auto'.
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java
index f573445..07d363e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSanitize.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasSanitize {
/**
- * Should HTML content sanitized?
- * The effect of sanitizing depends on the configuration.
- * The value "auto" means, that sanitizing take place for
+ * Should HTML content sanitized? The effect of sanitizing depends on the configuration. The value "auto" means, that
+ * sanitizing take place for
* <ul>
* <li>tc:out when escape="false" or</li>
* <li>tc:textarea when attribute data-html-editor is set,</li>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java
index 8d2df8d..4e4fcec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSpacing.java
@@ -25,8 +25,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasSpacing {
/**
- * Spacing between component and layout cell's.
- * Can be overwritten by columnSpacing and rowSpacing.
+ * Spacing between component and layout cell's. Can be overwritten by columnSpacing and rowSpacing.
*
* @deprecated Use columnSpacing and/or rowSpacing instead.
*/
@@ -42,7 +41,7 @@ public interface HasSpacing {
@TagAttribute
@UIComponentTagAttribute(
type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "getCellspacing() != null\n"
+ defaultCode = "getCellspacing() != null\n"
+ " ? getCellspacing()\n : getRendererType() != null"
+ " ? ((SpacingValues)getRenderer(getFacesContext())).getColumnSpacing(getFacesContext(), this)"
+ " : Measure.ZERO")
@@ -54,7 +53,7 @@ public interface HasSpacing {
@TagAttribute
@UIComponentTagAttribute(
type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "getCellspacing() != null\n"
+ defaultCode = "getCellspacing() != null\n"
+ " ? getCellspacing()\n : getRendererType() != null"
+ " ? ((SpacingValues)getRenderer(getFacesContext())).getRowSpacing(getFacesContext(), this) : Measure.ZERO")
void setRowSpacing(String rowSpacing);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
index 241ca80..eb02cdc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
@@ -30,11 +30,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasSuggestMethod {
/**
- * MethodBinding which generates a list of suggested input values based on
- * the currently entered text, which could be retrieved via getSubmittedValue() on the UIIn.
- * The expression has to evaluate to a public method which has a javax.faces.component.UIInput parameter
- * and returns a List<String>(deprecated), a List<org.apache.myfaces.tobago.model.AutoSuggestItem>
- * or a org.apache.myfaces.tobago.model.AutoSuggestItems.
+ * MethodBinding which generates a list of suggested input values based on the currently entered text, which could be
+ * retrieved via getSubmittedValue() on the UIIn. The expression has to evaluate to a public method which has a
+ * javax.faces.component.UIInput parameter and returns a List<String>(deprecated), a
+ * List<org.apache.myfaces.tobago.model.AutoSuggestItem> or a org.apache.myfaces.tobago.model.AutoSuggestItems.
*
* @deprecated since 2.0.0, please use tc:suggest
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java
index 7494a0d..28c05b9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabChangeListenerType.java
@@ -24,8 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasTabChangeListenerType {
/**
- * Fully qualified Java class name of a TabChangeListener to be
- * created and registered.
+ * Fully qualified Java class name of a TabChangeListener to be created and registered.
*/
@TagAttribute
@UIComponentTagAttribute(type = {"java.util.List", "java.util.Map", "java.lang.Object[]"})
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java
index 740b6cf..900a869 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTabIndex.java
@@ -25,16 +25,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasTabIndex {
/**
- * Controls the navigation of the focus through the
- * input controls on a page with the Tab-Key.
- * The navigation starts from the element with
- * the lowest tabIndex value to the element with the highest value.
- * Elements that have identical tabIndex values should be navigated
- * in the order they appear in the character stream
- * Elements that are disabled or with a negative tabIndex
- * do not participate in the tabbing order.
- *
- * @param tabIndex
+ * Controls the navigation of the focus through the input controls on a page with the Tab-Key. The navigation starts
+ * from the element with the lowest tabIndex value to the element with the highest value. Elements that have identical
+ * tabIndex values should be navigated in the order they appear in the character stream Elements that are disabled or
+ * with a negative tabIndex do not participate in the tabbing order.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.Integer")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java
index 15e21dc..0e390c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasTarget.java
@@ -24,8 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasTarget {
/**
- * Name of a frame where the resource retrieved via this hyperlink is to be
- * displayed.
+ * Name of a frame where the resource retrieved via this hyperlink is to be displayed.
*/
@TagAttribute
@UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
index 0ebea59..60bcb54 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
@@ -25,14 +25,12 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasValidator {
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
void setValidator(String validator);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
index 5097c87..5640609 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
@@ -25,12 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasValueChangeListener {
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
index 49cd3d9..6bdb76a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
@@ -26,9 +26,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasVar {
/**
- * Name of a request-scope attribute under which the model data for the row
- * selected by the current value of the "rowIndex" property
- * (i.e. also the current value of the "rowData" property) will be exposed.
+ * Name of a request-scope attribute under which the model data for the row selected by the current value of the
+ * "rowIndex" property (i.e. also the current value of the "rowData" property) will be exposed.
*/
@TagAttribute(required = true)
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java
index 1f8fc90..c72cb8f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDefaultCommand.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsDefaultCommand {
/**
- * If true the command is executed as default -- for example if the
- * user presses the enter key inside a related input field.
+ * If true the command is executed as default -- for example if the user presses the enter key inside a related input
+ * field.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java
index 3172b89..8335ae3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDraggable.java
@@ -35,8 +35,7 @@ public interface IsDraggable {
void setDraggable(String draggable);
/**
- * Indicate draggable of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate draggable of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.String[]")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java
index ba46aa5..2b1ee18 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentBase.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
/**
- * @deprecated This class should not be used directly, please use IsGridLayoutComponent.
+ * @deprecated This class should not be used directly, please use IsGridLayoutComponent.
*/
@Deprecated
public interface IsGridLayoutComponentBase {
@@ -44,7 +44,7 @@ public interface IsGridLayoutComponentBase {
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
defaultCode = "getHeight()")
void setCurrentHeight(String currentHeight);
-
+
/**
* @param columnSpan The number of horizontal cells this component should use.
*/
@@ -176,5 +176,5 @@ public interface IsGridLayoutComponentBase {
*/
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Display")
void setDisplay(String display);
-
+
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java
index 1f6f89b..85807b3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutComponentWithDimension.java
@@ -23,14 +23,14 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
/**
- * The width and height attributes can be set explicitly on some components.
- * Generally it should be checked, if using of a layout manager is a better alternative.
+ * The width and height attributes can be set explicitly on some components. Generally it should be checked, if using of
+ * a layout manager is a better alternative.
*/
public interface IsGridLayoutComponentWithDimension extends IsGridLayoutComponentBase {
/**
- * The width of the component in the UI.
- * This value will usually be set by the layout manager, but can be set explicitly here.
+ * The width of the component in the UI. This value will usually be set by the layout manager, but can be set
+ * explicitly here.
*
* @param width The width for this component.
*/
@@ -41,8 +41,8 @@ public interface IsGridLayoutComponentWithDimension extends IsGridLayoutComponen
void setWidth(String width);
/**
- * The height of the component in the UI.
- * This value will usually be set by the layout manager, but can be set explicitly here.
+ * The height of the component in the UI. This value will usually be set by the layout manager, but can be set
+ * explicitly here.
*
* @param height The height for this component.
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
index 6cb282f..afc198d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
@@ -25,10 +25,9 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsImmediateCommand {
/**
- * Flag indicating that, if this component is activated by the user,
- * notifications should be delivered to interested listeners and actions
- * immediately (that is, during Apply Request Values phase) rather than
- * waiting until Invoke Application phase.
+ * Flag indicating that, if this component is activated by the user, notifications should be delivered to interested
+ * listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke
+ * Application phase.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java
index a97141c..7367f38 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsOmit.java
@@ -24,12 +24,10 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsOmit {
/**
- * Flag indicating that the action of this element, will not be executed from client side
- * (e. g. when the user clicks a button.
- * When setting this value to true, the action will not be executed by the Tobago, but it can executed
- * by JavaScript.
- * This attribute is useful, when you want to add JavaScript event handlers to commands manually.
- * In this case you usually don't want a submit with a full reload of the page.
+ * Flag indicating that the action of this element, will not be executed from client side (e. g. when the user clicks
+ * a button. When setting this value to true, the action will not be executed by the Tobago, but it can executed by
+ * JavaScript. This attribute is useful, when you want to add JavaScript event handlers to commands manually. In this
+ * case you usually don't want a submit with a full reload of the page.
*/
@TagAttribute()
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java
index 20c234c..1aba8d6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsPassword.java
@@ -25,8 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsPassword {
/**
- * Flag indicating whether or not this component should be rendered as
- * password field , so you will not see the typed charakters.
+ * Flag indicating whether or not this component should be rendered as password field , so you will not see the typed
+ * charakters.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
index 0a80135..c0b9393 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsRendered {
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
index 85c1413..1dea01e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsRequired {
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
index 9aac147..c713139 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
@@ -24,9 +24,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsRequiredForSelect {
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java
index d254e2a..9637637 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRoot.java
@@ -25,9 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsShowRoot {
/**
- * Only applicable in the case that the data model is a tree.
- * This flag indicates that the root node should be displayed.
- * Often in tree structures the root node is special and should not be displayed.
+ * Only applicable in the case that the data model is a tree. This flag indicates that the root node should be
+ * displayed. Often in tree structures the root node is special and should not be displayed.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java
index 46d23b0..bbeddac 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsShowRootJunction.java
@@ -25,8 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsShowRootJunction {
/**
- * Only applicable in the case that the data model is a tree.
- * This flag indicates that the root node should be displayed with an open-close-switch.
+ * Only applicable in the case that the data model is a tree. This flag indicates that the root node should be
+ * displayed with an open-close-switch.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java
index 9998545..3ea6ea2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsTransition.java
@@ -24,8 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsTransition {
/**
- * Specify, if the command calls an JSF-Action.
- * Useful to switch off the Double-Submit-Check and Waiting-Behavior.
+ * Specify, if the command calls an JSF-Action. Useful to switch off the Double-Submit-Check and Waiting-Behavior.
*
* @param transition Indicates the transition.
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
index 7e82a00..5ad3ffe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
@@ -33,9 +33,7 @@ import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
/**
- * Renders a date input field with a date picker and a label.
- * <br />
- * Short syntax of:
+ * Renders a date input field with a date picker and a label. <br /> Short syntax of:
* <p/>
* <pre>
* <tc:panel>
@@ -256,23 +254,21 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -308,8 +304,7 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -318,8 +313,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -328,13 +323,9 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -344,15 +335,13 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
@@ -376,9 +365,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -396,8 +384,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Displays a short text in the input field, that describes the meaning of this field.
- * This is part of HTML 5, the theme should emulate the behaviour, when the browser doesn't support it.
+ * Displays a short text in the input field, that describes the meaning of this field. This is part of HTML 5, the
+ * theme should emulate the behaviour, when the browser doesn't support it.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -405,10 +393,9 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
this.placeholder = placeholder;
}
- /**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ /**
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -417,8 +404,7 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.String[]", defaultValue = "none")
@@ -460,8 +446,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -470,8 +456,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the automatically created picker component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the automatically created picker component inside of the container. This value must be
+ * unique within the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -480,8 +466,8 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the automatically created form component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the automatically created form component inside of the container. This value must be
+ * unique within the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -490,10 +476,9 @@ public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
index 9058747..a592312 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.tobago.internal.taglib.extension;
+
import org.apache.myfaces.tobago.component.UIExtensionPanel;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.internal.taglib.TobagoELTag;
@@ -31,13 +32,14 @@ import javax.faces.context.FacesContext;
public final class ExtensionPanelTag extends TobagoELTag {
private static final Logger LOG = LoggerFactory.getLogger(ExtensionPanelTag.class);
- private javax.el.ValueExpression markup;
- private javax.el.ValueExpression tip;
+ private javax.el.ValueExpression markup;
+ private javax.el.ValueExpression tip;
@Override
public String getComponentType() {
return UIExtensionPanel.COMPONENT_TYPE;
}
+
@Override
public String getRendererType() {
return "Panel";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
index bc053de..460ccb4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
@@ -197,8 +197,7 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -225,18 +224,15 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
@@ -251,8 +247,7 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -261,8 +256,8 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -271,15 +266,13 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
@@ -320,10 +313,9 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
this.placeholder = placeholder;
}
- /**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ /**
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -332,9 +324,8 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -385,8 +376,8 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -395,10 +386,9 @@ public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
index ea4a690..630a1da 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
@@ -33,9 +33,7 @@ import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
/**
- * Renders a text input field with a label.
- * <br />
- * Short syntax of:
+ * Renders a text input field with a label. <br /> Short syntax of:
* <p/>
* <pre>
* <tc:panel>
@@ -72,10 +70,19 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
private ValueExpression value;
private MethodExpression valueChangeListener;
private ValueExpression onchange;
+ /**
+ * @deprecated xxx
+ */
@Deprecated
private MethodExpression suggestMethod;
+ /**
+ * @deprecated xxx
+ */
@Deprecated
private ValueExpression suggestMinChars;
+ /**
+ * @deprecated xxx
+ */
@Deprecated
private ValueExpression suggestDelay;
private ValueExpression markup;
@@ -237,8 +244,7 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -256,12 +262,9 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
@@ -273,8 +276,7 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -301,8 +303,7 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -311,8 +312,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -321,13 +322,9 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -346,11 +343,10 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding which generates a list of suggested input values based on
- * the currently entered text, which could be retrieved via getSubmittedValue() on the UIIn.
- * The expression has to evaluate to a public method which has a javax.faces.component.UIInput parameter
- * and returns a List<String>(deprecated), a List<org.apache.myfaces.tobago.model.AutoSuggestItem>
- * or a org.apache.myfaces.tobago.model.AutoSuggestItems.
+ * MethodBinding which generates a list of suggested input values based on the currently entered text, which could be
+ * retrieved via getSubmittedValue() on the UIIn. The expression has to evaluate to a public method which has a
+ * javax.faces.component.UIInput parameter and returns a List<String>(deprecated), a
+ * List<org.apache.myfaces.tobago.model.AutoSuggestItem> or a org.apache.myfaces.tobago.model.AutoSuggestItems.
*
* @deprecated since 2.0.0, please use tc:suggest
*/
@@ -390,10 +386,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
@@ -404,8 +398,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered as
- * password field , so you will not see the typed charakters.
+ * Flag indicating whether or not this component should be rendered as password field , so you will not see the typed
+ * charakters.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -432,9 +426,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -452,8 +445,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Displays a short text in the input field, that describes the meaning of this field.
- * This is part of HTML 5, the theme should emulate the behaviour, when the browser doesn't support it.
+ * Displays a short text in the input field, that describes the meaning of this field. This is part of HTML 5, the
+ * theme should emulate the behaviour, when the browser doesn't support it.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -462,9 +455,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -506,8 +498,8 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -516,10 +508,9 @@ public class InExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
index e61d957..23110ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
@@ -35,10 +35,7 @@ import javax.faces.webapp.FacetTag;
import javax.servlet.jsp.JspException;
/**
- * Renders a label to any component.
- * <br />
- * Short syntax of:
- * <br />
+ * Renders a label to any component. <br /> Short syntax of: <br />
* <pre>
* <tc:panel>
* <f:facet name="layout">
@@ -48,8 +45,7 @@ import javax.servlet.jsp.JspException;
* ...
* </tc:panel>
* </pre>
- * This is the universal version of the special versions: <tx:in>, etc.
- * In other words:
+ * This is the universal version of the special versions: <tx:in>, etc. In other words:
* <pre>
* <tx:label>
* <tc:in/>
@@ -165,7 +161,7 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
markup = null;
}
- /**
+ /**
* The current value of this component.
*/
@TagAttribute
@@ -174,7 +170,7 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
this.value = value;
}
- /**
+ /**
* The accessKey of this component.
*/
@TagAttribute
@@ -193,8 +189,8 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -216,10 +212,9 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
this.rows = rows;
}
- /**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ /**
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -227,9 +222,8 @@ public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
this.labelWidth = labelWidth;
}
- /**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ /**
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
index 7b9f590..f9475ae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
@@ -151,8 +151,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
if (expression != null) {
command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
} else {
- final Object renderedPartially = inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
- command.setRenderedPartially(StringUtils.split((String) renderedPartially, ", "));
+ final String renderedPartiallyAttribute
+ = (String) inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
+ command.setRenderedPartially(StringUtils.split((String) renderedPartiallyAttribute, ", "));
}
}
@@ -184,13 +185,10 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Action to invoke when clicked.
- * This must be a MethodBinding or a String representing the application action to invoke when
- * this component is activated by the user.
- * The MethodBinding must evaluate to a public method that takes no parameters,
- * and returns a String (the logical outcome) which is passed to the
- * NavigationHandler for this application.
- * The String is directly passed to the Navigationhandler.
+ * Action to invoke when clicked. This must be a MethodBinding or a String representing the application action to
+ * invoke when this component is activated by the user. The MethodBinding must evaluate to a public method that takes
+ * no parameters, and returns a String (the logical outcome) which is passed to the NavigationHandler for this
+ * application. The String is directly passed to the Navigationhandler.
*/
@TagAttribute
@UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION,
@@ -200,10 +198,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing an action listener method that will be
- * notified when this component is activated by the user.
- * The expression must evaluate to a public method that takes an ActionEvent
- * parameter, with a return type of void.
+ * MethodBinding representing an action listener method that will be notified when this component is activated by the
+ * user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of
+ * void.
*/
@TagAttribute
@UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
@@ -214,8 +211,6 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
/**
* Script to be invoked when clicked
- *
- * @param onclick
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -225,8 +220,6 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
/**
* Link to an arbitrary URL
- *
- * @param link
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -235,8 +228,7 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -245,8 +237,8 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -273,8 +265,7 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -283,10 +274,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that, if this component is activated by the user,
- * notifications should be delivered to interested listeners and actions
- * immediately (that is, during Apply Request Values phase) rather than
- * waiting until Invoke Application phase.
+ * Flag indicating that, if this component is activated by the user, notifications should be delivered to interested
+ * listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke
+ * Application phase.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -295,8 +285,7 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Specify, if the command calls an JSF-Action.
- * Useful to switch off the Double-Submit-Check and Waiting-Behavior.
+ * Specify, if the command calls an JSF-Action. Useful to switch off the Double-Submit-Check and Waiting-Behavior.
*
* @param transition Indicates the transition.
*/
@@ -309,15 +298,15 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
/**
* Indicate the partially rendered Components in a case of a submit.
*/
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.String[]")
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.String[]")
public void setRenderedPartially(final javax.el.ValueExpression renderedPartially) {
this.renderedPartially = renderedPartially;
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -326,10 +315,9 @@ public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
index d72bcf0..a2b89b1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
@@ -160,8 +160,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
if (expression != null) {
command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
} else {
- final Object renderedPartially = inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
- command.setRenderedPartially(StringUtils.split((String) renderedPartially, ", "));
+ final String renderedPartiallyAttribute =
+ (String) inComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
+ command.setRenderedPartially(StringUtils.split(renderedPartiallyAttribute, ", "));
}
}
@@ -194,13 +195,10 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Action to invoke when clicked.
- * This must be a MethodBinding or a String representing the application action to invoke when
- * this component is activated by the user.
- * The MethodBinding must evaluate to a public method that takes no parameters,
- * and returns a String (the logical outcome) which is passed to the
- * NavigationHandler for this application.
- * The String is directly passed to the Navigationhandler.
+ * Action to invoke when clicked. This must be a MethodBinding or a String representing the application action to
+ * invoke when this component is activated by the user. The MethodBinding must evaluate to a public method that takes
+ * no parameters, and returns a String (the logical outcome) which is passed to the NavigationHandler for this
+ * application. The String is directly passed to the Navigationhandler.
*/
@TagAttribute
@UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION,
@@ -210,10 +208,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing an action listener method that will be
- * notified when this component is activated by the user.
- * The expression must evaluate to a public method that takes an ActionEvent
- * parameter, with a return type of void.
+ * MethodBinding representing an action listener method that will be notified when this component is activated by the
+ * user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of
+ * void.
*/
@TagAttribute
@UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
@@ -241,8 +238,7 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -251,8 +247,8 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -279,8 +275,7 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -289,10 +284,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that, if this component is activated by the user,
- * notifications should be delivered to interested listeners and actions
- * immediately (that is, during Apply Request Values phase) rather than
- * waiting until Invoke Application phase.
+ * Flag indicating that, if this component is activated by the user, notifications should be delivered to interested
+ * listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke
+ * Application phase.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -301,8 +295,7 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Specify, if the command calls an JSF-Action.
- * Useful to switch off the Double-Submit-Check and Waiting-Behavior.
+ * Specify, if the command calls an JSF-Action. Useful to switch off the Double-Submit-Check and Waiting-Behavior.
*
* @param transition Indicates the transition.
*/
@@ -313,13 +306,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -331,15 +320,15 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
/**
* Indicate the partially rendered Components in a case of a submit.
*/
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.String[]")
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.String[]")
public void setRenderedPartially(final javax.el.ValueExpression renderedPartially) {
this.renderedPartially = renderedPartially;
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -348,10 +337,9 @@ public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java
index dcc8c1d..ec8a8d5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/OutExtensionTag.java
@@ -30,9 +30,7 @@ import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
/**
- * Renders a text output field with a label.
- * <br />
- * Short syntax of:
+ * Renders a text output field with a label. <br /> Short syntax of:
* <p/>
* <pre>
* <tc:panel>
@@ -141,8 +139,7 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -160,8 +157,7 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -170,8 +166,7 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -180,8 +175,8 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -190,13 +185,9 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -215,9 +206,8 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -226,8 +216,8 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -236,10 +226,9 @@ public class OutExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
index dbaf5a4..9ecb3ed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
@@ -207,18 +207,15 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
@@ -251,8 +248,7 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -270,8 +266,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * Label to be displayed to the user for this option. This label will displayed beneath the component like
- * the label of other check box components.
+ * Label to be displayed to the user for this option. This label will displayed beneath the component like the label
+ * of other check box components.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -280,27 +276,21 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -310,8 +300,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -320,8 +310,7 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -339,9 +328,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -350,8 +338,7 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -375,9 +362,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -413,8 +399,8 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -423,10 +409,9 @@ public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSup
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
index aa2a135..619517d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
@@ -206,9 +206,8 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -226,16 +225,15 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
@@ -277,8 +275,7 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -300,27 +297,21 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
} */
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -330,8 +321,8 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -340,8 +331,7 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -359,9 +349,8 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -370,8 +359,7 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -429,10 +417,10 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
public void setRequiredMessage(final ValueExpression requiredMessage) {
this.requiredMessage = requiredMessage;
}
-
+
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -441,10 +429,9 @@ public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSuppor
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
index e32ebcb..e6a3a2a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
@@ -191,9 +191,8 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -211,18 +210,15 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
@@ -255,8 +251,7 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -274,27 +269,21 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -304,8 +293,8 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -314,8 +303,7 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -333,9 +321,8 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -344,8 +331,7 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -394,10 +380,10 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
public void setRequiredMessage(final ValueExpression requiredMessage) {
this.requiredMessage = requiredMessage;
}
-
+
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -406,10 +392,9 @@ public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
index 21b44cb..4def3ad 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
@@ -201,9 +201,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -221,12 +220,9 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
@@ -265,8 +261,7 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -302,10 +297,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
@@ -316,13 +309,9 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -332,8 +321,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -342,8 +331,7 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -361,9 +349,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -372,8 +359,7 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -424,8 +410,8 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -434,10 +420,9 @@ public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
index ecf0572..3de60d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
@@ -191,9 +191,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -211,32 +210,27 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
@@ -269,13 +263,9 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -285,8 +275,7 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -304,8 +293,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -314,8 +303,7 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -333,9 +321,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -359,8 +346,7 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -396,8 +382,8 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -406,10 +392,9 @@ public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
index 70cbd3f..8a001c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
@@ -195,9 +195,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -215,18 +214,15 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
@@ -259,8 +255,7 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -278,27 +273,21 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -308,8 +297,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -318,8 +307,7 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -337,9 +325,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -390,8 +377,7 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -400,8 +386,8 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -410,10 +396,9 @@ public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
index 0a59a8a..8c617ba 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
@@ -203,9 +203,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -223,32 +222,27 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
@@ -281,13 +275,9 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -295,6 +285,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
public void setConverter(final ValueExpression converter) {
this.converter = converter;
}
+
/**
* Flag indicating this component should rendered as an inline element.
*/
@@ -305,8 +296,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -324,8 +314,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -334,8 +324,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -353,9 +342,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -415,8 +403,7 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -425,8 +412,8 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -435,10 +422,9 @@ public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
index 2afc20e..85128f6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
@@ -31,9 +31,7 @@ import javax.faces.webapp.FacetTag;
import javax.servlet.jsp.JspException;
/**
- * Renders a separator.
- * <br />
- * Short syntax of:
+ * Renders a separator. <br /> Short syntax of:
* <p/>
* <pre>
* <tc:separator>
@@ -51,7 +49,7 @@ import javax.servlet.jsp.JspException;
rendererType = "Separator",
faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SeparatorExtensionHandler")
public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
-
+
private javax.el.ValueExpression binding;
private javax.el.ValueExpression rendered;
private javax.el.ValueExpression label;
@@ -108,18 +106,17 @@ public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
public void setBinding(final javax.el.ValueExpression binding) throws JspException {
this.binding = binding;
}
-
+
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -128,8 +125,7 @@ public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
index b22e4aa..1cda4ca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
@@ -31,9 +31,7 @@ import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
/**
- * Renders a multi line text input control with a label.
- * <br />
- * Short syntax of:
+ * Renders a multi line text input control with a label. <br /> Short syntax of:
* <p/>
* <pre>
* <tc:panel>
@@ -215,25 +213,21 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -260,8 +254,7 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -270,8 +263,8 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -280,13 +273,9 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -296,15 +285,13 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
@@ -319,8 +306,7 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -347,9 +333,8 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -366,10 +351,9 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
this.tip = tip;
}
- /**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ /**
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -411,8 +395,8 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -421,10 +405,9 @@ public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
index 12299c5..58bae5d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
@@ -31,9 +31,7 @@ import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
/**
- * Renders a time input field with a label.
- * <br />
- * Short syntax of:
+ * Renders a time input field with a label. <br /> Short syntax of:
* <p/>
* <pre>
* <tc:panel>
@@ -50,7 +48,7 @@ import javax.servlet.jsp.JspException;
@Tag(name = "time")
@ExtensionTag(
baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag",
- faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
+ faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
private ValueExpression binding;
@@ -204,8 +202,7 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
+ * Indicate markup of this component. Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
@@ -223,25 +220,21 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * MethodBinding representing a value change listener method
- * that will be notified when a new value has been set for this input component.
- * The expression must evaluate to a public method that takes a ValueChangeEvent
- * parameter, with a return type of void.
- *
- * @param valueChangeListener
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for
+ * this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with
+ * a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(final MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
/**
- * Text value to display as label.
- * If text contains an underscore the next character is used as accesskey.
+ * Text value to display as label. If text contains an underscore the next character is used as accesskey.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -268,8 +261,7 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The value binding expression linking this
- * component to a property in a backing bean.
+ * The value binding expression linking this component to a property in a backing bean.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
@@ -278,8 +270,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating whether or not this component should be rendered
- * (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on
+ * any subsequent form submit.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
@@ -288,13 +280,9 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * An expression that specifies the Converter for this component.
- * If the value binding expression is a String,
- * the String is used as an ID to look up a Converter.
- * If the value binding expression is a Converter,
- * uses that instance as the converter.
- * The value can either be a static value (ID case only)
- * or an EL expression.
+ * An expression that specifies the Converter for this component. If the value binding expression is a String, the
+ * String is used as an ID to look up a Converter. If the value binding expression is a Converter, uses that instance
+ * as the converter. The value can either be a static value (ID case only) or an EL expression.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.convert.Converter",
@@ -304,15 +292,13 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(final MethodExpression validator) {
this.validator = validator;
}
@@ -345,9 +331,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * Flag indicating that a value is required.
- * If the value is an empty string a
- * ValidationError occurs and a Error Message is rendered.
+ * Flag indicating that a value is required. If the value is an empty string a ValidationError occurs and a Error
+ * Message is rendered.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
@@ -365,9 +350,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The width for the label component. Default: 'auto'.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for the label component. Default: 'auto'. This value is used in the gridLayouts columns attribute. See
+ * gridLayout tag for valid values.
*/
@TagAttribute
@UIComponentTagAttribute()
@@ -409,8 +393,8 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for the input field component inside of the container.
- * This value must be unique within the closest parent component that is a naming container.
+ * The component identifier for the input field component inside of the container. This value must be unique within
+ * the closest parent component that is a naming container.
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
@@ -419,10 +403,9 @@ public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
}
/**
- * The component identifier for this component.
- * This value must be unique within the closest parent component that is a naming container.
- * For tx components the id will be set to the container (e. g. the panel).
- * To set the id of the input field, you have to use the attribute "fieldId".
+ * The component identifier for this component. This value must be unique within the closest parent component that is
+ * a naming container. For tx components the id will be set to the container (e. g. the panel). To set the id of the
+ * input field, you have to use the attribute "fieldId".
*/
@TagAttribute(rtexprvalue = true)
@UIComponentTagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
index f5eea8d..314fa72 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
@@ -27,15 +27,15 @@ import javax.servlet.jsp.tagext.JspIdConsumer;
public class TobagoExtensionBodyTagSupport extends BodyTagSupport implements JspIdConsumer {
protected static final String PREFIX = "tx";
-
+
private String jspId;
private int idSuffix;
-
+
protected ValueExpression createStringValueExpression(final String expression) {
return JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext())
.getExpressionFactory().createValueExpression(pageContext.getELContext(), expression, String.class);
}
-
+
public void setJspId(final String jspId) {
this.jspId = jspId;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java
index edef3bc..6e260ab 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ComponentAttributeUtils.java
@@ -52,12 +52,12 @@ public final class ComponentAttributeUtils {
public static boolean isValueReference(final String value) {
- final int start = value.indexOf("#{");
- if (start < 0) {
- return false;
- }
- final int end = value.lastIndexOf('}');
- return (end >=0 && start < end);
+ final int start = value.indexOf("#{");
+ if (start < 0) {
+ return false;
+ }
+ final int end = value.lastIndexOf('}');
+ return end >= 0 && start < end;
}
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
index 12b57ff..2e35e68 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
@@ -45,9 +45,7 @@ public final class DateFormatUtils {
}
/**
- * Find a pattern for the converter.
- * Returns the pattern inside the converter, if any.
- * Otherwise compute the pattern.
+ * Find a pattern for the converter. Returns the pattern inside the converter, if any. Otherwise compute the pattern.
*
* @return the patter or null, if DateFormat.getDateInstance() returns no SimpleDateFormat.
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
index f66f297..606293e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
@@ -30,10 +30,9 @@ public final class Deprecation {
}
/**
- * This Logger object should help to detect the usage of deprecated code.
- * The main reason for this class is the lack of a "deprecated concept"
- * for tag libraries. Thought the designer of a Tobago page cannot see
- * in his IDE that a tag or attribute is deprecated.
+ * This Logger object should help to detect the usage of deprecated code. The main reason for this class is the lack
+ * of a "deprecated concept" for tag libraries. Thought the designer of a Tobago page cannot see in his IDE that a tag
+ * or attribute is deprecated.
* <p>
* The Tobago Java code will log into this Logger object, with
* <dl>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
index 7d70a64..ccd4a9c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
@@ -126,7 +126,7 @@ public final class FacesContextUtils {
}
return list;
}
-
+
public static void addScriptFile(final FacesContext context, final String file) {
List<String> list = (List<String>) context.getAttributes().get(TOBAGO_SCRIPT_FILES);
if (list == null) {
@@ -143,7 +143,7 @@ public final class FacesContextUtils {
@Deprecated
public static Set<String> getScriptBlocks(final FacesContext context) {
final Set<String> set = (Set<String>) context.getAttributes().get(TOBAGO_SCRIPT_BLOCKS);
- if (set == null) {
+ if (set == null) {
return Collections.emptySet();
}
return set;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
index 4072c36..ec58f79 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
@@ -26,18 +26,21 @@ import javax.faces.component.UIComponent;
/**
* @deprecated Since 2.0.3
*/
+@Deprecated
public final class FindComponentUtils {
/**
* @deprecated Since 2.0.3
*/
+ @Deprecated
private FindComponentUtils() {
}
/**
* @deprecated Since 2.0.3, please use {@link org.apache.myfaces.tobago.util.ComponentUtils#findComponent(
- * javax.faces.component.UIComponent, String)}
+ *javax.faces.component.UIComponent, String)}
*/
+ @Deprecated
public static UIComponent findComponent(UIComponent from, String relativeId) {
return ComponentUtils.findComponent(from, relativeId);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
index 8fe8206..83520b4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
@@ -60,7 +60,7 @@ public final class HtmlWriterUtils extends WriterUtils {
@Override
protected void writeEncodedValue(final char[] text, final int start,
- final int length, final boolean isAttribute) throws IOException {
+ final int length, final boolean isAttribute) throws IOException {
int localIndex = -1;
@@ -88,7 +88,7 @@ public final class HtmlWriterUtils extends WriterUtils {
// Tilde or less...
if (ch < CHARS_TO_ESCAPE.length) {
- if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
+ if (isAttribute && ch == '&' && i + 1 < end && text[i + 1] == '{') {
// HTML 4.0, section B.7.1: ampersands followed by
// an open brace don't get escaped
buffer.addToBuffer('&');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
index d50bb68..db65647 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
@@ -56,7 +56,7 @@ public final class JavascriptWriterUtils extends WriterUtils {
@Override
protected void writeEncodedValue(final char[] text, final int start,
- final int length, final boolean isAttribute) throws IOException {
+ final int length, final boolean isAttribute) throws IOException {
int localIndex = -1;
@@ -84,7 +84,7 @@ public final class JavascriptWriterUtils extends WriterUtils {
// Tilde or less...
if (ch < CHARS_TO_ESCAPE.length) {
- if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
+ if (isAttribute && ch == '&' && i + 1 < end && text[i + 1] == '{') {
// HTML 4.0, section B.7.1: ampersands followed by
// an open brace don't get escaped
buffer.addToBuffer('&');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java
index f35b9f3..100fb0c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonWriterUtils.java
@@ -61,7 +61,7 @@ public final class JsonWriterUtils extends WriterUtils {
@Override
protected void writeEncodedValue(final char[] text, final int start,
- final int length, final boolean isAttribute) throws IOException {
+ final int length, final boolean isAttribute) throws IOException {
int localIndex = -1;
@@ -89,7 +89,7 @@ public final class JsonWriterUtils extends WriterUtils {
// Tilde or less...
if (ch < CHARS_TO_ESCAPE.length) {
- if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
+ if (isAttribute && ch == '&' && i + 1 < end && text[i + 1] == '{') {
// HTML 4.0, section B.7.1: ampersands followed by
// an open brace don't get escaped
buffer.addToBuffer('&');
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java
index 4294528..c62441f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/NumberUtils.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.util;
public class NumberUtils {
public static boolean isDigits(final String str) {
- if ((str == null) || (str.length() == 0)) {
+ if (str == null || str.length() == 0) {
return false;
}
for (int i = 0; i < str.length(); i++) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
index 04c90d8..49c3860 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Only needed for Servlet 3.0. Not needed for Servlet 3.1 or higher.
- *
+ * <p>
* Basically taken from Apache Tomcat 8
*/
public final class PartUtils {
@@ -37,8 +37,8 @@ public final class PartUtils {
}
/**
- * This is a helper method, to get the original file name of the upload.
- * If you have at least Servlet 3.1, you wouldn't need this function.
+ * This is a helper method, to get the original file name of the upload. If you have at least Servlet 3.1, you
+ * wouldn't need this function.
*
* @since Tobago 3.0.0
*/
@@ -113,43 +113,40 @@ public final class PartUtils {
/**
* Default ParameterParser constructor.
*/
- public ParameterParser() {
+ ParameterParser() {
super();
}
/**
* Are there any characters left to parse?
*
- * @return {@code true} if there are unparsed characters,
- * {@code false} otherwise.
+ * @return {@code true} if there are unparsed characters, {@code false} otherwise.
*/
private boolean hasChar() {
return this.pos < this.len;
}
/**
- * A helper method to process the parsed token. This method removes
- * leading and trailing blanks as well as enclosing quotation marks,
- * when necessary.
+ * A helper method to process the parsed token. This method removes leading and trailing blanks as well as enclosing
+ * quotation marks, when necessary.
*
- * @param quoted {@code true} if quotation marks are expected,
- * {@code false} otherwise.
+ * @param quoted {@code true} if quotation marks are expected, {@code false} otherwise.
* @return the token
*/
private String getToken(boolean quoted) {
// Trim leading white spaces
- while ((i1 < i2) && (Character.isWhitespace(chars[i1]))) {
+ while (i1 < i2 && Character.isWhitespace(chars[i1])) {
i1++;
}
// Trim trailing white spaces
- while ((i2 > i1) && (Character.isWhitespace(chars[i2 - 1]))) {
+ while (i2 > i1 && Character.isWhitespace(chars[i2 - 1])) {
i2--;
}
// Strip away quotation marks if necessary
if (quoted
- && ((i2 - i1) >= 2)
- && (chars[i1] == '"')
- && (chars[i2 - 1] == '"')) {
+ && i2 - i1 >= 2
+ && chars[i1] == '"'
+ && chars[i2 - 1] == '"') {
i1++;
i2--;
}
@@ -163,10 +160,9 @@ public final class PartUtils {
/**
* Tests if the given character is present in the array of characters.
*
- * @param ch the character to test for presense in the array of characters
+ * @param ch the character to test for presense in the array of characters
* @param charray the array of characters to test against
- * @return {@code true} if the character is present in the array of
- * characters, {@code false} otherwise.
+ * @return {@code true} if the character is present in the array of characters, {@code false} otherwise.
*/
private boolean isOneOf(char ch, final char[] charray) {
boolean result = false;
@@ -180,11 +176,10 @@ public final class PartUtils {
}
/**
- * Parses out a token until any of the given terminators
- * is encountered.
+ * Parses out a token until any of the given terminators is encountered.
*
- * @param terminators the array of terminating characters. Any of these
- * characters when encountered signify the end of the token
+ * @param terminators the array of terminating characters. Any of these characters when encountered signify the end
+ * of the token
* @return the token
*/
private String parseToken(final char[] terminators) {
@@ -203,12 +198,10 @@ public final class PartUtils {
}
/**
- * Parses out a token until any of the given terminators
- * is encountered outside the quotation marks.
+ * Parses out a token until any of the given terminators is encountered outside the quotation marks.
*
- * @param terminators the array of terminating characters. Any of these
- * characters when encountered outside the quotation marks signify the end
- * of the token
+ * @param terminators the array of terminating characters. Any of these characters when encountered outside the
+ * quotation marks signify the end of the token
* @return the token
*/
private String parseQuotedToken(final char[] terminators) {
@@ -225,7 +218,7 @@ public final class PartUtils {
if (!charEscaped && ch == '"') {
quoted = !quoted;
}
- charEscaped = (!charEscaped && ch == '\\');
+ charEscaped = !charEscaped && ch == '\\';
i2++;
pos++;
@@ -234,22 +227,19 @@ public final class PartUtils {
}
/**
- * Sets the flag if parameter names are to be converted to lower case when
- * name/value pairs are parsed.
+ * Sets the flag if parameter names are to be converted to lower case when name/value pairs are parsed.
*
- * @param b {@code true} if parameter names are to be
- * converted to lower case when name/value pairs are parsed.
- * {@code false} otherwise.
+ * @param b {@code true} if parameter names are to be converted to lower case when name/value pairs are parsed.
+ * {@code false} otherwise.
*/
public void setLowerCaseNames(boolean b) {
this.lowerCaseNames = b;
}
/**
- * Extracts a map of name/value pairs from the given string. Names are
- * expected to be unique.
+ * Extracts a map of name/value pairs from the given string. Names are expected to be unique.
*
- * @param str the string that contains a sequence of name/value pairs
+ * @param str the string that contains a sequence of name/value pairs
* @param separator the name/value pairs separator
* @return a map of name/value pairs
*/
@@ -261,11 +251,9 @@ public final class PartUtils {
}
/**
- * Extracts a map of name/value pairs from the given array of
- * characters. Names are expected to be unique.
+ * Extracts a map of name/value pairs from the given array of characters. Names are expected to be unique.
*
- * @param charArray the array of characters that contains a sequence of
- * name/value pairs
+ * @param charArray the array of characters that contains a sequence of name/value pairs
* @param separator the name/value pairs separator
* @return a map of name/value pairs
*/
@@ -277,13 +265,11 @@ public final class PartUtils {
}
/**
- * Extracts a map of name/value pairs from the given array of
- * characters. Names are expected to be unique.
+ * Extracts a map of name/value pairs from the given array of characters. Names are expected to be unique.
*
- * @param charArray the array of characters that contains a sequence of
- * name/value pairs
- * @param offset - the initial offset.
- * @param length - the length.
+ * @param charArray the array of characters that contains a sequence of name/value pairs
+ * @param offset - the initial offset.
+ * @param length - the length.
* @param separator the name/value pairs separator
* @return a map of name/value pairs
*/
@@ -308,16 +294,16 @@ public final class PartUtils {
'=', separator
});
paramValue = null;
- if (hasChar() && (charArray[pos] == '=')) {
+ if (hasChar() && charArray[pos] == '=') {
pos++; // skip '='
paramValue = parseQuotedToken(new char[]{
separator
});
}
- if (hasChar() && (charArray[pos] == separator)) {
+ if (hasChar() && charArray[pos] == separator) {
pos++; // skip separator
}
- if ((paramName != null) && (paramName.length() > 0)) {
+ if (paramName != null && paramName.length() > 0) {
if (this.lowerCaseNames) {
paramName = paramName.toLowerCase(Locale.ENGLISH);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
index 63fe16f..77d37ed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
@@ -124,7 +124,7 @@ public final class ResponseUtils {
servletResponse.setHeader(cspHeader, value);
}
} else if (PortletUtils.isPortletApiAvailable() && response instanceof MimeResponse) {
- // TODO Portlet
+ // TODO Portlet
if (contentSecurityPolicy.getMode() != ContentSecurityPolicy.Mode.OFF) {
LOG.warn("CSP not implemented for Portlet!");
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
index 449b56d..ba4e2be 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
@@ -23,14 +23,10 @@ import java.io.IOException;
import java.io.Writer;
/**
- * Buffering scheme: we use a tremendously simple buffering
- * scheme that greatly reduces the number of calls into the
- * Writer/PrintWriter. In practice this has produced significant
- * measured performance gains (at least in JDK 1.3.1). We only
- * support adding single characters to the buffer, so anytime
- * multiple characters need to be written out, the entire buffer
- * gets flushed. In practice, this is good enough, and keeps
- * the core simple.
+ * Buffering scheme: we use a tremendously simple buffering scheme that greatly reduces the number of calls into the
+ * Writer/PrintWriter. In practice this has produced significant measured performance gains (at least in JDK 1.3.1).
+ * We only support adding single characters to the buffer, so anytime multiple characters need to be written out, the
+ * entire buffer gets flushed. In practice, this is good enough, and keeps the core simple.
*/
public class ResponseWriterBuffer {
@@ -47,8 +43,7 @@ public class ResponseWriterBuffer {
}
/**
- * Add a character to the buffer, flushing the buffer if the buffer is
- * full, and returning the new buffer index
+ * Add a character to the buffer, flushing the buffer if the buffer is full, and returning the new buffer index
*/
public void addToBuffer(final char ch) throws IOException {
if (bufferIndex >= BUFFER_SIZE) {
@@ -70,8 +65,7 @@ public class ResponseWriterBuffer {
}
/**
- * Flush the contents of the buffer to the output stream
- * and return the reset buffer index
+ * Flush the contents of the buffer to the output stream and return the reset buffer index
*/
public void flushBuffer() throws IOException {
if (bufferIndex > 0) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
index 3533ac1..f4ee1e7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
@@ -99,15 +99,14 @@ public final class StringUtils {
} else if (chars[i] == '_') {
builder.append(chars[++i]);
} else {
- builder.append((((Character) chars[i]).toString().toLowerCase(Locale.ENGLISH)));
+ builder.append(((Character) chars[i]).toString().toLowerCase(Locale.ENGLISH));
}
}
return builder.toString();
}
/**
- * Is the same string, by ignoring differences that are only whitespaces.
- * (null and "" are not equal)
+ * Is the same string, by ignoring differences that are only whitespaces. (null and "" are not equal)
*/
@SuppressWarnings("StringEquality")
public static boolean equalsIgnoreCaseAndWhitespace(final String type1, final String type2) {
@@ -171,7 +170,7 @@ public final class StringUtils {
*/
public static boolean endsWith(final String string, final String suffix) {
if (string == null || suffix == null) {
- return (string == null && suffix == null);
+ return string == null && suffix == null;
}
if (suffix.length() > string.length()) {
return false;
@@ -337,7 +336,7 @@ public final class StringUtils {
return true;
}
for (int i = 0; i < strLen; i++) {
- if ((!Character.isWhitespace(string.charAt(i)))) {
+ if (!Character.isWhitespace(string.charAt(i))) {
return false;
}
}
@@ -366,8 +365,8 @@ public final class StringUtils {
}
final int replLength = searchString.length();
int increase = replacement.length() - replLength;
- increase = (increase < 0 ? 0 : increase);
- increase *= (max < 0 ? 16 : (max > 64 ? 64 : max));
+ increase = increase < 0 ? 0 : increase;
+ increase *= max < 0 ? 16 : max > 64 ? 64 : max;
final StringBuilder buf = new StringBuilder(text.length() + increase);
while (end != -1) {
buf.append(text.substring(start, end)).append(replacement);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
index 753f0bc..16919b5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
@@ -154,9 +154,8 @@ public abstract class WriterUtils {
throws IOException;
/**
- * Writes a character as a decimal escape. Hex escapes are smaller than
- * the decimal version, but Netscape didn't support hex escapes until
- * 4.7.4.
+ * Writes a character as a decimal escape. Hex escapes are smaller than the decimal version, but Netscape didn't
+ * support hex escapes until 4.7.4.
*/
protected void writeDecRef(final char ch) throws IOException {
if (ch == '\u20ac') {
@@ -169,27 +168,27 @@ public abstract class WriterUtils {
// going gonzo, it should be even better)
int i = (int) ch;
if (i > 10000) {
- out.write('0' + (i / 10000));
+ out.write('0' + i / 10000);
i = i % 10000;
- out.write('0' + (i / 1000));
+ out.write('0' + i / 1000);
i = i % 1000;
- out.write('0' + (i / 100));
+ out.write('0' + i / 100);
i = i % 100;
- out.write('0' + (i / 10));
+ out.write('0' + i / 10);
i = i % 10;
out.write('0' + i);
} else if (i > 1000) {
- out.write('0' + (i / 1000));
+ out.write('0' + i / 1000);
i = i % 1000;
- out.write('0' + (i / 100));
+ out.write('0' + i / 100);
i = i % 100;
- out.write('0' + (i / 10));
+ out.write('0' + i / 10);
i = i % 10;
out.write('0' + i);
} else {
- out.write('0' + (i / 100));
+ out.write('0' + i / 100);
i = i % 100;
- out.write('0' + (i / 10));
+ out.write('0' + i / 10);
i = i % 10;
out.write('0' + i);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
index 87d10dd..01ef5d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
@@ -65,11 +65,17 @@ public class DebugResponseWriterWrapper extends TobagoResponseWriter {
return new DebugResponseWriterWrapper((TobagoResponseWriter) responseWriter.cloneWithWriter(writer));
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public void writeAttribute(final String name, final Object value, final String property) throws IOException {
responseWriter.writeAttribute(name, value, property);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public void writeText(final Object text, final String property) throws IOException {
responseWriter.writeText(text, property);
@@ -83,6 +89,9 @@ public class DebugResponseWriterWrapper extends TobagoResponseWriter {
responseWriter.writeAttribute(name, value, escape);
}
+ /**
+ * @deprecated by API
+ */
@Override
@Deprecated
public String getStyleClasses() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
index 7aa9f4a..447d60c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
@@ -143,15 +143,16 @@ public class HtmlResponseWriter extends TobagoResponseWriterBase {
}
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
- public static Style ensureHtmlStyleMap(final UIComponent component, Style styles) {
+ public static Style ensureHtmlStyleMap(final UIComponent component, final Style styles) {
+ Style result = styles;
if (styles == null) {
- styles = new Style();
- ((Map<String, Object>) component.getAttributes()).put(Attributes.STYLE, styles);
+ result = new Style();
+ ((Map<String, Object>) component.getAttributes()).put(Attributes.STYLE, result);
}
- return styles;
+ return result;
}
@Override
@@ -163,7 +164,7 @@ public class HtmlResponseWriter extends TobagoResponseWriterBase {
@Override
public void endElement(final String name) throws IOException {
- if (name == HtmlElements.BODY) {
+ if (HtmlElements.BODY.equals(name)) {
final String javascript = getJavascript();
if (StringUtils.isNotEmpty(javascript)) {
startElement(HtmlElements.SCRIPT, null);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
index 8cbe31f..26a8fcc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
@@ -112,7 +112,7 @@ public class JsonResponseWriter extends HtmlResponseWriter {
@Override
protected void endElementInternal(final Writer writer, final String name) throws IOException {
if (EMPTY_TAG.contains(name)) {
- writer.write(">");
+ writer.write(">");
} else {
if (isStartStillOpen()) {
writer.write(">");
@@ -176,9 +176,9 @@ public class JsonResponseWriter extends HtmlResponseWriter {
*/
public ResponseWriter cloneWithWriter(final Writer originalWriter) {
- return new JsonResponseWriter(
- originalWriter, getContentType(), getCharacterEncoding());
- }
+ return new JsonResponseWriter(
+ originalWriter, getContentType(), getCharacterEncoding());
+ }
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
index 1fc4777..f988b4c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
@@ -49,11 +49,15 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
HtmlElements.BASE,
HtmlElements.META));
- /** @deprecated Since Tobago 1.5.3 */
+ /**
+ * @deprecated Since Tobago 1.5.3
+ */
@Deprecated
public static final String XML_VERSION_1_0_ENCODING_UTF_8 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- /** @deprecated Since Tobago 1.5.3 */
+ /**
+ * @deprecated Since Tobago 1.5.3
+ */
@Deprecated
public static final int XML_VERSION_1_0_ENCODING_UTF_8_LENGTH = XML_VERSION_1_0_ENCODING_UTF_8.length();
@@ -136,9 +140,9 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
writeInternal(writer, string);
}
- protected final void writeInternal(final Writer writer, final String string) throws IOException {
+ protected final void writeInternal(final Writer writerParameter, final String string) throws IOException {
closeOpenTag();
- writer.write(string);
+ writerParameter.write(string);
}
@Override
@@ -175,10 +179,6 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
}
-
-
-
-
protected void closeOpenTag() throws IOException {
if (startStillOpen) {
writer.write("\n>");
@@ -207,15 +207,16 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
startElementInternal(writer, name, currentComponent);
}
- protected void startElementInternal(final Writer writer, final String name, final UIComponent currentComponent)
+ protected void startElementInternal(
+ final Writer writerParameter, final String name, final UIComponent currentComponent)
throws IOException {
this.component = currentComponent;
// closeOpenTag();
if (startStillOpen) {
- writer.write("\n>");
+ writerParameter.write("\n>");
}
- writer.write("<");
- writer.write(name);
+ writerParameter.write("<");
+ writerParameter.write(name);
startStillOpen = true;
}
@@ -232,7 +233,6 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
}
-
public void writeAttribute(final String name, final Object value, final String property)
throws IOException {
@@ -264,10 +264,10 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
writeAttributeInternal(writer, name, value, escape);
}
- @Override
/**
* @deprecated Since Tobago 2.0.0
*/
+ @Override
@Deprecated
public String getStyleClasses() {
if (component == null) {
@@ -286,24 +286,25 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
}
- protected void endElementInternal(final Writer writer, final String name) throws IOException {
+ protected void endElementInternal(final Writer writerParameter, final String name) throws IOException {
if (EMPTY_TAG.contains(name)) {
closeEmptyTag();
} else {
if (startStillOpen) {
- writer.write("\n>");
+ writerParameter.write("\n>");
}
- writer.write("</");
- writer.write(name);
+ writerParameter.write("</");
+ writerParameter.write(name);
// writer.write("\n>"); // FIXME: this makes problems with Tidy
- writer.write(">");
+ writerParameter.write(">");
}
startStillOpen = false;
}
+
protected abstract void closeEmptyTag() throws IOException;
protected void writeAttributeInternal(
- final Writer writer, final String name, final String value, final boolean escape)
+ final Writer writerParameter, final String name, final String value, final boolean escape)
throws IOException {
if (!startStillOpen) {
final String trace = getCallingClassStackTraceElementString();
@@ -316,13 +317,14 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
}
if (value != null) {
- writer.write(' ');
- writer.write(name);
- writer.write("='");
+ writerParameter.write(' ');
+ writerParameter.write(name);
+ writerParameter.write("='");
writerAttributeValue(value, escape);
- writer.write('\'');
+ writerParameter.write('\'');
}
}
+
protected abstract void writerAttributeValue(String value, boolean escape) throws IOException;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
index 15c9e34..9140b78 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
@@ -58,11 +58,17 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
return responseWriter.cloneWithWriter(writer);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public void writeAttribute(final String name, final Object value, final String property) throws IOException {
responseWriter.writeAttribute(name, value, property);
}
+ /**
+ * @deprecated by API
+ */
@Deprecated
public void writeText(final Object text, final String property) throws IOException {
responseWriter.writeText(text, property);
@@ -76,6 +82,9 @@ public class TobagoResponseWriterWrapper extends TobagoResponseWriter {
responseWriter.writeAttribute(name, value, null);
}
+ /**
+ * @deprecated by API
+ */
@Override
@Deprecated
public String getStyleClasses() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java
index 25a86e2..8368922 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/AutoLayoutToken.java
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.layout;
public final class AutoLayoutToken extends LayoutToken {
-
+
public static final AutoLayoutToken INSTANCE = new AutoLayoutToken();
public String toString() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java
index ca4b07f..3e11ee4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBase.java
@@ -27,51 +27,67 @@ import org.apache.myfaces.tobago.config.Configurable;
public interface LayoutBase extends Configurable {
Measure getWidth();
+
void setWidth(Measure width);
Measure getHeight();
+
void setHeight(Measure height);
Measure getCurrentWidth();
+
void setCurrentWidth(Measure width);
Measure getCurrentHeight();
+
void setCurrentHeight(Measure height);
Measure getMinimumWidth();
+
void setMinimumWidth(Measure minimumWidth);
Measure getMinimumHeight();
+
void setMinimumHeight(Measure minimumHeight);
void setPreferredWidth(Measure preferredWidth);
+
Measure getPreferredWidth();
void setPreferredHeight(Measure preferredHeight);
+
Measure getPreferredHeight();
Measure getMaximumWidth();
+
void setMaximumWidth(Measure maximumWidth);
Measure getMaximumHeight();
+
void setMaximumHeight(Measure maximumHeight);
Measure getLeft();
+
void setLeft(Measure left);
Measure getTop();
+
void setTop(Measure top);
Measure getMarginLeft();
+
void setMarginLeft(Measure marginLeft);
Measure getMarginRight();
+
void setMarginRight(Measure marginRight);
Measure getMarginTop();
+
void setMarginTop(Measure marginTop);
Measure getMarginBottom();
+
void setMarginBottom(Measure marginBottom);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java
index 724c237..2d92237 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutBox.java
@@ -24,27 +24,35 @@ import org.apache.myfaces.tobago.config.Configurable;
public interface LayoutBox extends Configurable {
Measure getBorderLeft();
+
void setBorderLeft(Measure borderLeft);
Measure getBorderRight();
+
void setBorderRight(Measure borderRight);
Measure getBorderTop();
+
void setBorderTop(Measure borderTop);
Measure getBorderBottom();
+
void setBorderBottom(Measure borderBottom);
Measure getPaddingLeft();
+
void setPaddingLeft(Measure paddingLeft);
Measure getPaddingRight();
+
void setPaddingRight(Measure paddingRight);
Measure getPaddingTop();
+
void setPaddingTop(Measure paddingTop);
Measure getPaddingBottom();
+
void setPaddingBottom(Measure paddingBottom);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
index d5b388f..ec64101 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutComponent.java
@@ -25,18 +25,23 @@ package org.apache.myfaces.tobago.layout;
public interface LayoutComponent extends LayoutBase {
Integer getColumnSpan();
+
void setColumnSpan(Integer columnSpan);
Integer getRowSpan();
+
void setRowSpan(Integer rowSpan);
Integer getHorizontalIndex();
+
void setHorizontalIndex(Integer horizontalIndex);
Integer getVerticalIndex();
+
void setVerticalIndex(Integer verticalIndex);
Display getDisplay();
+
void setDisplay(Display display);
boolean isRendered();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
index 6b89d45..a2bb221 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
@@ -26,6 +26,7 @@ public interface LayoutContainer extends LayoutBox, LayoutBase {
List<LayoutComponent> getComponents();
LayoutManager getLayoutManager();
+
void setLayoutManager(LayoutManager layoutManager);
/**
@@ -34,8 +35,10 @@ public interface LayoutContainer extends LayoutBox, LayoutBase {
boolean isLayoutChildren();
boolean isOverflowX();
+
void setOverflowX(boolean overflowX);
boolean isOverflowY();
+
void setOverflowY(boolean overflowY);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
index 4f6b6f2..db73c1e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
@@ -27,7 +27,7 @@ import java.io.Serializable;
import java.util.List;
/**
- * In JSPs the class {@link org.apache.myfaces.tobago.layout.MeasureEditor} will convert the string literals.
+ * In JSPs the class {@link org.apache.myfaces.tobago.layout.MeasureEditor} will convert the string literals.
*/
public abstract class Measure implements Serializable {
@@ -39,7 +39,7 @@ public abstract class Measure implements Serializable {
public static final Measure MAX = valueOf(Integer.MAX_VALUE);
// todo: refactor and consolidate with LayoutToken
-
+
public static Measure valueOf(final Measure value) {
if (value == null) {
return ZERO;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
index d3279b7..f568257 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
@@ -26,9 +26,9 @@ import java.beans.PropertyEditorSupport;
*/
public class MeasureEditor extends PropertyEditorSupport {
- @Override
- public void setAsText(final String text) throws IllegalArgumentException {
- setValue(Measure.valueOf(text));
- }
+ @Override
+ public void setAsText(final String text) throws IllegalArgumentException {
+ setValue(Measure.valueOf(text));
+ }
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java
index 3d5ddc4..0c314a4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Orientation.java
@@ -20,10 +20,10 @@
package org.apache.myfaces.tobago.layout;
public enum Orientation {
-
+
HORIZONTAL,
VERTICAL;
-
+
public Orientation other() {
if (this == HORIZONTAL) {
return VERTICAL;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
index 84398d3..5479216 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
@@ -28,14 +28,14 @@ public final class PixelMeasure extends Measure {
static final PixelMeasure[] PIXEL_CACHE;
static final int PIXEL_CACHE_MAX = 4000;
-
+
static {
PIXEL_CACHE = new PixelMeasure[PIXEL_CACHE_MAX + 1];
for (int i = 0; i < PIXEL_CACHE.length; i++) {
PIXEL_CACHE[i] = new PixelMeasure(i);
}
}
-
+
private final int pixel;
private PixelMeasure(final int pixel) {
@@ -48,7 +48,7 @@ public final class PixelMeasure extends Measure {
}
return new PixelMeasure(value);
}
-
... 5665 lines suppressed ...
[myfaces-tobago] 22/32: cherrypick from 2.x: build: use specific tobago-2 checkstyle
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b7436497ffe4e53405200270370ee64f2e132c30
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Feb 9 17:51:15 2022 +0100
cherrypick from 2.x: build: use specific tobago-2 checkstyle
* update checkstyle
* update dependency
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index f7ac60a..410ea1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <checkstyle-rules.version>15</checkstyle-rules.version>
+ <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+ <checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
@@ -371,7 +372,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
+ <version>${maven-checkstyle-plugin.version}</version>
<executions>
<execution>
<id>verify-style</id>
@@ -379,7 +380,7 @@
</execution>
</executions>
<configuration>
- <configLocation>tobago/checkstyle.xml</configLocation>
+ <configLocation>tobago/checkstyle-for-tobago-2.x.xml</configLocation>
<headerLocation>default/myfaces-header.txt</headerLocation>
<xrefLocation>xref</xrefLocation>
<excludes>**/package-info.java</excludes>
@@ -390,8 +391,7 @@
<dependency>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>checkstyle-rules</artifactId>
- <version>6</version>
- <!--<version>${checkstyle-rules.version}</version>-->
+ <version>${checkstyle-rules.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -544,7 +544,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
+ <version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>tobago/checkstyle.xml</configLocation>
<headerLocation>default/myfaces-header.txt</headerLocation>
[myfaces-tobago] 30/32: cherrypick from 2.x: build(deps): bump apache-rat-plugin from 0.11 to 0.13
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 0aba8a4620cd1555e1d33e954a1cb18d046ab8ce
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Feb 10 17:21:08 2022 +0000
cherrypick from 2.x: build(deps): bump apache-rat-plugin from 0.11 to 0.13
Bumps apache-rat-plugin from 0.11 to 0.13.
---
updated-dependencies:
- dependency-name: org.apache.rat:apache-rat-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 22a5177..848d2d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -716,7 +716,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.13</version>
<configuration>
<excludes>
<!-- This file is created during a release and needs no licensing text -->
[myfaces-tobago] 32/32: cherrypick from 2.x: build(deps): bump cargo-maven2-plugin from 1.0.3 to 1.8.5
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit be9d9d0af90b540174269b438fe9c189da1ad1c0
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 9 10:08:50 2022 +0000
cherrypick from 2.x: build(deps): bump cargo-maven2-plugin from 1.0.3 to 1.8.5
Bumps cargo-maven2-plugin from 1.0.3 to 1.8.5.
---
updated-dependencies:
- dependency-name: org.codehaus.cargo:cargo-maven2-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
tobago-example/tobago-example-demo/pom.xml | 4 ++--
tobago-example/tobago-example-test/pom.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 848d2d6..17e524f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -594,7 +594,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0.3</version>
+ <version>1.8.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 086f46c..90b74af 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -591,7 +591,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0</version>
+ <version>1.8.5</version>
<configuration>
<container>
<containerId>tomcat6x</containerId>
@@ -618,7 +618,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0</version>
+ <version>1.8.5</version>
<configuration>
<container>
<containerId>tomcat5x</containerId>
diff --git a/tobago-example/tobago-example-test/pom.xml b/tobago-example/tobago-example-test/pom.xml
index c1c77e7..1103d58 100644
--- a/tobago-example/tobago-example-test/pom.xml
+++ b/tobago-example/tobago-example-test/pom.xml
@@ -316,7 +316,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0</version>
+ <version>1.8.5</version>
<configuration>
<container>
<containerId>tomcat6x</containerId>
@@ -343,7 +343,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0</version>
+ <version>1.8.5</version>
<configuration>
<container>
<containerId>tomcat5x</containerId>
[myfaces-tobago] 26/32: cherrypick from 2.x: chore: Update jQuery UI Timepicker to 1.6.3
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 6b2baf20821384905da78665ed5dbbabd438449a
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 12:51:35 2022 +0100
cherrypick from 2.x: chore: Update jQuery UI Timepicker to 1.6.3
issue: TOBAGO-2111
---
.../src/main/resources/META-INF/tobago-config.xml | 8 +-
.../contrib/jquery-ui-timepicker-addon-1.4.5.js | 2203 -------------------
.../contrib/jquery-ui-timepicker-addon-1.4.5_sr.js | 21 -
.../contrib/jquery-ui-timepicker-addon-1.4.5_zh.js | 21 -
.../contrib/jquery-ui-timepicker-addon-1.6.3.js | 2291 ++++++++++++++++++++
.../jquery-ui-timepicker-addon-1.6.3.min.js | 5 +
...f.js => jquery-ui-timepicker-addon-1.6.3_af.js} | 1 +
...m.js => jquery-ui-timepicker-addon-1.6.3_am.js} | 1 +
...g.js => jquery-ui-timepicker-addon-1.6.3_bg.js} | 1 +
...a.js => jquery-ui-timepicker-addon-1.6.3_ca.js} | 1 +
...s.js => jquery-ui-timepicker-addon-1.6.3_cs.js} | 1 +
...a.js => jquery-ui-timepicker-addon-1.6.3_da.js} | 1 +
...e.js => jquery-ui-timepicker-addon-1.6.3_de.js} | 1 +
...l.js => jquery-ui-timepicker-addon-1.6.3_el.js} | 7 +-
...s.js => jquery-ui-timepicker-addon-1.6.3_es.js} | 6 +-
...t.js => jquery-ui-timepicker-addon-1.6.3_et.js} | 1 +
...u.js => jquery-ui-timepicker-addon-1.6.3_eu.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_fa.js | 22 +
...i.js => jquery-ui-timepicker-addon-1.6.3_fi.js} | 1 +
...r.js => jquery-ui-timepicker-addon-1.6.3_fr.js} | 1 +
...l.js => jquery-ui-timepicker-addon-1.6.3_gl.js} | 1 +
...e.js => jquery-ui-timepicker-addon-1.6.3_he.js} | 1 +
...r.js => jquery-ui-timepicker-addon-1.6.3_hr.js} | 1 +
...u.js => jquery-ui-timepicker-addon-1.6.3_hu.js} | 1 +
...d.js => jquery-ui-timepicker-addon-1.6.3_id.js} | 1 +
...t.js => jquery-ui-timepicker-addon-1.6.3_it.js} | 1 +
...a.js => jquery-ui-timepicker-addon-1.6.3_ja.js} | 1 +
...o.js => jquery-ui-timepicker-addon-1.6.3_ko.js} | 1 +
...t.js => jquery-ui-timepicker-addon-1.6.3_lt.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_lv.js | 22 +
...g.js => jquery-ui-timepicker-addon-1.6.3_mk.js} | 13 +-
...l.js => jquery-ui-timepicker-addon-1.6.3_nl.js} | 1 +
...o.js => jquery-ui-timepicker-addon-1.6.3_no.js} | 1 +
...l.js => jquery-ui-timepicker-addon-1.6.3_pl.js} | 1 +
...t.js => jquery-ui-timepicker-addon-1.6.3_pt.js} | 1 +
...s => jquery-ui-timepicker-addon-1.6.3_pt_BR.js} | 1 +
...o.js => jquery-ui-timepicker-addon-1.6.3_ro.js} | 1 +
...u.js => jquery-ui-timepicker-addon-1.6.3_ru.js} | 1 +
...k.js => jquery-ui-timepicker-addon-1.6.3_sk.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_sl.js | 22 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_sq.js | 22 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_sr.js | 22 +
...s => jquery-ui-timepicker-addon-1.6.3_sr_YU.js} | 1 +
...v.js => jquery-ui-timepicker-addon-1.6.3_sv.js} | 1 +
...h.js => jquery-ui-timepicker-addon-1.6.3_th.js} | 3 +-
...r.js => jquery-ui-timepicker-addon-1.6.3_tr.js} | 1 +
...k.js => jquery-ui-timepicker-addon-1.6.3_uk.js} | 1 +
...i.js => jquery-ui-timepicker-addon-1.6.3_vi.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.6.3_zh.js | 22 +
...s => jquery-ui-timepicker-addon-1.6.3_zh_TW.js} | 1 +
.../contrib/jquery-ui-timepicker-addon-1.4.5.css | 11 -
.../contrib/jquery-ui-timepicker-addon-1.6.3.css | 33 +
52 files changed, 2516 insertions(+), 2272 deletions(-)
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 2407a56..345efc0 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -401,11 +401,11 @@
<resources production="true">
<script priority="10" name="script/contrib/jquery-3.6.0.js"/>
<script priority="20" name="script/contrib/jquery-ui-1.13.1.custom.js"/>
- <script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
+ <script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.6.3.js"/>
<script priority="35" name="script/contrib/select2/select2.full.js"/>
<script priority="40" name="script/tobago.js"/>
<style priority="10" name="style/contrib/ui-lightness/jquery-ui-1.13.1.custom.css"/>
- <style priority="20" name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
+ <style priority="20" name="style/contrib/jquery-ui-timepicker-addon-1.6.3.css"/>
<style priority="25" name="style/contrib/select2/select2.css"/>
<style priority="30" name="style/tobago.css"/>
<!-- backward compatibility -->
@@ -414,7 +414,7 @@
<resources production="false">
<script priority="10" name="script/contrib/jquery-3.6.0.js"/>
<script priority="20" name="script/contrib/jquery-ui-1.13.1.custom.js"/>
- <script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
+ <script priority="30" name="script/contrib/jquery-ui-timepicker-addon-1.6.3.js"/>
<script priority="35" name="script/contrib/select2/select2.full.js"/>
<script priority="40" name="script/tobago.js"/>
<script priority="50" name="script/tobago-calendar.js"/>
@@ -434,7 +434,7 @@
<script priority="170" name="script/tobago-utils.js"/>
<script priority="180" name="script/tobago-logging.js"/>
<style priority="10" name="style/contrib/ui-lightness/jquery-ui-1.13.1.custom.css"/>
- <style priority="20" name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
+ <style priority="20" name="style/contrib/jquery-ui-timepicker-addon-1.6.3.css"/>
<style priority="25" name="style/contrib/select2/select2.css"/>
<style priority="30" name="style/tobago.css"/>
<!-- backward compatibility -->
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5.js
deleted file mode 100644
index 66a12d3..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5.js
+++ /dev/null
@@ -1,2203 +0,0 @@
-/*! jQuery Timepicker Addon - v1.4.5 - 2014-05-26
-* http://trentrichardson.com/examples/timepicker
-* Copyright (c) 2014 Trent Richardson; Licensed MIT */
-(function ($) {
-
- /*
- * Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
- */
- $.ui.timepicker = $.ui.timepicker || {};
- if ($.ui.timepicker.version) {
- return;
- }
-
- /*
- * Extend jQueryUI, get it started with our version number
- */
- $.extend($.ui, {
- timepicker: {
- version: "1.4.5"
- }
- });
-
- /*
- * Timepicker manager.
- * Use the singleton instance of this class, $.timepicker, to interact with the time picker.
- * Settings for (groups of) time pickers are maintained in an instance object,
- * allowing multiple different settings on the same page.
- */
- var Timepicker = function () {
- this.regional = []; // Available regional settings, indexed by language code
- this.regional[''] = { // Default regional settings
- currentText: 'Now',
- closeText: 'Done',
- amNames: ['AM', 'A'],
- pmNames: ['PM', 'P'],
- timeFormat: 'HH:mm',
- timeSuffix: '',
- timeOnlyTitle: 'Choose Time',
- timeText: 'Time',
- hourText: 'Hour',
- minuteText: 'Minute',
- secondText: 'Second',
- millisecText: 'Millisecond',
- microsecText: 'Microsecond',
- timezoneText: 'Time Zone',
- isRTL: false
- };
- this._defaults = { // Global defaults for all the datetime picker instances
- showButtonPanel: true,
- timeOnly: false,
- timeOnlyShowDate: false,
- showHour: null,
- showMinute: null,
- showSecond: null,
- showMillisec: null,
- showMicrosec: null,
- showTimezone: null,
- showTime: true,
- stepHour: 1,
- stepMinute: 1,
- stepSecond: 1,
- stepMillisec: 1,
- stepMicrosec: 1,
- hour: 0,
- minute: 0,
- second: 0,
- millisec: 0,
- microsec: 0,
- timezone: null,
- hourMin: 0,
- minuteMin: 0,
- secondMin: 0,
- millisecMin: 0,
- microsecMin: 0,
- hourMax: 23,
- minuteMax: 59,
- secondMax: 59,
- millisecMax: 999,
- microsecMax: 999,
- minDateTime: null,
- maxDateTime: null,
- maxTime: null,
- minTime: null,
- onSelect: null,
- hourGrid: 0,
- minuteGrid: 0,
- secondGrid: 0,
- millisecGrid: 0,
- microsecGrid: 0,
- alwaysSetTime: true,
- separator: ' ',
- altFieldTimeOnly: true,
- altTimeFormat: null,
- altSeparator: null,
- altTimeSuffix: null,
- altRedirectFocus: true,
- pickerTimeFormat: null,
- pickerTimeSuffix: null,
- showTimepicker: true,
- timezoneList: null,
- addSliderAccess: false,
- sliderAccessArgs: null,
- controlType: 'slider',
- defaultValue: null,
- parse: 'strict'
- };
- $.extend(this._defaults, this.regional['']);
- };
-
- $.extend(Timepicker.prototype, {
- $input: null,
- $altInput: null,
- $timeObj: null,
- inst: null,
- hour_slider: null,
- minute_slider: null,
- second_slider: null,
- millisec_slider: null,
- microsec_slider: null,
- timezone_select: null,
- maxTime: null,
- minTime: null,
- hour: 0,
- minute: 0,
- second: 0,
- millisec: 0,
- microsec: 0,
- timezone: null,
- hourMinOriginal: null,
- minuteMinOriginal: null,
- secondMinOriginal: null,
- millisecMinOriginal: null,
- microsecMinOriginal: null,
- hourMaxOriginal: null,
- minuteMaxOriginal: null,
- secondMaxOriginal: null,
- millisecMaxOriginal: null,
- microsecMaxOriginal: null,
- ampm: '',
- formattedDate: '',
- formattedTime: '',
- formattedDateTime: '',
- timezoneList: null,
- units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
- support: {},
- control: null,
-
- /*
- * Override the default settings for all instances of the time picker.
- * @param {Object} settings object - the new settings to use as defaults (anonymous object)
- * @return {Object} the manager object
- */
- setDefaults: function (settings) {
- extendRemove(this._defaults, settings || {});
- return this;
- },
-
- /*
- * Create a new Timepicker instance
- */
- _newInst: function ($input, opts) {
- var tp_inst = new Timepicker(),
- inlineSettings = {},
- fns = {},
- overrides, i;
-
- for (var attrName in this._defaults) {
- if (this._defaults.hasOwnProperty(attrName)) {
- var attrValue = $input.attr('time:' + attrName);
- if (attrValue) {
- try {
- inlineSettings[attrName] = eval(attrValue);
- } catch (err) {
- inlineSettings[attrName] = attrValue;
- }
- }
- }
- }
-
- overrides = {
- beforeShow: function (input, dp_inst) {
- if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
- return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
- }
- },
- onChangeMonthYear: function (year, month, dp_inst) {
- // Update the time as well : this prevents the time from disappearing from the $input field.
- tp_inst._updateDateTime(dp_inst);
- if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
- tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
- }
- },
- onClose: function (dateText, dp_inst) {
- if (tp_inst.timeDefined === true && $input.val() !== '') {
- tp_inst._updateDateTime(dp_inst);
- }
- if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
- tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
- }
- }
- };
- for (i in overrides) {
- if (overrides.hasOwnProperty(i)) {
- fns[i] = opts[i] || null;
- }
- }
-
- tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
- evnts: fns,
- timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
- });
- tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
- return val.toUpperCase();
- });
- tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
- return val.toUpperCase();
- });
-
- // detect which units are supported
- tp_inst.support = detectSupport(
- tp_inst._defaults.timeFormat +
- (tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
- (tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
-
- // controlType is string - key to our this._controls
- if (typeof(tp_inst._defaults.controlType) === 'string') {
- if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
- tp_inst._defaults.controlType = 'select';
- }
- tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
- }
- // controlType is an object and must implement create, options, value methods
- else {
- tp_inst.control = tp_inst._defaults.controlType;
- }
-
- // prep the timezone options
- var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
- 0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
- if (tp_inst._defaults.timezoneList !== null) {
- timezoneList = tp_inst._defaults.timezoneList;
- }
- var tzl = timezoneList.length, tzi = 0, tzv = null;
- if (tzl > 0 && typeof timezoneList[0] !== 'object') {
- for (; tzi < tzl; tzi++) {
- tzv = timezoneList[tzi];
- timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
- }
- }
- tp_inst._defaults.timezoneList = timezoneList;
-
- // set the default units
- tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
- ((new Date()).getTimezoneOffset() * -1);
- tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
- tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
- tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
- tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
- tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
- tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
- tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
- tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
- tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
- tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
- tp_inst.ampm = '';
- tp_inst.$input = $input;
-
- if (tp_inst._defaults.altField) {
- tp_inst.$altInput = $(tp_inst._defaults.altField);
- if (tp_inst._defaults.altRedirectFocus === true) {
- tp_inst.$altInput.css({
- cursor: 'pointer'
- }).focus(function () {
- $input.trigger("focus");
- });
- }
- }
-
- if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
- tp_inst._defaults.minDate = new Date();
- }
- if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
- tp_inst._defaults.maxDate = new Date();
- }
-
- // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
- if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
- tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
- }
- if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
- tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
- }
- if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
- tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
- }
- if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
- tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
- }
- tp_inst.$input.bind('focus', function () {
- tp_inst._onFocus();
- });
-
- return tp_inst;
- },
-
- /*
- * add our sliders to the calendar
- */
- _addTimePicker: function (dp_inst) {
- var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
-
- this.timeDefined = this._parseTime(currDT);
- this._limitMinMaxDateTime(dp_inst, false);
- this._injectTimePicker();
- },
-
- /*
- * parse the time string from input value or _setTime
- */
- _parseTime: function (timeString, withDate) {
- if (!this.inst) {
- this.inst = $.datepicker._getInst(this.$input[0]);
- }
-
- if (withDate || !this._defaults.timeOnly) {
- var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
- try {
- var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
- if (!parseRes.timeObj) {
- return false;
- }
- $.extend(this, parseRes.timeObj);
- } catch (err) {
- $.timepicker.log("Error parsing the date/time string: " + err +
- "\ndate/time string = " + timeString +
- "\ntimeFormat = " + this._defaults.timeFormat +
- "\ndateFormat = " + dp_dateFormat);
- return false;
- }
- return true;
- } else {
- var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
- if (!timeObj) {
- return false;
- }
- $.extend(this, timeObj);
- return true;
- }
- },
-
- /*
- * generate and inject html for timepicker into ui datepicker
- */
- _injectTimePicker: function () {
- var $dp = this.inst.dpDiv,
- o = this.inst.settings,
- tp_inst = this,
- litem = '',
- uitem = '',
- show = null,
- max = {},
- gridSize = {},
- size = null,
- i = 0,
- l = 0;
-
- // Prevent displaying twice
- if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
- var noDisplay = ' style="display:none;"',
- html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
- '<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
-
- // Create the markup
- for (i = 0, l = this.units.length; i < l; i++) {
- litem = this.units[i];
- uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
- show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
-
- // Added by Peter Medeiros:
- // - Figure out what the hour/minute/second max should be based on the step values.
- // - Example: if stepMinute is 15, then minMax is 45.
- max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
- gridSize[litem] = 0;
-
- html += '<dt class="ui_tpicker_' + litem + '_label"' + (show ? '' : noDisplay) + '>' + o[litem + 'Text'] + '</dt>' +
- '<dd class="ui_tpicker_' + litem + '"><div class="ui_tpicker_' + litem + '_slider"' + (show ? '' : noDisplay) + '></div>';
-
- if (show && o[litem + 'Grid'] > 0) {
- html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
- if (litem === 'hour') {
- for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
- gridSize[litem]++;
- var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
- html += '<td data-for="' + litem + '">' + tmph + '</td>';
- }
- }
- else {
- for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
- gridSize[litem]++;
- html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
- }
- }
-
- html += '</tr></table></div>';
- }
- html += '</dd>';
- }
-
- // Timezone
- var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
- html += '<dt class="ui_tpicker_timezone_label"' + (showTz ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
- html += '<dd class="ui_tpicker_timezone" ' + (showTz ? '' : noDisplay) + '></dd>';
-
- // Create the elements from string
- html += '</dl></div>';
- var $tp = $(html);
-
- // if we only want time picker...
- if (o.timeOnly === true) {
- $tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
- $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
- }
-
- // add sliders, adjust grids, add events
- for (i = 0, l = tp_inst.units.length; i < l; i++) {
- litem = tp_inst.units[i];
- uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
- show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
-
- // add the slider
- tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
-
- // adjust the grid and add click event
- if (show && o[litem + 'Grid'] > 0) {
- size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
- $tp.find('.ui_tpicker_' + litem + ' table').css({
- width: size + "%",
- marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
- marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
- borderCollapse: 'collapse'
- }).find("td").click(function (e) {
- var $t = $(this),
- h = $t.html(),
- n = parseInt(h.replace(/[^0-9]/g), 10),
- ap = h.replace(/[^apm]/ig),
- f = $t.data('for'); // loses scope, so we use data-for
-
- if (f === 'hour') {
- if (ap.indexOf('p') !== -1 && n < 12) {
- n += 12;
- }
- else {
- if (ap.indexOf('a') !== -1 && n === 12) {
- n = 0;
- }
- }
- }
-
- tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
-
- tp_inst._onTimeChange();
- tp_inst._onSelectHandler();
- }).css({
- cursor: 'pointer',
- width: (100 / gridSize[litem]) + '%',
- textAlign: 'center',
- overflow: 'hidden'
- });
- } // end if grid > 0
- } // end for loop
-
- // Add timezone options
- this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
- $.fn.append.apply(this.timezone_select,
- $.map(o.timezoneList, function (val, idx) {
- return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
- }));
- if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
- var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
- if (local_timezone === this.timezone) {
- selectLocalTimezone(tp_inst);
- } else {
- this.timezone_select.val(this.timezone);
- }
- } else {
- if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
- this.timezone_select.val(o.timezone);
- } else {
- selectLocalTimezone(tp_inst);
- }
- }
- this.timezone_select.change(function () {
- tp_inst._onTimeChange();
- tp_inst._onSelectHandler();
- });
- // End timezone options
-
- // inject timepicker into datepicker
- var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
- if ($buttonPanel.length) {
- $buttonPanel.before($tp);
- } else {
- $dp.append($tp);
- }
-
- this.$timeObj = $tp.find('.ui_tpicker_time');
-
- if (this.inst !== null) {
- var timeDefined = this.timeDefined;
- this._onTimeChange();
- this.timeDefined = timeDefined;
- }
-
- // slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
- if (this._defaults.addSliderAccess) {
- var sliderAccessArgs = this._defaults.sliderAccessArgs,
- rtl = this._defaults.isRTL;
- sliderAccessArgs.isRTL = rtl;
-
- setTimeout(function () { // fix for inline mode
- if ($tp.find('.ui-slider-access').length === 0) {
- $tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
-
- // fix any grids since sliders are shorter
- var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
- if (sliderAccessWidth) {
- $tp.find('table:visible').each(function () {
- var $g = $(this),
- oldWidth = $g.outerWidth(),
- oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
- newWidth = oldWidth - sliderAccessWidth,
- newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
- css = { width: newWidth, marginRight: 0, marginLeft: 0 };
- css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
- $g.css(css);
- });
- }
- }
- }, 10);
- }
- // end slideAccess integration
-
- tp_inst._limitMinMaxDateTime(this.inst, true);
- }
- },
-
- /*
- * This function tries to limit the ability to go outside the
- * min/max date range
- */
- _limitMinMaxDateTime: function (dp_inst, adjustSliders) {
- var o = this._defaults,
- dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
-
- if (!this._defaults.showTimepicker) {
- return;
- } // No time so nothing to check here
-
- if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
- var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
- minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
-
- if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
- this.hourMinOriginal = o.hourMin;
- this.minuteMinOriginal = o.minuteMin;
- this.secondMinOriginal = o.secondMin;
- this.millisecMinOriginal = o.millisecMin;
- this.microsecMinOriginal = o.microsecMin;
- }
-
- if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
- this._defaults.hourMin = minDateTime.getHours();
- if (this.hour <= this._defaults.hourMin) {
- this.hour = this._defaults.hourMin;
- this._defaults.minuteMin = minDateTime.getMinutes();
- if (this.minute <= this._defaults.minuteMin) {
- this.minute = this._defaults.minuteMin;
- this._defaults.secondMin = minDateTime.getSeconds();
- if (this.second <= this._defaults.secondMin) {
- this.second = this._defaults.secondMin;
- this._defaults.millisecMin = minDateTime.getMilliseconds();
- if (this.millisec <= this._defaults.millisecMin) {
- this.millisec = this._defaults.millisecMin;
- this._defaults.microsecMin = minDateTime.getMicroseconds();
- } else {
- if (this.microsec < this._defaults.microsecMin) {
- this.microsec = this._defaults.microsecMin;
- }
- this._defaults.microsecMin = this.microsecMinOriginal;
- }
- } else {
- this._defaults.millisecMin = this.millisecMinOriginal;
- this._defaults.microsecMin = this.microsecMinOriginal;
- }
- } else {
- this._defaults.secondMin = this.secondMinOriginal;
- this._defaults.millisecMin = this.millisecMinOriginal;
- this._defaults.microsecMin = this.microsecMinOriginal;
- }
- } else {
- this._defaults.minuteMin = this.minuteMinOriginal;
- this._defaults.secondMin = this.secondMinOriginal;
- this._defaults.millisecMin = this.millisecMinOriginal;
- this._defaults.microsecMin = this.microsecMinOriginal;
- }
- } else {
- this._defaults.hourMin = this.hourMinOriginal;
- this._defaults.minuteMin = this.minuteMinOriginal;
- this._defaults.secondMin = this.secondMinOriginal;
- this._defaults.millisecMin = this.millisecMinOriginal;
- this._defaults.microsecMin = this.microsecMinOriginal;
- }
- }
-
- if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
- var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
- maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
-
- if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
- this.hourMaxOriginal = o.hourMax;
- this.minuteMaxOriginal = o.minuteMax;
- this.secondMaxOriginal = o.secondMax;
- this.millisecMaxOriginal = o.millisecMax;
- this.microsecMaxOriginal = o.microsecMax;
- }
-
- if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
- this._defaults.hourMax = maxDateTime.getHours();
- if (this.hour >= this._defaults.hourMax) {
- this.hour = this._defaults.hourMax;
- this._defaults.minuteMax = maxDateTime.getMinutes();
- if (this.minute >= this._defaults.minuteMax) {
- this.minute = this._defaults.minuteMax;
- this._defaults.secondMax = maxDateTime.getSeconds();
- if (this.second >= this._defaults.secondMax) {
- this.second = this._defaults.secondMax;
- this._defaults.millisecMax = maxDateTime.getMilliseconds();
- if (this.millisec >= this._defaults.millisecMax) {
- this.millisec = this._defaults.millisecMax;
- this._defaults.microsecMax = maxDateTime.getMicroseconds();
- } else {
- if (this.microsec > this._defaults.microsecMax) {
- this.microsec = this._defaults.microsecMax;
- }
- this._defaults.microsecMax = this.microsecMaxOriginal;
- }
- } else {
- this._defaults.millisecMax = this.millisecMaxOriginal;
- this._defaults.microsecMax = this.microsecMaxOriginal;
- }
- } else {
- this._defaults.secondMax = this.secondMaxOriginal;
- this._defaults.millisecMax = this.millisecMaxOriginal;
- this._defaults.microsecMax = this.microsecMaxOriginal;
- }
- } else {
- this._defaults.minuteMax = this.minuteMaxOriginal;
- this._defaults.secondMax = this.secondMaxOriginal;
- this._defaults.millisecMax = this.millisecMaxOriginal;
- this._defaults.microsecMax = this.microsecMaxOriginal;
- }
- } else {
- this._defaults.hourMax = this.hourMaxOriginal;
- this._defaults.minuteMax = this.minuteMaxOriginal;
- this._defaults.secondMax = this.secondMaxOriginal;
- this._defaults.millisecMax = this.millisecMaxOriginal;
- this._defaults.microsecMax = this.microsecMaxOriginal;
- }
- }
-
- if (dp_inst.settings.minTime!==null) {
- var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);
- if (this.hour<tempMinTime.getHours()) {
- this.hour=this._defaults.hourMin=tempMinTime.getHours();
- this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
- } else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
- this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
- } else {
- if (this._defaults.hourMin<tempMinTime.getHours()) {
- this._defaults.hourMin=tempMinTime.getHours();
- this._defaults.minuteMin=tempMinTime.getMinutes();
- } else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
- this._defaults.minuteMin=tempMinTime.getMinutes();
- } else {
- this._defaults.minuteMin=0;
- }
- }
- }
-
- if (dp_inst.settings.maxTime!==null) {
- var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
- if (this.hour>tempMaxTime.getHours()) {
- this.hour=this._defaults.hourMax=tempMaxTime.getHours();
- this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
- } else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {
- this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
- } else {
- if (this._defaults.hourMax>tempMaxTime.getHours()) {
- this._defaults.hourMax=tempMaxTime.getHours();
- this._defaults.minuteMax=tempMaxTime.getMinutes();
- } else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
- this._defaults.minuteMax=tempMaxTime.getMinutes();
- } else {
- this._defaults.minuteMax=59;
- }
- }
- }
-
- if (adjustSliders !== undefined && adjustSliders === true) {
- var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
- minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
- secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
- millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
- microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
-
- if (this.hour_slider) {
- this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour });
- this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
- }
- if (this.minute_slider) {
- this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute });
- this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
- }
- if (this.second_slider) {
- this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond });
- this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
- }
- if (this.millisec_slider) {
- this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec });
- this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
- }
- if (this.microsec_slider) {
- this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec });
- this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
- }
- }
-
- },
-
- /*
- * when a slider moves, set the internal time...
- * on time change is also called when the time is updated in the text field
- */
- _onTimeChange: function () {
- if (!this._defaults.showTimepicker) {
- return;
- }
- var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
- minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
- second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
- millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
- microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
- timezone = (this.timezone_select) ? this.timezone_select.val() : false,
- o = this._defaults,
- pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
- pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
-
- if (typeof(hour) === 'object') {
- hour = false;
- }
- if (typeof(minute) === 'object') {
- minute = false;
- }
- if (typeof(second) === 'object') {
- second = false;
- }
- if (typeof(millisec) === 'object') {
- millisec = false;
- }
- if (typeof(microsec) === 'object') {
- microsec = false;
- }
- if (typeof(timezone) === 'object') {
- timezone = false;
- }
-
- if (hour !== false) {
- hour = parseInt(hour, 10);
- }
- if (minute !== false) {
- minute = parseInt(minute, 10);
- }
- if (second !== false) {
- second = parseInt(second, 10);
- }
- if (millisec !== false) {
- millisec = parseInt(millisec, 10);
- }
- if (microsec !== false) {
- microsec = parseInt(microsec, 10);
- }
- if (timezone !== false) {
- timezone = timezone.toString();
- }
-
- var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
-
- // If the update was done in the input field, the input field should not be updated.
- // If the update was done using the sliders, update the input field.
- var hasChanged = (
- hour !== parseInt(this.hour,10) || // sliders should all be numeric
- minute !== parseInt(this.minute,10) ||
- second !== parseInt(this.second,10) ||
- millisec !== parseInt(this.millisec,10) ||
- microsec !== parseInt(this.microsec,10) ||
- (this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
- (this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
- );
-
- if (hasChanged) {
-
- if (hour !== false) {
- this.hour = hour;
- }
- if (minute !== false) {
- this.minute = minute;
- }
- if (second !== false) {
- this.second = second;
- }
- if (millisec !== false) {
- this.millisec = millisec;
- }
- if (microsec !== false) {
- this.microsec = microsec;
- }
- if (timezone !== false) {
- this.timezone = timezone;
- }
-
- if (!this.inst) {
- this.inst = $.datepicker._getInst(this.$input[0]);
- }
-
- this._limitMinMaxDateTime(this.inst, true);
- }
- if (this.support.ampm) {
- this.ampm = ampm;
- }
-
- // Updates the time within the timepicker
- this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
- if (this.$timeObj) {
- if (pickerTimeFormat === o.timeFormat) {
- this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
- }
- else {
- this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
- }
- }
-
- this.timeDefined = true;
- if (hasChanged) {
- this._updateDateTime();
- //this.$input.focus(); // may automatically open the picker on setDate
- }
- },
-
- /*
- * call custom onSelect.
- * bind to sliders slidestop, and grid click.
- */
- _onSelectHandler: function () {
- var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
- var inputEl = this.$input ? this.$input[0] : null;
- if (onSelect && inputEl) {
- onSelect.apply(inputEl, [this.formattedDateTime, this]);
- }
- },
-
- /*
- * update our input with the new date time..
- */
- _updateDateTime: function (dp_inst) {
- dp_inst = this.inst || dp_inst;
- var dtTmp = (dp_inst.currentYear > 0?
- new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) :
- new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
- dt = $.datepicker._daylightSavingAdjust(dtTmp),
- //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
- //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
- dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
- formatCfg = $.datepicker._getFormatConfig(dp_inst),
- timeAvailable = dt !== null && this.timeDefined;
- this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
- var formattedDateTime = this.formattedDate;
-
- // if a slider was changed but datepicker doesn't have a value yet, set it
- if (dp_inst.lastVal === "") {
- dp_inst.currentYear = dp_inst.selectedYear;
- dp_inst.currentMonth = dp_inst.selectedMonth;
- dp_inst.currentDay = dp_inst.selectedDay;
- }
-
- /*
- * remove following lines to force every changes in date picker to change the input value
- * Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker.
- * If the user manually empty the value in the input field, the date picker will never change selected value.
- */
- //if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
- // return;
- //}
-
- if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
- formattedDateTime = this.formattedTime;
- } else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
- formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
- }
-
- this.formattedDateTime = formattedDateTime;
-
- if (!this._defaults.showTimepicker) {
- this.$input.val(this.formattedDate);
- } else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
- this.$altInput.val(this.formattedTime);
- this.$input.val(this.formattedDate);
- } else if (this.$altInput) {
- this.$input.val(formattedDateTime);
- var altFormattedDateTime = '',
- altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator,
- altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
-
- if (!this._defaults.timeOnly) {
- if (this._defaults.altFormat) {
- altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
- }
- else {
- altFormattedDateTime = this.formattedDate;
- }
-
- if (altFormattedDateTime) {
- altFormattedDateTime += altSeparator;
- }
- }
-
- if (this._defaults.altTimeFormat !== null) {
- altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
- }
- else {
- altFormattedDateTime += this.formattedTime + altTimeSuffix;
- }
- this.$altInput.val(altFormattedDateTime);
- } else {
- this.$input.val(formattedDateTime);
- }
-
- this.$input.trigger("change");
- },
-
- _onFocus: function () {
- if (!this.$input.val() && this._defaults.defaultValue) {
- this.$input.val(this._defaults.defaultValue);
- var inst = $.datepicker._getInst(this.$input.get(0)),
- tp_inst = $.datepicker._get(inst, 'timepicker');
- if (tp_inst) {
- if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
- try {
- $.datepicker._updateDatepicker(inst);
- } catch (err) {
- $.timepicker.log(err);
- }
- }
- }
- }
- },
-
- /*
- * Small abstraction to control types
- * We can add more, just be sure to follow the pattern: create, options, value
- */
- _controls: {
- // slider methods
- slider: {
- create: function (tp_inst, obj, unit, val, min, max, step) {
- var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
- return obj.prop('slide', null).slider({
- orientation: "horizontal",
- value: rtl ? val * -1 : val,
- min: rtl ? max * -1 : min,
- max: rtl ? min * -1 : max,
- step: step,
- slide: function (event, ui) {
- tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
- tp_inst._onTimeChange();
- },
- stop: function (event, ui) {
- tp_inst._onSelectHandler();
- }
- });
- },
- options: function (tp_inst, obj, unit, opts, val) {
- if (tp_inst._defaults.isRTL) {
- if (typeof(opts) === 'string') {
- if (opts === 'min' || opts === 'max') {
- if (val !== undefined) {
- return obj.slider(opts, val * -1);
- }
- return Math.abs(obj.slider(opts));
- }
- return obj.slider(opts);
- }
- var min = opts.min,
- max = opts.max;
- opts.min = opts.max = null;
- if (min !== undefined) {
- opts.max = min * -1;
- }
- if (max !== undefined) {
- opts.min = max * -1;
- }
- return obj.slider(opts);
- }
- if (typeof(opts) === 'string' && val !== undefined) {
- return obj.slider(opts, val);
- }
- return obj.slider(opts);
- },
- value: function (tp_inst, obj, unit, val) {
- if (tp_inst._defaults.isRTL) {
- if (val !== undefined) {
- return obj.slider('value', val * -1);
- }
- return Math.abs(obj.slider('value'));
- }
- if (val !== undefined) {
- return obj.slider('value', val);
- }
- return obj.slider('value');
- }
- },
- // select methods
- select: {
- create: function (tp_inst, obj, unit, val, min, max, step) {
- var sel = '<select class="ui-timepicker-select" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
- format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
-
- for (var i = min; i <= max; i += step) {
- sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
- if (unit === 'hour') {
- sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
- }
- else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
- else {sel += '0' + i.toString(); }
- sel += '</option>';
- }
- sel += '</select>';
-
- obj.children('select').remove();
-
- $(sel).appendTo(obj).change(function (e) {
- tp_inst._onTimeChange();
- tp_inst._onSelectHandler();
- });
-
- return obj;
- },
- options: function (tp_inst, obj, unit, opts, val) {
- var o = {},
- $t = obj.children('select');
- if (typeof(opts) === 'string') {
- if (val === undefined) {
- return $t.data(opts);
- }
- o[opts] = val;
- }
- else { o = opts; }
- return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
- },
- value: function (tp_inst, obj, unit, val) {
- var $t = obj.children('select');
- if (val !== undefined) {
- return $t.val(val);
- }
- return $t.val();
- }
- }
- } // end _controls
-
- });
-
- $.fn.extend({
- /*
- * shorthand just to use timepicker.
- */
- timepicker: function (o) {
- o = o || {};
- var tmp_args = Array.prototype.slice.call(arguments);
-
- if (typeof o === 'object') {
- tmp_args[0] = $.extend(o, {
- timeOnly: true
- });
- }
-
- return $(this).each(function () {
- $.fn.datetimepicker.apply($(this), tmp_args);
- });
- },
-
- /*
- * extend timepicker to datepicker
- */
- datetimepicker: function (o) {
- o = o || {};
- var tmp_args = arguments;
-
- if (typeof(o) === 'string') {
- if (o === 'getDate' || (o === 'option' && tmp_args.length === 2 && typeof (tmp_args[1]) === 'string')) {
- return $.fn.datepicker.apply($(this[0]), tmp_args);
- } else {
- return this.each(function () {
- var $t = $(this);
- $t.datepicker.apply($t, tmp_args);
- });
- }
- } else {
- return this.each(function () {
- var $t = $(this);
- $t.datepicker($.timepicker._newInst($t, o)._defaults);
- });
- }
- }
- });
-
- /*
- * Public Utility to parse date and time
- */
- $.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
- var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
- if (parseRes.timeObj) {
- var t = parseRes.timeObj;
- parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
- parseRes.date.setMicroseconds(t.microsec);
- }
-
- return parseRes.date;
- };
-
- /*
- * Public utility to parse time
- */
- $.datepicker.parseTime = function (timeFormat, timeString, options) {
- var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
- iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
-
- // Strict parse requires the timeString to match the timeFormat exactly
- var strictParse = function (f, s, o) {
-
- // pattern for standard and localized AM/PM markers
- var getPatternAmpm = function (amNames, pmNames) {
- var markers = [];
- if (amNames) {
- $.merge(markers, amNames);
- }
- if (pmNames) {
- $.merge(markers, pmNames);
- }
- markers = $.map(markers, function (val) {
- return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
- });
- return '(' + markers.join('|') + ')?';
- };
-
- // figure out position of time elements.. cause js cant do named captures
- var getFormatPositions = function (timeFormat) {
- var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
- orders = {
- h: -1,
- m: -1,
- s: -1,
- l: -1,
- c: -1,
- t: -1,
- z: -1
- };
-
- if (finds) {
- for (var i = 0; i < finds.length; i++) {
- if (orders[finds[i].toString().charAt(0)] === -1) {
- orders[finds[i].toString().charAt(0)] = i + 1;
- }
- }
- }
- return orders;
- };
-
- var regstr = '^' + f.toString()
- .replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
- var ml = match.length;
- switch (match.charAt(0).toLowerCase()) {
- case 'h':
- return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
- case 'm':
- return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
- case 's':
- return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
- case 'l':
- return '(\\d?\\d?\\d)';
- case 'c':
- return '(\\d?\\d?\\d)';
- case 'z':
- return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
- case 't':
- return getPatternAmpm(o.amNames, o.pmNames);
- default: // literal escaped in quotes
- return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
- }
- })
- .replace(/\s/g, '\\s?') +
- o.timeSuffix + '$',
- order = getFormatPositions(f),
- ampm = '',
- treg;
-
- treg = s.match(new RegExp(regstr, 'i'));
-
- var resTime = {
- hour: 0,
- minute: 0,
- second: 0,
- millisec: 0,
- microsec: 0
- };
-
- if (treg) {
- if (order.t !== -1) {
- if (treg[order.t] === undefined || treg[order.t].length === 0) {
- ampm = '';
- resTime.ampm = '';
- } else {
- ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
- resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
- }
- }
-
- if (order.h !== -1) {
- if (ampm === 'AM' && treg[order.h] === '12') {
- resTime.hour = 0; // 12am = 0 hour
- } else {
- if (ampm === 'PM' && treg[order.h] !== '12') {
- resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
- } else {
- resTime.hour = Number(treg[order.h]);
- }
- }
- }
-
- if (order.m !== -1) {
- resTime.minute = Number(treg[order.m]);
- }
- if (order.s !== -1) {
- resTime.second = Number(treg[order.s]);
- }
- if (order.l !== -1) {
- resTime.millisec = Number(treg[order.l]);
- }
- if (order.c !== -1) {
- resTime.microsec = Number(treg[order.c]);
- }
- if (order.z !== -1 && treg[order.z] !== undefined) {
- resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
- }
-
-
- return resTime;
- }
- return false;
- };// end strictParse
-
- // First try JS Date, if that fails, use strictParse
- var looseParse = function (f, s, o) {
- try {
- var d = new Date('2012-01-01 ' + s);
- if (isNaN(d.getTime())) {
- d = new Date('2012-01-01T' + s);
- if (isNaN(d.getTime())) {
- d = new Date('01/01/2012 ' + s);
- if (isNaN(d.getTime())) {
- throw "Unable to parse time with native Date: " + s;
- }
- }
- }
-
- return {
- hour: d.getHours(),
- minute: d.getMinutes(),
- second: d.getSeconds(),
- millisec: d.getMilliseconds(),
- microsec: d.getMicroseconds(),
- timezone: d.getTimezoneOffset() * -1
- };
- }
- catch (err) {
- try {
- return strictParse(f, s, o);
- }
- catch (err2) {
- $.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
- }
- }
- return false;
- }; // end looseParse
-
- if (typeof o.parse === "function") {
- return o.parse(timeFormat, timeString, o);
- }
- if (o.parse === 'loose') {
- return looseParse(timeFormat, timeString, o);
- }
- return strictParse(timeFormat, timeString, o);
- };
-
- /**
- * Public utility to format the time
- * @param {string} format format of the time
- * @param {Object} time Object not a Date for timezones
- * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
- * @returns {string} the formatted time
- */
- $.datepicker.formatTime = function (format, time, options) {
- options = options || {};
- options = $.extend({}, $.timepicker._defaults, options);
- time = $.extend({
- hour: 0,
- minute: 0,
- second: 0,
- millisec: 0,
- microsec: 0,
- timezone: null
- }, time);
-
- var tmptime = format,
- ampmName = options.amNames[0],
- hour = parseInt(time.hour, 10);
-
- if (hour > 11) {
- ampmName = options.pmNames[0];
- }
-
- tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
- switch (match) {
- case 'HH':
- return ('0' + hour).slice(-2);
- case 'H':
- return hour;
- case 'hh':
- return ('0' + convert24to12(hour)).slice(-2);
- case 'h':
- return convert24to12(hour);
- case 'mm':
- return ('0' + time.minute).slice(-2);
- case 'm':
- return time.minute;
- case 'ss':
- return ('0' + time.second).slice(-2);
- case 's':
- return time.second;
- case 'l':
- return ('00' + time.millisec).slice(-3);
- case 'c':
- return ('00' + time.microsec).slice(-3);
- case 'z':
- return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
- case 'Z':
- return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
- case 'T':
- return ampmName.charAt(0).toUpperCase();
- case 'TT':
- return ampmName.toUpperCase();
- case 't':
- return ampmName.charAt(0).toLowerCase();
- case 'tt':
- return ampmName.toLowerCase();
- default:
- return match.replace(/'/g, "");
- }
- });
-
- return tmptime;
- };
-
- /*
- * the bad hack :/ override datepicker so it doesn't close on select
- // inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
- */
- $.datepicker._base_selectDate = $.datepicker._selectDate;
- $.datepicker._selectDate = function (id, dateStr) {
- var inst = this._getInst($(id)[0]),
- tp_inst = this._get(inst, 'timepicker');
-
- if (tp_inst && inst.settings.showTimepicker) {
- tp_inst._limitMinMaxDateTime(inst, true);
- inst.inline = inst.stay_open = true;
- //This way the onSelect handler called from calendarpicker get the full dateTime
- this._base_selectDate(id, dateStr);
- inst.inline = inst.stay_open = false;
- this._notifyChange(inst);
- this._updateDatepicker(inst);
- } else {
- this._base_selectDate(id, dateStr);
- }
- };
-
- /*
- * second bad hack :/ override datepicker so it triggers an event when changing the input field
- * and does not redraw the datepicker on every selectDate event
- */
- $.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
- $.datepicker._updateDatepicker = function (inst) {
-
- // don't popup the datepicker if there is another instance already opened
- var input = inst.input[0];
- if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
- return;
- }
-
- if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-
- this._base_updateDatepicker(inst);
-
- // Reload the time control when changing something in the input text field.
- var tp_inst = this._get(inst, 'timepicker');
- if (tp_inst) {
- tp_inst._addTimePicker(inst);
- }
- }
- };
-
- /*
- * third bad hack :/ override datepicker so it allows spaces and colon in the input field
- */
- $.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
- $.datepicker._doKeyPress = function (event) {
- var inst = $.datepicker._getInst(event.target),
- tp_inst = $.datepicker._get(inst, 'timepicker');
-
- if (tp_inst) {
- if ($.datepicker._get(inst, 'constrainInput')) {
- var ampm = tp_inst.support.ampm,
- tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
- dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
- datetimeChars = tp_inst._defaults.timeFormat.toString()
- .replace(/[hms]/g, '')
- .replace(/TT/g, ampm ? 'APM' : '')
- .replace(/Tt/g, ampm ? 'AaPpMm' : '')
- .replace(/tT/g, ampm ? 'AaPpMm' : '')
- .replace(/T/g, ampm ? 'AP' : '')
- .replace(/tt/g, ampm ? 'apm' : '')
- .replace(/t/g, ampm ? 'ap' : '') +
- " " + tp_inst._defaults.separator +
- tp_inst._defaults.timeSuffix +
- (tz ? tp_inst._defaults.timezoneList.join('') : '') +
- (tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) +
- dateChars,
- chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
- return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
- }
- }
-
- return $.datepicker._base_doKeyPress(event);
- };
-
- /*
- * Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
- * Update any alternate field to synchronise with the main field.
- */
- $.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
- $.datepicker._updateAlternate = function (inst) {
- var tp_inst = this._get(inst, 'timepicker');
- if (tp_inst) {
- var altField = tp_inst._defaults.altField;
- if (altField) { // update alternate field too
- var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
- date = this._getDate(inst),
- formatCfg = $.datepicker._getFormatConfig(inst),
- altFormattedDateTime = '',
- altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator,
- altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
- altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
-
- altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
- if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
- if (tp_inst._defaults.altFormat) {
- altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
- }
- else {
- altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
- }
- }
- $(altField).val( inst.input.val() ? altFormattedDateTime : "");
- }
- }
- else {
- $.datepicker._base_updateAlternate(inst);
- }
- };
-
- /*
- * Override key up event to sync manual input changes.
- */
- $.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
- $.datepicker._doKeyUp = function (event) {
- var inst = $.datepicker._getInst(event.target),
- tp_inst = $.datepicker._get(inst, 'timepicker');
-
- if (tp_inst) {
- if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
- try {
- $.datepicker._updateDatepicker(inst);
- } catch (err) {
- $.timepicker.log(err);
- }
- }
- }
-
- return $.datepicker._base_doKeyUp(event);
- };
-
- /*
- * override "Today" button to also grab the time.
- */
- $.datepicker._base_gotoToday = $.datepicker._gotoToday;
- $.datepicker._gotoToday = function (id) {
- var inst = this._getInst($(id)[0]),
- $dp = inst.dpDiv;
- this._base_gotoToday(id);
- var tp_inst = this._get(inst, 'timepicker');
- selectLocalTimezone(tp_inst);
- var now = new Date();
- this._setTime(inst, now);
- $('.ui-datepicker-today', $dp).click();
- };
-
- /*
- * Disable & enable the Time in the datetimepicker
- */
- $.datepicker._disableTimepickerDatepicker = function (target) {
- var inst = this._getInst(target);
- if (!inst) {
- return;
- }
-
- var tp_inst = this._get(inst, 'timepicker');
- $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
- if (tp_inst) {
- inst.settings.showTimepicker = false;
- tp_inst._defaults.showTimepicker = false;
- tp_inst._updateDateTime(inst);
- }
- };
-
- $.datepicker._enableTimepickerDatepicker = function (target) {
- var inst = this._getInst(target);
- if (!inst) {
- return;
- }
-
- var tp_inst = this._get(inst, 'timepicker');
- $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
- if (tp_inst) {
- inst.settings.showTimepicker = true;
- tp_inst._defaults.showTimepicker = true;
- tp_inst._addTimePicker(inst); // Could be disabled on page load
- tp_inst._updateDateTime(inst);
- }
- };
-
- /*
- * Create our own set time function
- */
- $.datepicker._setTime = function (inst, date) {
- var tp_inst = this._get(inst, 'timepicker');
- if (tp_inst) {
- var defaults = tp_inst._defaults;
-
- // calling _setTime with no date sets time to defaults
- tp_inst.hour = date ? date.getHours() : defaults.hour;
- tp_inst.minute = date ? date.getMinutes() : defaults.minute;
- tp_inst.second = date ? date.getSeconds() : defaults.second;
- tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
- tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
-
- //check if within min/max times..
- tp_inst._limitMinMaxDateTime(inst, true);
-
- tp_inst._onTimeChange();
- tp_inst._updateDateTime(inst);
- }
- };
-
- /*
- * Create new public method to set only time, callable as $().datepicker('setTime', date)
- */
- $.datepicker._setTimeDatepicker = function (target, date, withDate) {
- var inst = this._getInst(target);
- if (!inst) {
- return;
- }
-
- var tp_inst = this._get(inst, 'timepicker');
-
- if (tp_inst) {
- this._setDateFromField(inst);
- var tp_date;
- if (date) {
- if (typeof date === "string") {
- tp_inst._parseTime(date, withDate);
- tp_date = new Date();
- tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
- tp_date.setMicroseconds(tp_inst.microsec);
- } else {
- tp_date = new Date(date.getTime());
- tp_date.setMicroseconds(date.getMicroseconds());
- }
- if (tp_date.toString() === 'Invalid Date') {
- tp_date = undefined;
- }
- this._setTime(inst, tp_date);
- }
- }
-
- };
-
- /*
- * override setDate() to allow setting time too within Date object
- */
- $.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
- $.datepicker._setDateDatepicker = function (target, _date) {
- var inst = this._getInst(target);
- var date = _date;
- if (!inst) {
- return;
- }
-
- if (typeof(_date) === 'string') {
- date = new Date(_date);
- if (!date.getTime()) {
- this._base_setDateDatepicker.apply(this, arguments);
- date = $(target).datepicker('getDate');
- }
- }
-
- var tp_inst = this._get(inst, 'timepicker');
- var tp_date;
- if (date instanceof Date) {
- tp_date = new Date(date.getTime());
- tp_date.setMicroseconds(date.getMicroseconds());
- } else {
- tp_date = date;
- }
-
- // This is important if you are using the timezone option, javascript's Date
- // object will only return the timezone offset for the current locale, so we
- // adjust it accordingly. If not using timezone option this won't matter..
- // If a timezone is different in tp, keep the timezone as is
- if (tp_inst && tp_date) {
- // look out for DST if tz wasn't specified
- if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
- tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
- }
- date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
- tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
- }
-
- this._updateDatepicker(inst);
- this._base_setDateDatepicker.apply(this, arguments);
- this._setTimeDatepicker(target, tp_date, true);
- };
-
- /*
- * override getDate() to allow getting time too within Date object
- */
- $.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
- $.datepicker._getDateDatepicker = function (target, noDefault) {
- var inst = this._getInst(target);
- if (!inst) {
- return;
- }
-
- var tp_inst = this._get(inst, 'timepicker');
-
- if (tp_inst) {
- // if it hasn't yet been defined, grab from field
- if (inst.lastVal === undefined) {
- this._setDateFromField(inst, noDefault);
- }
-
- var date = this._getDate(inst);
- if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
- date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
- date.setMicroseconds(tp_inst.microsec);
-
- // This is important if you are using the timezone option, javascript's Date
- // object will only return the timezone offset for the current locale, so we
- // adjust it accordingly. If not using timezone option this won't matter..
- if (tp_inst.timezone != null) {
- // look out for DST if tz wasn't specified
- if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
- tp_inst.timezone = date.getTimezoneOffset() * -1;
- }
- date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
- }
- }
- return date;
- }
- return this._base_getDateDatepicker(target, noDefault);
- };
-
- /*
- * override parseDate() because UI 1.8.14 throws an error about "Extra characters"
- * An option in datapicker to ignore extra format characters would be nicer.
- */
- $.datepicker._base_parseDate = $.datepicker.parseDate;
- $.datepicker.parseDate = function (format, value, settings) {
- var date;
- try {
- date = this._base_parseDate(format, value, settings);
- } catch (err) {
- // Hack! The error message ends with a colon, a space, and
- // the "extra" characters. We rely on that instead of
- // attempting to perfectly reproduce the parsing algorithm.
- if (err.indexOf(":") >= 0) {
- date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
- $.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
- } else {
- throw err;
- }
- }
- return date;
- };
-
- /*
- * override formatDate to set date with time to the input
- */
- $.datepicker._base_formatDate = $.datepicker._formatDate;
- $.datepicker._formatDate = function (inst, day, month, year) {
- var tp_inst = this._get(inst, 'timepicker');
- if (tp_inst) {
- tp_inst._updateDateTime(inst);
- return tp_inst.$input.val();
- }
- return this._base_formatDate(inst);
- };
-
- /*
- * override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
- */
- $.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
- $.datepicker._optionDatepicker = function (target, name, value) {
- var inst = this._getInst(target),
- name_clone;
- if (!inst) {
- return null;
- }
-
- var tp_inst = this._get(inst, 'timepicker');
- if (tp_inst) {
- var min = null,
- max = null,
- onselect = null,
- overrides = tp_inst._defaults.evnts,
- fns = {},
- prop;
- if (typeof name === 'string') { // if min/max was set with the string
- if (name === 'minDate' || name === 'minDateTime') {
- min = value;
- } else if (name === 'maxDate' || name === 'maxDateTime') {
- max = value;
- } else if (name === 'onSelect') {
- onselect = value;
- } else if (overrides.hasOwnProperty(name)) {
- if (typeof (value) === 'undefined') {
- return overrides[name];
- }
- fns[name] = value;
- name_clone = {}; //empty results in exiting function after overrides updated
- }
- } else if (typeof name === 'object') { //if min/max was set with the JSON
- if (name.minDate) {
- min = name.minDate;
- } else if (name.minDateTime) {
- min = name.minDateTime;
- } else if (name.maxDate) {
- max = name.maxDate;
- } else if (name.maxDateTime) {
- max = name.maxDateTime;
- }
- for (prop in overrides) {
- if (overrides.hasOwnProperty(prop) && name[prop]) {
- fns[prop] = name[prop];
- }
- }
- }
- for (prop in fns) {
- if (fns.hasOwnProperty(prop)) {
- overrides[prop] = fns[prop];
- if (!name_clone) { name_clone = $.extend({}, name); }
- delete name_clone[prop];
- }
- }
- if (name_clone && isEmptyObject(name_clone)) { return; }
- if (min) { //if min was set
- if (min === 0) {
- min = new Date();
- } else {
- min = new Date(min);
- }
- tp_inst._defaults.minDate = min;
- tp_inst._defaults.minDateTime = min;
- } else if (max) { //if max was set
- if (max === 0) {
- max = new Date();
- } else {
- max = new Date(max);
- }
- tp_inst._defaults.maxDate = max;
- tp_inst._defaults.maxDateTime = max;
- } else if (onselect) {
- tp_inst._defaults.onSelect = onselect;
- }
- }
- if (value === undefined) {
- return this._base_optionDatepicker.call($.datepicker, target, name);
- }
- return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
- };
-
- /*
- * jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
- * it will return false for all objects
- */
- var isEmptyObject = function (obj) {
- var prop;
- for (prop in obj) {
- if (obj.hasOwnProperty(prop)) {
- return false;
- }
- }
- return true;
- };
-
- /*
- * jQuery extend now ignores nulls!
- */
- var extendRemove = function (target, props) {
- $.extend(target, props);
- for (var name in props) {
- if (props[name] === null || props[name] === undefined) {
- target[name] = props[name];
- }
- }
- return target;
- };
-
- /*
- * Determine by the time format which units are supported
- * Returns an object of booleans for each unit
- */
- var detectSupport = function (timeFormat) {
- var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
- isIn = function (f, t) { // does the format contain the token?
- return f.indexOf(t) !== -1 ? true : false;
- };
- return {
- hour: isIn(tf, 'h'),
- minute: isIn(tf, 'm'),
- second: isIn(tf, 's'),
- millisec: isIn(tf, 'l'),
- microsec: isIn(tf, 'c'),
- timezone: isIn(tf, 'z'),
- ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
- iso8601: isIn(timeFormat, 'Z')
- };
- };
-
- /*
- * Converts 24 hour format into 12 hour
- * Returns 12 hour without leading 0
- */
- var convert24to12 = function (hour) {
- hour %= 12;
-
- if (hour === 0) {
- hour = 12;
- }
-
- return String(hour);
- };
-
- var computeEffectiveSetting = function (settings, property) {
- return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
- };
-
- /*
- * Splits datetime string into date and time substrings.
- * Throws exception when date can't be parsed
- * Returns {dateString: dateString, timeString: timeString}
- */
- var splitDateTime = function (dateTimeString, timeSettings) {
- // The idea is to get the number separator occurrences in datetime and the time format requested (since time has
- // fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
- var separator = computeEffectiveSetting(timeSettings, 'separator'),
- format = computeEffectiveSetting(timeSettings, 'timeFormat'),
- timeParts = format.split(separator), // how many occurrences of separator may be in our format?
- timePartsLen = timeParts.length,
- allParts = dateTimeString.split(separator),
- allPartsLen = allParts.length;
-
- if (allPartsLen > 1) {
- return {
- dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
- timeString: allParts.splice(0, timePartsLen).join(separator)
- };
- }
-
- return {
- dateString: dateTimeString,
- timeString: ''
- };
- };
-
- /*
- * Internal function to parse datetime interval
- * Returns: {date: Date, timeObj: Object}, where
- * date - parsed date without time (type Date)
- * timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
- */
- var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
- var date,
- parts,
- parsedTime;
-
- parts = splitDateTime(dateTimeString, timeSettings);
- date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
-
- if (parts.timeString === '') {
- return {
- date: date
- };
- }
-
- parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
-
- if (!parsedTime) {
- throw 'Wrong time format';
- }
-
- return {
- date: date,
- timeObj: parsedTime
- };
- };
-
- /*
- * Internal function to set timezone_select to the local timezone
- */
- var selectLocalTimezone = function (tp_inst, date) {
- if (tp_inst && tp_inst.timezone_select) {
- var now = date || new Date();
- tp_inst.timezone_select.val(-now.getTimezoneOffset());
- }
- };
-
- /*
- * Create a Singleton Instance
- */
- $.timepicker = new Timepicker();
-
- /**
- * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
- * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
- * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
- * @return {string}
- */
- $.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
- if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
- return tzMinutes;
- }
-
- var off = tzMinutes,
- minutes = off % 60,
- hours = (off - minutes) / 60,
- iso = iso8601 ? ':' : '',
- tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
-
- if (tz === '+00:00') {
- return 'Z';
- }
- return tz;
- };
-
- /**
- * Get the number in minutes that represents a timezone string
- * @param {string} tzString formatted like "+0500", "-1245", "Z"
- * @return {number} the offset minutes or the original string if it doesn't match expectations
- */
- $.timepicker.timezoneOffsetNumber = function (tzString) {
- var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
-
- if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
- return 0;
- }
-
- if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
- return tzString;
- }
-
- return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
- ((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
- parseInt(normalized.substr(3, 2), 10))); // minutes
- };
-
- /**
- * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
- * @param {Date} date
- * @param {string} toTimezone formatted like "+0500", "-1245"
- * @return {Date}
- */
- $.timepicker.timezoneAdjust = function (date, toTimezone) {
- var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
- if (!isNaN(toTz)) {
- date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
- }
- return date;
- };
-
- /**
- * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
- * enforce date range limits.
- * n.b. The input value must be correctly formatted (reformatting is not supported)
- * @param {Element} startTime
- * @param {Element} endTime
- * @param {Object} options Options for the timepicker() call
- * @return {jQuery}
- */
- $.timepicker.timeRange = function (startTime, endTime, options) {
- return $.timepicker.handleRange('timepicker', startTime, endTime, options);
- };
-
- /**
- * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
- * enforce date range limits.
- * @param {Element} startTime
- * @param {Element} endTime
- * @param {Object} options Options for the `timepicker()` call. Also supports `reformat`,
- * a boolean value that can be used to reformat the input values to the `dateFormat`.
- * @param {string} method Can be used to specify the type of picker to be added
- * @return {jQuery}
- */
- $.timepicker.datetimeRange = function (startTime, endTime, options) {
- $.timepicker.handleRange('datetimepicker', startTime, endTime, options);
- };
-
- /**
- * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
- * enforce date range limits.
- * @param {Element} startTime
- * @param {Element} endTime
- * @param {Object} options Options for the `timepicker()` call. Also supports `reformat`,
- * a boolean value that can be used to reformat the input values to the `dateFormat`.
- * @return {jQuery}
- */
- $.timepicker.dateRange = function (startTime, endTime, options) {
- $.timepicker.handleRange('datepicker', startTime, endTime, options);
- };
-
- /**
- * Calls `method` on the `startTime` and `endTime` elements, and configures them to
- * enforce date range limits.
- * @param {string} method Can be used to specify the type of picker to be added
- * @param {Element} startTime
- * @param {Element} endTime
- * @param {Object} options Options for the `timepicker()` call. Also supports `reformat`,
- * a boolean value that can be used to reformat the input values to the `dateFormat`.
- * @return {jQuery}
- */
- $.timepicker.handleRange = function (method, startTime, endTime, options) {
- options = $.extend({}, {
- minInterval: 0, // min allowed interval in milliseconds
- maxInterval: 0, // max allowed interval in milliseconds
- start: {}, // options for start picker
- end: {} // options for end picker
- }, options);
-
- // for the mean time this fixes an issue with calling getDate with timepicker()
- var timeOnly = false;
- if(method === 'timepicker'){
- timeOnly = true;
- method = 'datetimepicker';
- }
-
- function checkDates(changed, other) {
- var startdt = startTime[method]('getDate'),
- enddt = endTime[method]('getDate'),
- changeddt = changed[method]('getDate');
-
- if (startdt !== null) {
- var minDate = new Date(startdt.getTime()),
- maxDate = new Date(startdt.getTime());
-
- minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
- maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
-
- if (options.minInterval > 0 && minDate > enddt) { // minInterval check
- endTime[method]('setDate', minDate);
- }
- else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
- endTime[method]('setDate', maxDate);
- }
- else if (startdt > enddt) {
- other[method]('setDate', changeddt);
- }
- }
- }
-
- function selected(changed, other, option) {
- if (!changed.val()) {
- return;
- }
- var date = changed[method].call(changed, 'getDate');
- if (date !== null && options.minInterval > 0) {
- if (option === 'minDate') {
- date.setMilliseconds(date.getMilliseconds() + options.minInterval);
- }
- if (option === 'maxDate') {
- date.setMilliseconds(date.getMilliseconds() - options.minInterval);
- }
- }
- if (date.getTime) {
- other[method].call(other, 'option', option, date);
- }
- }
-
- $.fn[method].call(startTime, $.extend({
- timeOnly: timeOnly,
- onClose: function (dateText, inst) {
- checkDates($(this), endTime);
- },
- onSelect: function (selectedDateTime) {
- selected($(this), endTime, 'minDate');
- }
- }, options, options.start));
- $.fn[method].call(endTime, $.extend({
- timeOnly: timeOnly,
- onClose: function (dateText, inst) {
- checkDates($(this), startTime);
- },
- onSelect: function (selectedDateTime) {
- selected($(this), startTime, 'maxDate');
- }
- }, options, options.end));
-
- checkDates(startTime, endTime);
- selected(startTime, endTime, 'minDate');
- selected(endTime, startTime, 'maxDate');
- return $([startTime.get(0), endTime.get(0)]);
- };
-
- /**
- * Log error or data to the console during error or debugging
- * @param {Object} err pass any type object to log to the console during error or debugging
- * @return {void}
- */
- $.timepicker.log = function (err) {
- if (window.console) {
- window.console.log(err);
- }
- };
-
- /*
- * Add util object to allow access to private methods for testability.
- */
- $.timepicker._util = {
- _extendRemove: extendRemove,
- _isEmptyObject: isEmptyObject,
- _convert24to12: convert24to12,
- _detectSupport: detectSupport,
- _selectLocalTimezone: selectLocalTimezone,
- _computeEffectiveSetting: computeEffectiveSetting,
- _splitDateTime: splitDateTime,
- _parseDateTimeInternal: parseDateTimeInternal
- };
-
- /*
- * Microsecond support
- */
- if (!Date.prototype.getMicroseconds) {
- Date.prototype.microseconds = 0;
- Date.prototype.getMicroseconds = function () { return this.microseconds; };
- Date.prototype.setMicroseconds = function (m) {
- this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
- this.microseconds = m % 1000;
- return this;
- };
- }
-
- /*
- * Keep up with the version
- */
- $.timepicker.version = "1.4.5";
-
-})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr.js
deleted file mode 100755
index 1ee4aae..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Serbian cyrilic translation for the jQuery Timepicker Addon */
-/* Written by Vladimir Jelovac */
-(function($) {
- $.timepicker.regional['sr-RS'] = {
- timeOnlyTitle: 'Одаберите време',
- timeText: 'Време',
- hourText: 'Сати',
- minuteText: 'Минути',
- secondText: 'Секунде',
- millisecText: 'Милисекунде',
- microsecText: 'Микросекунде',
- timezoneText: 'Временска зона',
- currentText: 'Сада',
- closeText: 'Затвори',
- timeFormat: 'HH:mm',
- amNames: ['AM', 'A'],
- pmNames: ['PM', 'P'],
- isRTL: false
- };
- $.timepicker.setDefaults($.timepicker.regional['sr-RS']);
-})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh.js
deleted file mode 100755
index e73ac3b..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Simplified Chinese translation for the jQuery Timepicker Addon /
-/ Written by Will Lu */
-(function($) {
- $.timepicker.regional['zh-CN'] = {
- timeOnlyTitle: '选择时间',
- timeText: '时间',
- hourText: '小时',
- minuteText: '分钟',
- secondText: '秒钟',
- millisecText: '毫秒',
- microsecText: '微秒',
- timezoneText: '时区',
- currentText: '现在时间',
- closeText: '关闭',
- timeFormat: 'HH:mm',
- amNames: ['AM', 'A'],
- pmNames: ['PM', 'P'],
- isRTL: false
- };
- $.timepicker.setDefaults($.timepicker.regional['zh-CN']);
-})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.js
new file mode 100644
index 0000000..f56c9b4
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.js
@@ -0,0 +1,2291 @@
+/*! jQuery Timepicker Addon - v1.6.3 - 2016-04-20
+* http://trentrichardson.com/examples/timepicker
+* Copyright (c) 2016 Trent Richardson; Licensed MIT */
+(function (factory) {
+ if (typeof define === 'function' && define.amd) {
+ define(['jquery', 'jquery-ui'], factory);
+ } else {
+ factory(jQuery);
+ }
+}(function ($) {
+
+ /*
+ * Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+ */
+ $.ui.timepicker = $.ui.timepicker || {};
+ if ($.ui.timepicker.version) {
+ return;
+ }
+
+ /*
+ * Extend jQueryUI, get it started with our version number
+ */
+ $.extend($.ui, {
+ timepicker: {
+ version: "1.6.3"
+ }
+ });
+
+ /*
+ * Timepicker manager.
+ * Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+ * Settings for (groups of) time pickers are maintained in an instance object,
+ * allowing multiple different settings on the same page.
+ */
+ var Timepicker = function () {
+ this.regional = []; // Available regional settings, indexed by language code
+ this.regional[''] = { // Default regional settings
+ currentText: 'Now',
+ closeText: 'Done',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ timeOnlyTitle: 'Choose Time',
+ timeText: 'Time',
+ hourText: 'Hour',
+ minuteText: 'Minute',
+ secondText: 'Second',
+ millisecText: 'Millisecond',
+ microsecText: 'Microsecond',
+ timezoneText: 'Time Zone',
+ isRTL: false
+ };
+ this._defaults = { // Global defaults for all the datetime picker instances
+ showButtonPanel: true,
+ timeOnly: false,
+ timeOnlyShowDate: false,
+ showHour: null,
+ showMinute: null,
+ showSecond: null,
+ showMillisec: null,
+ showMicrosec: null,
+ showTimezone: null,
+ showTime: true,
+ stepHour: 1,
+ stepMinute: 1,
+ stepSecond: 1,
+ stepMillisec: 1,
+ stepMicrosec: 1,
+ hour: 0,
+ minute: 0,
+ second: 0,
+ millisec: 0,
+ microsec: 0,
+ timezone: null,
+ hourMin: 0,
+ minuteMin: 0,
+ secondMin: 0,
+ millisecMin: 0,
+ microsecMin: 0,
+ hourMax: 23,
+ minuteMax: 59,
+ secondMax: 59,
+ millisecMax: 999,
+ microsecMax: 999,
+ minDateTime: null,
+ maxDateTime: null,
+ maxTime: null,
+ minTime: null,
+ onSelect: null,
+ hourGrid: 0,
+ minuteGrid: 0,
+ secondGrid: 0,
+ millisecGrid: 0,
+ microsecGrid: 0,
+ alwaysSetTime: true,
+ separator: ' ',
+ altFieldTimeOnly: true,
+ altTimeFormat: null,
+ altSeparator: null,
+ altTimeSuffix: null,
+ altRedirectFocus: true,
+ pickerTimeFormat: null,
+ pickerTimeSuffix: null,
+ showTimepicker: true,
+ timezoneList: null,
+ addSliderAccess: false,
+ sliderAccessArgs: null,
+ controlType: 'slider',
+ oneLine: false,
+ defaultValue: null,
+ parse: 'strict',
+ afterInject: null
+ };
+ $.extend(this._defaults, this.regional['']);
+ };
+
+ $.extend(Timepicker.prototype, {
+ $input: null,
+ $altInput: null,
+ $timeObj: null,
+ inst: null,
+ hour_slider: null,
+ minute_slider: null,
+ second_slider: null,
+ millisec_slider: null,
+ microsec_slider: null,
+ timezone_select: null,
+ maxTime: null,
+ minTime: null,
+ hour: 0,
+ minute: 0,
+ second: 0,
+ millisec: 0,
+ microsec: 0,
+ timezone: null,
+ hourMinOriginal: null,
+ minuteMinOriginal: null,
+ secondMinOriginal: null,
+ millisecMinOriginal: null,
+ microsecMinOriginal: null,
+ hourMaxOriginal: null,
+ minuteMaxOriginal: null,
+ secondMaxOriginal: null,
+ millisecMaxOriginal: null,
+ microsecMaxOriginal: null,
+ ampm: '',
+ formattedDate: '',
+ formattedTime: '',
+ formattedDateTime: '',
+ timezoneList: null,
+ units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
+ support: {},
+ control: null,
+
+ /*
+ * Override the default settings for all instances of the time picker.
+ * @param {Object} settings object - the new settings to use as defaults (anonymous object)
+ * @return {Object} the manager object
+ */
+ setDefaults: function (settings) {
+ extendRemove(this._defaults, settings || {});
+ return this;
+ },
+
+ /*
+ * Create a new Timepicker instance
+ */
+ _newInst: function ($input, opts) {
+ var tp_inst = new Timepicker(),
+ inlineSettings = {},
+ fns = {},
+ overrides, i;
+
+ for (var attrName in this._defaults) {
+ if (this._defaults.hasOwnProperty(attrName)) {
+ var attrValue = $input.attr('time:' + attrName);
+ if (attrValue) {
+ try {
+ inlineSettings[attrName] = eval(attrValue);
+ } catch (err) {
+ inlineSettings[attrName] = attrValue;
+ }
+ }
+ }
+ }
+
+ overrides = {
+ beforeShow: function (input, dp_inst) {
+ if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
+ return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
+ }
+ },
+ onChangeMonthYear: function (year, month, dp_inst) {
+ // Update the time as well : this prevents the time from disappearing from the $input field.
+ // tp_inst._updateDateTime(dp_inst);
+ if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
+ tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+ }
+ },
+ onClose: function (dateText, dp_inst) {
+ if (tp_inst.timeDefined === true && $input.val() !== '') {
+ tp_inst._updateDateTime(dp_inst);
+ }
+ if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
+ tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
+ }
+ }
+ };
+ for (i in overrides) {
+ if (overrides.hasOwnProperty(i)) {
+ fns[i] = opts[i] || this._defaults[i] || null;
+ }
+ }
+
+ tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
+ evnts: fns,
+ timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+ });
+ tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
+ return val.toUpperCase();
+ });
+ tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
+ return val.toUpperCase();
+ });
+
+ // detect which units are supported
+ tp_inst.support = detectSupport(
+ tp_inst._defaults.timeFormat +
+ (tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
+ (tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
+
+ // controlType is string - key to our this._controls
+ if (typeof(tp_inst._defaults.controlType) === 'string') {
+ if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
+ tp_inst._defaults.controlType = 'select';
+ }
+ tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
+ }
+ // controlType is an object and must implement create, options, value methods
+ else {
+ tp_inst.control = tp_inst._defaults.controlType;
+ }
+
+ // prep the timezone options
+ var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
+ 0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
+ if (tp_inst._defaults.timezoneList !== null) {
+ timezoneList = tp_inst._defaults.timezoneList;
+ }
+ var tzl = timezoneList.length, tzi = 0, tzv = null;
+ if (tzl > 0 && typeof timezoneList[0] !== 'object') {
+ for (; tzi < tzl; tzi++) {
+ tzv = timezoneList[tzi];
+ timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
+ }
+ }
+ tp_inst._defaults.timezoneList = timezoneList;
+
+ // set the default units
+ tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
+ ((new Date()).getTimezoneOffset() * -1);
+ tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
+ tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
+ tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
+ tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
+ tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
+ tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
+ tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
+ tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
+ tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
+ tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
+ tp_inst.ampm = '';
+ tp_inst.$input = $input;
+
+ if (tp_inst._defaults.altField) {
+ tp_inst.$altInput = $(tp_inst._defaults.altField);
+ if (tp_inst._defaults.altRedirectFocus === true) {
+ tp_inst.$altInput.css({
+ cursor: 'pointer'
+ }).focus(function () {
+ $input.trigger("focus");
+ });
+ }
+ }
+
+ if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
+ tp_inst._defaults.minDate = new Date();
+ }
+ if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
+ tp_inst._defaults.maxDate = new Date();
+ }
+
+ // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+ if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+ tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+ }
+ if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+ tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+ }
+ if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+ tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+ }
+ if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+ tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+ }
+ tp_inst.$input.bind('focus', function () {
+ tp_inst._onFocus();
+ });
+
+ return tp_inst;
+ },
+
+ /*
+ * add our sliders to the calendar
+ */
+ _addTimePicker: function (dp_inst) {
+ var currDT = $.trim((this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val());
+
+ this.timeDefined = this._parseTime(currDT);
+ this._limitMinMaxDateTime(dp_inst, false);
+ this._injectTimePicker();
+ this._afterInject();
+ },
+
+ /*
+ * parse the time string from input value or _setTime
+ */
+ _parseTime: function (timeString, withDate) {
+ if (!this.inst) {
+ this.inst = $.datepicker._getInst(this.$input[0]);
+ }
+
+ if (withDate || !this._defaults.timeOnly) {
+ var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+ try {
+ var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+ if (!parseRes.timeObj) {
+ return false;
+ }
+ $.extend(this, parseRes.timeObj);
+ } catch (err) {
+ $.timepicker.log("Error parsing the date/time string: " + err +
+ "\ndate/time string = " + timeString +
+ "\ntimeFormat = " + this._defaults.timeFormat +
+ "\ndateFormat = " + dp_dateFormat);
+ return false;
+ }
+ return true;
+ } else {
+ var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+ if (!timeObj) {
+ return false;
+ }
+ $.extend(this, timeObj);
+ return true;
+ }
+ },
+
+ /*
+ * Handle callback option after injecting timepicker
+ */
+ _afterInject: function() {
+ var o = this.inst.settings;
+ if ($.isFunction(o.afterInject)) {
+ o.afterInject.call(this);
+ }
+ },
+
+ /*
+ * generate and inject html for timepicker into ui datepicker
+ */
+ _injectTimePicker: function () {
+ var $dp = this.inst.dpDiv,
+ o = this.inst.settings,
+ tp_inst = this,
+ litem = '',
+ uitem = '',
+ show = null,
+ max = {},
+ gridSize = {},
+ size = null,
+ i = 0,
+ l = 0;
+
+ // Prevent displaying twice
+ if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
+ var noDisplay = ' ui_tpicker_unit_hide',
+ html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + (o.oneLine && o.controlType === 'select' ? ' ui-timepicker-oneLine' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label' + ((o.showTime) ? '' : noDisplay) + '">' + o.timeText + '</dt>' +
+ '<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"><input class="ui_tpicker_time_input" ' + (o.timeInput ? '' : 'disabled') + '/></dd>';
+
+ // Create the markup
+ for (i = 0, l = this.units.length; i < l; i++) {
+ litem = this.units[i];
+ uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+ show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+ // Added by Peter Medeiros:
+ // - Figure out what the hour/minute/second max should be based on the step values.
+ // - Example: if stepMinute is 15, then minMax is 45.
+ max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
+ gridSize[litem] = 0;
+
+ html += '<dt class="ui_tpicker_' + litem + '_label' + (show ? '' : noDisplay) + '">' + o[litem + 'Text'] + '</dt>' +
+ '<dd class="ui_tpicker_' + litem + (show ? '' : noDisplay) + '"><div class="ui_tpicker_' + litem + '_slider' + (show ? '' : noDisplay) + '"></div>';
+
+ if (show && o[litem + 'Grid'] > 0) {
+ html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+ if (litem === 'hour') {
+ for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
+ gridSize[litem]++;
+ var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
+ html += '<td data-for="' + litem + '">' + tmph + '</td>';
+ }
+ }
+ else {
+ for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
+ gridSize[litem]++;
+ html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
+ }
+ }
+
+ html += '</tr></table></div>';
+ }
+ html += '</dd>';
+ }
+
+ // Timezone
+ var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
+ html += '<dt class="ui_tpicker_timezone_label' + (showTz ? '' : noDisplay) + '">' + o.timezoneText + '</dt>';
+ html += '<dd class="ui_tpicker_timezone' + (showTz ? '' : noDisplay) + '"></dd>';
+
+ // Create the elements from string
+ html += '</dl></div>';
+ var $tp = $(html);
+
+ // if we only want time picker...
+ if (o.timeOnly === true) {
+ $tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
+ $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+ }
+
+ // add sliders, adjust grids, add events
+ for (i = 0, l = tp_inst.units.length; i < l; i++) {
+ litem = tp_inst.units[i];
+ uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+ show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+ // add the slider
+ tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
+
+ // adjust the grid and add click event
+ if (show && o[litem + 'Grid'] > 0) {
+ size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
+ $tp.find('.ui_tpicker_' + litem + ' table').css({
+ width: size + "%",
+ marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
+ marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
+ borderCollapse: 'collapse'
+ }).find("td").click(function (e) {
+ var $t = $(this),
+ h = $t.html(),
+ n = parseInt(h.replace(/[^0-9]/g), 10),
+ ap = h.replace(/[^apm]/ig),
+ f = $t.data('for'); // loses scope, so we use data-for
+
+ if (f === 'hour') {
+ if (ap.indexOf('p') !== -1 && n < 12) {
+ n += 12;
+ }
+ else {
+ if (ap.indexOf('a') !== -1 && n === 12) {
+ n = 0;
+ }
+ }
+ }
+
+ tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
+
+ tp_inst._onTimeChange();
+ tp_inst._onSelectHandler();
+ }).css({
+ cursor: 'pointer',
+ width: (100 / gridSize[litem]) + '%',
+ textAlign: 'center',
+ overflow: 'hidden'
+ });
+ } // end if grid > 0
+ } // end for loop
+
+ // Add timezone options
+ this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
+ $.fn.append.apply(this.timezone_select,
+ $.map(o.timezoneList, function (val, idx) {
+ return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
+ }));
+ if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
+ var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
+ if (local_timezone === this.timezone) {
+ selectLocalTimezone(tp_inst);
+ } else {
+ this.timezone_select.val(this.timezone);
+ }
+ } else {
+ if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
+ this.timezone_select.val(o.timezone);
+ } else {
+ selectLocalTimezone(tp_inst);
+ }
+ }
+ this.timezone_select.change(function () {
+ tp_inst._onTimeChange();
+ tp_inst._onSelectHandler();
+ tp_inst._afterInject();
+ });
+ // End timezone options
+
+ // inject timepicker into datepicker
+ var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+ if ($buttonPanel.length) {
+ $buttonPanel.before($tp);
+ } else {
+ $dp.append($tp);
+ }
+
+ this.$timeObj = $tp.find('.ui_tpicker_time_input');
+ this.$timeObj.change(function () {
+ var timeFormat = tp_inst.inst.settings.timeFormat;
+ var parsedTime = $.datepicker.parseTime(timeFormat, this.value);
+ var update = new Date();
+ if (parsedTime) {
+ update.setHours(parsedTime.hour);
+ update.setMinutes(parsedTime.minute);
+ update.setSeconds(parsedTime.second);
+ $.datepicker._setTime(tp_inst.inst, update);
+ } else {
+ this.value = tp_inst.formattedTime;
+ this.blur();
+ }
+ });
+
+ if (this.inst !== null) {
+ var timeDefined = this.timeDefined;
+ this._onTimeChange();
+ this.timeDefined = timeDefined;
+ }
+
+ // slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+ if (this._defaults.addSliderAccess) {
+ var sliderAccessArgs = this._defaults.sliderAccessArgs,
+ rtl = this._defaults.isRTL;
+ sliderAccessArgs.isRTL = rtl;
+
+ setTimeout(function () { // fix for inline mode
+ if ($tp.find('.ui-slider-access').length === 0) {
+ $tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+ // fix any grids since sliders are shorter
+ var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+ if (sliderAccessWidth) {
+ $tp.find('table:visible').each(function () {
+ var $g = $(this),
+ oldWidth = $g.outerWidth(),
+ oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
+ newWidth = oldWidth - sliderAccessWidth,
+ newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
+ css = { width: newWidth, marginRight: 0, marginLeft: 0 };
+ css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
+ $g.css(css);
+ });
+ }
+ }
+ }, 10);
+ }
+ // end slideAccess integration
+
+ tp_inst._limitMinMaxDateTime(this.inst, true);
+ }
+ },
+
+ /*
+ * This function tries to limit the ability to go outside the
+ * min/max date range
+ */
+ _limitMinMaxDateTime: function (dp_inst, adjustSliders) {
+ var o = this._defaults,
+ dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+ if (!this._defaults.showTimepicker) {
+ return;
+ } // No time so nothing to check here
+
+ if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
+ var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+ minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+ if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
+ this.hourMinOriginal = o.hourMin;
+ this.minuteMinOriginal = o.minuteMin;
+ this.secondMinOriginal = o.secondMin;
+ this.millisecMinOriginal = o.millisecMin;
+ this.microsecMinOriginal = o.microsecMin;
+ }
+
+ if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
+ this._defaults.hourMin = minDateTime.getHours();
+ if (this.hour <= this._defaults.hourMin) {
+ this.hour = this._defaults.hourMin;
+ this._defaults.minuteMin = minDateTime.getMinutes();
+ if (this.minute <= this._defaults.minuteMin) {
+ this.minute = this._defaults.minuteMin;
+ this._defaults.secondMin = minDateTime.getSeconds();
+ if (this.second <= this._defaults.secondMin) {
+ this.second = this._defaults.secondMin;
+ this._defaults.millisecMin = minDateTime.getMilliseconds();
+ if (this.millisec <= this._defaults.millisecMin) {
+ this.millisec = this._defaults.millisecMin;
+ this._defaults.microsecMin = minDateTime.getMicroseconds();
+ } else {
+ if (this.microsec < this._defaults.microsecMin) {
+ this.microsec = this._defaults.microsecMin;
+ }
+ this._defaults.microsecMin = this.microsecMinOriginal;
+ }
+ } else {
+ this._defaults.millisecMin = this.millisecMinOriginal;
+ this._defaults.microsecMin = this.microsecMinOriginal;
+ }
+ } else {
+ this._defaults.secondMin = this.secondMinOriginal;
+ this._defaults.millisecMin = this.millisecMinOriginal;
+ this._defaults.microsecMin = this.microsecMinOriginal;
+ }
+ } else {
+ this._defaults.minuteMin = this.minuteMinOriginal;
+ this._defaults.secondMin = this.secondMinOriginal;
+ this._defaults.millisecMin = this.millisecMinOriginal;
+ this._defaults.microsecMin = this.microsecMinOriginal;
+ }
+ } else {
+ this._defaults.hourMin = this.hourMinOriginal;
+ this._defaults.minuteMin = this.minuteMinOriginal;
+ this._defaults.secondMin = this.secondMinOriginal;
+ this._defaults.millisecMin = this.millisecMinOriginal;
+ this._defaults.microsecMin = this.microsecMinOriginal;
+ }
+ }
+
+ if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
+ var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+ maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+ if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
+ this.hourMaxOriginal = o.hourMax;
+ this.minuteMaxOriginal = o.minuteMax;
+ this.secondMaxOriginal = o.secondMax;
+ this.millisecMaxOriginal = o.millisecMax;
+ this.microsecMaxOriginal = o.microsecMax;
+ }
+
+ if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
+ this._defaults.hourMax = maxDateTime.getHours();
+ if (this.hour >= this._defaults.hourMax) {
+ this.hour = this._defaults.hourMax;
+ this._defaults.minuteMax = maxDateTime.getMinutes();
+ if (this.minute >= this._defaults.minuteMax) {
+ this.minute = this._defaults.minuteMax;
+ this._defaults.secondMax = maxDateTime.getSeconds();
+ if (this.second >= this._defaults.secondMax) {
+ this.second = this._defaults.secondMax;
+ this._defaults.millisecMax = maxDateTime.getMilliseconds();
+ if (this.millisec >= this._defaults.millisecMax) {
+ this.millisec = this._defaults.millisecMax;
+ this._defaults.microsecMax = maxDateTime.getMicroseconds();
+ } else {
+ if (this.microsec > this._defaults.microsecMax) {
+ this.microsec = this._defaults.microsecMax;
+ }
+ this._defaults.microsecMax = this.microsecMaxOriginal;
+ }
+ } else {
+ this._defaults.millisecMax = this.millisecMaxOriginal;
+ this._defaults.microsecMax = this.microsecMaxOriginal;
+ }
+ } else {
+ this._defaults.secondMax = this.secondMaxOriginal;
+ this._defaults.millisecMax = this.millisecMaxOriginal;
+ this._defaults.microsecMax = this.microsecMaxOriginal;
+ }
+ } else {
+ this._defaults.minuteMax = this.minuteMaxOriginal;
+ this._defaults.secondMax = this.secondMaxOriginal;
+ this._defaults.millisecMax = this.millisecMaxOriginal;
+ this._defaults.microsecMax = this.microsecMaxOriginal;
+ }
+ } else {
+ this._defaults.hourMax = this.hourMaxOriginal;
+ this._defaults.minuteMax = this.minuteMaxOriginal;
+ this._defaults.secondMax = this.secondMaxOriginal;
+ this._defaults.millisecMax = this.millisecMaxOriginal;
+ this._defaults.microsecMax = this.microsecMaxOriginal;
+ }
+ }
+
+ if (dp_inst.settings.minTime!==null) {
+ var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);
+ if (this.hour<tempMinTime.getHours()) {
+ this.hour=this._defaults.hourMin=tempMinTime.getHours();
+ this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
+ } else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
+ this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
+ } else {
+ if (this._defaults.hourMin<tempMinTime.getHours()) {
+ this._defaults.hourMin=tempMinTime.getHours();
+ this._defaults.minuteMin=tempMinTime.getMinutes();
+ } else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
+ this._defaults.minuteMin=tempMinTime.getMinutes();
+ } else {
+ this._defaults.minuteMin=0;
+ }
+ }
+ }
+
+ if (dp_inst.settings.maxTime!==null) {
+ var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
+ if (this.hour>tempMaxTime.getHours()) {
+ this.hour=this._defaults.hourMax=tempMaxTime.getHours();
+ this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
+ } else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {
+ this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
+ } else {
+ if (this._defaults.hourMax>tempMaxTime.getHours()) {
+ this._defaults.hourMax=tempMaxTime.getHours();
+ this._defaults.minuteMax=tempMaxTime.getMinutes();
+ } else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
+ this._defaults.minuteMax=tempMaxTime.getMinutes();
+ } else {
+ this._defaults.minuteMax=59;
+ }
+ }
+ }
+
+ if (adjustSliders !== undefined && adjustSliders === true) {
+ var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
+ minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
+ secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
+ millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
+ microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
+
+ if (this.hour_slider) {
+ this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour });
+ this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
+ }
+ if (this.minute_slider) {
+ this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute });
+ this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
+ }
+ if (this.second_slider) {
+ this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond });
+ this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
+ }
+ if (this.millisec_slider) {
+ this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec });
+ this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
+ }
+ if (this.microsec_slider) {
+ this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec });
+ this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
+ }
+ }
+
+ },
+
+ /*
+ * when a slider moves, set the internal time...
+ * on time change is also called when the time is updated in the text field
+ */
+ _onTimeChange: function () {
+ if (!this._defaults.showTimepicker) {
+ return;
+ }
+ var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
+ minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
+ second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
+ millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
+ microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
+ timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+ o = this._defaults,
+ pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
+ pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
+
+ if (typeof(hour) === 'object') {
+ hour = false;
+ }
+ if (typeof(minute) === 'object') {
+ minute = false;
+ }
+ if (typeof(second) === 'object') {
+ second = false;
+ }
+ if (typeof(millisec) === 'object') {
+ millisec = false;
+ }
+ if (typeof(microsec) === 'object') {
+ microsec = false;
+ }
+ if (typeof(timezone) === 'object') {
+ timezone = false;
+ }
+
+ if (hour !== false) {
+ hour = parseInt(hour, 10);
+ }
+ if (minute !== false) {
+ minute = parseInt(minute, 10);
+ }
+ if (second !== false) {
+ second = parseInt(second, 10);
+ }
+ if (millisec !== false) {
+ millisec = parseInt(millisec, 10);
+ }
+ if (microsec !== false) {
+ microsec = parseInt(microsec, 10);
+ }
+ if (timezone !== false) {
+ timezone = timezone.toString();
+ }
+
+ var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+ // If the update was done in the input field, the input field should not be updated.
+ // If the update was done using the sliders, update the input field.
+ var hasChanged = (
+ hour !== parseInt(this.hour,10) || // sliders should all be numeric
+ minute !== parseInt(this.minute,10) ||
+ second !== parseInt(this.second,10) ||
+ millisec !== parseInt(this.millisec,10) ||
+ microsec !== parseInt(this.microsec,10) ||
+ (this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
+ (this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
+ );
+
+ if (hasChanged) {
+
+ if (hour !== false) {
+ this.hour = hour;
+ }
+ if (minute !== false) {
+ this.minute = minute;
+ }
+ if (second !== false) {
+ this.second = second;
+ }
+ if (millisec !== false) {
+ this.millisec = millisec;
+ }
+ if (microsec !== false) {
+ this.microsec = microsec;
+ }
+ if (timezone !== false) {
+ this.timezone = timezone;
+ }
+
+ if (!this.inst) {
+ this.inst = $.datepicker._getInst(this.$input[0]);
+ }
+
+ this._limitMinMaxDateTime(this.inst, true);
+ }
+ if (this.support.ampm) {
+ this.ampm = ampm;
+ }
+
+ // Updates the time within the timepicker
+ this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
+ if (this.$timeObj) {
+ if (pickerTimeFormat === o.timeFormat) {
+ this.$timeObj.val(this.formattedTime + pickerTimeSuffix);
+ }
+ else {
+ this.$timeObj.val($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
+ }
+ if (this.$timeObj[0].setSelectionRange) {
+ var sPos = this.$timeObj[0].selectionStart;
+ var ePos = this.$timeObj[0].selectionEnd;
+ this.$timeObj[0].setSelectionRange(sPos, ePos);
+ }
+ }
+
+ this.timeDefined = true;
+ if (hasChanged) {
+ this._updateDateTime();
+ //this.$input.focus(); // may automatically open the picker on setDate
+ }
+ },
+
+ /*
+ * call custom onSelect.
+ * bind to sliders slidestop, and grid click.
+ */
+ _onSelectHandler: function () {
+ var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
+ var inputEl = this.$input ? this.$input[0] : null;
+ if (onSelect && inputEl) {
+ onSelect.apply(inputEl, [this.formattedDateTime, this]);
+ }
+ },
+
+ /*
+ * update our input with the new date time..
+ */
+ _updateDateTime: function (dp_inst) {
+ dp_inst = this.inst || dp_inst;
+ var dtTmp = (dp_inst.currentYear > 0?
+ new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) :
+ new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+ dt = $.datepicker._daylightSavingAdjust(dtTmp),
+ //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+ //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
+ dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+ formatCfg = $.datepicker._getFormatConfig(dp_inst),
+ timeAvailable = dt !== null && this.timeDefined;
+ this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+ var formattedDateTime = this.formattedDate;
+
+ // if a slider was changed but datepicker doesn't have a value yet, set it
+ if (dp_inst.lastVal === "") {
+ dp_inst.currentYear = dp_inst.selectedYear;
+ dp_inst.currentMonth = dp_inst.selectedMonth;
+ dp_inst.currentDay = dp_inst.selectedDay;
+ }
+
+ /*
+ * remove following lines to force every changes in date picker to change the input value
+ * Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker.
+ * If the user manually empty the value in the input field, the date picker will never change selected value.
+ */
+ //if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+ // return;
+ //}
+
+ if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
+ formattedDateTime = this.formattedTime;
+ } else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
+ formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+ }
+
+ this.formattedDateTime = formattedDateTime;
+
+ if (!this._defaults.showTimepicker) {
+ this.$input.val(this.formattedDate);
+ } else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
+ this.$altInput.val(this.formattedTime);
+ this.$input.val(this.formattedDate);
+ } else if (this.$altInput) {
+ this.$input.val(formattedDateTime);
+ var altFormattedDateTime = '',
+ altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator,
+ altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
+
+ if (!this._defaults.timeOnly) {
+ if (this._defaults.altFormat) {
+ altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+ }
+ else {
+ altFormattedDateTime = this.formattedDate;
+ }
+
+ if (altFormattedDateTime) {
+ altFormattedDateTime += altSeparator;
+ }
+ }
+
+ if (this._defaults.altTimeFormat !== null) {
+ altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
+ }
+ else {
+ altFormattedDateTime += this.formattedTime + altTimeSuffix;
+ }
+ this.$altInput.val(altFormattedDateTime);
+ } else {
+ this.$input.val(formattedDateTime);
+ }
+
+ this.$input.trigger("change");
+ },
+
+ _onFocus: function () {
+ if (!this.$input.val() && this._defaults.defaultValue) {
+ this.$input.val(this._defaults.defaultValue);
+ var inst = $.datepicker._getInst(this.$input.get(0)),
+ tp_inst = $.datepicker._get(inst, 'timepicker');
+ if (tp_inst) {
+ if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+ try {
+ $.datepicker._updateDatepicker(inst);
+ } catch (err) {
+ $.timepicker.log(err);
+ }
+ }
+ }
+ }
+ },
+
+ /*
+ * Small abstraction to control types
+ * We can add more, just be sure to follow the pattern: create, options, value
+ */
+ _controls: {
+ // slider methods
+ slider: {
+ create: function (tp_inst, obj, unit, val, min, max, step) {
+ var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
+ return obj.prop('slide', null).slider({
+ orientation: "horizontal",
+ value: rtl ? val * -1 : val,
+ min: rtl ? max * -1 : min,
+ max: rtl ? min * -1 : max,
+ step: step,
+ slide: function (event, ui) {
+ tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
+ tp_inst._onTimeChange();
+ },
+ stop: function (event, ui) {
+ tp_inst._onSelectHandler();
+ }
+ });
+ },
+ options: function (tp_inst, obj, unit, opts, val) {
+ if (tp_inst._defaults.isRTL) {
+ if (typeof(opts) === 'string') {
+ if (opts === 'min' || opts === 'max') {
+ if (val !== undefined) {
+ return obj.slider(opts, val * -1);
+ }
+ return Math.abs(obj.slider(opts));
+ }
+ return obj.slider(opts);
+ }
+ var min = opts.min,
+ max = opts.max;
+ opts.min = opts.max = null;
+ if (min !== undefined) {
+ opts.max = min * -1;
+ }
+ if (max !== undefined) {
+ opts.min = max * -1;
+ }
+ return obj.slider(opts);
+ }
+ if (typeof(opts) === 'string' && val !== undefined) {
+ return obj.slider(opts, val);
+ }
+ return obj.slider(opts);
+ },
+ value: function (tp_inst, obj, unit, val) {
+ if (tp_inst._defaults.isRTL) {
+ if (val !== undefined) {
+ return obj.slider('value', val * -1);
+ }
+ return Math.abs(obj.slider('value'));
+ }
+ if (val !== undefined) {
+ return obj.slider('value', val);
+ }
+ return obj.slider('value');
+ }
+ },
+ // select methods
+ select: {
+ create: function (tp_inst, obj, unit, val, min, max, step) {
+ var sel = '<select class="ui-timepicker-select ui-state-default ui-corner-all" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
+ format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
+
+ for (var i = min; i <= max; i += step) {
+ sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
+ if (unit === 'hour') {
+ sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
+ }
+ else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
+ else {sel += '0' + i.toString(); }
+ sel += '</option>';
+ }
+ sel += '</select>';
+
+ obj.children('select').remove();
+
+ $(sel).appendTo(obj).change(function (e) {
+ tp_inst._onTimeChange();
+ tp_inst._onSelectHandler();
+ tp_inst._afterInject();
+ });
+
+ return obj;
+ },
+ options: function (tp_inst, obj, unit, opts, val) {
+ var o = {},
+ $t = obj.children('select');
+ if (typeof(opts) === 'string') {
+ if (val === undefined) {
+ return $t.data(opts);
+ }
+ o[opts] = val;
+ }
+ else { o = opts; }
+ return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
+ },
+ value: function (tp_inst, obj, unit, val) {
+ var $t = obj.children('select');
+ if (val !== undefined) {
+ return $t.val(val);
+ }
+ return $t.val();
+ }
+ }
+ } // end _controls
+
+ });
+
+ $.fn.extend({
+ /*
+ * shorthand just to use timepicker.
+ */
+ timepicker: function (o) {
+ o = o || {};
+ var tmp_args = Array.prototype.slice.call(arguments);
+
+ if (typeof o === 'object') {
+ tmp_args[0] = $.extend(o, {
+ timeOnly: true
+ });
+ }
+
+ return $(this).each(function () {
+ $.fn.datetimepicker.apply($(this), tmp_args);
+ });
+ },
+
+ /*
+ * extend timepicker to datepicker
+ */
+ datetimepicker: function (o) {
+ o = o || {};
+ var tmp_args = arguments;
+
+ if (typeof(o) === 'string') {
+ if (o === 'getDate' || (o === 'option' && tmp_args.length === 2 && typeof (tmp_args[1]) === 'string')) {
+ return $.fn.datepicker.apply($(this[0]), tmp_args);
+ } else {
+ return this.each(function () {
+ var $t = $(this);
+ $t.datepicker.apply($t, tmp_args);
+ });
+ }
+ } else {
+ return this.each(function () {
+ var $t = $(this);
+ $t.datepicker($.timepicker._newInst($t, o)._defaults);
+ });
+ }
+ }
+ });
+
+ /*
+ * Public Utility to parse date and time
+ */
+ $.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+ var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+ if (parseRes.timeObj) {
+ var t = parseRes.timeObj;
+ parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+ parseRes.date.setMicroseconds(t.microsec);
+ }
+
+ return parseRes.date;
+ };
+
+ /*
+ * Public utility to parse time
+ */
+ $.datepicker.parseTime = function (timeFormat, timeString, options) {
+ var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
+ iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
+
+ // Strict parse requires the timeString to match the timeFormat exactly
+ var strictParse = function (f, s, o) {
+
+ // pattern for standard and localized AM/PM markers
+ var getPatternAmpm = function (amNames, pmNames) {
+ var markers = [];
+ if (amNames) {
+ $.merge(markers, amNames);
+ }
+ if (pmNames) {
+ $.merge(markers, pmNames);
+ }
+ markers = $.map(markers, function (val) {
+ return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
+ });
+ return '(' + markers.join('|') + ')?';
+ };
+
+ // figure out position of time elements.. cause js cant do named captures
+ var getFormatPositions = function (timeFormat) {
+ var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
+ orders = {
+ h: -1,
+ m: -1,
+ s: -1,
+ l: -1,
+ c: -1,
+ t: -1,
+ z: -1
+ };
+
+ if (finds) {
+ for (var i = 0; i < finds.length; i++) {
+ if (orders[finds[i].toString().charAt(0)] === -1) {
+ orders[finds[i].toString().charAt(0)] = i + 1;
+ }
+ }
+ }
+ return orders;
+ };
+
+ var regstr = '^' + f.toString()
+ .replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+ var ml = match.length;
+ switch (match.charAt(0).toLowerCase()) {
+ case 'h':
+ return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+ case 'm':
+ return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+ case 's':
+ return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+ case 'l':
+ return '(\\d?\\d?\\d)';
+ case 'c':
+ return '(\\d?\\d?\\d)';
+ case 'z':
+ return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
+ case 't':
+ return getPatternAmpm(o.amNames, o.pmNames);
+ default: // literal escaped in quotes
+ return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
+ }
+ })
+ .replace(/\s/g, '\\s?') +
+ o.timeSuffix + '$',
+ order = getFormatPositions(f),
+ ampm = '',
+ treg;
+
+ treg = s.match(new RegExp(regstr, 'i'));
+
+ var resTime = {
+ hour: 0,
+ minute: 0,
+ second: 0,
+ millisec: 0,
+ microsec: 0
+ };
+
+ if (treg) {
+ if (order.t !== -1) {
+ if (treg[order.t] === undefined || treg[order.t].length === 0) {
+ ampm = '';
+ resTime.ampm = '';
+ } else {
+ ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM';
+ resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
+ }
+ }
+
+ if (order.h !== -1) {
+ if (ampm === 'AM' && treg[order.h] === '12') {
+ resTime.hour = 0; // 12am = 0 hour
+ } else {
+ if (ampm === 'PM' && treg[order.h] !== '12') {
+ resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+ } else {
+ resTime.hour = Number(treg[order.h]);
+ }
+ }
+ }
+
+ if (order.m !== -1) {
+ resTime.minute = Number(treg[order.m]);
+ }
+ if (order.s !== -1) {
+ resTime.second = Number(treg[order.s]);
+ }
+ if (order.l !== -1) {
+ resTime.millisec = Number(treg[order.l]);
+ }
+ if (order.c !== -1) {
+ resTime.microsec = Number(treg[order.c]);
+ }
+ if (order.z !== -1 && treg[order.z] !== undefined) {
+ resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
+ }
+
+
+ return resTime;
+ }
+ return false;
+ };// end strictParse
+
+ // First try JS Date, if that fails, use strictParse
+ var looseParse = function (f, s, o) {
+ try {
+ var d = new Date('2012-01-01 ' + s);
+ if (isNaN(d.getTime())) {
+ d = new Date('2012-01-01T' + s);
+ if (isNaN(d.getTime())) {
+ d = new Date('01/01/2012 ' + s);
+ if (isNaN(d.getTime())) {
+ throw "Unable to parse time with native Date: " + s;
+ }
+ }
+ }
+
+ return {
+ hour: d.getHours(),
+ minute: d.getMinutes(),
+ second: d.getSeconds(),
+ millisec: d.getMilliseconds(),
+ microsec: d.getMicroseconds(),
+ timezone: d.getTimezoneOffset() * -1
+ };
+ }
+ catch (err) {
+ try {
+ return strictParse(f, s, o);
+ }
+ catch (err2) {
+ $.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
+ }
+ }
+ return false;
+ }; // end looseParse
+
+ if (typeof o.parse === "function") {
+ return o.parse(timeFormat, timeString, o);
+ }
+ if (o.parse === 'loose') {
+ return looseParse(timeFormat, timeString, o);
+ }
+ return strictParse(timeFormat, timeString, o);
+ };
+
+ /**
+ * Public utility to format the time
+ * @param {string} format format of the time
+ * @param {Object} time Object not a Date for timezones
+ * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
+ * @returns {string} the formatted time
+ */
+ $.datepicker.formatTime = function (format, time, options) {
+ options = options || {};
+ options = $.extend({}, $.timepicker._defaults, options);
+ time = $.extend({
+ hour: 0,
+ minute: 0,
+ second: 0,
+ millisec: 0,
+ microsec: 0,
+ timezone: null
+ }, time);
+
+ var tmptime = format,
+ ampmName = options.amNames[0],
+ hour = parseInt(time.hour, 10);
+
+ if (hour > 11) {
+ ampmName = options.pmNames[0];
+ }
+
+ tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+ switch (match) {
+ case 'HH':
+ return ('0' + hour).slice(-2);
+ case 'H':
+ return hour;
+ case 'hh':
+ return ('0' + convert24to12(hour)).slice(-2);
+ case 'h':
+ return convert24to12(hour);
+ case 'mm':
+ return ('0' + time.minute).slice(-2);
+ case 'm':
+ return time.minute;
+ case 'ss':
+ return ('0' + time.second).slice(-2);
+ case 's':
+ return time.second;
+ case 'l':
+ return ('00' + time.millisec).slice(-3);
+ case 'c':
+ return ('00' + time.microsec).slice(-3);
+ case 'z':
+ return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
+ case 'Z':
+ return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
+ case 'T':
+ return ampmName.charAt(0).toUpperCase();
+ case 'TT':
+ return ampmName.toUpperCase();
+ case 't':
+ return ampmName.charAt(0).toLowerCase();
+ case 'tt':
+ return ampmName.toLowerCase();
+ default:
+ return match.replace(/'/g, "");
+ }
+ });
+
+ return tmptime;
+ };
+
+ /*
+ * the bad hack :/ override datepicker so it doesn't close on select
+ // inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+ */
+ $.datepicker._base_selectDate = $.datepicker._selectDate;
+ $.datepicker._selectDate = function (id, dateStr) {
+ var inst = this._getInst($(id)[0]),
+ tp_inst = this._get(inst, 'timepicker'),
+ was_inline;
+
+ if (tp_inst && inst.settings.showTimepicker) {
+ tp_inst._limitMinMaxDateTime(inst, true);
+ was_inline = inst.inline;
+ inst.inline = inst.stay_open = true;
+ //This way the onSelect handler called from calendarpicker get the full dateTime
+ this._base_selectDate(id, dateStr);
+ inst.inline = was_inline;
+ inst.stay_open = false;
+ this._notifyChange(inst);
+ this._updateDatepicker(inst);
+ } else {
+ this._base_selectDate(id, dateStr);
+ }
+ };
+
+ /*
+ * second bad hack :/ override datepicker so it triggers an event when changing the input field
+ * and does not redraw the datepicker on every selectDate event
+ */
+ $.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+ $.datepicker._updateDatepicker = function (inst) {
+
+ // don't popup the datepicker if there is another instance already opened
+ var input = inst.input[0];
+ if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
+ return;
+ }
+
+ if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+ this._base_updateDatepicker(inst);
+
+ // Reload the time control when changing something in the input text field.
+ var tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ tp_inst._addTimePicker(inst);
+ }
+ }
+ };
+
+ /*
+ * third bad hack :/ override datepicker so it allows spaces and colon in the input field
+ */
+ $.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+ $.datepicker._doKeyPress = function (event) {
+ var inst = $.datepicker._getInst(event.target),
+ tp_inst = $.datepicker._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ if ($.datepicker._get(inst, 'constrainInput')) {
+ var ampm = tp_inst.support.ampm,
+ tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
+ dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+ datetimeChars = tp_inst._defaults.timeFormat.toString()
+ .replace(/[hms]/g, '')
+ .replace(/TT/g, ampm ? 'APM' : '')
+ .replace(/Tt/g, ampm ? 'AaPpMm' : '')
+ .replace(/tT/g, ampm ? 'AaPpMm' : '')
+ .replace(/T/g, ampm ? 'AP' : '')
+ .replace(/tt/g, ampm ? 'apm' : '')
+ .replace(/t/g, ampm ? 'ap' : '') +
+ " " + tp_inst._defaults.separator +
+ tp_inst._defaults.timeSuffix +
+ (tz ? tp_inst._defaults.timezoneList.join('') : '') +
+ (tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) +
+ dateChars,
+ chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+ return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+ }
+ }
+
+ return $.datepicker._base_doKeyPress(event);
+ };
+
+ /*
+ * Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
+ * Update any alternate field to synchronise with the main field.
+ */
+ $.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
+ $.datepicker._updateAlternate = function (inst) {
+ var tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ var altField = tp_inst._defaults.altField;
+ if (altField) { // update alternate field too
+ var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
+ date = this._getDate(inst),
+ formatCfg = $.datepicker._getFormatConfig(inst),
+ altFormattedDateTime = '',
+ altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator,
+ altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
+ altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
+
+ altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
+ if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
+ if (tp_inst._defaults.altFormat) {
+ altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
+ }
+ else {
+ altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
+ }
+ }
+ $(altField).val( inst.input.val() ? altFormattedDateTime : "");
+ }
+ }
+ else {
+ $.datepicker._base_updateAlternate(inst);
+ }
+ };
+
+ /*
+ * Override key up event to sync manual input changes.
+ */
+ $.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+ $.datepicker._doKeyUp = function (event) {
+ var inst = $.datepicker._getInst(event.target),
+ tp_inst = $.datepicker._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+ try {
+ $.datepicker._updateDatepicker(inst);
+ } catch (err) {
+ $.timepicker.log(err);
+ }
+ }
+ }
+
+ return $.datepicker._base_doKeyUp(event);
+ };
+
+ /*
+ * override "Today" button to also grab the time and set it to input field.
+ */
+ $.datepicker._base_gotoToday = $.datepicker._gotoToday;
+ $.datepicker._gotoToday = function (id) {
+ var inst = this._getInst($(id)[0]);
+ this._base_gotoToday(id);
+ var tp_inst = this._get(inst, 'timepicker');
+ if (!tp_inst) {
+ return;
+ }
+
+ var tzoffset = $.timepicker.timezoneOffsetNumber(tp_inst.timezone);
+ var now = new Date();
+ now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + parseInt(tzoffset, 10));
+ this._setTime(inst, now);
+ this._setDate(inst, now);
+ tp_inst._onSelectHandler();
+ };
+
+ /*
+ * Disable & enable the Time in the datetimepicker
+ */
+ $.datepicker._disableTimepickerDatepicker = function (target) {
+ var inst = this._getInst(target);
+ if (!inst) {
+ return;
+ }
+
+ var tp_inst = this._get(inst, 'timepicker');
+ $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+ if (tp_inst) {
+ inst.settings.showTimepicker = false;
+ tp_inst._defaults.showTimepicker = false;
+ tp_inst._updateDateTime(inst);
+ }
+ };
+
+ $.datepicker._enableTimepickerDatepicker = function (target) {
+ var inst = this._getInst(target);
+ if (!inst) {
+ return;
+ }
+
+ var tp_inst = this._get(inst, 'timepicker');
+ $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+ if (tp_inst) {
+ inst.settings.showTimepicker = true;
+ tp_inst._defaults.showTimepicker = true;
+ tp_inst._addTimePicker(inst); // Could be disabled on page load
+ tp_inst._updateDateTime(inst);
+ }
+ };
+
+ /*
+ * Create our own set time function
+ */
+ $.datepicker._setTime = function (inst, date) {
+ var tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ var defaults = tp_inst._defaults;
+
+ // calling _setTime with no date sets time to defaults
+ tp_inst.hour = date ? date.getHours() : defaults.hour;
+ tp_inst.minute = date ? date.getMinutes() : defaults.minute;
+ tp_inst.second = date ? date.getSeconds() : defaults.second;
+ tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
+ tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
+
+ //check if within min/max times..
+ tp_inst._limitMinMaxDateTime(inst, true);
+
+ tp_inst._onTimeChange();
+ tp_inst._updateDateTime(inst);
+ }
+ };
+
+ /*
+ * Create new public method to set only time, callable as $().datepicker('setTime', date)
+ */
+ $.datepicker._setTimeDatepicker = function (target, date, withDate) {
+ var inst = this._getInst(target);
+ if (!inst) {
+ return;
+ }
+
+ var tp_inst = this._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ this._setDateFromField(inst);
+ var tp_date;
+ if (date) {
+ if (typeof date === "string") {
+ tp_inst._parseTime(date, withDate);
+ tp_date = new Date();
+ tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+ tp_date.setMicroseconds(tp_inst.microsec);
+ } else {
+ tp_date = new Date(date.getTime());
+ tp_date.setMicroseconds(date.getMicroseconds());
+ }
+ if (tp_date.toString() === 'Invalid Date') {
+ tp_date = undefined;
+ }
+ this._setTime(inst, tp_date);
+ }
+ }
+
+ };
+
+ /*
+ * override setDate() to allow setting time too within Date object
+ */
+ $.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+ $.datepicker._setDateDatepicker = function (target, _date) {
+ var inst = this._getInst(target);
+ var date = _date;
+ if (!inst) {
+ return;
+ }
+
+ if (typeof(_date) === 'string') {
+ date = new Date(_date);
+ if (!date.getTime()) {
+ this._base_setDateDatepicker.apply(this, arguments);
+ date = $(target).datepicker('getDate');
+ }
+ }
+
+ var tp_inst = this._get(inst, 'timepicker');
+ var tp_date;
+ if (date instanceof Date) {
+ tp_date = new Date(date.getTime());
+ tp_date.setMicroseconds(date.getMicroseconds());
+ } else {
+ tp_date = date;
+ }
+
+ // This is important if you are using the timezone option, javascript's Date
+ // object will only return the timezone offset for the current locale, so we
+ // adjust it accordingly. If not using timezone option this won't matter..
+ // If a timezone is different in tp, keep the timezone as is
+ if (tp_inst && tp_date) {
+ // look out for DST if tz wasn't specified
+ if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+ tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
+ }
+ date = $.timepicker.timezoneAdjust(date, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset()), tp_inst.timezone);
+ tp_date = $.timepicker.timezoneAdjust(tp_date, $.timepicker.timezoneOffsetString(-tp_date.getTimezoneOffset()), tp_inst.timezone);
+ }
+
+ this._updateDatepicker(inst);
+ this._base_setDateDatepicker.apply(this, arguments);
+ this._setTimeDatepicker(target, tp_date, true);
+ };
+
+ /*
+ * override getDate() to allow getting time too within Date object
+ */
+ $.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+ $.datepicker._getDateDatepicker = function (target, noDefault) {
+ var inst = this._getInst(target);
+ if (!inst) {
+ return;
+ }
+
+ var tp_inst = this._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ // if it hasn't yet been defined, grab from field
+ if (inst.lastVal === undefined) {
+ this._setDateFromField(inst, noDefault);
+ }
+
+ var date = this._getDate(inst);
+
+ var currDT = null;
+
+ if (tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) {
+ currDT = tp_inst.$input.val() + ' ' + tp_inst.$altInput.val();
+ }
+ else if (tp_inst.$input.get(0).tagName !== 'INPUT' && tp_inst.$altInput) {
+ /**
+ * in case the datetimepicker has been applied to a non-input tag for inline UI,
+ * and the user has not configured the plugin to display only time in altInput,
+ * pick current date time from the altInput (and hope for the best, for now, until "ER1" is applied)
+ *
+ * @todo ER1. Since altInput can have a totally difference format, convert it to standard format by reading input format from "altFormat" and "altTimeFormat" option values
+ */
+ currDT = tp_inst.$altInput.val();
+ }
+ else {
+ currDT = tp_inst.$input.val();
+ }
+
+ if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
+ date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+ date.setMicroseconds(tp_inst.microsec);
+
+ // This is important if you are using the timezone option, javascript's Date
+ // object will only return the timezone offset for the current locale, so we
+ // adjust it accordingly. If not using timezone option this won't matter..
+ if (tp_inst.timezone != null) {
+ // look out for DST if tz wasn't specified
+ if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+ tp_inst.timezone = date.getTimezoneOffset() * -1;
+ }
+ date = $.timepicker.timezoneAdjust(date, tp_inst.timezone, $.timepicker.timezoneOffsetString(-date.getTimezoneOffset()));
+ }
+ }
+ return date;
+ }
+ return this._base_getDateDatepicker(target, noDefault);
+ };
+
+ /*
+ * override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+ * An option in datapicker to ignore extra format characters would be nicer.
+ */
+ $.datepicker._base_parseDate = $.datepicker.parseDate;
+ $.datepicker.parseDate = function (format, value, settings) {
+ var date;
+ try {
+ date = this._base_parseDate(format, value, settings);
+ } catch (err) {
+ // Hack! The error message ends with a colon, a space, and
+ // the "extra" characters. We rely on that instead of
+ // attempting to perfectly reproduce the parsing algorithm.
+ if (err.indexOf(":") >= 0) {
+ date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
+ $.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
+ } else {
+ throw err;
+ }
+ }
+ return date;
+ };
+
+ /*
+ * override formatDate to set date with time to the input
+ */
+ $.datepicker._base_formatDate = $.datepicker._formatDate;
+ $.datepicker._formatDate = function (inst, day, month, year) {
+ var tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ tp_inst._updateDateTime(inst);
+ return tp_inst.$input.val();
+ }
+ return this._base_formatDate(inst);
+ };
+
+ /*
+ * override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+ */
+ $.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+ $.datepicker._optionDatepicker = function (target, name, value) {
+ var inst = this._getInst(target),
+ name_clone;
+ if (!inst) {
+ return null;
+ }
+
+ var tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ var min = null,
+ max = null,
+ onselect = null,
+ overrides = tp_inst._defaults.evnts,
+ fns = {},
+ prop,
+ ret,
+ oldVal,
+ $target;
+ if (typeof name === 'string') { // if min/max was set with the string
+ if (name === 'minDate' || name === 'minDateTime') {
+ min = value;
+ } else if (name === 'maxDate' || name === 'maxDateTime') {
+ max = value;
+ } else if (name === 'onSelect') {
+ onselect = value;
+ } else if (overrides.hasOwnProperty(name)) {
+ if (typeof (value) === 'undefined') {
+ return overrides[name];
+ }
+ fns[name] = value;
+ name_clone = {}; //empty results in exiting function after overrides updated
+ }
+ } else if (typeof name === 'object') { //if min/max was set with the JSON
+ if (name.minDate) {
+ min = name.minDate;
+ } else if (name.minDateTime) {
+ min = name.minDateTime;
+ } else if (name.maxDate) {
+ max = name.maxDate;
+ } else if (name.maxDateTime) {
+ max = name.maxDateTime;
+ }
+ for (prop in overrides) {
+ if (overrides.hasOwnProperty(prop) && name[prop]) {
+ fns[prop] = name[prop];
+ }
+ }
+ }
+ for (prop in fns) {
+ if (fns.hasOwnProperty(prop)) {
+ overrides[prop] = fns[prop];
+ if (!name_clone) { name_clone = $.extend({}, name); }
+ delete name_clone[prop];
+ }
+ }
+ if (name_clone && isEmptyObject(name_clone)) { return; }
+ if (min) { //if min was set
+ if (min === 0) {
+ min = new Date();
+ } else {
+ min = new Date(min);
+ }
+ tp_inst._defaults.minDate = min;
+ tp_inst._defaults.minDateTime = min;
+ } else if (max) { //if max was set
+ if (max === 0) {
+ max = new Date();
+ } else {
+ max = new Date(max);
+ }
+ tp_inst._defaults.maxDate = max;
+ tp_inst._defaults.maxDateTime = max;
+ } else if (onselect) {
+ tp_inst._defaults.onSelect = onselect;
+ }
+
+ // Datepicker will override our date when we call _base_optionDatepicker when
+ // calling minDate/maxDate, so we will first grab the value, call
+ // _base_optionDatepicker, then set our value back.
+ if(min || max){
+ $target = $(target);
+ oldVal = $target.datetimepicker('getDate');
+ ret = this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+ $target.datetimepicker('setDate', oldVal);
+ return ret;
+ }
+ }
+ if (value === undefined) {
+ return this._base_optionDatepicker.call($.datepicker, target, name);
+ }
+ return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+ };
+
+ /*
+ * jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
+ * it will return false for all objects
+ */
+ var isEmptyObject = function (obj) {
+ var prop;
+ for (prop in obj) {
+ if (obj.hasOwnProperty(prop)) {
+ return false;
+ }
+ }
+ return true;
+ };
+
+ /*
+ * jQuery extend now ignores nulls!
+ */
+ var extendRemove = function (target, props) {
+ $.extend(target, props);
+ for (var name in props) {
+ if (props[name] === null || props[name] === undefined) {
+ target[name] = props[name];
+ }
+ }
+ return target;
+ };
+
+ /*
+ * Determine by the time format which units are supported
+ * Returns an object of booleans for each unit
+ */
+ var detectSupport = function (timeFormat) {
+ var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
+ isIn = function (f, t) { // does the format contain the token?
+ return f.indexOf(t) !== -1 ? true : false;
+ };
+ return {
+ hour: isIn(tf, 'h'),
+ minute: isIn(tf, 'm'),
+ second: isIn(tf, 's'),
+ millisec: isIn(tf, 'l'),
+ microsec: isIn(tf, 'c'),
+ timezone: isIn(tf, 'z'),
+ ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
+ iso8601: isIn(timeFormat, 'Z')
+ };
+ };
+
+ /*
+ * Converts 24 hour format into 12 hour
+ * Returns 12 hour without leading 0
+ */
+ var convert24to12 = function (hour) {
+ hour %= 12;
+
+ if (hour === 0) {
+ hour = 12;
+ }
+
+ return String(hour);
+ };
+
+ var computeEffectiveSetting = function (settings, property) {
+ return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
+ };
+
+ /*
+ * Splits datetime string into date and time substrings.
+ * Throws exception when date can't be parsed
+ * Returns {dateString: dateString, timeString: timeString}
+ */
+ var splitDateTime = function (dateTimeString, timeSettings) {
+ // The idea is to get the number separator occurrences in datetime and the time format requested (since time has
+ // fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
+ var separator = computeEffectiveSetting(timeSettings, 'separator'),
+ format = computeEffectiveSetting(timeSettings, 'timeFormat'),
+ timeParts = format.split(separator), // how many occurrences of separator may be in our format?
+ timePartsLen = timeParts.length,
+ allParts = dateTimeString.split(separator),
+ allPartsLen = allParts.length;
+
+ if (allPartsLen > 1) {
+ return {
+ dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
+ timeString: allParts.splice(0, timePartsLen).join(separator)
+ };
+ }
+
+ return {
+ dateString: dateTimeString,
+ timeString: ''
+ };
+ };
+
+ /*
+ * Internal function to parse datetime interval
+ * Returns: {date: Date, timeObj: Object}, where
+ * date - parsed date without time (type Date)
+ * timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
+ */
+ var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+ var date,
+ parts,
+ parsedTime;
+
+ parts = splitDateTime(dateTimeString, timeSettings);
+ date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
+
+ if (parts.timeString === '') {
+ return {
+ date: date
+ };
+ }
+
+ parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
+
+ if (!parsedTime) {
+ throw 'Wrong time format';
+ }
+
+ return {
+ date: date,
+ timeObj: parsedTime
+ };
+ };
+
+ /*
+ * Internal function to set timezone_select to the local timezone
+ */
+ var selectLocalTimezone = function (tp_inst, date) {
+ if (tp_inst && tp_inst.timezone_select) {
+ var now = date || new Date();
+ tp_inst.timezone_select.val(-now.getTimezoneOffset());
+ }
+ };
+
+ /*
+ * Create a Singleton Instance
+ */
+ $.timepicker = new Timepicker();
+
+ /**
+ * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+ * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
+ * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
+ * @return {string}
+ */
+ $.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
+ if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
+ return tzMinutes;
+ }
+
+ var off = tzMinutes,
+ minutes = off % 60,
+ hours = (off - minutes) / 60,
+ iso = iso8601 ? ':' : '',
+ tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
+
+ if (tz === '+00:00') {
+ return 'Z';
+ }
+ return tz;
+ };
+
+ /**
+ * Get the number in minutes that represents a timezone string
+ * @param {string} tzString formatted like "+0500", "-1245", "Z"
+ * @return {number} the offset minutes or the original string if it doesn't match expectations
+ */
+ $.timepicker.timezoneOffsetNumber = function (tzString) {
+ var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
+
+ if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
+ return 0;
+ }
+
+ if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
+ return parseInt(tzString, 10);
+ }
+
+ return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
+ ((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
+ parseInt(normalized.substr(3, 2), 10))); // minutes
+ };
+
+ /**
+ * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
+ * @param {Date} date
+ * @param {string} fromTimezone formatted like "+0500", "-1245"
+ * @param {string} toTimezone formatted like "+0500", "-1245"
+ * @return {Date}
+ */
+ $.timepicker.timezoneAdjust = function (date, fromTimezone, toTimezone) {
+ var fromTz = $.timepicker.timezoneOffsetNumber(fromTimezone);
+ var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
+ if (!isNaN(toTz)) {
+ date.setMinutes(date.getMinutes() + (-fromTz) - (-toTz));
+ }
+ return date;
+ };
+
+ /**
+ * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
+ * enforce date range limits.
+ * n.b. The input value must be correctly formatted (reformatting is not supported)
+ * @param {Element} startTime
+ * @param {Element} endTime
+ * @param {Object} options Options for the timepicker() call
+ * @return {jQuery}
+ */
+ $.timepicker.timeRange = function (startTime, endTime, options) {
+ return $.timepicker.handleRange('timepicker', startTime, endTime, options);
+ };
+
+ /**
+ * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
+ * enforce date range limits.
+ * @param {Element} startTime
+ * @param {Element} endTime
+ * @param {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+ * a boolean value that can be used to reformat the input values to the `dateFormat`.
+ * @param {string} method Can be used to specify the type of picker to be added
+ * @return {jQuery}
+ */
+ $.timepicker.datetimeRange = function (startTime, endTime, options) {
+ $.timepicker.handleRange('datetimepicker', startTime, endTime, options);
+ };
+
+ /**
+ * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
+ * enforce date range limits.
+ * @param {Element} startTime
+ * @param {Element} endTime
+ * @param {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+ * a boolean value that can be used to reformat the input values to the `dateFormat`.
+ * @return {jQuery}
+ */
+ $.timepicker.dateRange = function (startTime, endTime, options) {
+ $.timepicker.handleRange('datepicker', startTime, endTime, options);
+ };
+
+ /**
+ * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+ * enforce date range limits.
+ * @param {string} method Can be used to specify the type of picker to be added
+ * @param {Element} startTime
+ * @param {Element} endTime
+ * @param {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+ * a boolean value that can be used to reformat the input values to the `dateFormat`.
+ * @return {jQuery}
+ */
+ $.timepicker.handleRange = function (method, startTime, endTime, options) {
+ options = $.extend({}, {
+ minInterval: 0, // min allowed interval in milliseconds
+ maxInterval: 0, // max allowed interval in milliseconds
+ start: {}, // options for start picker
+ end: {} // options for end picker
+ }, options);
+
+ // for the mean time this fixes an issue with calling getDate with timepicker()
+ var timeOnly = false;
+ if(method === 'timepicker'){
+ timeOnly = true;
+ method = 'datetimepicker';
+ }
+
+ function checkDates(changed, other) {
+ var startdt = startTime[method]('getDate'),
+ enddt = endTime[method]('getDate'),
+ changeddt = changed[method]('getDate');
+
+ if (startdt !== null) {
+ var minDate = new Date(startdt.getTime()),
+ maxDate = new Date(startdt.getTime());
+
+ minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
+ maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
+
+ if (options.minInterval > 0 && minDate > enddt) { // minInterval check
+ endTime[method]('setDate', minDate);
+ }
+ else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
+ endTime[method]('setDate', maxDate);
+ }
+ else if (startdt > enddt) {
+ other[method]('setDate', changeddt);
+ }
+ }
+ }
+
+ function selected(changed, other, option) {
+ if (!changed.val()) {
+ return;
+ }
+ var date = changed[method].call(changed, 'getDate');
+ if (date !== null && options.minInterval > 0) {
+ if (option === 'minDate') {
+ date.setMilliseconds(date.getMilliseconds() + options.minInterval);
+ }
+ if (option === 'maxDate') {
+ date.setMilliseconds(date.getMilliseconds() - options.minInterval);
+ }
+ }
+
+ if (date.getTime) {
+ other[method].call(other, 'option', option, date);
+ }
+ }
+
+ $.fn[method].call(startTime, $.extend({
+ timeOnly: timeOnly,
+ onClose: function (dateText, inst) {
+ checkDates($(this), endTime);
+ },
+ onSelect: function (selectedDateTime) {
+ selected($(this), endTime, 'minDate');
+ }
+ }, options, options.start));
+ $.fn[method].call(endTime, $.extend({
+ timeOnly: timeOnly,
+ onClose: function (dateText, inst) {
+ checkDates($(this), startTime);
+ },
+ onSelect: function (selectedDateTime) {
+ selected($(this), startTime, 'maxDate');
+ }
+ }, options, options.end));
+
+ checkDates(startTime, endTime);
+
+ selected(startTime, endTime, 'minDate');
+ selected(endTime, startTime, 'maxDate');
+
+ return $([startTime.get(0), endTime.get(0)]);
+ };
+
+ /**
+ * Log error or data to the console during error or debugging
+ * @param {Object} err pass any type object to log to the console during error or debugging
+ * @return {void}
+ */
+ $.timepicker.log = function () {
+ // Older IE (9, maybe 10) throw error on accessing `window.console.log.apply`, so check first.
+ if (window.console && window.console.log && window.console.log.apply) {
+ window.console.log.apply(window.console, Array.prototype.slice.call(arguments));
+ }
+ };
+
+ /*
+ * Add util object to allow access to private methods for testability.
+ */
+ $.timepicker._util = {
+ _extendRemove: extendRemove,
+ _isEmptyObject: isEmptyObject,
+ _convert24to12: convert24to12,
+ _detectSupport: detectSupport,
+ _selectLocalTimezone: selectLocalTimezone,
+ _computeEffectiveSetting: computeEffectiveSetting,
+ _splitDateTime: splitDateTime,
+ _parseDateTimeInternal: parseDateTimeInternal
+ };
+
+ /*
+ * Microsecond support
+ */
+ if (!Date.prototype.getMicroseconds) {
+ Date.prototype.microseconds = 0;
+ Date.prototype.getMicroseconds = function () { return this.microseconds; };
+ Date.prototype.setMicroseconds = function (m) {
+ this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
+ this.microseconds = m % 1000;
+ return this;
+ };
+ }
+
+ /*
+ * Keep up with the version
+ */
+ $.timepicker.version = "1.6.3";
+
+}));
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.min.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.min.js
new file mode 100644
index 0000000..611cbd6
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3.min.js
@@ -0,0 +1,5 @@
+/*! jQuery Timepicker Addon - v1.6.3 - 2016-04-20
+* http://trentrichardson.com/examples/timepicker
+* Copyright (c) 2016 Trent Richardson; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery","jquery-ui"],a):a(jQuery)}(function($){if($.ui.timepicker=$.ui.timepicker||{},!$.ui.timepicker.version){$.extend($.ui,{timepicker:{version:"1.6.3"}});var Timepicker=function(){this.regional=[],this.regional[""]={currentText:"Now",closeText:"Done",amNames:["AM","A"],pmNames:["PM","P"],timeFormat:"HH:mm",timeSuffix:"",timeOnlyTitle:"Choose Time",timeText:"Time",hourText:"Hour",minuteText:"Minute",secondText:"Second",millis [...]
+if(c&&c._defaults.timeOnly&&b.input.val()!==b.lastVal)try{$.datepicker._updateDatepicker(b)}catch(d){$.timepicker.log(d)}return $.datepicker._base_doKeyUp(a)},$.datepicker._base_gotoToday=$.datepicker._gotoToday,$.datepicker._gotoToday=function(a){var b=this._getInst($(a)[0]);this._base_gotoToday(a);var c=this._get(b,"timepicker");if(c){var d=$.timepicker.timezoneOffsetNumber(c.timezone),e=new Date;e.setMinutes(e.getMinutes()+e.getTimezoneOffset()+parseInt(d,10)),this._setTime(b,e),this. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_af.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_af.js
old mode 100755
new mode 100644
similarity index 93%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_af.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_af.js
index fe9f8c5..8dbec3e
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_af.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_af.js
@@ -13,6 +13,7 @@
currentText: 'Huidige Tyd',
closeText: 'Klaar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_am.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_am.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_am.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_am.js
index 69cce8a..676c8b9
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_am.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_am.js
@@ -13,6 +13,7 @@
currentText: 'Այժմ',
closeText: 'Փակել',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_bg.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_bg.js
old mode 100755
new mode 100644
similarity index 95%
copy from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_bg.js
copy to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_bg.js
index 1efb439..58f076e
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_bg.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_bg.js
@@ -13,6 +13,7 @@
currentText: 'Сега',
closeText: 'Затвори',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ca.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ca.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ca.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ca.js
index 25b4eed..84fa00e
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ca.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ca.js
@@ -13,6 +13,7 @@
currentText: 'Ara',
closeText: 'Tancar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_cs.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_cs.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_cs.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_cs.js
index 9d358fa..26d6ec7
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_cs.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_cs.js
@@ -13,6 +13,7 @@
currentText: 'Nyní',
closeText: 'Zavřít',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['dop.', 'AM', 'A'],
pmNames: ['odp.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_da.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_da.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_da.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_da.js
index 7afb189..5d8072b
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_da.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_da.js
@@ -13,6 +13,7 @@
currentText: 'Nu',
closeText: 'Luk',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['am', 'AM', 'A'],
pmNames: ['pm', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_de.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_de.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_de.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_de.js
index a0ddf9f..90c33af
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_de.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_de.js
@@ -13,6 +13,7 @@
currentText: 'Jetzt',
closeText: 'Fertig',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['vorm.', 'AM', 'A'],
pmNames: ['nachm.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_el.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_el.js
old mode 100755
new mode 100644
similarity index 79%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_el.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_el.js
index 6b7e827..72aec6d
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_el.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_el.js
@@ -7,15 +7,16 @@
hourText: 'Ώρες',
minuteText: 'Λεπτά',
secondText: 'Δευτερόλεπτα',
- millisecText: 'μιλιδευτερόλεπτο',
- microsecText: 'Microseconds',
+ millisecText: 'Χιλιοστοδευτερόλεπτα',
+ microsecText: 'Μικροδευτερόλεπτα',
timezoneText: 'Ζώνη ώρας',
currentText: 'Τώρα',
closeText: 'Κλείσιμο',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['π.μ.', 'AM', 'A'],
pmNames: ['μ.μ.', 'PM', 'P'],
isRTL: false
};
$.timepicker.setDefaults($.timepicker.regional['el']);
-})(jQuery);
+})(jQuery);
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_es.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_es.js
old mode 100755
new mode 100644
similarity index 83%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_es.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_es.js
index d73a1e8..b19ba11
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_es.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_es.js
@@ -1,5 +1,6 @@
/* Spanish translation for the jQuery Timepicker Addon */
/* Written by Ianaré Sévi */
+/* Modified by Carlos Martínez */
(function($) {
$.timepicker.regional['es'] = {
timeOnlyTitle: 'Elegir una hora',
@@ -9,10 +10,11 @@
secondText: 'Segundos',
millisecText: 'Milisegundos',
microsecText: 'Microsegundos',
- timezoneText: 'Huso horario',
- currentText: 'Ahora',
+ timezoneText: 'Uso horario',
+ currentText: 'Hoy',
closeText: 'Cerrar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_et.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_et.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_et.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_et.js
index 2e64cc8..b2bb766
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_et.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_et.js
@@ -13,6 +13,7 @@
currentText: 'Praegu',
closeText: 'Valmis',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_eu.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_eu.js
old mode 100755
new mode 100644
similarity index 95%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_eu.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_eu.js
index 8884e4a..7e0c0f3
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_eu.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_eu.js
@@ -14,6 +14,7 @@
currentText: 'Orain',
closeText: 'Itxi',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fa.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fa.js
new file mode 100644
index 0000000..25e2403
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fa.js
@@ -0,0 +1,22 @@
+/* Persian translation for the jQuery Timepicker Addon */
+/* Written by Meysam Pour Ganji */
+(function($) {
+ $.timepicker.regional['fa'] = {
+ timeOnlyTitle: 'انتخاب زمان',
+ timeText: 'زمان',
+ hourText: 'ساعت',
+ minuteText: 'دقیقه',
+ secondText: 'ثانیه',
+ millisecText: 'میلی ثانیه',
+ microsecText: 'میکرو ثانیه',
+ timezoneText: 'منطقه زمانی',
+ currentText: 'الان',
+ closeText: 'انتخاب',
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ amNames: ['قبل ظهر', 'AM', 'A'],
+ pmNames: ['بعد ظهر', 'PM', 'P'],
+ isRTL: true
+ };
+ $.timepicker.setDefaults($.timepicker.regional['fa']);
+})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_fi.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fi.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_fi.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fi.js
index 3f1d95e..4493d4c
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_fi.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fi.js
@@ -13,6 +13,7 @@
currentText: 'Nyt',
closeText: 'Sulje',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['ap.', 'AM', 'A'],
pmNames: ['ip.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_fr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fr.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_fr.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fr.js
index a8a46fe..0002517
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_fr.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_fr.js
@@ -13,6 +13,7 @@
currentText: 'Maintenant',
closeText: 'Terminé',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_gl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_gl.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_gl.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_gl.js
index 900e377..4b9501f
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_gl.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_gl.js
@@ -13,6 +13,7 @@
currentText: 'Agora',
closeText: 'Pechar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_he.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_he.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_he.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_he.js
index eb71018..9b78cbd
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_he.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_he.js
@@ -13,6 +13,7 @@
currentText: "עכשיו",
closeText:"סגור",
timeFormat: "HH:mm",
+ timeSuffix: '',
amNames: ['לפנה"צ', 'AM', 'A'],
pmNames: ['אחה"צ', 'PM', 'P'],
isRTL: true
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_hr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_hr.js
old mode 100755
new mode 100644
similarity index 95%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_hr.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_hr.js
index c314b8e..b60f89a
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_hr.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_hr.js
@@ -13,6 +13,7 @@
currentText: 'Sada',
closeText: 'Gotovo',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_hu.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_hu.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_hu.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_hu.js
index fd1f5e1..6bdb0f4
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_hu.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_hu.js
@@ -13,6 +13,7 @@
currentText: 'Most',
closeText: 'Kész',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['de.', 'AM', 'A'],
pmNames: ['du.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_id.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_id.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_id.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_id.js
index 50a976b..9f21f50
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_id.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_id.js
@@ -13,6 +13,7 @@
currentText: 'Sekarang',
closeText: 'OK',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_it.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_it.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_it.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_it.js
index ea976fd..540f41a
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_it.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_it.js
@@ -13,6 +13,7 @@
currentText: 'Adesso',
closeText: 'Chiudi',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['m.', 'AM', 'A'],
pmNames: ['p.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ja.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ja.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ja.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ja.js
index 15c7b79..cd3f020
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ja.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ja.js
@@ -13,6 +13,7 @@
currentText: '現時刻',
closeText: '閉じる',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['午前', 'AM', 'A'],
pmNames: ['午後', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ko.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ko.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ko.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ko.js
index 0a41c5b..ca85b88
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ko.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ko.js
@@ -13,6 +13,7 @@
currentText: '현재 시각',
closeText: '닫기',
timeFormat: 'tt h:mm',
+ timeSuffix: '',
amNames: ['오전', 'AM', 'A'],
pmNames: ['오후', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_lt.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lt.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_lt.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lt.js
index eb7b3c7..97d2b8b
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_lt.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lt.js
@@ -13,6 +13,7 @@
currentText: 'Dabar',
closeText: 'Uždaryti',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['priešpiet', 'AM', 'A'],
pmNames: ['popiet', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lv.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lv.js
new file mode 100644
index 0000000..0cbd6e6
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_lv.js
@@ -0,0 +1,22 @@
+/* Latvian translation for the jQuery Timepicker Addon */
+/* Written by Dmitry Bogatykh */
+(function($) {
+ $.timepicker.regional['lv'] = {
+ timeOnlyTitle: 'Ievadiet laiku',
+ timeText: 'Laiks',
+ hourText: 'Stundas',
+ minuteText: 'Minūtes',
+ secondText: 'Sekundes',
+ millisecText: 'Milisekundes',
+ microsecText: 'Mikrosekundes',
+ timezoneText: 'Laika josla',
+ currentText: 'Tagad',
+ closeText: 'Aizvērt',
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ amNames: ['AM', 'AM', 'A'],
+ pmNames: ['PM', 'PM', 'P'],
+ isRTL: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['lv']);
+})(jQuery);
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_bg.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_mk.js
old mode 100755
new mode 100644
similarity index 53%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_bg.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_mk.js
index 1efb439..9857e01
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_bg.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_mk.js
@@ -1,21 +1,22 @@
-/* Bulgarian translation for the jQuery Timepicker Addon */
-/* Written by Plamen Kovandjiev */
+/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
+/* Written by Vlatko Ristovski */
(function($) {
- $.timepicker.regional['bg'] = {
- timeOnlyTitle: 'Изберете време',
+ $.timepicker.regional['mk'] = {
+ timeOnlyTitle: 'Одберете време',
timeText: 'Време',
hourText: 'Час',
minuteText: 'Минути',
secondText: 'Секунди',
millisecText: 'Милисекунди',
microsecText: 'Микросекунди',
- timezoneText: 'Часови пояс',
+ timezoneText: 'Временска зона',
currentText: 'Сега',
closeText: 'Затвори',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
};
- $.timepicker.setDefaults($.timepicker.regional['bg']);
+ $.timepicker.setDefaults($.timepicker.regional['mk']);
})(jQuery);
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_nl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_nl.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_nl.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_nl.js
index 8189cc4..bc71fc1
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_nl.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_nl.js
@@ -13,6 +13,7 @@
currentText: 'Vandaag',
closeText: 'Sluiten',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_no.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_no.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_no.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_no.js
index 1eeee6d..39f32fd
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_no.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_no.js
@@ -13,6 +13,7 @@
currentText: 'Nå',
closeText: 'Lukk',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['am', 'AM', 'A'],
pmNames: ['pm', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pl.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pl.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pl.js
index 5b7d4a9..0a67a79
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pl.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pl.js
@@ -13,6 +13,7 @@
currentText: 'Teraz',
closeText: 'Gotowe',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pt.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pt.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pt.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pt.js
index bc549e0..0aa792e
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pt.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pt.js
@@ -13,6 +13,7 @@
currentText: 'Agora',
closeText: 'Fechar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pt_BR.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pt_BR.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pt_BR.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pt_BR.js
index 2c1b02f..0ad06a3
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_pt_BR.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_pt_BR.js
@@ -13,6 +13,7 @@
currentText: 'Agora',
closeText: 'Fechar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ro.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ro.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ro.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ro.js
index 01acce7..4f5f386
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ro.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ro.js
@@ -13,6 +13,7 @@
currentText: 'Acum',
closeText: 'Închide',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ru.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ru.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ru.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ru.js
index d7169fa..b539a73
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_ru.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_ru.js
@@ -13,6 +13,7 @@
currentText: 'Сейчас',
closeText: 'Закрыть',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sk.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sk.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sk.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sk.js
index 15700e0..eee0d0b
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sk.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sk.js
@@ -13,6 +13,7 @@
currentText: 'Teraz',
closeText: 'Zavrieť',
timeFormat: 'H:m',
+ timeSuffix: '',
amNames: ['dop.', 'AM', 'A'],
pmNames: ['pop.', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sl.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sl.js
new file mode 100644
index 0000000..0906b10
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sl.js
@@ -0,0 +1,22 @@
+/* Slovenian translation for the jQuery Timepicker Addon */
+/* Written by Hadalin (https://github.com/hadalin) */
+(function($) {
+ $.timepicker.regional['sl'] = {
+ timeOnlyTitle: 'Izberite čas',
+ timeText: 'Čas',
+ hourText: 'Ura',
+ minuteText: 'Minute',
+ secondText: 'Sekunde',
+ millisecText: 'Milisekunde',
+ microsecText: 'Mikrosekunde',
+ timezoneText: 'Časovni pas',
+ currentText: 'Sedaj',
+ closeText: 'Zapri',
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ amNames: ['dop.', 'AM', 'A'],
+ pmNames: ['pop.', 'PM', 'P'],
+ isRTL: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['sl']);
+})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sq.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sq.js
new file mode 100644
index 0000000..d93d88c
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sq.js
@@ -0,0 +1,22 @@
+/* Albanian translation for the jQuery Timepicker Addon */
+/* Written by Olti Buzi */
+(function($) {
+ $.timepicker.regional['sq'] = {
+ timeOnlyTitle: 'Zgjidh orarin',
+ timeText: 'Orari',
+ hourText: 'Ora',
+ minuteText: 'Minuta',
+ secondText: 'Sekonda',
+ millisecText: 'Minisekonda',
+ microsecText: 'Mikrosekonda',
+ timezoneText: 'Zona kohore',
+ currentText: 'Tani',
+ closeText: 'Mbyll',
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ amNames: ['m.', 'AM', 'A'],
+ pmNames: ['p.', 'PM', 'P'],
+ isRTL: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['sq']);
+})(jQuery);
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr.js
new file mode 100755
index 0000000..7d3ccdb
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr.js
@@ -0,0 +1,22 @@
+/* Serbian cyrilic translation for the jQuery Timepicker Addon */
+/* Written by Vladimir Jelovac */
+(function($) {
+ $.timepicker.regional['sr-RS'] = {
+ timeOnlyTitle: 'Одаберите време',
+ timeText: 'Време',
+ hourText: 'Сати',
+ minuteText: 'Минути',
+ secondText: 'Секунде',
+ millisecText: 'Милисекунде',
+ microsecText: 'Микросекунде',
+ timezoneText: 'Временска зона',
+ currentText: 'Сада',
+ closeText: 'Затвори',
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
+ isRTL: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['sr-RS']);
+})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr_YU.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr_YU.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr_YU.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr_YU.js
index cb99fb8..260881a
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sr_YU.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sr_YU.js
@@ -13,6 +13,7 @@
currentText: 'Sada',
closeText: 'Zatvori',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sv.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sv.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sv.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sv.js
index 4540ac6..7bb0e7e
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_sv.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_sv.js
@@ -13,6 +13,7 @@
currentText: 'Nu',
closeText: 'Stäng',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_th.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_th.js
old mode 100755
new mode 100644
similarity index 91%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_th.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_th.js
index 7042e8c..4eb93a5
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_th.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_th.js
@@ -12,7 +12,8 @@
timezoneText: 'เขตเวลา',
currentText: 'เวลาปัจจุบัน',
closeText: 'ปิด',
- timeFormat: 'hh:mm tt'
+ timeFormat: 'hh:mm tt',
+ timeSuffix: ''
};
$.timepicker.setDefaults($.timepicker.regional['th']);
})(jQuery);
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_tr.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_tr.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_tr.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_tr.js
index 51f89d6..f426e70
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_tr.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_tr.js
@@ -13,6 +13,7 @@
currentText: 'Şu an',
closeText: 'Tamam',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['ÖÖ', 'Ö'],
pmNames: ['ÖS', 'S'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_uk.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_uk.js
old mode 100755
new mode 100644
similarity index 97%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_uk.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_uk.js
index a239fe2..285c8ba
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_uk.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_uk.js
@@ -13,6 +13,7 @@
currentText: 'Зараз',
closeText: 'Закрити',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_vi.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_vi.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_vi.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_vi.js
index 60d712a..59fddae
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_vi.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_vi.js
@@ -13,6 +13,7 @@
currentText: 'Hiện thời',
closeText: 'Đóng',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['SA', 'S'],
pmNames: ['CH', 'C'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh.js
new file mode 100755
index 0000000..da42c93
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh.js
@@ -0,0 +1,22 @@
+/* Simplified Chinese translation for the jQuery Timepicker Addon /
+/ Written by Will Lu */
+(function($) {
+ $.timepicker.regional['zh-CN'] = {
+ timeOnlyTitle: '选择时间',
+ timeText: '时间',
+ hourText: '小时',
+ minuteText: '分钟',
+ secondText: '秒钟',
+ millisecText: '毫秒',
+ microsecText: '微秒',
+ timezoneText: '时区',
+ currentText: '现在时间',
+ closeText: '关闭',
+ timeFormat: 'HH:mm',
+ timeSuffix: '',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
+ isRTL: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['zh-CN']);
+})(jQuery);
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh_TW.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh_TW.js
old mode 100755
new mode 100644
similarity index 96%
rename from tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh_TW.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh_TW.js
index 9cbeabf..762797b
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.4.5_zh_TW.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/contrib/jquery-ui-timepicker-addon-1.6.3_zh_TW.js
@@ -13,6 +13,7 @@
currentText: '現在時間',
closeText: '確定',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['上午', 'AM', 'A'],
pmNames: ['下午', 'PM', 'P'],
isRTL: false
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.4.5.css b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.4.5.css
deleted file mode 100644
index da12d98..0000000
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.4.5.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
-.ui-timepicker-rtl dl dt{ float: right; clear: right; }
-.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.6.3.css b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.6.3.css
new file mode 100644
index 0000000..5d391d9
--- /dev/null
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/contrib/jquery-ui-timepicker-addon-1.6.3.css
@@ -0,0 +1,33 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }
+
+/* xxx patch: no border bottom
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; }
+ */
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; width: 95%; }
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
+
+/* Shortened version style */
+.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,
+.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; }
[myfaces-tobago] 28/32: cherrypick from 2.x: build: checkstyle enhancements
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 2d511160e63af3219902803189802d3122ca00aa
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 16:39:30 2022 +0100
cherrypick from 2.x: build: checkstyle enhancements
---
pom.xml | 22 ++++++++--------------
.../apache/myfaces/tobago/config/TobagoConfig.java | 2 +-
.../myfaces/tobago/event/TabChangeEvent.java | 2 +-
.../component/SelectItemsTagDeclaration.java | 2 +-
.../taglib/component/SuggestTagDeclaration.java | 4 ++--
.../myfaces/tobago/internal/util/PartUtils.java | 2 +-
.../tobago/internal/webapp/JsonResponseWriter.java | 2 +-
.../tobago/renderkit/LabelWithAccessKey.java | 2 +-
.../apache/myfaces/tobago/util/BeanComparator.java | 9 ---------
.../tobago/util/ValueExpressionComparator.java | 5 -----
.../tobago/webapp/TobagoResponseWriter.java | 2 +-
.../internal/taglib/component/GenericTestBase.java | 6 +++---
.../addressbook/web/StartupPhaseListener.java | 4 ++--
.../addressbook/web/StartupPhaseListener.java | 4 ++--
tobago-example/tobago-example-demo/pom.xml | 4 ++--
.../demo/clientConfig/ClientConfigController.java | 2 +-
.../myfaces/tobago/event/PageActionUtil.java | 2 +-
.../myfaces/tobago/renderkit/html/JsonUtils.java | 2 +-
18 files changed, 29 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index 410ea1f..6aecc03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+ <maven-checkstyle.version>8.45.1</maven-checkstyle.version>
<checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
@@ -385,6 +386,7 @@
<xrefLocation>xref</xrefLocation>
<excludes>**/package-info.java</excludes>
<indentSize>2</indentSize>
+ <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<dependencies>
@@ -393,6 +395,11 @@
<artifactId>checkstyle-rules</artifactId>
<version>${checkstyle-rules.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${maven-checkstyle.version}</version>
+ </dependency>
</dependencies>
</plugin>
@@ -542,19 +549,6 @@
<version>1.7</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <configuration>
- <configLocation>tobago/checkstyle.xml</configLocation>
- <headerLocation>default/myfaces-header.txt</headerLocation>
- <xrefLocation>xref</xrefLocation>
- <excludes>**/package-info.java</excludes>
- <indentSize>2</indentSize>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.2.1</version>
<executions>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
index d4178d8..5d97deb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
@@ -41,7 +41,7 @@ public abstract class TobagoConfig {
return (TobagoConfig) servletContext.getAttribute(TOBAGO_CONFIG);
}
- public abstract Theme getTheme(final String name);
+ public abstract Theme getTheme(String name);
public abstract List<Theme> getSupportedThemes();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
index 2875237..4ad7539 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
@@ -37,7 +37,7 @@ public class TabChangeEvent extends ActionEvent {
}
/**
- * @deprecated Please use {@link TabChangeEvent(UIComponent, Integer, Integer)}
+ * @deprecated Please use {@link #TabChangeEvent(UIComponent, Integer, Integer)}
*/
@Deprecated
public TabChangeEvent(final UIComponent uiComponent, final Object oldState, final Object newState) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
index 15891a1..199e391 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
@@ -55,7 +55,7 @@ public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLab
*/
@TagAttribute
@UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
- void setVar(final String var);
+ void setVar(String var);
/**
* Flag indicating whether the option created by this component is disabled.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
index 6ee02da..1fa615b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
@@ -138,9 +138,9 @@ public interface SuggestTagDeclaration extends HasIdBindingAndRendered, HasMarku
/**
* TODO: not implemented yet
- * <p/>
+ * <p>
* Should the list be updated while typing (via AJAX). This is the default behaviour.
- * If you set this value to <code>false</code>, please set the <code>minimumCharacters="0"</pre>.
+ * If you set this value to <code>false</code>, please set the <code>minimumCharacters="0"</code>.
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
index 49c3860..9076ea2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
@@ -152,7 +152,7 @@ public final class PartUtils {
}
String result = null;
if (i2 > i1) {
- result = new String(chars, i1, i2 - i1);
+ result = String.copyValueOf(chars, i1, i2 - i1);
}
return result;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
index 26a8fcc..f2b7cea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
@@ -80,7 +80,7 @@ public class JsonResponseWriter extends HtmlResponseWriter {
if (FacesVersion.isMojarra() && FacesVersion.supports20()) {
final StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
if (stackTraceElements[2].getClassName().equals("com.sun.faces.renderkit.ServerSideStateHelper")) {
- super.write(StringUtils.replace(new String(chars), "\"", "\\\""));
+ super.write(StringUtils.replace(String.copyValueOf(chars), "\"", "\\\""));
return;
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
index 2b10148..69c4d2b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
@@ -117,7 +117,7 @@ public final class LabelWithAccessKey {
j++;
}
}
- label0 = new String(chars, 0, j);
+ label0 = String.copyValueOf(chars, 0, j);
}
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
index b676c46..eca59db 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
@@ -53,10 +53,6 @@ public class BeanComparator extends ComparatorBase implements Serializable {
this.property = property;
}
- /**
- * @param param1 <description>
- * @return <description>
- */
public boolean equals(final Object param1) {
if (this == param1) {
return true;
@@ -77,11 +73,6 @@ public class BeanComparator extends ComparatorBase implements Serializable {
// implementation of java.util.Comparator interface
- /**
- * @param param1 <description>
- * @param param2 <description>
- * @return <description>
- */
public int compare(final Object param1, final Object param2) {
final Object obj1;
final Object obj2;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
index 28ae643..d770780 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
@@ -108,11 +108,6 @@ public class ValueExpressionComparator extends ComparatorBase {
// implementation of java.util.Comparator interface
- /**
- * @param param1 <description>
- * @param param2 <description>
- * @return <description>
- */
public int compare(final Object param1, final Object param2) {
final Object obj1;
final Object obj2;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
index 63b703f..ef33662 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
@@ -67,7 +67,7 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
* @deprecated Should not directly called via this interface. There is be a special method which might be better.
*/
@Deprecated
- public abstract void writeAttribute(String name, Object value, final String property) throws IOException;
+ public abstract void writeAttribute(String name, Object value, String property) throws IOException;
/**
* @deprecated Should not directly called via this interface. There is be a special method which might be better.
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTestBase.java
index 8002d7f..abd0cd4 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTestBase.java
@@ -137,12 +137,12 @@ public abstract class GenericTestBase extends AbstractTobagoTestBase {
for (final PropertyDescriptor descriptor : descriptors) {
if (isTagProperty(descriptor)) {
final String name = descriptor.getName();
- final Class propertyType = descriptor.getPropertyType();
+ final Class<?> propertyType = descriptor.getPropertyType();
Object value = null;
if (propertyType == String.class) {
- value = new String("bla");
+ value = "bla";
} else if (propertyType == Integer.TYPE) {
- value = new Integer(42);
+ value = 42;
} else if (propertyType == Boolean.TYPE) {
value = Boolean.TRUE;
} else {
diff --git a/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java b/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
index 5bddf04..d008438 100644
--- a/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
+++ b/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
@@ -50,8 +50,8 @@ public class StartupPhaseListener implements PhaseListener {
LOG.debug("externalContext.getRequestPathInfo() = '" + pathInfo + "'");
}
- if (pathInfo.equals("/error.xhtml") || // todo: not nice, find a declarative way.
- pathInfo.startsWith("/auth/")) {
+ if (pathInfo.equals("/error.xhtml") // todo: not nice, find a declarative way.
+ || pathInfo.startsWith("/auth/")) {
final Object session = externalContext.getSession(false);
if (session != null) {
externalContext.getSessionMap().put(LOGGED_IN, Boolean.FALSE);
diff --git a/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java b/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
index 5bddf04..d008438 100644
--- a/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
+++ b/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
@@ -50,8 +50,8 @@ public class StartupPhaseListener implements PhaseListener {
LOG.debug("externalContext.getRequestPathInfo() = '" + pathInfo + "'");
}
- if (pathInfo.equals("/error.xhtml") || // todo: not nice, find a declarative way.
- pathInfo.startsWith("/auth/")) {
+ if (pathInfo.equals("/error.xhtml") // todo: not nice, find a declarative way.
+ || pathInfo.startsWith("/auth/")) {
final Object session = externalContext.getSession(false);
if (session != null) {
externalContext.getSessionMap().put(LOGGED_IN, Boolean.FALSE);
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 8782ffb..4088b56 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -643,12 +643,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
+ <version>3.1.2</version>
<configuration>
<configLocation>META-INF/checkstyle-tobago.xml</configLocation>
<includes>**/*.xhtml,**/*.jsp,**/*.tag</includes>
<excludes>**/*.java</excludes>
- <sourceDirectory>src/main/webapp</sourceDirectory>
+ <sourceDirectories>src/main/webapp</sourceDirectories>
</configuration>
<dependencies>
<dependency>
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
index 837d10a..66e56f9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
@@ -170,7 +170,7 @@ public class ClientConfigController {
public String getLocalizedLocale() {
if (locale != null) {
return locale.getDisplayName(locale);
- } else{
+ } else {
return null;
}
}
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java
index 098d7f8..b0a6aa6 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * @deprecated use {@link PageAction.parse()}
+ * @deprecated use {@link PageAction#parse(String)}
*/
@Deprecated
public class PageActionUtil {
diff --git a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.java b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.java
index b857d22..aac1eaf 100644
--- a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.java
+++ b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.java
@@ -88,7 +88,7 @@ public class JsonUtils {
final Map<String, Command> other = commandMap.getOther();
if (other != null) {
- for(final Map.Entry<String, Command> entry : other.entrySet()) {
+ for (final Map.Entry<String, Command> entry : other.entrySet()) {
encode(builder, entry.getKey(), entry.getValue());
}
}
[myfaces-tobago] 24/32: cherrypick from 2.x: build(deps): bump geronimo-jcdi_1.0_spec from 1.0 to 1.1
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit a8fcdb44f3ccb61e635387f451d7a0234cb35101
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 9 10:31:06 2022 +0000
cherrypick from 2.x: build(deps): bump geronimo-jcdi_1.0_spec from 1.0 to 1.1
Bumps geronimo-jcdi_1.0_spec from 1.0 to 1.1.
---
updated-dependencies:
- dependency-name: org.apache.geronimo.specs:geronimo-jcdi_1.0_spec
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
tobago-example/tobago-example-addressbook-cdi/pom.xml | 2 +-
tobago-example/tobago-example-demo/pom.xml | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tobago-example/tobago-example-addressbook-cdi/pom.xml b/tobago-example/tobago-example-addressbook-cdi/pom.xml
index 8954c18..567902b 100644
--- a/tobago-example/tobago-example-addressbook-cdi/pom.xml
+++ b/tobago-example/tobago-example-addressbook-cdi/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<!-- XXX websphere-provided -->
<scope>provided</scope>
</dependency>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 78af100..8782ffb 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -247,7 +247,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -305,7 +305,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -363,7 +363,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -421,7 +421,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -479,7 +479,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -537,7 +537,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
[myfaces-tobago] 29/32: cherrypick from 2.x: build: checkstyle enhancements
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 96a8db4fbca520100538c9bacca422c3d367c864
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 16:52:21 2022 +0100
cherrypick from 2.x: build: checkstyle enhancements
---
pom.xml | 4 ++--
tobago-example/tobago-example-demo/pom.xml | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6aecc03..22a5177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
- <maven-checkstyle.version>8.45.1</maven-checkstyle.version>
+ <checkstyle.version>8.45.1</checkstyle.version>
<checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
@@ -398,7 +398,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>${maven-checkstyle.version}</version>
+ <version>${checkstyle.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 4088b56..7b7fef3 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -643,7 +643,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.2</version>
+ <version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>META-INF/checkstyle-tobago.xml</configLocation>
<includes>**/*.xhtml,**/*.jsp,**/*.tag</includes>
@@ -656,6 +656,11 @@
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>