You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2022/11/18 15:05:11 UTC
[myfaces-tobago] branch tobago-5.x updated (3bb0c0adcb -> c3760631a0)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
from 3bb0c0adcb Tobago 5.x fix code scanning (#3429)
new a014ee5d6b style(editorconfig): optimize autolayout
new 599b053710 style: reformat java files
new c3760631a0 style: remove trailing semicolon
The 3 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 | 14 +-
pom.xml | 2 +-
.../myfaces/tobago/component/Attributes.java | 10 +-
.../apache/myfaces/tobago/component/Facets.java | 2 +-
.../org/apache/myfaces/tobago/component/Tags.java | 1 +
.../apache/myfaces/tobago/component/Visual.java | 2 +-
.../apache/myfaces/tobago/config/TobagoConfig.java | 3 +-
.../org/apache/myfaces/tobago/context/Markup.java | 2 +-
.../myfaces/tobago/context/MarkupEditor.java | 8 +-
.../tobago/context/TransientStateHolder.java | 1 -
.../apache/myfaces/tobago/context/UserAgent.java | 17 +-
.../myfaces/tobago/convert/LocaleConverter.java | 1 -
.../event/MethodExpressionTabChangeListener.java | 2 +-
.../MethodExpressionTreeExpansionListener.java | 1 -
.../myfaces/tobago/event/PageActionEvent.java | 2 -
.../tobago/event/ResetFormActionListener.java | 2 +-
.../tobago/event/ResetInputActionListener.java | 2 +-
.../tobago/event/TreeExpansionListener.java | 2 +-
.../ValueExpressionResetInputActionListener.java | 4 +-
.../facelets/ResetInputActionListenerHandler.java | 2 +-
.../facelets/SegmentLayoutConstraintHandler.java | 5 +-
.../tobago/facelets/SortActionSourceRule.java | 5 +-
.../tobago/facelets/TabChangeListenerHandler.java | 1 -
.../internal/behavior/AttachedStateWrapper.java | 2 +-
.../tobago/internal/behavior/DeltaStateHelper.java | 2 -
.../tobago/internal/behavior/EventBehavior.java | 4 +-
.../internal/component/AbstractUICommand.java | 6 +-
.../tobago/internal/component/AbstractUIEvent.java | 1 +
.../tobago/internal/component/AbstractUIImage.java | 1 +
.../tobago/internal/component/AbstractUIPage.java | 2 +-
.../tobago/internal/component/AbstractUIRange.java | 2 +
.../internal/component/AbstractUIScript.java | 2 +
.../component/AbstractUISelectReference.java | 1 +
.../tobago/internal/component/AbstractUISheet.java | 6 +-
.../tobago/internal/component/AbstractUIStyle.java | 12 ++
.../internal/component/AbstractUITabGroup.java | 2 -
.../tobago/internal/component/AbstractUITree.java | 1 +
.../internal/component/AbstractUITreeIcon.java | 4 +-
.../internal/component/AbstractUITreeSelect.java | 1 +
.../tobago/internal/config/SecurityAnnotation.java | 24 +--
.../tobago/internal/config/TobagoConfigMerger.java | 2 +-
.../tobago/internal/config/TobagoConfigParser.java | 2 +-
.../tobago/internal/config/TobagoConfigSorter.java | 1 -
.../internal/config/TobagoConfigVersion.java | 4 +-
.../tobago/internal/renderkit/CommandMap.java | 1 +
.../internal/renderkit/renderer/BadgeRenderer.java | 10 +-
.../renderer/DecodingInputRendererBase.java | 2 +-
.../internal/renderkit/renderer/InRenderer.java | 10 +-
.../renderer/LabelLayoutRendererBase.java | 7 +-
.../internal/renderkit/renderer/PageRenderer.java | 2 +-
.../internal/renderkit/renderer/RangeRenderer.java | 10 +-
.../renderer/SelectBooleanRendererBase.java | 4 +-
.../renderer/SelectManyCheckboxRenderer.java | 4 +-
.../renderkit/renderer/SelectManyRendererBase.java | 23 +--
.../renderkit/renderer/SelectOneRadioRenderer.java | 4 +-
.../internal/renderkit/renderer/SheetRenderer.java | 3 +-
.../internal/renderkit/renderer/StyleRenderer.java | 4 +-
.../renderkit/renderer/TabGroupRenderer.java | 46 ++---
.../renderer/TobagoClientBehaviorRenderer.java | 3 +-
.../taglib/component/AttributeTagDeclaration.java | 1 +
.../taglib/component/ColumnTagDeclaration.java | 4 +-
.../taglib/component/DateTagDeclaration.java | 16 +-
.../taglib/component/FileTagDeclaration.java | 2 +-
.../taglib/component/FooterTagDeclaration.java | 1 +
.../taglib/component/HeaderTagDeclaration.java | 1 +
.../taglib/component/InTagDeclaration.java | 6 +-
.../taglib/component/LinkTagDeclaration.java | 4 +-
.../taglib/component/MessagesTagDeclaration.java | 12 +-
.../taglib/component/OutTagDeclaration.java | 1 +
.../taglib/component/RangeTagDeclaration.java | 36 ++--
.../taglib/component/ReloadTagDeclaration.java | 1 -
.../taglib/component/ScriptTagDeclaration.java | 1 +
.../component/SegmentLayoutTagDeclaration.java | 1 +
.../taglib/component/SelectItemTagDeclaration.java | 1 +
.../component/SelectManyShuttleTagDeclaration.java | 1 -
.../component/SelectOneChoiceTagDeclaration.java | 2 +-
.../component/SelectOneListboxTagDeclaration.java | 2 +-
.../component/SelectOneRadioTagDeclaration.java | 2 +-
.../taglib/component/SheetTagDeclaration.java | 3 +
.../component/SplitLayoutTagDeclaration.java | 2 +-
.../taglib/component/StyleTagDeclaration.java | 6 +-
.../taglib/component/TabGroupTagDeclaration.java | 3 +-
.../taglib/component/TextareaTagDeclaration.java | 6 +-
.../taglib/component/TreeTagDeclaration.java | 2 +-
.../taglib/declaration/HasCollapsedMode.java | 6 +-
.../taglib/declaration/HasConverterMessage.java | 1 -
.../taglib/declaration/HasPlaceholder.java | 1 +
.../taglib/declaration/HasRequiredMessage.java | 1 -
.../declaration/HasRequiredMessageForSelect.java | 1 -
.../internal/taglib/declaration/HasValidator.java | 2 +-
.../tobago/internal/util/AuthorizationHelper.java | 16 +-
.../myfaces/tobago/internal/util/Deprecation.java | 1 -
.../tobago/internal/util/HtmlRendererUtils.java | 16 +-
.../tobago/internal/util/HtmlWriterHelper.java | 3 +-
.../myfaces/tobago/internal/util/PartUtils.java | 1 -
.../myfaces/tobago/internal/util/RenderUtils.java | 12 +-
.../myfaces/tobago/internal/util/SortingUtils.java | 6 +-
.../myfaces/tobago/internal/util/StringUtils.java | 4 +-
.../myfaces/tobago/internal/util/WriterHelper.java | 5 +-
.../myfaces/tobago/layout/GridSpanEditor.java | 8 +-
.../myfaces/tobago/layout/MeasureEditor.java | 8 +-
.../tobago/model/AutoSuggestExtensionItem.java | 1 -
.../myfaces/tobago/model/AutoSuggestItems.java | 1 -
.../apache/myfaces/tobago/model/ExpandedState.java | 4 +-
.../apache/myfaces/tobago/model/SheetState.java | 1 -
.../myfaces/tobago/renderkit/RendererBase.java | 9 +-
.../tobago/renderkit/css/BootstrapClass.java | 14 +-
.../tobago/renderkit/css/CssClassUtils.java | 10 +-
.../myfaces/tobago/renderkit/css/TobagoClass.java | 20 +-
.../tobago/renderkit/html/DataAttributes.java | 3 +
.../tobago/renderkit/html/HtmlAttributes.java | 52 +++--
.../tobago/renderkit/html/HtmlButtonTypes.java | 2 +-
.../tobago/renderkit/html/HtmlElements.java | 6 +-
.../tobago/renderkit/html/HtmlInputTypes.java | 8 +-
.../apache/myfaces/tobago/sanitizer/Sanitizer.java | 2 +-
.../tobago/servlet/NonFacesRequestServlet.java | 1 -
.../apache/myfaces/tobago/util/ComparatorBase.java | 1 -
.../apache/myfaces/tobago/util/ComponentUtils.java | 4 +-
.../myfaces/tobago/util/ContextCallback.java | 1 -
.../myfaces/tobago/util/DebugActionListener.java | 1 -
.../tobago/util/DebugNavigationHandler.java | 2 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 8 +-
.../org/apache/myfaces/tobago/util/DebugUtils.java | 3 +-
.../apache/myfaces/tobago/util/FacesVersion.java | 5 +
.../apache/myfaces/tobago/util/WebXmlUtils.java | 2 +-
.../tobago/webapp/TobagoResponseWriter.java | 15 +-
.../component/AbstractUIGridLayoutUnitTest.java | 1 -
.../internal/config/AbstractTobagoTestBase.java | 4 +
.../config/TobagoConfigSorterUnitTest.java | 1 -
.../internal/mock/servlet/MockHttpSession.java | 16 +-
.../tobago/internal/renderkit/CommandUnitTest.java | 2 +-
.../renderkit/renderer/DateRendererUnitTest.java | 4 +-
.../renderkit/renderer/FileRendererUnitTest.java | 6 +-
.../renderkit/renderer/InRendererUnitTest.java | 26 +--
.../renderkit/renderer/LinkRendererUnitTest.java | 4 +-
.../renderkit/renderer/RendererTestBase.java | 2 +-
.../SelectBooleanCheckboxRendererUnitTest.java | 25 ++-
.../SelectBooleanToggleRendererUnitTest.java | 1 -
.../SelectManyCheckboxRendererUnitTest.java | 18 +-
.../SelectManyShuttleRendererUnitTest.java | 1 -
.../internal/util/AuthorizationHelperUnitTest.java | 36 ++--
.../apache/myfaces/tobago/internal/util/Fruit.java | 13 +-
.../apache/myfaces/tobago/internal/util/Pear.java | 4 +-
.../tobago/internal/util/RenderUtilsUnitTest.java | 2 +-
.../tobago/internal/util/SortingUtilsUnitTest.java | 230 ++++++++++-----------
.../tobago/model/ExpandedStateUnitTest.java | 1 -
.../myfaces/tobago/model/SelectableUnitTest.java | 8 +-
.../myfaces/tobago/model/TreePathUnitTest.java | 1 -
.../renderkit/html/HtmlElementsUnitTest.java | 28 +--
.../tobago/util/ComponentUtilsUnitTest.java | 1 -
.../myfaces/tobago/example/demo/AstroData.java | 4 +-
.../example/demo/ConversationController.java | 2 +-
.../tobago/example/demo/DateController.java | 6 +-
.../tobago/example/demo/EventController.java | 1 -
.../tobago/example/demo/ExceptionController.java | 2 +-
.../tobago/example/demo/ExecuteController.java | 8 +-
.../example/demo/InputSuggestController.java | 3 -
.../tobago/example/demo/LoggingController.java | 5 +-
.../tobago/example/demo/NavigationNode.java | 4 +-
.../tobago/example/demo/NavigationState.java | 2 +-
.../example/demo/PartialReloadController.java | 1 -
.../tobago/example/demo/PopupController.java | 1 -
.../tobago/example/demo/SelectController.java | 18 +-
.../example/demo/SelectManyListboxController.java | 10 +-
.../example/demo/SelectOneListboxController.java | 10 +-
.../tobago/example/demo/SheetActionController.java | 2 +-
.../myfaces/tobago/example/demo/SheetConfig.java | 1 -
.../tobago/example/demo/SheetController.java | 2 +-
.../tobago/example/demo/SheetFilterController.java | 2 +-
.../tobago/example/demo/StarsController.java | 1 -
.../tobago/example/demo/TestController.java | 12 +-
.../tobago/example/demo/TreeEditorController.java | 9 +-
.../tobago/example/demo/TreeSelectController.java | 12 +-
.../tobago/example/demo/UploadController.java | 2 +-
.../tobago/example/demo/ValidationController.java | 4 +-
.../myfaces/tobago/example/demo/info/Activity.java | 2 +-
.../myfaces/tobago/example/demo/sudoku/Sudoku.java | 1 -
.../tobago/example/demo/integration/BasicTest.java | 1 -
.../renderkit/css/BootstrapClassUnitTest.java | 5 +-
.../myfaces/tobago/apt/annotation/Behavior.java | 2 +
.../apt/annotation/BodyContentDescription.java | 1 +
.../myfaces/tobago/apt/annotation/Converter.java | 1 +
.../myfaces/tobago/apt/annotation/Facet.java | 7 +-
.../myfaces/tobago/apt/annotation/Preliminary.java | 1 -
.../tobago/apt/annotation/TagAttribute.java | 8 +-
.../myfaces/tobago/apt/annotation/Taglib.java | 4 +
.../apt/annotation/UIComponentTagAttribute.java | 12 +-
.../myfaces/tobago/apt/annotation/Validator.java | 1 +
.../tobago/apt/annotation/ValidatorTag.java | 1 +
.../myfaces/tobago/apt/generate/ClassInfo.java | 1 -
.../myfaces/tobago/apt/generate/Imports.java | 1 -
.../myfaces/tobago/apt/generate/TagInfo.java | 1 -
.../apt/processor/CheckstyleConfigGenerator.java | 1 -
.../tobago/apt/processor/FacesConfigGenerator.java | 1 -
.../tobago/apt/processor/TaglibGenerator.java | 12 +-
195 files changed, 699 insertions(+), 615 deletions(-)
[myfaces-tobago] 03/03: style: remove trailing semicolon
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit c3760631a00d8a651d4741f085ed2f23727d826f
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Nov 18 15:38:57 2022 +0100
style: remove trailing semicolon
---
.../src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java
index 7f6ab3a141..c04b409749 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java
@@ -30,6 +30,4 @@ public interface Sanitizer {
default String getInfo() {
return toString();
}
-
- ;
}
[myfaces-tobago] 02/03: style: reformat java files
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 599b0537100bb33bc6df096600f19e3fec97687a
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Nov 18 15:24:06 2022 +0100
style: reformat java files
---
.../myfaces/tobago/component/Attributes.java | 10 +-
.../apache/myfaces/tobago/component/Facets.java | 2 +-
.../org/apache/myfaces/tobago/component/Tags.java | 1 +
.../apache/myfaces/tobago/component/Visual.java | 2 +-
.../apache/myfaces/tobago/config/TobagoConfig.java | 3 +-
.../org/apache/myfaces/tobago/context/Markup.java | 2 +-
.../myfaces/tobago/context/MarkupEditor.java | 8 +-
.../tobago/context/TransientStateHolder.java | 1 -
.../apache/myfaces/tobago/context/UserAgent.java | 17 +-
.../myfaces/tobago/convert/LocaleConverter.java | 1 -
.../event/MethodExpressionTabChangeListener.java | 2 +-
.../MethodExpressionTreeExpansionListener.java | 1 -
.../myfaces/tobago/event/PageActionEvent.java | 2 -
.../tobago/event/ResetFormActionListener.java | 2 +-
.../tobago/event/ResetInputActionListener.java | 2 +-
.../tobago/event/TreeExpansionListener.java | 2 +-
.../ValueExpressionResetInputActionListener.java | 4 +-
.../facelets/ResetInputActionListenerHandler.java | 2 +-
.../facelets/SegmentLayoutConstraintHandler.java | 5 +-
.../tobago/facelets/SortActionSourceRule.java | 5 +-
.../tobago/facelets/TabChangeListenerHandler.java | 1 -
.../internal/behavior/AttachedStateWrapper.java | 2 +-
.../tobago/internal/behavior/DeltaStateHelper.java | 2 -
.../tobago/internal/behavior/EventBehavior.java | 4 +-
.../internal/component/AbstractUICommand.java | 6 +-
.../tobago/internal/component/AbstractUIEvent.java | 1 +
.../tobago/internal/component/AbstractUIImage.java | 1 +
.../tobago/internal/component/AbstractUIPage.java | 2 +-
.../tobago/internal/component/AbstractUIRange.java | 2 +
.../internal/component/AbstractUIScript.java | 2 +
.../component/AbstractUISelectReference.java | 1 +
.../tobago/internal/component/AbstractUISheet.java | 6 +-
.../tobago/internal/component/AbstractUIStyle.java | 12 ++
.../internal/component/AbstractUITabGroup.java | 2 -
.../tobago/internal/component/AbstractUITree.java | 1 +
.../internal/component/AbstractUITreeIcon.java | 4 +-
.../internal/component/AbstractUITreeSelect.java | 1 +
.../tobago/internal/config/SecurityAnnotation.java | 24 +--
.../tobago/internal/config/TobagoConfigMerger.java | 2 +-
.../tobago/internal/config/TobagoConfigParser.java | 2 +-
.../tobago/internal/config/TobagoConfigSorter.java | 1 -
.../internal/config/TobagoConfigVersion.java | 4 +-
.../tobago/internal/renderkit/CommandMap.java | 1 +
.../internal/renderkit/renderer/BadgeRenderer.java | 10 +-
.../renderer/DecodingInputRendererBase.java | 2 +-
.../internal/renderkit/renderer/InRenderer.java | 10 +-
.../renderer/LabelLayoutRendererBase.java | 7 +-
.../internal/renderkit/renderer/PageRenderer.java | 2 +-
.../internal/renderkit/renderer/RangeRenderer.java | 10 +-
.../renderer/SelectBooleanRendererBase.java | 4 +-
.../renderer/SelectManyCheckboxRenderer.java | 4 +-
.../renderkit/renderer/SelectManyRendererBase.java | 23 +--
.../renderkit/renderer/SelectOneRadioRenderer.java | 4 +-
.../internal/renderkit/renderer/SheetRenderer.java | 3 +-
.../internal/renderkit/renderer/StyleRenderer.java | 4 +-
.../renderkit/renderer/TabGroupRenderer.java | 46 ++---
.../renderer/TobagoClientBehaviorRenderer.java | 3 +-
.../taglib/component/AttributeTagDeclaration.java | 1 +
.../taglib/component/ColumnTagDeclaration.java | 4 +-
.../taglib/component/DateTagDeclaration.java | 16 +-
.../taglib/component/FileTagDeclaration.java | 2 +-
.../taglib/component/FooterTagDeclaration.java | 1 +
.../taglib/component/HeaderTagDeclaration.java | 1 +
.../taglib/component/InTagDeclaration.java | 6 +-
.../taglib/component/LinkTagDeclaration.java | 4 +-
.../taglib/component/MessagesTagDeclaration.java | 12 +-
.../taglib/component/OutTagDeclaration.java | 1 +
.../taglib/component/RangeTagDeclaration.java | 36 ++--
.../taglib/component/ReloadTagDeclaration.java | 1 -
.../taglib/component/ScriptTagDeclaration.java | 1 +
.../component/SegmentLayoutTagDeclaration.java | 1 +
.../taglib/component/SelectItemTagDeclaration.java | 1 +
.../component/SelectManyShuttleTagDeclaration.java | 1 -
.../component/SelectOneChoiceTagDeclaration.java | 2 +-
.../component/SelectOneListboxTagDeclaration.java | 2 +-
.../component/SelectOneRadioTagDeclaration.java | 2 +-
.../taglib/component/SheetTagDeclaration.java | 3 +
.../component/SplitLayoutTagDeclaration.java | 2 +-
.../taglib/component/StyleTagDeclaration.java | 6 +-
.../taglib/component/TabGroupTagDeclaration.java | 3 +-
.../taglib/component/TextareaTagDeclaration.java | 6 +-
.../taglib/component/TreeTagDeclaration.java | 2 +-
.../taglib/declaration/HasCollapsedMode.java | 6 +-
.../taglib/declaration/HasConverterMessage.java | 1 -
.../taglib/declaration/HasPlaceholder.java | 1 +
.../taglib/declaration/HasRequiredMessage.java | 1 -
.../declaration/HasRequiredMessageForSelect.java | 1 -
.../internal/taglib/declaration/HasValidator.java | 2 +-
.../tobago/internal/util/AuthorizationHelper.java | 16 +-
.../myfaces/tobago/internal/util/Deprecation.java | 1 -
.../tobago/internal/util/HtmlRendererUtils.java | 16 +-
.../tobago/internal/util/HtmlWriterHelper.java | 3 +-
.../myfaces/tobago/internal/util/PartUtils.java | 1 -
.../myfaces/tobago/internal/util/RenderUtils.java | 12 +-
.../myfaces/tobago/internal/util/SortingUtils.java | 6 +-
.../myfaces/tobago/internal/util/StringUtils.java | 4 +-
.../myfaces/tobago/internal/util/WriterHelper.java | 5 +-
.../myfaces/tobago/layout/GridSpanEditor.java | 8 +-
.../myfaces/tobago/layout/MeasureEditor.java | 8 +-
.../tobago/model/AutoSuggestExtensionItem.java | 1 -
.../myfaces/tobago/model/AutoSuggestItems.java | 1 -
.../apache/myfaces/tobago/model/ExpandedState.java | 4 +-
.../apache/myfaces/tobago/model/SheetState.java | 1 -
.../myfaces/tobago/renderkit/RendererBase.java | 9 +-
.../tobago/renderkit/css/BootstrapClass.java | 14 +-
.../tobago/renderkit/css/CssClassUtils.java | 10 +-
.../myfaces/tobago/renderkit/css/TobagoClass.java | 20 +-
.../tobago/renderkit/html/DataAttributes.java | 3 +
.../tobago/renderkit/html/HtmlAttributes.java | 52 +++--
.../tobago/renderkit/html/HtmlButtonTypes.java | 2 +-
.../tobago/renderkit/html/HtmlElements.java | 6 +-
.../tobago/renderkit/html/HtmlInputTypes.java | 8 +-
.../apache/myfaces/tobago/sanitizer/Sanitizer.java | 4 +-
.../tobago/servlet/NonFacesRequestServlet.java | 1 -
.../apache/myfaces/tobago/util/ComparatorBase.java | 1 -
.../apache/myfaces/tobago/util/ComponentUtils.java | 4 +-
.../myfaces/tobago/util/ContextCallback.java | 1 -
.../myfaces/tobago/util/DebugActionListener.java | 1 -
.../tobago/util/DebugNavigationHandler.java | 2 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 8 +-
.../org/apache/myfaces/tobago/util/DebugUtils.java | 3 +-
.../apache/myfaces/tobago/util/FacesVersion.java | 5 +
.../apache/myfaces/tobago/util/WebXmlUtils.java | 2 +-
.../tobago/webapp/TobagoResponseWriter.java | 15 +-
.../component/AbstractUIGridLayoutUnitTest.java | 1 -
.../internal/config/AbstractTobagoTestBase.java | 4 +
.../config/TobagoConfigSorterUnitTest.java | 1 -
.../internal/mock/servlet/MockHttpSession.java | 16 +-
.../tobago/internal/renderkit/CommandUnitTest.java | 2 +-
.../renderkit/renderer/DateRendererUnitTest.java | 4 +-
.../renderkit/renderer/FileRendererUnitTest.java | 6 +-
.../renderkit/renderer/InRendererUnitTest.java | 26 +--
.../renderkit/renderer/LinkRendererUnitTest.java | 4 +-
.../renderkit/renderer/RendererTestBase.java | 2 +-
.../SelectBooleanCheckboxRendererUnitTest.java | 25 ++-
.../SelectBooleanToggleRendererUnitTest.java | 1 -
.../SelectManyCheckboxRendererUnitTest.java | 18 +-
.../SelectManyShuttleRendererUnitTest.java | 1 -
.../internal/util/AuthorizationHelperUnitTest.java | 36 ++--
.../apache/myfaces/tobago/internal/util/Fruit.java | 13 +-
.../apache/myfaces/tobago/internal/util/Pear.java | 4 +-
.../tobago/internal/util/RenderUtilsUnitTest.java | 2 +-
.../tobago/internal/util/SortingUtilsUnitTest.java | 230 ++++++++++-----------
.../tobago/model/ExpandedStateUnitTest.java | 1 -
.../myfaces/tobago/model/SelectableUnitTest.java | 8 +-
.../myfaces/tobago/model/TreePathUnitTest.java | 1 -
.../renderkit/html/HtmlElementsUnitTest.java | 28 +--
.../tobago/util/ComponentUtilsUnitTest.java | 1 -
.../myfaces/tobago/example/demo/AstroData.java | 4 +-
.../example/demo/ConversationController.java | 2 +-
.../tobago/example/demo/DateController.java | 6 +-
.../tobago/example/demo/EventController.java | 1 -
.../tobago/example/demo/ExceptionController.java | 2 +-
.../tobago/example/demo/ExecuteController.java | 8 +-
.../example/demo/InputSuggestController.java | 3 -
.../tobago/example/demo/LoggingController.java | 5 +-
.../tobago/example/demo/NavigationNode.java | 4 +-
.../tobago/example/demo/NavigationState.java | 2 +-
.../example/demo/PartialReloadController.java | 1 -
.../tobago/example/demo/PopupController.java | 1 -
.../tobago/example/demo/SelectController.java | 18 +-
.../example/demo/SelectManyListboxController.java | 10 +-
.../example/demo/SelectOneListboxController.java | 10 +-
.../tobago/example/demo/SheetActionController.java | 2 +-
.../myfaces/tobago/example/demo/SheetConfig.java | 1 -
.../tobago/example/demo/SheetController.java | 2 +-
.../tobago/example/demo/SheetFilterController.java | 2 +-
.../tobago/example/demo/StarsController.java | 1 -
.../tobago/example/demo/TestController.java | 12 +-
.../tobago/example/demo/TreeEditorController.java | 9 +-
.../tobago/example/demo/TreeSelectController.java | 12 +-
.../tobago/example/demo/UploadController.java | 2 +-
.../tobago/example/demo/ValidationController.java | 4 +-
.../myfaces/tobago/example/demo/info/Activity.java | 2 +-
.../myfaces/tobago/example/demo/sudoku/Sudoku.java | 1 -
.../tobago/example/demo/integration/BasicTest.java | 1 -
.../renderkit/css/BootstrapClassUnitTest.java | 5 +-
.../myfaces/tobago/apt/annotation/Behavior.java | 2 +
.../apt/annotation/BodyContentDescription.java | 1 +
.../myfaces/tobago/apt/annotation/Converter.java | 1 +
.../myfaces/tobago/apt/annotation/Facet.java | 7 +-
.../myfaces/tobago/apt/annotation/Preliminary.java | 1 -
.../tobago/apt/annotation/TagAttribute.java | 8 +-
.../myfaces/tobago/apt/annotation/Taglib.java | 4 +
.../apt/annotation/UIComponentTagAttribute.java | 12 +-
.../myfaces/tobago/apt/annotation/Validator.java | 1 +
.../tobago/apt/annotation/ValidatorTag.java | 1 +
.../myfaces/tobago/apt/generate/ClassInfo.java | 1 -
.../myfaces/tobago/apt/generate/Imports.java | 1 -
.../myfaces/tobago/apt/generate/TagInfo.java | 1 -
.../apt/processor/CheckstyleConfigGenerator.java | 1 -
.../tobago/apt/processor/FacesConfigGenerator.java | 1 -
.../tobago/apt/processor/TaglibGenerator.java | 12 +-
193 files changed, 689 insertions(+), 611 deletions(-)
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 5e80a5c8d3..70eb42717c 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
@@ -157,7 +157,9 @@ public enum Attributes {
lang,
link,
localMenu,
- /** @deprecated since 2.0.0 */
+ /**
+ * @deprecated since 2.0.0
+ */
@Deprecated
margin,
/**
@@ -447,12 +449,14 @@ public enum Attributes {
widthList,
zIndex;
- /** This constants are needed for annotations, because they can't use the enums. */
+ /**
+ * This constants are needed for annotations, because they can't use the enums.
+ */
public static final String EXECUTE = "execute";
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private final String explicit;
+ private final String explicit;
Attributes() {
this(null);
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 989fecdabc..16fa53b04d 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
@@ -29,7 +29,7 @@ public enum Facets {
confirmation,
constraints,
/**
- * @deprecated currently not supported
+ * @deprecated currently not supported
*/
@Deprecated
contextMenu,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java
index 14e270a511..683b8ea686 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.internal.util.StringUtils;
/**
* Constants for the component type.
+ *
* @since 4.4.0
*/
public enum Tags {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Visual.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Visual.java
index 78ef99afe2..697771596e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Visual.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Visual.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.component;
-
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.renderkit.css.CustomClass;
@@ -36,6 +35,7 @@ public interface Visual {
/**
* 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();
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 7e447b3df8..2c4826dc89 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
@@ -99,7 +99,7 @@ public class TobagoConfig {
/**
* @param servletContext From the container. If null, the WEB-INF/tobago-config.xml will be ignored.
- * @param alternative Alternative tobago-config-files, only needed for testing.
+ * @param alternative Alternative tobago-config-files, only needed for testing.
*/
public TobagoConfig(final ServletContext servletContext, final String... alternative) {
@@ -265,7 +265,6 @@ public class TobagoConfig {
this.checkSessionSecret = checkSessionSecret;
}
-
public boolean isPreventFrameAttacks() {
return preventFrameAttacks;
}
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 659eebe09e..e01a89cbf8 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
@@ -222,7 +222,7 @@ public final class Markup implements Serializable, Iterable<String> {
if (forbiddenCharFound) {
final String newString = stringBuilder.toString();
LOG.warn("Only numeric and alphabetic characters are allowed for markups: '{}' converted to '{}'.", string,
- newString);
+ newString);
return newString;
} else {
return string;
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 165af6e63f..7267ee533b 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/TransientStateHolder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
index 3e96092b54..252f43bf58 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
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.context;
-
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import java.io.Serializable;
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 81cf589a12..dda0783c68 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
@@ -92,7 +92,6 @@ public final class UserAgent implements Serializable {
@Deprecated
public static final UserAgent MSIE_6_0_MAC = new UserAgent("msie", "6_0_mac");
-
/**
* e. g. Opera 10
*/
@@ -356,10 +355,10 @@ public final class UserAgent implements Serializable {
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;
@@ -374,10 +373,10 @@ public final class UserAgent implements Serializable {
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;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
index e08fbbbd67..84c4cc9c90 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
@@ -30,7 +30,6 @@ import java.util.Locale;
@org.apache.myfaces.tobago.apt.annotation.Converter(forClass = "java.util.Locale")
public class LocaleConverter implements Converter<Locale> {
-
@Override
public Locale getAsObject(
final FacesContext facesContext, final UIComponent component, final String value) {
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 e999c12c54..fa70e0b167 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
@@ -41,7 +41,7 @@ public class MethodExpressionTabChangeListener implements TabChangeListener, Sta
@Override
public void processTabChange(final TabChangeEvent actionEvent) throws AbortProcessingException {
- FacesELUtils.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
+ FacesELUtils.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, actionEvent);
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
index e9aa9ce656..00356efe5f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
@@ -26,7 +26,6 @@ import javax.el.MethodExpression;
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
-
public class MethodExpressionTreeExpansionListener implements TreeExpansionListener, StateHolder {
private MethodExpression methodExpression;
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 27bac8b9c0..b4bbde5760 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
@@ -19,11 +19,9 @@
package org.apache.myfaces.tobago.event;
-
import javax.faces.event.ActionEvent;
import javax.faces.component.UIComponent;
-
public class PageActionEvent extends ActionEvent {
private static final long serialVersionUID = 3364193750247386220L;
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 fe1936c9e8..f684a1f314 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 {
@Override
public void processAction(final ActionEvent actionEvent) throws AbortProcessingException {
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 3d8b37bd6a..1c9cd2421e 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
@@ -39,7 +39,7 @@ public class ResetInputActionListener extends AbstractResetInputActionListener i
}
public ResetInputActionListener(final Collection<String> clientIds) {
- this.clientIds = clientIds.toArray(new String[0]);
+ this.clientIds = clientIds.toArray(new String[0]);
}
@Override
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 5eedf7a41e..92234c099c 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 d12eb7f344..0b65dcdcff 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
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.event;
-
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
@@ -56,7 +55,7 @@ public class ValueExpressionResetInputActionListener extends AbstractResetInputA
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;
@@ -87,7 +86,6 @@ public class ValueExpressionResetInputActionListener extends AbstractResetInputA
return values;
}
-
@Override
public void setTransient(final boolean newTransientValue) {
// ignore
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 1de5b58951..720d73205d 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
@@ -52,7 +52,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/SegmentLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
index bd8b45f626..bd90451762 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
@@ -86,8 +86,9 @@ public class SegmentLayoutConstraintHandler extends TagHandler {
apply(faceletContext, parent, offsetExtraLarge, Attributes.offsetExtraLarge, Integer.TYPE);
}
- private void apply(final FaceletContext faceletContext, final UIComponent parent, final TagAttribute tagAttribute,
- final Attributes attribute, final Class type) {
+ private void apply(
+ final FaceletContext faceletContext, final UIComponent parent, final TagAttribute tagAttribute,
+ final Attributes attribute, final Class type) {
if (tagAttribute != null) {
if (tagAttribute.isLiteral()) {
parent.getAttributes().put(attribute.getName(), tagAttribute.getValue());
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 45f89b3252..382ce079c7 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
@@ -35,8 +35,9 @@ public class SortActionSourceRule extends MetaRule {
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
@Override
- public Metadata applyRule(final String name, final TagAttribute attribute,
- final MetadataTarget metadataTarget) {
+ public Metadata applyRule(
+ final String name, final TagAttribute attribute,
+ final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(SortActionSource.class)) {
if ("sortActionListener".equals(name)) {
return new SortActionListenerMapper(attribute);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
index 2f5d566e2f..2c809997d4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
@@ -41,7 +41,6 @@ public class TabChangeListenerHandler extends TagHandler {
private final TagAttribute binding;
-
public TabChangeListenerHandler(final TagConfig config) {
super(config);
binding = getAttribute("binding");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedStateWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedStateWrapper.java
index 41fb68cc64..8aac563cbf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedStateWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/AttachedStateWrapper.java
@@ -31,7 +31,7 @@ class AttachedStateWrapper implements Serializable {
private Object wrappedStateObject;
/**
- * @param clazz null means wrappedStateObject is a List of state objects
+ * @param clazz null means wrappedStateObject is a List of state objects
*/
AttachedStateWrapper(final Class<?> clazz, final Object wrappedStateObject) {
if (wrappedStateObject != null && !(wrappedStateObject instanceof Serializable)) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
index a019f89eac..a676100dca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
@@ -184,8 +184,6 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
/**
* Used to create delta map on demand
- *
- * @return
*/
private boolean createDeltas() {
if (isInitialStateMarked()) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java
index 67dde7c70e..31720de278 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java
@@ -135,7 +135,7 @@ public class EventBehavior extends ClientBehaviorBase {
}
final Map<String, Object> bindings = (Map<String, Object>) getStateHelper().
- get(EventBehavior.PropertyKeys.bindings);
+ get(EventBehavior.PropertyKeys.bindings);
if (bindings != null) {
return (ValueExpression) bindings.get(name);
} else {
@@ -287,7 +287,7 @@ public class EventBehavior extends ClientBehaviorBase {
return getCollectionFromSpaceSplitString((String) value);
} else {
throw new IllegalArgumentException("Type " + value.getClass()
- + " not supported for attribute " + attributeName);
+ + " not supported for attribute " + attributeName);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
index 55ba60110b..859167f641 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
@@ -35,7 +35,7 @@ import javax.faces.context.FacesContext;
* Base class for commands.
*/
public abstract class AbstractUICommand extends AbstractUICommandBase
- implements SupportsAutoSpacing, SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
+ implements SupportsAutoSpacing, SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
enum PropertyKeys {
disabled,
@@ -49,8 +49,8 @@ public abstract class AbstractUICommand extends AbstractUICommandBase
parentOfCommands = false;
for (final UIComponent child : getChildren()) {
if (child.isRendered()
- && !(child instanceof AbstractUIEvent)
- && (child instanceof UICommand || child instanceof UIInput)) {
+ && !(child instanceof AbstractUIEvent)
+ && (child instanceof UICommand || child instanceof UIInput)) {
parentOfCommands = true;
break;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java
index e8ad2bb661..01ff44b768 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java
@@ -29,5 +29,6 @@ import javax.faces.component.behavior.ClientBehaviorHolder;
public abstract class AbstractUIEvent extends AbstractUICommandBase implements ClientBehaviorHolder {
public abstract ClientBehaviors getEvent();
+
public abstract void setEvent(ClientBehaviors event);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
index 1c63959dbc..fe5915aa79 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
@@ -29,5 +29,6 @@ import javax.faces.component.UIGraphic;
public abstract class AbstractUIImage extends UIGraphic implements Visual {
public abstract boolean isDisabled();
+
public abstract String getAlt();
}
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 3f0bd381c0..4c9064551b 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
@@ -70,7 +70,7 @@ public abstract class AbstractUIPage extends AbstractUIFormBase implements Clien
markSubmittedForm(context);
// invoke processDecodes() on children
- for (final Iterator<UIComponent> kids = getFacetsAndChildren(); kids.hasNext();) {
+ for (final Iterator<UIComponent> kids = getFacetsAndChildren(); kids.hasNext(); ) {
final UIComponent kid = kids.next();
kid.processDecodes(context);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRange.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRange.java
index b843391a37..aa6478b12b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRange.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRange.java
@@ -25,6 +25,8 @@ package org.apache.myfaces.tobago.internal.component;
public abstract class AbstractUIRange extends AbstractUIInput {
public abstract Integer getMin();
+
public abstract Integer getMax();
+
public abstract Integer getStep();
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
index 3c83e183e8..5e90e5f906 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
@@ -65,8 +65,10 @@ public abstract class AbstractUIScript extends UIComponentBase {
}
public abstract String getFile();
+
public abstract void setFile(String file);
public abstract String getType();
+
public abstract void setType(String type);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java
index 43f97f4d9f..242be75fc2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java
@@ -23,5 +23,6 @@ import javax.faces.component.UIOutput;
public abstract class AbstractUISelectReference extends UIOutput {
public abstract String getFor();
+
public abstract String getRenderRange();
}
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 a6049634de..608790e68a 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
@@ -191,7 +191,7 @@ 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).
+ * (undefined).
*/
public int getLastRowIndexOfCurrentPage() {
if (!hasRowCount()) {
@@ -226,7 +226,7 @@ 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).
+ * (undefined).
*/
public int getPages() {
if (isRowsUnlimited()) {
@@ -304,7 +304,7 @@ public abstract class AbstractUISheet extends AbstractUIData
*
* @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).
+ * (undefined).
*/
public int getFirstRowIndexOfLastPage() {
if (isRowsUnlimited()) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
index 36b2e99e71..7368a22027 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
@@ -103,6 +103,7 @@ public abstract class AbstractUIStyle extends UIComponentBase {
}
public abstract String getSelector();
+
public abstract void setSelector(String selector);
public abstract Measure getPaddingRight();
@@ -112,6 +113,7 @@ public abstract class AbstractUIStyle extends UIComponentBase {
public abstract Measure getMarginRight();
public abstract String getFile();
+
public abstract void setFile(String file);
public abstract Measure getPaddingBottom();
@@ -123,6 +125,7 @@ public abstract class AbstractUIStyle extends UIComponentBase {
public abstract Measure getPaddingTop();
public abstract Measure getHeight();
+
public abstract void setHeight(Measure height);
public abstract Measure getMaxWidth();
@@ -146,6 +149,7 @@ public abstract class AbstractUIStyle extends UIComponentBase {
public abstract Measure getLeft();
public abstract Measure getWidth();
+
public abstract void setWidth(Measure width);
public abstract CustomClass getCustomClass();
@@ -159,27 +163,35 @@ public abstract class AbstractUIStyle extends UIComponentBase {
public abstract Measure getMarginTop();
public abstract String getBackgroundImage();
+
public abstract void setBackgroundImage(String backgroundImage);
public abstract Number getFlexGrow();
+
public abstract void setFlexGrow(Number flexGrow);
public abstract Number getFlexShrink();
+
public abstract void setFlexShrink(Number flexShrink);
public abstract Measure getFlexBasis();
+
public abstract void setFlexBasis(Measure flexBasis);
public abstract String getGridTemplateColumns();
+
public abstract void setGridTemplateColumns(String gridTemplateColumns);
public abstract String getGridTemplateRows();
+
public abstract void setGridTemplateRows(String gridTemplateRows);
public abstract GridSpan getGridColumn();
+
public abstract void setGridColumn(GridSpan gridColumn);
public abstract GridSpan getGridRow();
+
public abstract void setGridRow(GridSpan gridRow);
}
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 c322ba64b8..feaba10d56 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
@@ -62,7 +62,6 @@ public abstract class AbstractUITabGroup extends AbstractUIPanelBase
setRenderedIndex(getSelectedIndex());
}
-
@Override
public boolean getRendersChildren() {
return true;
@@ -99,7 +98,6 @@ public abstract class AbstractUITabGroup extends AbstractUIPanelBase
return getTab(getSelectedIndex());
}
-
@Override
public void processDecodes(final FacesContext context) {
if (!(getSwitchType() == SwitchType.client)) {
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 26e544b0dc..0fb44211ee 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
@@ -45,6 +45,7 @@ public abstract class AbstractUITree extends AbstractUIData implements NamingCon
/**
* Workaround for mojarra: UIData.getClientId() returns the clientId + row index if an index is set.
+ *
* @return clientId without row index
*/
public String getBaseClientId(final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIcon.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIcon.java
index 5a2b85a90a..eef8e233ac 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIcon.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIcon.java
@@ -24,7 +24,7 @@ package org.apache.myfaces.tobago.internal.component;
*/
public abstract class AbstractUITreeIcon extends AbstractUIImage {
- public abstract String getOpen();
+ public abstract String getOpen();
- public abstract String getClosed();
+ public abstract String getClosed();
}
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 607e9dbb98..4285d2d015 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
@@ -40,6 +40,7 @@ public abstract class AbstractUITreeSelect extends UISelectBoolean implements Vi
/**
* 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/SecurityAnnotation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java
index 0726655253..d0ad341ca9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java
@@ -24,18 +24,18 @@ package org.apache.myfaces.tobago.internal.config;
*/
public enum SecurityAnnotation {
- /**
- * Hides forbidden commands.
- */
- hide,
+ /**
+ * Hides forbidden commands.
+ */
+ hide,
- /**
- * Disables forbidden commands.
- */
- disable,
+ /**
+ * Disables forbidden commands.
+ */
+ disable,
- /**
- * Tobago ignores the role annotation.
- */
- ignore
+ /**
+ * Tobago ignores the role annotation.
+ */
+ ignore
}
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 51a4a25ebe..3de39ec8f8 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
@@ -217,7 +217,7 @@ public class TobagoConfigMerger {
}
private void checkThemeIsAvailable(
- final String name, final Theme theme, final Map<String, ThemeImpl>availableThemes) {
+ final String name, final Theme theme, final Map<String, ThemeImpl> availableThemes) {
if (theme == null) {
final String error = "Theme not found! name: '" + name + "'. "
+ "Please ensure you have a tobago-config.xml with a theme-definition in your "
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
index ad8b08b255..1b9a2c8b50 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
@@ -447,7 +447,7 @@ public class TobagoConfigParser extends TobagoConfigEntityResolver {
tobagoConfig.setSanitizerProperties(properties);
if (properties.get("whitelist") != null) {
LOG.warn("<sanitizer><properties><entry key=\"whitelist\"> is deprecated:"
- + " use <sanitizer><properties><entry key=\"safelist\"> instead.");
+ + " use <sanitizer><properties><entry key=\"safelist\"> instead.");
}
}
properties = null;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
index 8c1bc7598a..9213fdfb85 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
@@ -110,7 +110,6 @@ public class TobagoConfigSorter {
}
}
-
private void createEdges() {
// collecting all relations, which are relevant for us. We don't need "before" and "after" of unknown names.
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 64053d28af..230c8e1438 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
@@ -31,7 +31,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/renderkit/CommandMap.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java
index b2816f076e..964a25960f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java
@@ -84,6 +84,7 @@ public class CommandMap {
* Merges these two maps.
* If one is null, the other one will be return. It may also return null.
* If both are not null, m1 will be filled with the data of m2.
+ *
* @param m1 map 1
* @param m2 map 2
* @return m1 or m2
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
index 73ce23af70..b2f7161f8c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
@@ -42,11 +42,11 @@ public class BadgeRenderer<T extends AbstractUIBadge> extends RendererBase<T> {
writer.startElement(HtmlElements.TOBAGO_BADGE);
writer.writeIdAttribute(component.getClientId(facesContext));
writer.writeClassAttribute(
- BootstrapClass.BADGE,
- getBadgeColor(markup),
- markup.contains(Markup.PILL) ? BootstrapClass.ROUNDED_PILL : null,
- isInside(facesContext, HtmlElements.TOBAGO_BUTTONS) ? BootstrapClass.BTN : null,
- component.getCustomClass());
+ BootstrapClass.BADGE,
+ getBadgeColor(markup),
+ markup.contains(Markup.PILL) ? BootstrapClass.ROUNDED_PILL : null,
+ isInside(facesContext, HtmlElements.TOBAGO_BUTTONS) ? BootstrapClass.BTN : null,
+ component.getCustomClass());
if (tip != null) {
writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
index f361c5df19..76fd47570e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
@@ -66,7 +66,7 @@ public abstract class DecodingInputRendererBase<T extends UIComponent> extends R
protected abstract boolean isOutputOnly(T component);
protected void setSubmittedValue(
- final FacesContext facesContext, final EditableValueHolder component, final String newValue) {
+ final FacesContext facesContext, final EditableValueHolder component, final String newValue) {
component.setSubmittedValue(newValue);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
index 5bc30e852c..9038830730 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
@@ -72,7 +72,7 @@ public class InRenderer<T extends AbstractUIIn> extends MessageLayoutRendererBas
@Override
protected void encodeBeginField(final FacesContext facesContext, final T component)
- throws IOException {
+ throws IOException {
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, component);
final String currentValue = getCurrentValue(facesContext, component);
final boolean password = component.isPassword();
@@ -143,10 +143,10 @@ public class InRenderer<T extends AbstractUIIn> extends MessageLayoutRendererBas
}
writer.writeClassAttribute(
- markup != null && markup.contains(Markup.NUMBER) ? TobagoClass.NUMBER : null,
- BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)),
- BootstrapClass.FORM_CONTROL,
- component.getCustomClass());
+ markup != null && markup.contains(Markup.NUMBER) ? TobagoClass.NUMBER : null,
+ BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)),
+ BootstrapClass.FORM_CONTROL,
+ component.getCustomClass());
writer.writeAttribute(HtmlAttributes.REQUIRED, required);
renderFocus(clientId, component.isFocus(), component.isError(), facesContext, writer);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index dee7a9db87..16f152a080 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -220,7 +220,8 @@ public abstract class LabelLayoutRendererBase<T extends UIComponent & SupportsLa
}
}
- protected void encodeLabel(final FacesContext facesContext, final T component,
+ protected void encodeLabel(
+ final FacesContext facesContext, final T component,
final TobagoResponseWriter writer, final LabelLayout labelLayout)
throws IOException {
// TBD: maybe use an interface for getLabel()
@@ -238,8 +239,8 @@ public abstract class LabelLayoutRendererBase<T extends UIComponent & SupportsLa
}
writer.writeAttribute(HtmlAttributes.FOR, getFieldId(facesContext, component), false);
writer.writeClassAttribute(
- ComponentUtils.getBooleanAttribute(component, Attributes.required) ? TobagoClass.REQUIRED : null,
- BootstrapClass.COL_FORM_LABEL);
+ ComponentUtils.getBooleanAttribute(component, Attributes.required) ? TobagoClass.REQUIRED : null,
+ BootstrapClass.COL_FORM_LABEL);
if (component instanceof SupportsAccessKey) {
final LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey((SupportsAccessKey) component);
HtmlRendererUtils.writeLabelWithAccessKey(writer, labelWithAccessKey);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
index 3274cf0244..3c7c5f84c3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
@@ -175,7 +175,7 @@ public class PageRenderer<T extends AbstractUIPage> extends RendererBase<T> {
for (final ThemeStyle themeStyle : theme.getStyleResources(productionMode)) {
if (style == null) {
style = (AbstractUIStyle) facesContext.getApplication()
- .createComponent(facesContext, Tags.style.componentType(), RendererTypes.Style.name());
+ .createComponent(facesContext, Tags.style.componentType(), RendererTypes.Style.name());
style.setTransient(true);
}
style.setFile(contextPath + themeStyle.getName());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java
index 917a3a6305..58284cf672 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java
@@ -48,7 +48,7 @@ public class RangeRenderer<T extends AbstractUIRange> extends MessageLayoutRende
@Override
protected void encodeBeginField(final FacesContext facesContext, final T component)
- throws IOException {
+ throws IOException {
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, component);
final String currentValue = getCurrentValue(facesContext, component);
final String clientId = component.getClientId(facesContext);
@@ -91,10 +91,10 @@ public class RangeRenderer<T extends AbstractUIRange> extends MessageLayoutRende
final CssItem rendererCssClass = getRendererCssClass();
writer.writeClassAttribute(
- rendererCssClass,
- BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)),
- BootstrapClass.FORM_RANGE,
- component.getCustomClass());
+ rendererCssClass,
+ BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)),
+ BootstrapClass.FORM_RANGE,
+ component.getCustomClass());
renderFocus(clientId, component.isFocus(), component.isError(), facesContext, writer);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
index 49d66523f7..65c54b1543 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
@@ -100,8 +100,8 @@ public abstract class SelectBooleanRendererBase<T extends AbstractUISelectBoolea
writer.startElement(HtmlElements.INPUT);
writer.writeClassAttribute(
- BootstrapClass.FORM_CHECK_INPUT,
- BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)));
+ BootstrapClass.FORM_CHECK_INPUT,
+ BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)));
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
writer.writeAttribute(HtmlAttributes.VALUE, "true", false);
writer.writeNameAttribute(clientId);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
index 752aeae865..2ab6faf352 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
@@ -83,8 +83,8 @@ public class SelectManyCheckboxRenderer<T extends AbstractUISelectManyCheckbox>
isInsideCommand ? BootstrapClass.DROPDOWN_ITEM : null);
writer.startElement(HtmlElements.INPUT);
writer.writeClassAttribute(
- BootstrapClass.FORM_CHECK_INPUT,
- BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)));
+ BootstrapClass.FORM_CHECK_INPUT,
+ BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)));
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
final String formattedValue = getFormattedValue(facesContext, component, item.getValue());
final boolean checked;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
index c165c72332..27660e39ea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
@@ -125,8 +125,9 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
static final String COLLECTION_TYPE_KEY = "collectionType";
static final String VALUE_TYPE_KEY = "valueType";
- static Object getConvertedUISelectManyValue(final FacesContext facesContext, final UISelectMany component,
- final String[] submittedValue) throws ConverterException {
+ static Object getConvertedUISelectManyValue(
+ final FacesContext facesContext, final UISelectMany component,
+ final String[] submittedValue) throws ConverterException {
return getConvertedUISelectManyValue(facesContext, component,
submittedValue, false);
}
@@ -135,11 +136,10 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
* Gets the converted value of a UISelectMany component.
* If the considerValueType is true, this method will also consider the
* valueType attribute of Tomahawk UISelectMany components.
- *
- * @throws ConverterException
*/
- static Object getConvertedUISelectManyValue(final FacesContext facesContext, final UISelectMany component,
- final String[] submittedValue, final boolean considerValueType)
+ static Object getConvertedUISelectManyValue(
+ final FacesContext facesContext, final UISelectMany component,
+ final String[] submittedValue, final boolean considerValueType)
throws ConverterException {
// Attention!
// This code is duplicated in shared renderkit package (except for considerValueType).
@@ -324,8 +324,9 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
* @throws FacesException if the value is a String and the represented
* class cannot be found
*/
- static Class<?> getClassFromAttribute(final FacesContext facesContext,
- final Object attribute) throws FacesException {
+ static Class<?> getClassFromAttribute(
+ final FacesContext facesContext,
+ final Object attribute) throws FacesException {
// Attention!
// This code is duplicated in shared renderkit package.
// If you change something here please do the same in the other class!
@@ -356,10 +357,6 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
/**
* Uses the valueType attribute of the given UISelectMany component to
* get a by-type converter.
- *
- * @param facesContext
- * @param component
- * @return
*/
static Converter getValueTypeConverter(final FacesContext facesContext, final UISelectMany component) {
Converter converter = null;
@@ -397,8 +394,6 @@ public abstract class SelectManyRendererBase<T extends AbstractUISelectManyBase>
* Iterates through the SelectItems with the given Iterator and tries to obtain
* a by-class-converter based on the Class of SelectItem.getValue().
*
- * @param iterator
- * @param facesContext
* @return The first suitable Converter for the given SelectItems or null.
*/
static Converter getSelectItemsValueConverter(final Iterator<SelectItem> iterator, final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
index 648aa46ff4..4dee4d00cd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
@@ -133,8 +133,8 @@ public class SelectOneRadioRenderer<T extends AbstractUISelectOneRadio> extends
isInsideCommand ? BootstrapClass.DROPDOWN_ITEM : null);
writer.startElement(HtmlElements.INPUT);
writer.writeClassAttribute(
- BootstrapClass.FORM_CHECK_INPUT,
- BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)));
+ BootstrapClass.FORM_CHECK_INPUT,
+ BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)));
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.RADIO);
final String formattedValue = getFormattedValue(facesContext, component, item.getValue());
final boolean checked;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
index fa12991a64..6004a8ab39 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
@@ -167,7 +167,6 @@ public class SheetRenderer<T extends AbstractUISheet> extends RendererBase<T> {
}
}
-
private void decodeSheetAction(final FacesContext facesContext, final AbstractUISheet component) {
final String sourceId = facesContext.getExternalContext().getRequestParameterMap().get("javax.faces.source");
@@ -658,7 +657,7 @@ public class SheetRenderer<T extends AbstractUISheet> extends RendererBase<T> {
}
}
// the row client id depends from the existence of an UIRow component! TBD: is this good?
- writer.writeIdAttribute(row != null ? row.getClientId(facesContext): sheet.getRowClientId());
+ writer.writeIdAttribute(row != null ? row.getClientId(facesContext) : sheet.getRowClientId());
writer.writeClassAttribute(
selected ? TobagoClass.SELECTED : null,
selected ? BootstrapClass.TABLE_INFO : null,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
index 144f888eda..083460156b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
@@ -270,7 +270,7 @@ public class StyleRenderer<T extends AbstractUIStyle> extends RendererBase<T> {
writer.writeText(";");
}
-// XXX remove me
+ // XXX remove me
private void encodeStyle(final TobagoResponseWriter writer, final String name, final String value)
throws IOException {
writer.writeText(name);
@@ -279,7 +279,7 @@ public class StyleRenderer<T extends AbstractUIStyle> extends RendererBase<T> {
writer.writeText(";");
}
-// XXX remove me
+ // XXX remove me
private void encodeStyle(final TobagoResponseWriter writer, final String name, final Integer value)
throws IOException {
if (value != null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
index 12f3ef927f..b187a4c6ec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
@@ -67,7 +67,7 @@ import java.util.Map;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase<T>
- implements ComponentSystemEventListener {
+ implements ComponentSystemEventListener {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -92,14 +92,14 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
case reloadTab:
final AjaxBehavior ajaxBehavior = new AjaxBehavior();
final Collection<String> ids = Collections.singleton(
- UINamingContainer.getSeparatorChar(facesContext) + tabGroup.getClientId(facesContext));
+ UINamingContainer.getSeparatorChar(facesContext) + tabGroup.getClientId(facesContext));
ajaxBehavior.setExecute(ids);
ajaxBehavior.setRender(ids);
tab.addClientBehavior(click.name(), ajaxBehavior);
break;
case reloadPage:
final AbstractUIEvent component = (AbstractUIEvent) ComponentUtils.createComponent(
- facesContext, Tags.event.componentType(), RendererTypes.Event, "_click");
+ facesContext, Tags.event.componentType(), RendererTypes.Event, "_click");
component.setEvent(click);
tab.getChildren().add(component);
final EventBehavior eventBehavior = new EventBehavior();
@@ -145,10 +145,10 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
writer.startElement(HtmlElements.TOBAGO_TAB_GROUP);
writer.writeIdAttribute(clientId);
writer.writeClassAttribute(
- BootstrapClass.CARD,
- autoSpacing ? TobagoClass.AUTO__SPACING : null,
- uiComponent.getCustomClass(),
- markup != null && markup.contains(Markup.SPREAD) ? TobagoClass.SPREAD : null);
+ BootstrapClass.CARD,
+ autoSpacing ? TobagoClass.AUTO__SPACING : null,
+ uiComponent.getCustomClass(),
+ markup != null && markup.contains(Markup.SPREAD) ? TobagoClass.SPREAD : null);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, uiComponent);
writer.writeAttribute(CustomAttributes.SWITCH_TYPE, switchType.name(), false);
@@ -207,9 +207,9 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
}
private void encodeHeader(
- final FacesContext facesContext, final TobagoResponseWriter writer, final AbstractUITabGroup tabGroup,
- final int selectedIndex, final SwitchType switchType)
- throws IOException {
+ final FacesContext facesContext, final TobagoResponseWriter writer, final AbstractUITabGroup tabGroup,
+ final int selectedIndex, final SwitchType switchType)
+ throws IOException {
final String tabGroupClientId = tabGroup.getClientId(facesContext);
@@ -217,9 +217,9 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
writer.writeClassAttribute(BootstrapClass.CARD_HEADER);
writer.startElement(HtmlElements.UL);
writer.writeClassAttribute(
- BootstrapClass.NAV,
- BootstrapClass.NAV_TABS,
- BootstrapClass.CARD_HEADER_TABS);
+ BootstrapClass.NAV,
+ BootstrapClass.NAV_TABS,
+ BootstrapClass.CARD_HEADER_TABS);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.TABLIST.toString(), false);
int index = 0;
@@ -235,7 +235,7 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
Markup markup = tab.getMarkup() != null ? tab.getMarkup() : Markup.NULL;
final FacesMessage.Severity maxSeverity
- = ComponentUtils.getMaximumSeverityOfChildrenMessages(facesContext, tab);
+ = ComponentUtils.getMaximumSeverityOfChildrenMessages(facesContext, tab);
if (maxSeverity != null) {
markup = markup.add(ComponentUtils.markupOfSeverity(maxSeverity));
}
@@ -243,9 +243,9 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
writer.startElement(HtmlElements.TOBAGO_TAB);
writer.writeIdAttribute(tabId);
writer.writeClassAttribute(
- BootstrapClass.NAV_ITEM,
- barFacet != null ? TobagoClass.BAR : null,
- tab.getCustomClass());
+ BootstrapClass.NAV_ITEM,
+ barFacet != null ? TobagoClass.BAR : null,
+ tab.getCustomClass());
writer.writeAttribute(HtmlAttributes.FOR, tabGroupClientId, true);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.PRESENTATION.toString(), false);
writer.writeAttribute(CustomAttributes.INDEX, index);
@@ -267,7 +267,7 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
}
if (!disabled && switchType == SwitchType.client) {
writer.writeAttribute(
- DataAttributes.TARGET, '#' + getTabPanelId(facesContext, tab).replaceAll(":", "\\\\:"), false);
+ DataAttributes.TARGET, '#' + getTabPanelId(facesContext, tab).replaceAll(":", "\\\\:"), false);
}
if (!disabled && label.getAccessKey() != null) {
@@ -321,8 +321,8 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
}
protected void encodeContent(
- final FacesContext facesContext, final TobagoResponseWriter writer, final AbstractUITabGroup tabGroup,
- final int selectedIndex, final SwitchType switchType) throws IOException {
+ final FacesContext facesContext, final TobagoResponseWriter writer, final AbstractUITabGroup tabGroup,
+ final int selectedIndex, final SwitchType switchType) throws IOException {
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.CARD_BODY, BootstrapClass.TAB_CONTENT);
int index = 0;
@@ -334,9 +334,9 @@ public class TabGroupRenderer<T extends AbstractUITabGroup> extends RendererBase
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(
- BootstrapClass.TAB_PANE,
- index == selectedIndex ? BootstrapClass.ACTIVE : null,
- tab.getCustomClass());
+ BootstrapClass.TAB_PANE,
+ index == selectedIndex ? BootstrapClass.ACTIVE : null,
+ tab.getCustomClass());
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.TABPANEL.toString(), false);
writer.writeIdAttribute(getTabPanelId(facesContext, tab));
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
index f6bb4600f3..d2477683c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
@@ -144,7 +144,8 @@ public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehav
}
@Override
- public void decode(final FacesContext facesContext, final UIComponent component,
+ public void decode(
+ final FacesContext facesContext, final UIComponent component,
final ClientBehavior clientBehavior) {
if (clientBehavior instanceof AjaxBehavior) {
AjaxBehavior ajaxBehavior = (AjaxBehavior) clientBehavior;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
index edf0d623c1..ca898f15d7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
@@ -51,6 +51,7 @@ public interface AttributeTagDeclaration {
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
void setValue(ValueExpression value);
+
/**
* Allowed values are "action", "actionListener", "actionFromValue", "isNotSet", "isSet", "valueIfSet".
* <br>
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 63999133aa..74e6250229 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
@@ -50,8 +50,8 @@ import javax.faces.component.UIColumn;
"javax.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
- @Facet(name = Facets.BAR,
- description = "Contains some code to be placed in the header at the bar position.")
+ @Facet(name = Facets.BAR,
+ description = "Contains some code to be placed in the header at the bar position.")
}
)
public interface ColumnTagDeclaration
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 3858a7b0f1..fd6f2c4c84 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
@@ -67,14 +67,14 @@ import javax.faces.component.UIInput;
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.DATE,
allowedChildComponenents = "NONE",
- facets = {
- @Facet(name = Facets.BEFORE,
- description =
- "This facet can contain a part for input groups."),
- @Facet(name = Facets.AFTER,
- description =
- "This facet can contain a part for input groups.")
- },
+ facets = {
+ @Facet(name = Facets.BEFORE,
+ description =
+ "This facet can contain a part for input groups."),
+ @Facet(name = Facets.AFTER,
+ description =
+ "This facet can contain a part for input groups.")
+ },
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
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 a06b8227f3..5168a8b2ca 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
@@ -92,7 +92,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/FooterTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
index a259653b5b..c5c1efe563 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
@@ -31,6 +31,7 @@ import javax.faces.component.UIPanel;
/**
* Defines a footer of its parent (like page, box, ...)
+ *
* @since 3.0.0
*/
@Tag(name = "footer")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
index 860454687a..96898a454b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
@@ -31,6 +31,7 @@ import javax.faces.component.UIPanel;
/**
* Defines a header of its parent (like page, box, ...)
+ *
* @since 3.0.0
*/
@Tag(name = "header")
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 e623c6910e..53bd2fde73 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
@@ -87,11 +87,11 @@ import javax.faces.component.UIInput;
@Behavior(
name = ClientBehaviors.FOCUS),
@Behavior(
- name = ClientBehaviors.KEYDOWN),
+ name = ClientBehaviors.KEYDOWN),
@Behavior(
- name = ClientBehaviors.KEYPRESS),
+ name = ClientBehaviors.KEYPRESS),
@Behavior(
- name = ClientBehaviors.KEYUP),
+ name = ClientBehaviors.KEYUP),
@Behavior(
name = ClientBehaviors.BLUR)
})
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
index 59c7b38984..af3754fe6e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
@@ -81,6 +81,6 @@ import javax.faces.component.UICommand;
})
public interface LinkTagDeclaration
extends HasIdBindingAndRendered, HasAction, HasActionListener, IsImmediateCommand, HasConfirmation,
- HasLink, HasOutcome, HasFragment, IsTransition, HasTarget, IsDisabledBySecurity,
- IsOmit, HasImage, HasTabIndex, IsVisual, HasLabel, HasAccessKey, HasTip, HasAutoSpacing {
+ HasLink, HasOutcome, HasFragment, IsTransition, HasTarget, IsDisabledBySecurity,
+ IsOmit, HasImage, HasTabIndex, IsVisual, HasLabel, HasAccessKey, HasTip, HasAutoSpacing {
}
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 a50795e0fd..db85477b5e 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
@@ -71,7 +71,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
@@ -79,24 +79,24 @@ 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.
+ * 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
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 99a4583c6b..1591a29f2f 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
@@ -80,6 +80,7 @@ public interface OutTagDeclaration
* (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).
+ *
* @deprecated after 4.0.0 release. Use attribute 'plain' instead ({@link IsPlain#setPlain(String)}).
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java
index 9dddd289da..e78c3c9717 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java
@@ -78,25 +78,25 @@ public interface RangeTagDeclaration
HasAccessKey, HasValidator, HasValue, HasValueChangeListener, HasTabIndex, IsFocus, IsVisual,
HasValidatorMessage, HasConverterMessage, HasLabel, HasLabelLayout, HasAutoSpacing {
- /**
- * Sets the minimum value of the range.
- */
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "0")
- void setMin(String min);
+ /**
+ * Sets the minimum value of the range.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "0")
+ void setMin(String min);
- /**
- * Sets the maximum value of the range.
- */
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "100")
- void setMax(String max);
+ /**
+ * Sets the maximum value of the range.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "100")
+ void setMax(String max);
- /**
- * Sets the step size of the range.
- */
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "1")
- void setStep(String step);
+ /**
+ * Sets the step size of the range.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "1")
+ void setStep(String step);
}
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 0e3230a8fa..bc96c263b7 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
@@ -44,7 +44,6 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
allowedChildComponenents = "NONE")
public interface ReloadTagDeclaration extends HasIdBindingAndRendered {
-
/**
* Time in milliseconds after which the parent component is automatically reloaded.
*/
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 5b338ecd0e..bdaff70d6f 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
@@ -43,6 +43,7 @@ public interface ScriptTagDeclaration extends HasIdBindingAndRendered {
* File name to include into the rendered page. The name must be full qualified, or relative.
* If using a complete path from root, you'll need to add the contextPath from the web application.
* This can be done with the EL #{request.contextPath}.
+ *
* @param file A Script file.
*/
@TagAttribute()
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java
index 7a20c89c21..ab83b9c2e2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java
@@ -35,6 +35,7 @@ import org.apache.myfaces.tobago.layout.SegmentJustify;
* Find more information on how the grid works in the Twitter Bootstrap documentation.
*
* If no attribute is defined, extraSmall="12seg" will be used as default.
+ *
* @since 3.0.0
*/
@Tag(name = "segmentLayout")
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 b160aa504f..8820112f7c 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
@@ -45,6 +45,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, IsVisual, H
/**
* Description of an item, might be rendered as a tool tip.
+ *
* @deprecated since 2.0.0, please use itemTip.
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
index 5687956151..5eeeb672c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
@@ -103,7 +103,6 @@ public interface SelectManyShuttleTagDeclaration extends
@UIComponentTagAttribute()
void setUnselectedLabel(String label);
-
/**
* A localized user presentable label for the right select box.
*/
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 68235acc88..bde49f5367 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
@@ -63,7 +63,7 @@ import javax.faces.component.UISelectOne;
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
- },
+ },
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
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 a8cc13f288..5a018d9f3f 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
@@ -65,7 +65,7 @@ import javax.faces.component.UISelectOne;
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
- },
+ },
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
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 162615b62c..4165e5c9e6 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
@@ -66,7 +66,7 @@ import javax.faces.component.UISelectOne;
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
- },
+ },
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
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 321b3ef4ac..944df27978 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
@@ -272,6 +272,7 @@ public interface SheetTagDeclaration
/**
* Flag indicating if paging arrows are shown near direct links
+ *
* @since 2.0.0
*/
@TagAttribute
@@ -280,6 +281,7 @@ public interface SheetTagDeclaration
/**
* Flag indicating if paging arrows are shown near page range
+ *
* @since 2.0.0
*/
@TagAttribute
@@ -288,6 +290,7 @@ public interface SheetTagDeclaration
/**
* The maximum count of multi-sorted columns to indicate.
+ *
* @since 5.3.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 031e8cb262..1d5c260744 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
@@ -54,7 +54,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
)
})
public interface SplitLayoutTagDeclaration
- extends HasId, HasSpacing, HasBinding, IsVisual {
+ extends HasId, HasSpacing, HasBinding, IsVisual {
/**
* This value defines the layout constraints for column layout.
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 298bd081d8..4256761b3f 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
@@ -316,7 +316,8 @@ public interface StyleTagDeclaration extends HasIdBindingAndRendered {
* @since 4.0.0
*/
@TagAttribute
- @UIComponentTagAttribute//(type = "org.apache.myfaces.tobago.layout.TBD")
+ @UIComponentTagAttribute
+//(type = "org.apache.myfaces.tobago.layout.TBD")
void setGridTemplateColumns(String gridTemplateColumns);
/**
@@ -325,7 +326,8 @@ public interface StyleTagDeclaration extends HasIdBindingAndRendered {
* @since 4.0.0
*/
@TagAttribute
- @UIComponentTagAttribute//(type = "org.apache.myfaces.tobago.layout.TBD")
+ @UIComponentTagAttribute
+//(type = "org.apache.myfaces.tobago.layout.TBD")
void setGridTemplateRows(String gridTemplateRows);
/**
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 fab28e29e0..ea98d08d47 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
@@ -88,6 +88,7 @@ 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
@@ -98,10 +99,8 @@ public interface TabGroupTagDeclaration
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")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
index d75bbaf53b..967818847f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
@@ -75,11 +75,11 @@ import javax.faces.component.UIInput;
@Behavior(
name = ClientBehaviors.FOCUS),
@Behavior(
- name = ClientBehaviors.KEYDOWN),
+ name = ClientBehaviors.KEYDOWN),
@Behavior(
- name = ClientBehaviors.KEYPRESS),
+ name = ClientBehaviors.KEYPRESS),
@Behavior(
- name = ClientBehaviors.KEYUP),
+ name = ClientBehaviors.KEYUP),
@Behavior(
name = ClientBehaviors.BLUR)
},
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 ba65fde3d6..91b7d3a940 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
@@ -53,7 +53,7 @@ import javax.faces.component.UIData;
},
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode"
- })
+ })
public interface TreeTagDeclaration
extends HasIdBindingAndRendered, HasValue, HasVar, IsVisual,
IsShowRoot, IsShowRootJunction {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCollapsedMode.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCollapsedMode.java
index 66495f1025..dd1487ef27 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCollapsedMode.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasCollapsedMode.java
@@ -30,8 +30,8 @@ public interface HasCollapsedMode {
*/
@TagAttribute
@UIComponentTagAttribute(
- type = "org.apache.myfaces.tobago.model.CollapseMode",
- defaultValue = CollapseMode.NONE,
- defaultCode = "org.apache.myfaces.tobago.model.CollapseMode.none")
+ type = "org.apache.myfaces.tobago.model.CollapseMode",
+ defaultValue = CollapseMode.NONE,
+ defaultCode = "org.apache.myfaces.tobago.model.CollapseMode.none")
void setCollapsedMode(String collapsed);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverterMessage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverterMessage.java
index 1344a217d2..489b9aa19d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverterMessage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverterMessage.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-
public interface HasConverterMessage {
/**
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 41e03de992..bff915a576 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
@@ -28,6 +28,7 @@ public interface HasPlaceholder {
* <p>
* Displays a short text in the input field, that describes the meaning of this field.
* </p>
+ *
* @param placeholder The text to display
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessage.java
index dd7992b151..b843dada34 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessage.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-
public interface HasRequiredMessage {
/**
* An expression that specifies the required message
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessageForSelect.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessageForSelect.java
index 933857ab07..67dcd5d6c0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessageForSelect.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessageForSelect.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-
public interface HasRequiredMessageForSelect {
/**
* An expression that specifies the required message
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 0ebea59e58..1f0c9fb88e 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
@@ -33,6 +33,6 @@ public interface HasValidator {
@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/util/AuthorizationHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
index aebe032c09..90240cfd3b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
@@ -75,7 +75,7 @@ public class AuthorizationHelper {
public static AuthorizationHelper getInstance(final FacesContext facesContext) {
final ELContext elContext = facesContext.getELContext();
return (AuthorizationHelper)
- elContext.getELResolver().getValue(elContext, null, AUTHORIZATION_HELPER);
+ elContext.getELResolver().getValue(elContext, null, AUTHORIZATION_HELPER);
}
public boolean isAuthorized(final FacesContext facesContext, final UIComponent component, final String expression) {
@@ -114,7 +114,7 @@ public class AuthorizationHelper {
}
private Annotation getSecurityAnnotation(
- final FacesContext facesContext, final UIComponent component, final String expressionFull) {
+ final FacesContext facesContext, final UIComponent component, final String expressionFull) {
final String expression = skipParameterPart(expressionFull);
@@ -144,7 +144,7 @@ public class AuthorizationHelper {
break;
default:
LOG.warn("Method name ambiguous '" + methodString + "' in class " + bean.getClass()
- + ". Found " + methods.size() + " but only 1 is supported, yet.");
+ + ". Found " + methods.size() + " but only 1 is supported, yet.");
}
// if not set, try from class
if (securityAnnotation == null) {
@@ -168,8 +168,8 @@ public class AuthorizationHelper {
if (compositeComponent != null) {
final int attrNameStart = expression.indexOf(CC_ATTRS) + CC_ATTRS.length();
final int attrNameEnd = expression.substring(attrNameStart).contains(".")
- ? attrNameStart + expression.substring(attrNameStart).indexOf(".")
- : attrNameStart + expression.substring(attrNameStart).indexOf("}");
+ ? attrNameStart + expression.substring(attrNameStart).indexOf(".")
+ : attrNameStart + expression.substring(attrNameStart).indexOf("}");
final String attrName = expression.substring(attrNameStart, attrNameEnd);
ValueExpression valueExpression = compositeComponent.getValueExpression(attrName);
@@ -180,13 +180,13 @@ public class AuthorizationHelper {
final String trimmedCcExpression = ccExpression.substring(bracketStart + 1, bracketEnd).trim();
return getSecurityAnnotation(facesContext, component,
- expression.replace(CC_ATTRS + attrName, trimmedCcExpression));
+ expression.replace(CC_ATTRS + attrName, trimmedCcExpression));
}
MethodExpression methodExpression = (MethodExpression) compositeComponent.getAttributes().get(attrName);
if (methodExpression != null) {
return getSecurityAnnotation(facesContext, component,
- methodExpression.getExpressionString().replaceAll(" ", ""));
+ methodExpression.getExpressionString().replaceAll(" ", ""));
}
return securityAnnotation;
@@ -223,7 +223,7 @@ public class AuthorizationHelper {
try {
BeanManager beanManager = (BeanManager) FacesContext.getCurrentInstance().getExternalContext().getApplicationMap()
- .get(BeanManager.class.getName());
+ .get(BeanManager.class.getName());
if (beanManager != null) {
for (final Bean<?> entry : beanManager.getBeans(beanName)) {
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 0ffeaeb834..7882cb7d8d 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
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
-
public final class Deprecation {
// to prevent instantiation
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
index df4acb9522..73cc190a50 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
@@ -110,7 +110,8 @@ public final class HtmlRendererUtils {
* @deprecated since 5.0.0. Please use {@link RendererBase#renderSelectItems}
*/
@Deprecated
- public static void renderSelectItems(final UIInput component, final TobagoClass optionClass,
+ public static void renderSelectItems(
+ final UIInput component, final TobagoClass optionClass,
final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
final TobagoResponseWriter writer, final FacesContext facesContext) throws IOException {
renderSelectItems(component, optionClass, items, values, submittedValues, null, writer, facesContext);
@@ -120,7 +121,8 @@ public final class HtmlRendererUtils {
* @deprecated since 5.0.0. Please use {@link RendererBase#renderSelectItems}
*/
@Deprecated
- public static void renderSelectItems(final UIInput component, final TobagoClass optionClass,
+ public static void renderSelectItems(
+ final UIInput component, final TobagoClass optionClass,
final Iterable<SelectItem> items, final Object value, final String submittedValue,
final TobagoResponseWriter writer, final FacesContext facesContext) throws IOException {
renderSelectItems(component, optionClass, items, value != null ? new Object[]{value} : null,
@@ -131,14 +133,16 @@ public final class HtmlRendererUtils {
* @deprecated since 5.0.0. Please use {@link RendererBase#renderSelectItems}
*/
@Deprecated
- public static void renderSelectItems(final UIInput component, final TobagoClass optionClass,
+ public static void renderSelectItems(
+ final UIInput component, final TobagoClass optionClass,
final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
final Boolean onlySelected, final TobagoResponseWriter writer, final FacesContext facesContext)
throws IOException {
new RendererBase<UIComponent>() {
- public void fake(final UIInput component, final TobagoClass optionClass,
- final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
- final Boolean onlySelected, final TobagoResponseWriter writer, final FacesContext facesContext)
+ public void fake(
+ final UIInput component, final TobagoClass optionClass,
+ final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
+ final Boolean onlySelected, final TobagoResponseWriter writer, final FacesContext facesContext)
throws IOException {
renderSelectItems(component, optionClass, items, values, submittedValues, onlySelected, writer, facesContext);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java
index 89d73a32cb..002f79c3e0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java
@@ -70,7 +70,8 @@ public final class HtmlWriterHelper extends WriterHelper {
}
@Override
- protected void writeEncodedValue(final char[] text, final int start,
+ protected void writeEncodedValue(
+ final char[] text, final int start,
final int length, final boolean isAttribute) throws IOException {
int localIndex = -1;
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 f081868f5d..48ba7a021d 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
@@ -40,7 +40,6 @@ public final class PartUtils {
* If you have at least Servlet 3.1, you wouldn't need this function.
*
* @since Tobago 3.0.0
- *
* @deprecated since 5.0.0. Servlet 3.1 or higher is required.
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
index 261fc5a2a2..752cc29ff6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
@@ -298,7 +298,8 @@ public final class RenderUtils {
* @deprecated since 5.0.0
*/
@Deprecated
- public static CommandMap getBehaviorCommands(final FacesContext facesContext,
+ public static CommandMap getBehaviorCommands(
+ final FacesContext facesContext,
final ClientBehaviorHolder clientBehaviorHolder) {
CommandMap commandMap = null;
@@ -353,14 +354,16 @@ public final class RenderUtils {
* @deprecated since 5.0.0
*/
@Deprecated
- private static ClientBehaviorContext getClientBehaviorContext(final FacesContext facesContext,
+ private static ClientBehaviorContext getClientBehaviorContext(
+ final FacesContext facesContext,
final ClientBehaviorHolder clientBehaviorHolder, final String eventName) {
UIComponent component = (UIComponent) clientBehaviorHolder;
return ClientBehaviorContext.createClientBehaviorContext(facesContext, component, eventName,
component.getClientId(facesContext), null);
}
- public static AbstractUIEvent getAbstractUIEvent(final UIComponent parent,
+ public static AbstractUIEvent getAbstractUIEvent(
+ final UIComponent parent,
final EventBehavior eventBehavior) {
return (AbstractUIEvent) parent.getChildren().stream()
.filter(child -> child instanceof AbstractUIEvent)
@@ -372,7 +375,8 @@ public final class RenderUtils {
* @deprecated since 5.0.0
*/
@Deprecated
- private static CommandMap getCommandMap(final FacesContext facesContext,
+ private static CommandMap getCommandMap(
+ final FacesContext facesContext,
final ClientBehaviorContext clientBehaviorContext, final ClientBehavior clientBehavior) {
if (clientBehavior instanceof ClientBehaviorBase) {
String type = ((ClientBehaviorBase) clientBehavior).getRendererType();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java
index 642bada575..8ada394c57 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java
@@ -104,9 +104,9 @@ public class SortingUtils {
if (expression != null) {
final String var = sheet.getVar();
if (var == null) {
- LOG.error("No sorting performed. Property var of sheet is not set!");
- addNotSortableMessage(facesContext, column);
- return false;
+ LOG.error("No sorting performed. Property var of sheet is not set!");
+ addNotSortableMessage(facesContext, column);
+ return false;
}
actualComparator = new ValueExpressionComparator(facesContext, var, expression, !ascending, comparator);
} else {
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 5e1baf8b12..ab057ea8f4 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
@@ -416,7 +416,7 @@ public final class StringUtils {
* StringUtils.containsAny("aba","z") = false
* </pre>
*
- * @param str the String to check, may be null
+ * @param str the String to check, may be null
* @param searchChars the chars to search for, may be null
* @return the <code>true</code> if any of the chars are found, <code>false</code> if no match or null input
*
@@ -463,7 +463,7 @@ public final class StringUtils {
*
* @param ch the character to test.
* @return {@code true} if {@code ch} is a high-surrogate code unit;
- * {@code false} otherwise.
+ * {@code false} otherwise.
*/
private static boolean isHighSurrogate(final char ch) {
return '\uD800' <= ch && '\uDBFF' >= ch;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java
index 85fc4896c0..9daf33819d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java
@@ -163,8 +163,9 @@ public abstract class WriterHelper {
writeEncodedValue(text, start, length, false);
}
- protected abstract void writeEncodedValue(char[] text, int start,
- int length, boolean isAttribute)
+ protected abstract void writeEncodedValue(
+ char[] text, int start,
+ int length, boolean isAttribute)
throws IOException;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpanEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpanEditor.java
index bc569c6b9f..285235e1d7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpanEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/GridSpanEditor.java
@@ -26,9 +26,9 @@ import java.beans.PropertyEditorSupport;
*/
public class GridSpanEditor extends PropertyEditorSupport {
- @Override
- public void setAsText(final String text) throws IllegalArgumentException {
- setValue(GridSpan.valueOf(text));
- }
+ @Override
+ public void setAsText(final String text) throws IllegalArgumentException {
+ setValue(GridSpan.valueOf(text));
+ }
}
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 d3279b7105..f5682578a1 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/model/AutoSuggestExtensionItem.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestExtensionItem.java
index 3b22356615..5fd94aabe6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestExtensionItem.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestExtensionItem.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.model;
-
public class AutoSuggestExtensionItem {
private String id;
private String value;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestItems.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestItems.java
index de735571c8..35e4960c2d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestItems.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/AutoSuggestItems.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.model;
-
import java.util.List;
public class AutoSuggestItems {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ExpandedState.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ExpandedState.java
index a67f703fe0..32d0ee0ec1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ExpandedState.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ExpandedState.java
@@ -87,7 +87,7 @@ public class ExpandedState implements Serializable {
/**
* Expands a single node.
*
- * @param node The node to expand.
+ * @param node The node to expand.
* @param parents Should the parents also be expanded?
*/
public void expand(final TreeNode node, final boolean parents) {
@@ -107,7 +107,7 @@ public class ExpandedState implements Serializable {
/**
* Expands a single node.
*
- * @param path The path of the node to expand.
+ * @param path The path of the node to expand.
* @param parents Should the parents also be expanded?
*/
public void expand(final TreePath path, final boolean parents) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
index 2a3cf0cfcf..dbed5801c3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
@@ -130,7 +130,6 @@ public class SheetState implements Serializable, ScrollPositionState {
}
/**
- * @param ascending
* @deprecated since 5.3.0, please use {@link #updateSortState(String id)}
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
index d15f00a092..5711aa8fb2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
@@ -380,20 +380,23 @@ public abstract class RendererBase<T extends UIComponent> extends Renderer {
}
}
- protected void renderSelectItems(final UIInput component, final TobagoClass optionClass,
+ protected void renderSelectItems(
+ final UIInput component, final TobagoClass optionClass,
final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
final TobagoResponseWriter writer, final FacesContext facesContext) throws IOException {
renderSelectItems(component, optionClass, items, values, submittedValues, null, writer, facesContext);
}
- protected void renderSelectItems(final UIInput component, final TobagoClass optionClass,
+ protected void renderSelectItems(
+ final UIInput component, final TobagoClass optionClass,
final Iterable<SelectItem> items, final Object value, final String submittedValue,
final TobagoResponseWriter writer, final FacesContext facesContext) throws IOException {
renderSelectItems(component, optionClass, items, value != null ? new Object[]{value} : null,
submittedValue != null ? new String[]{submittedValue} : null, null, writer, facesContext);
}
- protected void renderSelectItems(final UIInput component, final TobagoClass optionClass,
+ protected void renderSelectItems(
+ final UIInput component, final TobagoClass optionClass,
final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
final Boolean onlySelected, final TobagoResponseWriter writer, final FacesContext facesContext)
throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
index 6c6d1b1bbb..538a92ae08 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
@@ -669,8 +669,9 @@ public enum BootstrapClass implements CssItem {
return getSeverityCssItem(severity, BTN_INFO, BTN_WARNING, BTN_DANGER);
}
- private static CssItem getSeverityCssItem(FacesMessage.Severity severity,
- BootstrapClass info, BootstrapClass warning, BootstrapClass error) {
+ private static CssItem getSeverityCssItem(
+ FacesMessage.Severity severity,
+ BootstrapClass info, BootstrapClass warning, BootstrapClass error) {
if (severity.equals(FacesMessage.SEVERITY_INFO)) {
return info;
} else if (severity.equals(FacesMessage.SEVERITY_WARN)) {
@@ -805,8 +806,8 @@ public enum BootstrapClass implements CssItem {
OFFSET_XL_6, OFFSET_XL_7, OFFSET_XL_8, OFFSET_XL_9, OFFSET_XL_10, OFFSET_XL_11
};
private static final BootstrapClass[] OFFSET_EXTRA_EXTRA_LARGE = new BootstrapClass[]{
- OFFSET_XXL_0, OFFSET_XXL_1, OFFSET_XXL_2, OFFSET_XXL_3, OFFSET_XXL_4, OFFSET_XXL_5,
- OFFSET_XXL_6, OFFSET_XXL_7, OFFSET_XXL_8, OFFSET_XXL_9, OFFSET_XXL_10, OFFSET_XXL_11
+ OFFSET_XXL_0, OFFSET_XXL_1, OFFSET_XXL_2, OFFSET_XXL_3, OFFSET_XXL_4, OFFSET_XXL_5,
+ OFFSET_XXL_6, OFFSET_XXL_7, OFFSET_XXL_8, OFFSET_XXL_9, OFFSET_XXL_10, OFFSET_XXL_11
};
private final MeasureList extraSmall;
@@ -903,8 +904,9 @@ public enum BootstrapClass implements CssItem {
return measure;
}
- private void generate(final List<BootstrapClass> result, final MarginTokens margins,
- final Map<String, Object> attributes, final Attributes attribute) {
+ private void generate(
+ final List<BootstrapClass> result, final MarginTokens margins,
+ final Map<String, Object> attributes, final Attributes attribute) {
final Object overwrite = attributes.get(attribute.name());
if (overwrite != null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
index fcbaed291f..eb6b9fae51 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
@@ -47,10 +47,10 @@ class CssClassUtils {
private static boolean containsClassName(final String content, final String className) {
return content.contains("." + className + " ")
- || content.contains("." + className + "{")
- || content.contains("." + className + ",")
- || content.contains("." + className + ":")
- || content.contains("." + className + ".")
- || content.contains("." + className + ">");
+ || content.contains("." + className + "{")
+ || content.contains("." + className + ",")
+ || content.contains("." + className + ":")
+ || content.contains("." + className + ".")
+ || content.contains("." + className + ">");
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
index 2a7d5a6fa8..6e2212b726 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
@@ -28,13 +28,13 @@ public enum TobagoClass implements CssItem {
ASCENDING("tobago-ascending"),
AUTO__SPACING("tobago-auto-spacing"),
-// BADGE("tobago-badge"),
+ // BADGE("tobago-badge"),
BAR("tobago-bar"),
BODY("tobago-body"),
BOX__HEADER("tobago-box-header"),
// tbd: can this be removed, when using <tobago-button>?
BUTTON("tobago-button"),
-// BUTTONS("tobago-buttons"),
+ // BUTTONS("tobago-buttons"),
CIRCLE__1("tobago-circle-1"),
CIRCLE__2("tobago-circle-2"),
CIRCLE__3("tobago-circle-3"),
@@ -45,18 +45,18 @@ public enum TobagoClass implements CssItem {
CIRCLE__8("tobago-circle-8"),
CIRCLE__9("tobago-circle-9"),
COLLAPSED("tobago-collapsed"),
-// DATE("tobago-date"),
+ // DATE("tobago-date"),
// DATE__PICKER("tobago-date-picker"),
DELETED("tobago-deleted"),
DESCENDING("tobago-descending"),
DISPLAY__INLINE__BLOCK("tobago-display-inline-block"),
DROPDOWN__SUBMENU("tobago-dropdown-submenu"),
EXPANDED("tobago-expanded"),
-// FILE("tobago-file"),
+ // FILE("tobago-file"),
// FIGURE("tobago-figure"),
FOLDER("tobago-folder"),
HEADER("tobago-header"),
-// IMAGE("tobago-image"),
+ // IMAGE("tobago-image"),
// tbd: can be removed?
// IN("tobago-in"),
// INPUT__GROUP__OUTER("tobago-input-group-outer"),
@@ -70,7 +70,7 @@ public enum TobagoClass implements CssItem {
NUMBER("tobago-number"),
OBJECT("tobago-object"),
OUT("tobago-out"),
-// PAGE("tobago-page"),
+ // PAGE("tobago-page"),
PAGE__MENU_STORE("tobago-page-menuStore"),
PAGE__NOSCRIPT("tobago-page-noscript"),
PAGING("tobago-paging"),
@@ -81,7 +81,7 @@ public enum TobagoClass implements CssItem {
RESIZE("tobago-resize"),
SECTION__CONTENT("tobago-section-content"),
SELECT_MANY_LISTBOX__OPTION("tobago-selectManyListbox-option"),
-// SELECT_MANY_SHUTTLE("tobago-selectManyShuttle"),
+ // SELECT_MANY_SHUTTLE("tobago-selectManyShuttle"),
// SELECT_MANY_SHUTTLE__ADD("tobago-selectManyShuttle-add"),
// SELECT_MANY_SHUTTLE__ADD_ALL("tobago-selectManyShuttle-addAll"),
// SELECT_MANY_SHUTTLE__HIDDEN("tobago-selectManyShuttle-hidden"),
@@ -97,7 +97,7 @@ public enum TobagoClass implements CssItem {
SELECT_ONE_LISTBOX__OPTION("tobago-selectOneListbox-option"),
SELECTED("tobago-selected"),
SEPARATOR("tobago-separator"),
-// SHEET("tobago-sheet"),
+ // SHEET("tobago-sheet"),
// SHEET__CELL("tobago-sheet-cell"),
// SHEET__FOOTER("tobago-sheet-footer"),
// SHEET__BODY("tobago-sheet-body"),
@@ -122,7 +122,7 @@ public enum TobagoClass implements CssItem {
STARS__SLIDER("tobago-stars-slider"),
STARS__TOOLTIP("tobago-stars-tooltip"),
STARS__UNSELECTED("tobago-stars-unselected"),
-// TAB("tobago-tab"),
+ // TAB("tobago-tab"),
// TAB__BAR_FACET("tobago-tab-barFacet"),
// TAB__CONTENT("tobago-tab-content"),
// TAB_GROUP("tobago-tabGroup"),
@@ -130,7 +130,7 @@ public enum TobagoClass implements CssItem {
TEXT__JUSTIFY("tobago-text-justify"),
TOGGLE("tobago-toggle"),
TOOLTIP("tobago-tooltip"),
-// TREE_LABEL("tobago-treeLabel"),
+ // TREE_LABEL("tobago-treeLabel"),
// TREE_LISTBOX("tobago-treeListbox");
// TREE_LISTBOX__LEVEL("tobago-treeListbox-level"),
// TREE_LISTBOX__SELECT("tobago-treeListbox-select"),
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
index 40fc01f11c..97dd1807c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
@@ -132,6 +132,7 @@ public enum DataAttributes implements MarkupLanguageAttributes {
/**
* The selectable attribute e. g. for trees.
+ *
* @deprecated since 5.0.0, please use {@link CustomAttributes#SELECTABLE}
*/
@Deprecated
@@ -144,6 +145,7 @@ public enum DataAttributes implements MarkupLanguageAttributes {
/**
* A way to transport style data in JSON format to the browser. With CSP the normal style attribute isn't allowed.
+ *
* @deprecated since 4.0.0. UIStyle now renders itself.
*/
@Deprecated
@@ -165,6 +167,7 @@ public enum DataAttributes implements MarkupLanguageAttributes {
/**
* Id of the parent node in a tree node.
+ *
* @deprecated since 5.0.0, please use {@link CustomAttributes#PARENT}
*/
@Deprecated
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlAttributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlAttributes.java
index cce927642d..84145f99b5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlAttributes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlAttributes.java
@@ -62,40 +62,64 @@ public enum HtmlAttributes implements MarkupLanguageAttributes {
NONCE("nonce"),
MIN("min"),
MINLENGTH("minlength"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONBLUR("onblur"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
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
ONCLICK("onclick"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONDBLCLICK("ondblclick"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONFOCUS("onfocus"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONFOCUSIN("onfocusin"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONKEYDOWN("onkeydown"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONKEYPRESS("onkeypress"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONKEYUP("onkeyup"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONLOAD("onload"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONMOUSEOVER("onmouseover"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
ONMOUSEOUT("onmouseout"),
PATTERN("pattern"),
@@ -113,7 +137,9 @@ public enum HtmlAttributes implements MarkupLanguageAttributes {
SIZE("size"),
SRC("src"),
STEP("step"),
- /** @deprecated Since 2.0.0. This attribute work not with SCP */
+ /**
+ * @deprecated Since 2.0.0. This attribute work not with SCP
+ */
@Deprecated
STYLE("style"),
SUMMARY("summary"),
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlButtonTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlButtonTypes.java
index 6f0fc71b73..17d64446bb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlButtonTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlButtonTypes.java
@@ -35,4 +35,4 @@ public enum HtmlButtonTypes implements HtmlTypes {
public String getValue() {
return value;
}
- }
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
index ca4f20ebbf..6ae0023cc0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
@@ -46,7 +46,9 @@ public enum HtmlElements {
CODE("code", Qualifier.INLINE),
COL("col", Qualifier.VOID),
COLGROUP("colgroup"),
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
COMMAND("command", Qualifier.VOID),
DATALIST("datalist"),
@@ -149,7 +151,7 @@ public enum HtmlElements {
TOBAGO_FOOTER("tobago-footer"),
TOBAGO_FORM("tobago-form"),
TOBAGO_GRID_LAYOUT("tobago-grid-layout"),
-// TOBAGO_LABEL("tobago-label"),
+ // TOBAGO_LABEL("tobago-label"),
TOBAGO_HEADER("tobago-header"),
TOBAGO_IMAGE("tobago-image"),
TOBAGO_IN("tobago-in"),
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlInputTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlInputTypes.java
index a86a01d826..5c18f4fe7a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlInputTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlInputTypes.java
@@ -34,7 +34,9 @@ public enum HtmlInputTypes implements HtmlTypes {
BUTTON("button"),
COLOR("color"),
DATE("date"),
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
DATETIME("datetime"),
DATETIME_LOCAL("datetime-local"),
@@ -60,7 +62,9 @@ public enum HtmlInputTypes implements HtmlTypes {
public static final String STRING_BUTTON = "button";
public static final String STRING_COLOR = "color";
public static final String STRING_DATE = "date";
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
public static final String STRING_DATETIME = "datetime";
public static final String STRING_DATETIME_LOCAL = "datetime-local";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java
index efa32425aa..7f6ab3a141 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/Sanitizer.java
@@ -29,5 +29,7 @@ public interface Sanitizer {
default String getInfo() {
return toString();
- };
+ }
+
+ ;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
index 0b856d6026..e0dbee9c77 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
@@ -76,7 +76,6 @@ public abstract class NonFacesRequestServlet extends HttpServlet {
final NavigationHandler navigationHandler = application.getNavigationHandler();
navigationHandler.handleNavigation(facesContext, null, outcome);
-
lifecycle.render(facesContext);
} finally {
facesContext.release();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
index e62e042eb8..6d14e3198e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
@@ -23,7 +23,6 @@ import java.text.CollationKey;
import java.text.Collator;
import java.util.Comparator;
-
public abstract class ComparatorBase implements Comparator {
private Comparator comparator;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
index a401c8727c..1ad7ab3e82 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
@@ -578,7 +578,8 @@ public final class ComponentUtils {
return getRenderer(facesContext, component.getFamily(), component.getRendererType());
}
- public static RendererBase getRenderer(final FacesContext facesContext, final String family,
+ public static RendererBase getRenderer(
+ final FacesContext facesContext, final String family,
final String rendererType) {
if (rendererType == null) {
return null;
@@ -601,7 +602,6 @@ public final class ComponentUtils {
return renderer;
}
-
private static Renderer getRendererInternal(
final FacesContext facesContext, final String family, final String rendererType) {
final RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java
index 88c165b3f5..870f5f451f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.util;
-
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
index c0a4482023..3437a7417e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
@@ -33,7 +33,6 @@ public class DebugActionListener implements ActionListener {
private final ActionListener actionListener;
-
public DebugActionListener(final ActionListener actionListener) {
this.actionListener = actionListener;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
index d8e4a00ef5..0f69a7ecbd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
@@ -45,7 +45,7 @@ public class DebugNavigationHandler extends NavigationHandler {
// TBD: is this correct?
if (outcome != null && facesContext.getPartialViewContext().isAjaxRequest()) {
- LOG.warn("An AJAX-Request should not have an outcome set: outcome='" + outcome + "'");
+ LOG.warn("An AJAX-Request should not have an outcome set: outcome='" + outcome + "'");
}
navigationHandler.handleNavigation(facesContext, fromAction, outcome);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
index 2ff1d802c1..19fe47dfe6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
@@ -77,15 +77,15 @@ public class DebugPhaseListener implements PhaseListener {
LOG.info("Total response time : " + (end - start + " milliseconds"));
}
}
- for (final Iterator<String> iterator = facesContext.getClientIdsWithMessages(); iterator.hasNext();) {
+ for (final Iterator<String> iterator = facesContext.getClientIdsWithMessages(); iterator.hasNext(); ) {
final String clientId = iterator.next();
for (final Iterator<FacesMessage> messageIterator
- = facesContext.getMessages(clientId); messageIterator.hasNext();) {
+ = facesContext.getMessages(clientId); messageIterator.hasNext(); ) {
final FacesMessage msg = messageIterator.next();
LOG.info(MessageFormat.format("Faces message found."
- + "\n Component: {0} \n Severity : {1}"
- + "\n Summary : {2} \n Detail : {3}",
+ + "\n Component: {0} \n Severity : {1}"
+ + "\n Summary : {2} \n Detail : {3}",
clientId, msg.getSeverity(), msg.getSummary(), msg.getDetail()));
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java
index e1fe8cf6b5..f367a3bab8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-
public final class DebugUtils {
private DebugUtils() {
@@ -82,7 +81,7 @@ public final class DebugUtils {
buf.append(" ");
// buf.append(component.getId());
// buf.append(" ");
- buf.append(component.getClientId(FacesContext.getCurrentInstance()));
+ buf.append(component.getClientId(FacesContext.getCurrentInstance()));
if (component instanceof javax.faces.component.UIViewRoot) {
buf.append(" viewId=");
buf.append(((javax.faces.component.UIViewRoot) component).getViewId());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
index bc36fe6095..a200bc8664 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
@@ -79,6 +79,7 @@ public enum FacesVersion {
/**
* Does the JSF is version 1.2 or higher
+ *
* @return Supports 1.2 or higher
*/
public static boolean supports12() {
@@ -91,6 +92,7 @@ public enum FacesVersion {
/**
* Does the JSF is version 2.0 or higher
+ *
* @return Supports 2.0 or higher
*/
public static boolean supports20() {
@@ -102,6 +104,7 @@ public enum FacesVersion {
/**
* Does the JSF is version 2.1 or higher
+ *
* @return Supports 2.1 or higher
*/
public static boolean supports21() {
@@ -112,6 +115,7 @@ public enum FacesVersion {
/**
* Does the JSF is version 2.2 or higher
+ *
* @return Supports 2.2 or higher
*/
public static boolean supports22() {
@@ -121,6 +125,7 @@ public enum FacesVersion {
/**
* Does the JSF is version 2.3 or higher
+ *
* @return Supports 2.3 or higher
*/
public static boolean supports23() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
index c63cd3ef83..2cd402bc7e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
@@ -144,7 +144,7 @@ public class WebXmlUtils {
factory.setExpandEntityReferences(false);
} catch (ParserConfigurationException e) {
LOG.info("ParserConfigurationException was thrown. A feature is probably not supported by your XML processor. "
- + e.getMessage());
+ + e.getMessage());
}
final DocumentBuilder documentBuilder = factory.newDocumentBuilder();
for (final URL url : getWebXmlUrls(facesContext)) {
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 485dcff8c5..7915d641ab 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
@@ -169,21 +169,24 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
/**
* Write the class attribute. The value will not escaped.
*/
- public void writeClassAttribute(final CssItem first, final CssItem[] second, final CssItem[] third,
- final CssItem... fourth) throws IOException {
+ public void writeClassAttribute(
+ final CssItem first, final CssItem[] second, final CssItem[] third,
+ final CssItem... fourth) throws IOException {
writeClassAttribute(first, second, third, null, null, fourth);
}
/**
* Write the class attribute. The value will not escaped.
*/
- public void writeClassAttribute(final CssItem first, final CssItem[] second, final CssItem[] third,
- final CssItem[] fourth, final CssItem... fifth) throws IOException {
+ public void writeClassAttribute(
+ final CssItem first, final CssItem[] second, final CssItem[] third,
+ final CssItem[] fourth, final CssItem... fifth) throws IOException {
writeClassAttribute(first, second, third, fourth, null, fifth);
}
- public void writeClassAttribute(final CssItem first, final CssItem[] second, final CssItem[] third,
- final CssItem[] fourth, final CssItem[] fifth, final CssItem... sixth)
+ public void writeClassAttribute(
+ final CssItem first, final CssItem[] second, final CssItem[] third,
+ final CssItem[] fourth, final CssItem[] fifth, final CssItem... sixth)
throws IOException {
final StringBuilder builder = new StringBuilder();
boolean render = false;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java
index 13883045c0..4de5a71592 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java
@@ -67,7 +67,6 @@ public class AbstractUIGridLayoutUnitTest extends AbstractTobagoTestBase {
Assertions.assertEquals(d, cells[2][1]);
}
-
@Test
public void test2() {
final AbstractUIGridLayout grid = (AbstractUIGridLayout) ComponentUtils.createComponent(
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
index 020ca4276c..b6f2c4e2b6 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
@@ -64,7 +64,9 @@ import org.apache.myfaces.tobago.component.UITreeIndent;
import org.apache.myfaces.tobago.component.UITreeNode;
import org.apache.myfaces.tobago.component.UITreeSelect;
import org.apache.myfaces.tobago.config.TobagoConfig;
+
import static org.apache.myfaces.tobago.config.TobagoConfig.TOBAGO_CONFIG;
+
import org.apache.myfaces.tobago.context.TobagoContext;
import org.apache.myfaces.tobago.internal.behavior.EventBehavior;
import org.apache.myfaces.tobago.internal.renderkit.renderer.BadgeRenderer;
@@ -106,7 +108,9 @@ import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeNodeRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeRenderer;
import org.apache.myfaces.tobago.internal.renderkit.renderer.TreeSelectRenderer;
import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
+
import static org.apache.myfaces.tobago.util.ResourceUtils.TOBAGO_RESOURCE_BUNDLE;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorterUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorterUnitTest.java
index b793db8dbb..db0ec4abc8 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorterUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorterUnitTest.java
@@ -298,7 +298,6 @@ public class TobagoConfigSorterUnitTest {
speyside.getAfter().add(standard.getName());
standard.getAfter().add(core.getName());
-
final List<TobagoConfigFragment> list = new ArrayList<>();
list.add(blank);
list.add(charlotteville);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
index f520164c25..05f333a28c 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
@@ -61,21 +61,27 @@ public class MockHttpSession implements HttpSession {
return 0;
}
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
@Override
public HttpSessionContext getSessionContext() {
return null;
}
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
@Override
public Object getValue(final String s) {
return null;
}
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
@Override
public String[] getValueNames() {
@@ -91,7 +97,9 @@ public class MockHttpSession implements HttpSession {
return false;
}
- /** @deprecated */
+ /**
+ * @deprecated
+ */
@Deprecated
@Override
public void putValue(final String s, final Object o) {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/CommandUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/CommandUnitTest.java
index f97ce90f83..f609020c96 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/CommandUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/CommandUnitTest.java
@@ -33,7 +33,7 @@ public class CommandUnitTest {
new Collapse(Collapse.Operation.show, "a collapse"), false);
final Command b = new Command(
- "b client id", "b field id", null, null, "b execute", null, "b conf", null,
+ "b client id", "b field id", null, null, "b execute", null, "b conf", null,
new Collapse(Collapse.Operation.show, "b collapse"), false);
a.merge(b);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java
index e6f0c6c846..ca9cd48909 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java
@@ -99,7 +99,7 @@ public class DateRendererUnitTest extends RendererTestBase {
d.setValue(SPUTNIK_DATE);
final UIOut out = (UIOut) ComponentUtils.createComponent(
- facesContext, Tags.out.componentType(), RendererTypes.Out, "out");
+ facesContext, Tags.out.componentType(), RendererTypes.Out, "out");
d.getFacets().put("before", out);
out.setValue("before");
@@ -117,7 +117,7 @@ public class DateRendererUnitTest extends RendererTestBase {
d.setValue(SPUTNIK_DATE);
final UIOut out = (UIOut) ComponentUtils.createComponent(
- facesContext, Tags.out.componentType(), RendererTypes.Out, "out");
+ facesContext, Tags.out.componentType(), RendererTypes.Out, "out");
out.setValue("after");
d.getFacets().put("after", out);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java
index 5120a45561..a7975e56e2 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRendererUnitTest.java
@@ -44,7 +44,7 @@ public class FileRendererUnitTest extends RendererTestBase {
@Test
public void fileDropZoneThis() throws IOException {
final UIPanel panel = (UIPanel) ComponentUtils.createComponent(
- facesContext, Tags.panel.componentType(), RendererTypes.Panel, "drop-zone");
+ facesContext, Tags.panel.componentType(), RendererTypes.Panel, "drop-zone");
final UIFile c = (UIFile) ComponentUtils.createComponent(
facesContext, Tags.file.componentType(), RendererTypes.File, "id");
@@ -60,7 +60,7 @@ public class FileRendererUnitTest extends RendererTestBase {
@Test
public void fileDropZoneId() throws IOException {
final UIPanel panel = (UIPanel) ComponentUtils.createComponent(
- facesContext, Tags.panel.componentType(), RendererTypes.Panel, "drop-zone");
+ facesContext, Tags.panel.componentType(), RendererTypes.Panel, "drop-zone");
final UIFile c = (UIFile) ComponentUtils.createComponent(
facesContext, Tags.file.componentType(), RendererTypes.File, "id");
@@ -76,7 +76,7 @@ public class FileRendererUnitTest extends RendererTestBase {
@Test
public void fileDropZoneParent() throws IOException {
final UIPanel panel = (UIPanel) ComponentUtils.createComponent(
- facesContext, Tags.panel.componentType(), RendererTypes.Panel, "drop-zone");
+ facesContext, Tags.panel.componentType(), RendererTypes.Panel, "drop-zone");
final UIFile c = (UIFile) ComponentUtils.createComponent(
facesContext, Tags.file.componentType(), RendererTypes.File, "id");
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
index ac93e23f5c..9fc48ab5de 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
@@ -401,7 +401,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutFlexLeft() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.flexLeft); // same as default
@@ -413,7 +413,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutFlexRight() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.flexRight);
@@ -425,7 +425,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutFlowLeft() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.flowLeft);
@@ -437,7 +437,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutFlowRight() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.flowRight);
@@ -449,7 +449,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutTop() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.top);
@@ -461,7 +461,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutGridLeft() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.gridLeft);
@@ -473,7 +473,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutGridRight() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.gridRight);
@@ -485,7 +485,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutGridTop() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.gridTop);
@@ -497,7 +497,7 @@ public class InRendererUnitTest extends RendererTestBase {
@Test
public void requiredLabelLayoutGridBottom() throws IOException {
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.gridBottom);
@@ -510,11 +510,11 @@ public class InRendererUnitTest extends RendererTestBase {
public void requiredLabelLayoutSegmentLeft() throws IOException {
final UISegmentLayout l = (UISegmentLayout) ComponentUtils.createComponent(
- facesContext, Tags.segmentLayout.componentType(), RendererTypes.SegmentLayout, "segid");
+ facesContext, Tags.segmentLayout.componentType(), RendererTypes.SegmentLayout, "segid");
l.setMedium(SegmentMeasureList.parse("3seg 9seg"));
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.segmentLeft);
@@ -529,11 +529,11 @@ public class InRendererUnitTest extends RendererTestBase {
public void requiredLabelLayoutSegmentRight() throws IOException {
final UISegmentLayout l = (UISegmentLayout) ComponentUtils.createComponent(
- facesContext, Tags.segmentLayout.componentType(), RendererTypes.SegmentLayout, "segid");
+ facesContext, Tags.segmentLayout.componentType(), RendererTypes.SegmentLayout, "segid");
l.setMedium(SegmentMeasureList.parse("9seg 3seg"));
final UIIn c = (UIIn) ComponentUtils.createComponent(
- facesContext, Tags.in.componentType(), RendererTypes.In, "id");
+ facesContext, Tags.in.componentType(), RendererTypes.In, "id");
c.setLabel("label");
c.setRequired(true);
c.setLabelLayout(LabelLayout.segmentRight);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java
index 085334ceef..619a82803d 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRendererUnitTest.java
@@ -66,7 +66,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
@Test
public void linkWithImage() throws IOException {
final UILink c = (UILink) ComponentUtils.createComponent(
- facesContext, Tags.link.componentType(), RendererTypes.Link, "id");
+ facesContext, Tags.link.componentType(), RendererTypes.Link, "id");
c.setLabel("label");
c.setImage("url");
c.setLink("https://www.apache.org/");
@@ -78,7 +78,7 @@ public class LinkRendererUnitTest extends RendererTestBase {
@Test
public void linkWithEmptyImage() throws IOException {
final UILink c = (UILink) ComponentUtils.createComponent(
- facesContext, Tags.link.componentType(), RendererTypes.Link, "id");
+ facesContext, Tags.link.componentType(), RendererTypes.Link, "id");
c.setLabel("label");
c.setImage("");
c.setLink("https://www.apache.org/");
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java
index 00a36d7fce..2a59a1d4fd 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RendererTestBase.java
@@ -105,7 +105,7 @@ public abstract class RendererTestBase extends AbstractTobagoTestBase {
protected List<Item> getSheetSample(final int count) {
final List<Item> list = new ArrayList<Item>();
for (int i = 0; i < count; i++) {
- list.add(new Item("Name " + i));
+ list.add(new Item("Name " + i));
}
return list;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRendererUnitTest.java
index 1f696e39e6..1f9462d13a 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRendererUnitTest.java
@@ -31,7 +31,6 @@ import java.io.IOException;
public class SelectBooleanCheckboxRendererUnitTest extends RendererTestBase {
-
@Test
public void label() throws IOException {
final UISelectBooleanCheckbox c = (UISelectBooleanCheckbox) ComponentUtils.createComponent(
@@ -59,60 +58,60 @@ public class SelectBooleanCheckboxRendererUnitTest extends RendererTestBase {
@Test
public void messageFatal() throws IOException {
final UISelectBooleanCheckbox c = (UISelectBooleanCheckbox) ComponentUtils.createComponent(
- facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
+ facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
final FacesMessage message = new FacesMessage(
- FacesMessage.SEVERITY_FATAL, "Custom fatal", "This is a custom fatal error");
+ FacesMessage.SEVERITY_FATAL, "Custom fatal", "This is a custom fatal error");
facesContext.addMessage(c.getClientId(facesContext), message);
c.encodeAll(facesContext);
Assertions.assertEquals(loadHtml("renderer/selectBooleanCheckbox/selectBooleanCheckboxFatal.html"),
- formattedResult());
+ formattedResult());
}
@Test
public void messageError() throws IOException {
final UISelectBooleanCheckbox c = (UISelectBooleanCheckbox) ComponentUtils.createComponent(
- facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
+ facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
final FacesMessage message = new FacesMessage(
- FacesMessage.SEVERITY_ERROR, "Custom error", "This is a custom error");
+ FacesMessage.SEVERITY_ERROR, "Custom error", "This is a custom error");
facesContext.addMessage(c.getClientId(facesContext), message);
c.encodeAll(facesContext);
Assertions.assertEquals(loadHtml("renderer/selectBooleanCheckbox/selectBooleanCheckboxError.html"),
- formattedResult());
+ formattedResult());
}
@Test
public void messageWarning() throws IOException {
final UISelectBooleanCheckbox c = (UISelectBooleanCheckbox) ComponentUtils.createComponent(
- facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
+ facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
final FacesMessage message = new FacesMessage(
- FacesMessage.SEVERITY_WARN, "Custom warning", "This is a custom warning");
+ FacesMessage.SEVERITY_WARN, "Custom warning", "This is a custom warning");
facesContext.addMessage(c.getClientId(facesContext), message);
c.encodeAll(facesContext);
Assertions.assertEquals(loadHtml("renderer/selectBooleanCheckbox/selectBooleanCheckboxWarning.html"),
- formattedResult());
+ formattedResult());
}
@Test
public void messageInfo() throws IOException {
final UISelectBooleanCheckbox c = (UISelectBooleanCheckbox) ComponentUtils.createComponent(
- facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
+ facesContext, Tags.selectBooleanCheckbox.componentType(), RendererTypes.SelectBooleanCheckbox, "id");
final FacesMessage message = new FacesMessage(
- FacesMessage.SEVERITY_INFO, "Custom info", "This is a custom information");
+ FacesMessage.SEVERITY_INFO, "Custom info", "This is a custom information");
facesContext.addMessage(c.getClientId(facesContext), message);
c.encodeAll(facesContext);
Assertions.assertEquals(loadHtml("renderer/selectBooleanCheckbox/selectBooleanCheckboxInfo.html"),
- formattedResult());
+ formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRendererUnitTest.java
index 390048e4d4..4cd789a6fd 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRendererUnitTest.java
@@ -30,7 +30,6 @@ import java.io.IOException;
public class SelectBooleanToggleRendererUnitTest extends RendererTestBase {
-
@Test
public void label() throws IOException {
final UISelectBooleanToggle c = (UISelectBooleanToggle) ComponentUtils.createComponent(
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRendererUnitTest.java
index 6fc78e149c..2f3b702550 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRendererUnitTest.java
@@ -35,44 +35,44 @@ public class SelectManyCheckboxRendererUnitTest extends RendererTestBase {
@Test
public void itemLabel() throws IOException {
final UISelectManyCheckbox c = (UISelectManyCheckbox) ComponentUtils.createComponent(
- facesContext, Tags.selectManyCheckbox.componentType(), RendererTypes.SelectManyCheckbox, "id");
+ facesContext, Tags.selectManyCheckbox.componentType(), RendererTypes.SelectManyCheckbox, "id");
final UISelectItem i1 = (UISelectItem) ComponentUtils.createComponent(
- facesContext, Tags.selectItem.componentType(), null, "i1");
+ facesContext, Tags.selectItem.componentType(), null, "i1");
i1.setItemLabel("Entry One");
c.getChildren().add(i1);
final UISelectItem i2 = (UISelectItem) ComponentUtils.createComponent(
- facesContext, Tags.selectItem.componentType(), null, "i2");
+ facesContext, Tags.selectItem.componentType(), null, "i2");
i2.setItemLabel("Entry Two");
c.getChildren().add(i2);
c.encodeAll(facesContext);
Assertions.assertEquals(loadHtml("renderer/selectManyCheckbox/selectManyCheckboxItemLabel.html"),
- formattedResult());
+ formattedResult());
}
@Test
public void messageFatal() throws IOException {
final UISelectManyCheckbox c = (UISelectManyCheckbox) ComponentUtils.createComponent(
- facesContext, Tags.selectManyCheckbox.componentType(), RendererTypes.SelectManyCheckbox, "id");
+ facesContext, Tags.selectManyCheckbox.componentType(), RendererTypes.SelectManyCheckbox, "id");
final UISelectItem i1 = (UISelectItem) ComponentUtils.createComponent(
- facesContext, Tags.selectItem.componentType(), null, "i1");
+ facesContext, Tags.selectItem.componentType(), null, "i1");
i1.setItemLabel("Entry One");
c.getChildren().add(i1);
final UISelectItem i2 = (UISelectItem) ComponentUtils.createComponent(
- facesContext, Tags.selectItem.componentType(), null, "i2");
+ facesContext, Tags.selectItem.componentType(), null, "i2");
i2.setItemLabel("Entry Two");
c.getChildren().add(i2);
final FacesMessage message = new FacesMessage(
- FacesMessage.SEVERITY_FATAL, "Custom fatal", "This is a custom fatal error");
+ FacesMessage.SEVERITY_FATAL, "Custom fatal", "This is a custom fatal error");
facesContext.addMessage(c.getClientId(facesContext), message);
c.encodeAll(facesContext);
Assertions.assertEquals(loadHtml("renderer/selectManyCheckbox/selectManyCheckboxFatal.html"),
- formattedResult());
+ formattedResult());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRendererUnitTest.java
index 6c7123efa3..8bfbf0b1c9 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRendererUnitTest.java
@@ -72,7 +72,6 @@ public class SelectManyShuttleRendererUnitTest extends RendererTestBase {
}
//help
-
@Test
public void errorMessage() throws IOException {
final UISelectManyShuttle c = (UISelectManyShuttle) ComponentUtils.createComponent(
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelperUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelperUnitTest.java
index 190abd8c0b..cfc41f6de9 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelperUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelperUnitTest.java
@@ -27,31 +27,31 @@ class AuthorizationHelperUnitTest {
@Test
public void testSkipBrackets() {
Assertions.assertEquals(
- "#{controller.viewDetails}",
- AuthorizationHelper.skipParameterPart("#{controller.viewDetails(cc.attrs.value, facesContext)}"));
+ "#{controller.viewDetails}",
+ AuthorizationHelper.skipParameterPart("#{controller.viewDetails(cc.attrs.value, facesContext)}"));
Assertions.assertEquals(
- "#{x}",
- AuthorizationHelper.skipParameterPart("#{x}"));
+ "#{x}",
+ AuthorizationHelper.skipParameterPart("#{x}"));
Assertions.assertEquals(
- "controller.viewDetails",
- AuthorizationHelper.skipParameterPart("controller.viewDetails(cc.attrs.value, facesContext)"));
+ "controller.viewDetails",
+ AuthorizationHelper.skipParameterPart("controller.viewDetails(cc.attrs.value, facesContext)"));
Assertions.assertEquals(
- "x",
- AuthorizationHelper.skipParameterPart("x"));
+ "x",
+ AuthorizationHelper.skipParameterPart("x"));
Assertions.assertEquals(
- "",
- AuthorizationHelper.skipParameterPart(""));
+ "",
+ AuthorizationHelper.skipParameterPart(""));
Assertions.assertEquals(
- "#{x.a}",
- AuthorizationHelper.skipParameterPart("#{x.a()}"));
+ "#{x.a}",
+ AuthorizationHelper.skipParameterPart("#{x.a()}"));
Assertions.assertEquals(
- "#{x.a)(}",
- AuthorizationHelper.skipParameterPart("#{x.a)(}"));
+ "#{x.a)(}",
+ AuthorizationHelper.skipParameterPart("#{x.a)(}"));
Assertions.assertEquals(
- "#{x.a)}",
- AuthorizationHelper.skipParameterPart("#{x.a)}"));
+ "#{x.a)}",
+ AuthorizationHelper.skipParameterPart("#{x.a)}"));
Assertions.assertEquals(
- "#{x.a(}",
- AuthorizationHelper.skipParameterPart("#{x.a(}"));
+ "#{x.a(}",
+ AuthorizationHelper.skipParameterPart("#{x.a(}"));
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Fruit.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Fruit.java
index 70434f215a..18a58a4ea0 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Fruit.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Fruit.java
@@ -26,14 +26,15 @@ import java.util.List;
public interface Fruit extends Serializable {
static List<Fruit> getFreshFruits() {
- final List<Fruit> list = new ArrayList<>();
- list.add(Apple.GOLDEN_DELICIOUS);
- list.add(Apple.SCHOENER_AUS_BOSKOOP);
- list.add(Pear.WILLIAMS_CHRIST);
- list.add(Pear.KOESTLICHE_AUS_CHARNEUX);
- return list;
+ final List<Fruit> list = new ArrayList<>();
+ list.add(Apple.GOLDEN_DELICIOUS);
+ list.add(Apple.SCHOENER_AUS_BOSKOOP);
+ list.add(Pear.WILLIAMS_CHRIST);
+ list.add(Pear.KOESTLICHE_AUS_CHARNEUX);
+ return list;
}
String getName();
+
void setName(String name);
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Pear.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Pear.java
index f6b1edf638..1006433f48 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Pear.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/Pear.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.internal.util;
public class Pear implements Fruit {
- public static final Pear WILLIAMS_CHRIST =new Pear("Williams Christ");
- public static final Pear KOESTLICHE_AUS_CHARNEUX =new Pear("Köstliche aus Charneux");
+ public static final Pear WILLIAMS_CHRIST = new Pear("Williams Christ");
+ public static final Pear KOESTLICHE_AUS_CHARNEUX = new Pear("Köstliche aus Charneux");
private String name;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
index 519a3b92da..d7301f72b4 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
@@ -50,7 +50,7 @@ public class RenderUtilsUnitTest extends AbstractTobagoTestBase {
body.setName("body");
body.setValue("Hi, folks,\n"
+ "\n"
- + "we plan to build version 5.0.0 of Tobago soon.");
+ + "we plan to build version 5.0.0 of Tobago soon.");
link.getChildren().add(body);
final String url = RenderUtils.generateUrl(getFacesContext(), link);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/SortingUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/SortingUtilsUnitTest.java
index 22cb51719c..6c2ebefca4 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/SortingUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/SortingUtilsUnitTest.java
@@ -33,125 +33,125 @@ import java.util.List;
public class SortingUtilsUnitTest extends AbstractTobagoTestBase {
- @Test
- public void testSheetValueNull() {
- final UISheet sheet = new UISheet();
- final UIColumn column = new UIColumn();
- sheet.getChildren().add(column);
- SortingUtils.sort(sheet, null);
- }
-
- @Test
- public void testNoChild() {
- final List<Fruit> list = Fruit.getFreshFruits();
-
- final UISheet sheet = new UISheet();
- sheet.getState().updateSortState("id");
- final UIColumn column = new UIColumn();
- column.setId("id");
- sheet.getChildren().add(column);
- sheet.setValue(list);
- SortingUtils.sort(sheet, null);
-
- // not sorted
- Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
- Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
- Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(2));
- Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(3));
- }
+ @Test
+ public void testSheetValueNull() {
+ final UISheet sheet = new UISheet();
+ final UIColumn column = new UIColumn();
+ sheet.getChildren().add(column);
+ SortingUtils.sort(sheet, null);
+ }
+
+ @Test
+ public void testNoChild() {
+ final List<Fruit> list = Fruit.getFreshFruits();
+
+ final UISheet sheet = new UISheet();
+ sheet.getState().updateSortState("id");
+ final UIColumn column = new UIColumn();
+ column.setId("id");
+ sheet.getChildren().add(column);
+ sheet.setValue(list);
+ SortingUtils.sort(sheet, null);
+
+ // not sorted
+ Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
+ Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
+ Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(2));
+ Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(3));
+ }
/**
* @deprecated
*/
@Test
- @Deprecated
- public void testUIOutDeprected() {
- final List<Fruit> list = Fruit.getFreshFruits();
- final UISheet sheet = new UISheet();
- sheet.setMaxSortColumns(1);
- sheet.getState().setSortedColumnId("id");
- sheet.setVar("var");
- final UIColumn column = new UIColumn();
- column.setId("id");
- sheet.getChildren().add(column);
- sheet.setValue(list);
- final UIOut out = new UIOut();
- column.getChildren().add(out);
- out.setValueExpression(Attributes.value.getName(),
- new MockValueExpression("#{var.name}", String.class));
- Assertions.assertNotNull(out.getValueExpression(Attributes.value.getName()));
-
- SortingUtils.sort(sheet, null);
-
- Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
- Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(1));
- Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(2));
- Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(3));
-
- sheet.getState().setAscending(false);
- SortingUtils.sort(sheet, null);
-
- Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(0));
- Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
- Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(2));
- Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(3));
- }
-
- @Test
- public void testUIOut() {
- final List<Fruit> list = Fruit.getFreshFruits();
- final UISheet sheet = new UISheet();
- sheet.setMaxSortColumns(1);
- sheet.getState().updateSortState("id");
- sheet.setVar("var");
- final UIColumn column = new UIColumn();
- column.setId("id");
- sheet.getChildren().add(column);
- sheet.setValue(list);
- final UIOut out = new UIOut();
- column.getChildren().add(out);
- out.setValueExpression(Attributes.value.getName(),
- new MockValueExpression("#{var.name}", String.class));
- Assertions.assertNotNull(out.getValueExpression(Attributes.value.getName()));
-
- SortingUtils.sort(sheet, null);
-
- Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
- Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(1));
- Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(2));
- Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(3));
-
- sheet.getState().updateSortState("id");
- SortingUtils.sort(sheet, null);
-
- Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(0));
- Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
- Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(2));
- Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(3));
- }
-
- @Test
- public void testUILink() {
- final List<Fruit> list = Fruit.getFreshFruits();
- final UISheet sheet = new UISheet();
- sheet.getState().updateSortState("id");
- final UIColumn column = new UIColumn();
- column.setId("id");
- sheet.getChildren().add(column);
- sheet.setValue(list);
- final UILink link = new UILink();
- column.getChildren().add(link);
- link.setValueExpression(Attributes.label.getName(),
- new MockValueExpression("#{var.name}", String.class));
-
- Assertions.assertNotNull(link.getValueExpression(Attributes.label.getName()));
-
- SortingUtils.sort(sheet, null);
-
- Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
- Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
- Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(2));
- Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(3));
- }
+ @Deprecated
+ public void testUIOutDeprected() {
+ final List<Fruit> list = Fruit.getFreshFruits();
+ final UISheet sheet = new UISheet();
+ sheet.setMaxSortColumns(1);
+ sheet.getState().setSortedColumnId("id");
+ sheet.setVar("var");
+ final UIColumn column = new UIColumn();
+ column.setId("id");
+ sheet.getChildren().add(column);
+ sheet.setValue(list);
+ final UIOut out = new UIOut();
+ column.getChildren().add(out);
+ out.setValueExpression(Attributes.value.getName(),
+ new MockValueExpression("#{var.name}", String.class));
+ Assertions.assertNotNull(out.getValueExpression(Attributes.value.getName()));
+
+ SortingUtils.sort(sheet, null);
+
+ Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
+ Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(1));
+ Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(2));
+ Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(3));
+
+ sheet.getState().setAscending(false);
+ SortingUtils.sort(sheet, null);
+
+ Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(0));
+ Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
+ Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(2));
+ Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(3));
+ }
+
+ @Test
+ public void testUIOut() {
+ final List<Fruit> list = Fruit.getFreshFruits();
+ final UISheet sheet = new UISheet();
+ sheet.setMaxSortColumns(1);
+ sheet.getState().updateSortState("id");
+ sheet.setVar("var");
+ final UIColumn column = new UIColumn();
+ column.setId("id");
+ sheet.getChildren().add(column);
+ sheet.setValue(list);
+ final UIOut out = new UIOut();
+ column.getChildren().add(out);
+ out.setValueExpression(Attributes.value.getName(),
+ new MockValueExpression("#{var.name}", String.class));
+ Assertions.assertNotNull(out.getValueExpression(Attributes.value.getName()));
+
+ SortingUtils.sort(sheet, null);
+
+ Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
+ Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(1));
+ Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(2));
+ Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(3));
+
+ sheet.getState().updateSortState("id");
+ SortingUtils.sort(sheet, null);
+
+ Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(0));
+ Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
+ Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(2));
+ Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(3));
+ }
+
+ @Test
+ public void testUILink() {
+ final List<Fruit> list = Fruit.getFreshFruits();
+ final UISheet sheet = new UISheet();
+ sheet.getState().updateSortState("id");
+ final UIColumn column = new UIColumn();
+ column.setId("id");
+ sheet.getChildren().add(column);
+ sheet.setValue(list);
+ final UILink link = new UILink();
+ column.getChildren().add(link);
+ link.setValueExpression(Attributes.label.getName(),
+ new MockValueExpression("#{var.name}", String.class));
+
+ Assertions.assertNotNull(link.getValueExpression(Attributes.label.getName()));
+
+ SortingUtils.sort(sheet, null);
+
+ Assertions.assertEquals(Apple.GOLDEN_DELICIOUS, list.get(0));
+ Assertions.assertEquals(Apple.SCHOENER_AUS_BOSKOOP, list.get(1));
+ Assertions.assertEquals(Pear.WILLIAMS_CHRIST, list.get(2));
+ Assertions.assertEquals(Pear.KOESTLICHE_AUS_CHARNEUX, list.get(3));
+ }
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/ExpandedStateUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/ExpandedStateUnitTest.java
index 92ebbd2f5a..648f8179da 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/ExpandedStateUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/ExpandedStateUnitTest.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.model;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java
index dfdd31edb7..c003533b28 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/SelectableUnitTest.java
@@ -41,7 +41,7 @@ public class SelectableUnitTest extends EnumUnitTest {
for (Selectable selectable : Selectable.values()) {
Assertions.assertTrue(words.contains(selectable.name()),
- selectable.name() + " should be found in tobago-selectable.ts");
+ selectable.name() + " should be found in tobago-selectable.ts");
}
}
@@ -49,13 +49,13 @@ public class SelectableUnitTest extends EnumUnitTest {
final List<String> words = new ArrayList<>();
final String fileContent
- = FileTestUtils.fileToString("../tobago-theme/tobago-theme-standard/src/main/ts/tobago-selectable.ts");
+ = FileTestUtils.fileToString("../tobago-theme/tobago-theme-standard/src/main/ts/tobago-selectable.ts");
StringBuilder stringBuilder = new StringBuilder();
for (char c : fileContent.toCharArray()) {
if ('0' <= c && c <= '9'
- || 'A' <= c && c <= 'Z'
- || 'a' <= c && c <= 'z') {
+ || 'A' <= c && c <= 'Z'
+ || 'a' <= c && c <= 'z') {
stringBuilder.append(c);
} else {
if (stringBuilder.length() > 0) {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java
index 710db39562..40acc23ccd 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.model;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
index 61ee28f568..e1de0bffed 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
@@ -38,13 +38,13 @@ public class HtmlElementsUnitTest {
final HtmlElements element = (HtmlElements) field.get(null);
final String value = element.getValue();
Assertions.assertEquals(
- value,
- element.name().toLowerCase().replaceAll("_", "-"),
- "Check to lower: '" + element + "'");
+ value,
+ element.name().toLowerCase().replaceAll("_", "-"),
+ "Check to lower: '" + element + "'");
Assertions.assertEquals(
- value.toUpperCase().replaceAll("-", "_"),
- element.name(),
- "Check to upper: '" + element + "'");
+ value.toUpperCase().replaceAll("-", "_"),
+ element.name(),
+ "Check to upper: '" + element + "'");
}
}
@@ -53,9 +53,9 @@ public class HtmlElementsUnitTest {
// list from spec.
final List<String> voids = Arrays.asList(
- "area", "base", "br", "col", "command", "embed",
- "hr", "img", "input", "keygen", "link", "meta",
- "param", "source", "track", "wbr");
+ "area", "base", "br", "col", "command", "embed",
+ "hr", "img", "input", "keygen", "link", "meta",
+ "param", "source", "track", "wbr");
for (final Field field : HtmlElements.class.getFields()) {
final HtmlElements element = (HtmlElements) field.get(null);
@@ -88,10 +88,10 @@ public class HtmlElementsUnitTest {
private boolean containsTagName(final String content, final String tagName) {
return content.contains(tagName + " ")
- || content.contains(tagName + "{")
- || content.contains(tagName + ",")
- || content.contains(tagName + ":")
- || content.contains(tagName + ".")
- || content.contains(tagName + ">");
+ || content.contains(tagName + "{")
+ || content.contains(tagName + ",")
+ || content.contains(tagName + ":")
+ || content.contains(tagName + ".")
+ || content.contains(tagName + ">");
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java
index 01a8b6e67b..7827a0588b 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java
@@ -80,7 +80,6 @@ public class ComponentUtilsUnitTest extends AbstractTobagoTestBase {
input.setValid(false);
Assertions.assertEquals(FacesMessage.SEVERITY_FATAL, ComponentUtils.getMaximumSeverity(input));
-
final UIOut output = new UIOut();
final String outputId = "OutputID";
output.setId(outputId);
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java
index f5cea8f3f6..c79feb5ef3 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java
@@ -55,7 +55,8 @@ public class AstroData implements Serializable {
= new InputStreamReader(AstroData.class.getResourceAsStream("astro-data.json"));
Gson gson = new GsonBuilder().create();
- dataList = gson.fromJson(reader, new TypeToken<ArrayList<SolarObject>>(){}.getType());
+ dataList = gson.fromJson(reader, new TypeToken<ArrayList<SolarObject>>() {
+ }.getType());
dataMap = new HashMap<>(dataList.size());
for (SolarObject solarObject : dataList) {
dataMap.put(solarObject.getName(), solarObject);
@@ -117,7 +118,6 @@ public class AstroData implements Serializable {
return collect;
}
-
private List<SelectItem> createSelectItems(final List<SolarObject> objects) {
final List<SelectItem> list = new ArrayList<>();
for (SolarObject object : objects) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
index 4a799351e3..806d48a38a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
@@ -31,7 +31,7 @@ import java.io.Serializable;
@Named
public class ConversationController implements Serializable {
-// @Inject // XXX
+ // @Inject // XXX
private Conversation conversation;
private int count = 0;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
index efe055f4c9..30f29afebf 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
@@ -45,9 +45,9 @@ public class DateController implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final LocalDateTime SPUTNIK_LOCAL_DATE_TIME
- = LocalDateTime.of(1957, 10, 5, 0, 28, 34, 123456789);
+ = LocalDateTime.of(1957, 10, 5, 0, 28, 34, 123456789);
private static final LocalDateTime APOLLO11_LOCAL_DATE_TIME
- = LocalDateTime.of(1969, 7, 20, 20, 17, 40, 123456789);
+ = LocalDateTime.of(1969, 7, 20, 20, 17, 40, 123456789);
private Date once;
private LocalDate onchange;
@@ -90,7 +90,7 @@ public class DateController implements Serializable {
}
public void timeZoneValidator(
- final FacesContext facesContext, final UIComponent uiComponent, final Object string) throws ValidatorException {
+ final FacesContext facesContext, final UIComponent uiComponent, final Object string) throws ValidatorException {
try {
ZoneId.of((String) string);
} catch (Exception e) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java
index def5450508..dcb628a786 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java
@@ -155,7 +155,6 @@ public class EventController implements Serializable {
eventsOnComponents.add(new EventsOnComponent(new UITreeListbox()));
eventsOnComponents.add(new EventsOnComponent(new UITreeSelect()));
-
planets.add(new SolarObject("Mercury", "I", "Sun", 57910, 87.97, 7.00, 0.21, "-", null));
planets.add(new SolarObject("Venus", "II", "Sun", 108200, 224.70, 3.39, 0.01, "-", null));
planets.add(new SolarObject("Earth", "III", "Sun", 149600, 365.26, 0.00, 0.02, "-", null));
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
index 6f739d92a8..372b3681fc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
@@ -32,7 +32,7 @@ public class ExceptionController implements Serializable {
public String getStackTrace() {
final Throwable exception = (Throwable) FacesContext.getCurrentInstance().getExternalContext()
- .getRequestMap().get("javax.servlet.error.exception");
+ .getRequestMap().get("javax.servlet.error.exception");
final StringWriter stringWriter = new StringWriter();
final PrintWriter printWriter = new PrintWriter(stringWriter);
if (exception != null) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
index c1b507d30a..f5ec6ea27e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
@@ -40,10 +40,10 @@ public class ExecuteController implements Serializable {
public Outcome clear() {
LOG.info("action");
- value1=null;
- value2=null;
- value3=null;
- value4=null;
+ value1 = null;
+ value2 = null;
+ value3 = null;
+ value4 = null;
log();
return Outcome.TEST_JAVA_AJAX_EXECUTE;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
index 0d067ccf1e..0471e6c9ca 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
@@ -62,7 +62,6 @@ public class InputSuggestController implements Serializable {
{"66851 Olenkorb", "66851", "Olenkorb", "Rheinland-Pfalz"}
};
-
public String getSimpleValue() {
return simpleValue;
}
@@ -141,8 +140,6 @@ public class InputSuggestController implements Serializable {
return item;
}
-
-
public AutoSuggestItems getCitySuggestItems(final UIInput component) {
final String prefix = (String) component.getSubmittedValue();
final AutoSuggestItems item = new AutoSuggestItems();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java
index e922b9c9cb..886a72d0f8 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java
@@ -183,8 +183,9 @@ public class LoggingController {
private String factoryMethod;
private boolean usesString; // is false it uses "Object" for logging
- public LoggingInfo(final String id, final String factoryClassName, final String factoryMethod,
- final String category, final boolean usesString, final String... calls) {
+ public LoggingInfo(
+ final String id, final String factoryClassName, final String factoryMethod,
+ final String category, final boolean usesString, final String... calls) {
this.id = id;
this.calls = calls;
this.factoryClassName = factoryClassName;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
index f2709f7e29..668f610399 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
@@ -39,7 +39,9 @@ public class NavigationNode extends DefaultMutableTreeNode implements Comparable
private final NavigationTree tree;
- /** Cache the TreePath for optimization. */
+ /**
+ * Cache the TreePath for optimization.
+ */
private TreePath treePath;
public NavigationNode(final String path, final NavigationTree tree) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
index 8200652238..f680a32f2d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
@@ -69,7 +69,7 @@ public class NavigationState implements Serializable {
final TreePath treePath = currentNode.getTreePath();
state.getSelectedState().clearAndSelect(treePath);
if (!treePath.isRoot()) {
- state.getExpandedState().collapseAllButRoot();
+ state.getExpandedState().collapseAllButRoot();
state.getExpandedState().expand(treePath, true);
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
index 201a58c37a..75514d8eef 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
@@ -121,7 +121,6 @@ public class PartialReloadController {
return navValue;
}
-
public String getNavigateActionValue() {
return navigateActionValue;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
index 013d14be28..bba7d24b52 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-
import javax.enterprise.context.SessionScoped;
import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Named;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java
index dae811472d..d49b630c57 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java
@@ -33,15 +33,15 @@ public class SelectController implements Serializable {
public SelectController() {
entries = new SelectItem[]{
- new SelectItem("1", "Entry One"),
- new SelectItem("2", "Entry Two"),
- new SelectItem("3", "Entry Three"),
- new SelectItem("4", "Entry Four"),
- new SelectItem("5", "Entry Five"),
- new SelectItem("6", "Entry Six"),
- new SelectItem("7", "Entry Seven"),
- new SelectItem("8", "Entry Eight"),
- new SelectItem("9", "Entry Nine")
+ new SelectItem("1", "Entry One"),
+ new SelectItem("2", "Entry Two"),
+ new SelectItem("3", "Entry Three"),
+ new SelectItem("4", "Entry Four"),
+ new SelectItem("5", "Entry Five"),
+ new SelectItem("6", "Entry Six"),
+ new SelectItem("7", "Entry Seven"),
+ new SelectItem("8", "Entry Eight"),
+ new SelectItem("9", "Entry Nine")
};
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
index 1b9fbd9a70..49c88f31a9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
@@ -37,11 +37,11 @@ public class SelectManyListboxController implements Serializable {
public SelectManyListboxController() {
deserts = new SelectItem[]{
- new SelectItem("Antarctic Desert"),
- new SelectItem("Arctic"),
- new SelectItem("Sahara"),
- new SelectItem("Arabian Desert"),
- new SelectItem("Gobi Desert")
+ new SelectItem("Antarctic Desert"),
+ new SelectItem("Arctic"),
+ new SelectItem("Sahara"),
+ new SelectItem("Arabian Desert"),
+ new SelectItem("Gobi Desert")
};
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
index b08f3dc8cd..ca98487feb 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
@@ -35,11 +35,11 @@ public class SelectOneListboxController implements Serializable {
public SelectOneListboxController() {
mountains = new SelectItem[]{
- new SelectItem("8848 m", "Everest"),
- new SelectItem("8611 m", "K2"),
- new SelectItem("8586 m", "Kangchenjunga"),
- new SelectItem("8516 m", "Lhotse"),
- new SelectItem("8481 m", "Makalu")
+ new SelectItem("8848 m", "Everest"),
+ new SelectItem("8611 m", "K2"),
+ new SelectItem("8586 m", "Kangchenjunga"),
+ new SelectItem("8516 m", "Lhotse"),
+ new SelectItem("8481 m", "Makalu")
};
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetActionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetActionController.java
index 44b0dd5cd4..23e3484f90 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetActionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetActionController.java
@@ -40,7 +40,7 @@ public class SheetActionController implements Serializable {
LOG.info("deleteAction called for {}, but we do not delete objects here in this demo.", solarObject.getName());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_WARN,
- "We do not delete in this demo! (object='" + solarObject.getName() + "')", null));
+ "We do not delete in this demo! (object='" + solarObject.getName() + "')", null));
return null;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java
index 5810eb4ba8..d221eb4179 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java
@@ -81,7 +81,6 @@ public class SheetConfig {
return items;
}
-
public boolean isSheetShowHeader() {
return sheetShowHeader;
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
index 26e7957892..f77820ed3f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
@@ -158,6 +158,6 @@ public class SheetController implements Serializable {
}
public SelectItem[] getSelectableModes() {
- return SHEET_SELECTABLE;
+ return SHEET_SELECTABLE;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
index 62429de2b1..0de9f83f27 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
@SessionScoped
@Named
-public class SheetFilterController implements Serializable {
+public class SheetFilterController implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java
index d3b1138268..fbeb6192b3 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import javax.swing.DefaultBoundedRangeModel;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
index 61b99e6676..5faad8bc32 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
@@ -72,9 +72,9 @@ public class TestController implements Serializable {
for (final String page : getXHTMLs(rootDir)) {
final String base = page.substring(realPath.length(), page.length() - ".xhtml".length());
pages.add(new TestPage(
- "tp" + idCount++,
- URLEncoder.encode(base, StandardCharsets.UTF_8.name()),
- base));
+ "tp" + idCount++,
+ URLEncoder.encode(base, StandardCharsets.UTF_8.name()),
+ base));
// todo: StandardCharsets.UTF_8.name() can be simplified with Java 10
}
}
@@ -105,9 +105,9 @@ public class TestController implements Serializable {
for (final String testJs : getTestJs(rootDir)) {
final String base = testJs.substring(realPath.length(), testJs.length() - ".test.js".length());
testPages.add(new TestPage(
- "tp" + idCount++,
- URLEncoder.encode(base, StandardCharsets.UTF_8.name()),
- base));
+ "tp" + idCount++,
+ URLEncoder.encode(base, StandardCharsets.UTF_8.name()),
+ base));
// todo: StandardCharsets.UTF_8.name() can be simplified with Java 10
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
index 2990853b90..f3dfddbadc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
@@ -42,7 +42,6 @@ public class TreeEditorController implements Serializable {
private DefaultMutableTreeNode copyNode;
private DefaultMutableTreeNode cutNode;
-
public TreeEditorController() {
this.categoryTree = CategoryTree.createSample();
}
@@ -77,7 +76,7 @@ public class TreeEditorController implements Serializable {
node.removeFromParent();
} else {
FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_INFO, "Root node cannot be removed", null));
+ new FacesMessage(FacesMessage.SEVERITY_INFO, "Root node cannot be removed", null));
}
} else {
LOG.warn("No node selected.");
@@ -128,7 +127,7 @@ public class TreeEditorController implements Serializable {
if (cutNode != null) {
if (isBaseNodeContainSelectedNode(cutNode, node)) {
FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_INFO, "Cannot past a cut node into itself.", null));
+ new FacesMessage(FacesMessage.SEVERITY_INFO, "Cannot past a cut node into itself.", null));
} else {
node.insert(cutNode, 0);
cutNode = null;
@@ -178,7 +177,7 @@ public class TreeEditorController implements Serializable {
parent.insert(node, parent.getIndex(previousSibling));
} else {
FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_INFO, "The node cannot moved up further.", null));
+ new FacesMessage(FacesMessage.SEVERITY_INFO, "The node cannot moved up further.", null));
}
}
return null;
@@ -193,7 +192,7 @@ public class TreeEditorController implements Serializable {
parent.insert(node, parent.getIndex(nextSibling));
} else {
FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_INFO, "The node cannot moved down further.", null));
+ new FacesMessage(FacesMessage.SEVERITY_INFO, "The node cannot moved down further.", null));
}
}
return null;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java
index 7165cdea31..bd86b7a812 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java
@@ -31,12 +31,12 @@ import java.io.Serializable;
public class TreeSelectController implements Serializable {
private static final Selectable[] TREE_SELECT_MODE_KEYS = {
- Selectable.none,
- Selectable.single,
- Selectable.singleLeafOnly,
- Selectable.multi,
- Selectable.multiLeafOnly,
- Selectable.multiCascade
+ Selectable.none,
+ Selectable.single,
+ Selectable.singleLeafOnly,
+ Selectable.multi,
+ Selectable.multiLeafOnly,
+ Selectable.multiCascade
};
private DefaultMutableTreeNode sample;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
index 91c2fb3979..f21516aa5c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
@@ -90,7 +90,7 @@ public class UploadController implements Serializable {
LOG.info("name=" + submittedFileName);
uploadItems.add(new UploadItem(submittedFileName, part.getSize(), part.getContentType(), action));
FacesContext.getCurrentInstance().addMessage(
- null, new FacesMessage(FacesMessage.SEVERITY_INFO, "File was uploaded: " + submittedFileName, null));
+ null, new FacesMessage(FacesMessage.SEVERITY_INFO, "File was uploaded: " + submittedFileName, null));
}
public Part getFileBasic() {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java
index bd8d96f391..adec2330ab 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java
@@ -42,13 +42,13 @@ public class ValidationController implements Serializable {
}
public void customValidator(final FacesContext facesContext, final UIComponent component, final Object value)
- throws ValidatorException {
+ throws ValidatorException {
if (value == null) {
return;
}
if (!"tobago".equalsIgnoreCase(value.toString())) {
throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Please type in 'Tobago'",
- "Please type in 'Tobago'"));
+ "Please type in 'Tobago'"));
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java
index 544b86372e..1013f26211 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java
@@ -43,7 +43,7 @@ public class Activity implements Serializable {
}
public void executeAjaxRequest() {
- ajaxRequest++;
+ ajaxRequest++;
}
public String getSessionId() {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java
index 45d28f9221..7f5bf1325e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java
@@ -123,7 +123,6 @@ public class Sudoku {
return result;
}
-
private boolean checkRules() {
return checkRowRules() && checkColumnRules() && checkSquareRules();
}
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/integration/BasicTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/integration/BasicTest.java
index 8d9a06353e..c80beeee32 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/integration/BasicTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/integration/BasicTest.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.example.demo.integration;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java b/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java
index bd29076241..e2045325d0 100644
--- a/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java
+++ b/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-
/**
* Test if every in Java declared CSS class has really an entry in a CSS file.
*/
@@ -102,8 +101,8 @@ public class BootstrapClassUnitTest {
Assertions.assertEquals(BootstrapClass.COL_XL_AUTO,
BootstrapClass.valueOf(Measure.valueOf("auto"), Attributes.extraLarge));
Assertions.assertEquals(BootstrapClass.COL_XXL_5,
- BootstrapClass.valueOf(new Measure("5", Measure.Unit.SEG), Attributes.extra2Large));
+ BootstrapClass.valueOf(new Measure("5", Measure.Unit.SEG), Attributes.extra2Large));
Assertions.assertEquals(BootstrapClass.COL_XXL_AUTO,
- BootstrapClass.valueOf(Measure.valueOf("auto"), Attributes.extra2Large));
+ BootstrapClass.valueOf(Measure.valueOf("auto"), Attributes.extra2Large));
}
}
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Behavior.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Behavior.java
index a27f01a8de..5519e0775f 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Behavior.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Behavior.java
@@ -28,6 +28,8 @@ import java.lang.annotation.Target;
@Target(value = ElementType.TYPE)
public @interface Behavior {
String name();
+
String description() default "";
+
boolean isDefault() default false;
}
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/BodyContentDescription.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/BodyContentDescription.java
index f45b1b547a..804f1d0e79 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/BodyContentDescription.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/BodyContentDescription.java
@@ -29,6 +29,7 @@ import java.lang.annotation.ElementType;
public @interface BodyContentDescription {
String anyTagOf() default "";
+
String contentType() default "";
// TODO should be Class see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5089128
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Converter.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Converter.java
index 2fbce55cfa..148ea96a42 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Converter.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Converter.java
@@ -28,5 +28,6 @@ import java.lang.annotation.ElementType;
@Target(value = ElementType.TYPE)
public @interface Converter {
String id() default "";
+
String forClass() default "";
}
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Facet.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Facet.java
index a70ed64823..333e0c9336 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Facet.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Facet.java
@@ -28,13 +28,14 @@ import java.lang.annotation.ElementType;
@Target(value = ElementType.TYPE)
public @interface Facet {
String name();
+
String description() default "";
/**
- * Array of supported component-types that explictly enumerates the
- * set of allowd component children for this component. Other possible values are: ALL...
+ * Array of supported component-types that explictly enumerates the
+ * set of allowd component children for this component. Other possible values are: ALL...
*/
- String[] allowedChildComponenents() default { "ALL" };
+ String[] allowedChildComponenents() default {"ALL"};
/**
* Specifies whether this component should be available on a component palette.
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Preliminary.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Preliminary.java
index 5e5a76890d..7d1a662ebf 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Preliminary.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Preliminary.java
@@ -27,7 +27,6 @@ import java.lang.annotation.ElementType;
/**
* Mark the code as 'Preliminary'.
* The interface maybe subject to changed in a future version.
- *
*/
@Retention(value = RetentionPolicy.SOURCE)
@Target(value = {ElementType.TYPE, ElementType.METHOD})
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/TagAttribute.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/TagAttribute.java
index a67598bdae..6030a62e60 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/TagAttribute.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/TagAttribute.java
@@ -28,10 +28,14 @@ import java.lang.annotation.Target;
@Target(value = ElementType.METHOD)
public @interface TagAttribute {
- /** type of the Tag */
+ /**
+ * type of the Tag
+ */
String type() default "java.lang.String";
- /** allow JSP expression */
+ /**
+ * allow JSP expression
+ */
boolean rtexprvalue() default false;
boolean required() default false;
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Taglib.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Taglib.java
index 58673700ec..919ae9d086 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Taglib.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Taglib.java
@@ -30,8 +30,12 @@ import java.lang.annotation.Target;
public @interface Taglib {
String shortName();
+
String uri();
+
String name();
+
String displayName();
+
String[] listener() default {};
}
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
index a52438e87c..1c594827df 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
@@ -29,15 +29,19 @@ import java.lang.annotation.ElementType;
public @interface UIComponentTagAttribute {
- /** type of attribute in the UIComponent */
+ /**
+ * type of attribute in the UIComponent
+ */
String[] type() default {"java.lang.String"};
- String[] allowedValues() default { };
+ String[] allowedValues() default {};
- /** allow faces expression language, e.g. #{bean.value} */
+ /**
+ * allow faces expression language, e.g. #{bean.value}
+ */
DynamicExpression expression() default DynamicExpression.VALUE_EXPRESSION;
- String[] methodSignature() default { };
+ String[] methodSignature() default {};
String methodReturnType() default "void";
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Validator.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Validator.java
index 9a5691519d..995daf1aea 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Validator.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Validator.java
@@ -28,5 +28,6 @@ import java.lang.annotation.ElementType;
@Target(value = ElementType.TYPE)
public @interface Validator {
String id() default "";
+
String forClass() default "";
}
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ValidatorTag.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ValidatorTag.java
index a206ca71fc..a8623c83af 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ValidatorTag.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ValidatorTag.java
@@ -25,5 +25,6 @@ import java.lang.annotation.RetentionPolicy;
@Retention(value = RetentionPolicy.SOURCE)
public @interface ValidatorTag {
String validatorId();
+
String faceletHandler() default "";
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ClassInfo.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ClassInfo.java
index 138add654f..a5081be91b 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ClassInfo.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ClassInfo.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.apt.generate;
import java.util.HashSet;
import java.util.Set;
-
public class ClassInfo {
private String className;
private String packageName;
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java
index a76d674d2f..e067f8a5ab 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.apt.generate;
import java.util.TreeSet;
import java.util.Set;
-
public class Imports {
private Set<String> imports = new TreeSet<>();
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
index 876f53470d..abca07e2e6 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.apt.generate;
import java.util.ArrayList;
import java.util.List;
-
public class TagInfo extends RendererInfo {
private List<PropertyInfo> properties = new ArrayList<>();
private String componentClassName;
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
index baa6330627..6437045504 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.apt.processor;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.myfaces.tobago.apt.annotation.ConverterTag;
import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
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 d08c727f4d..f381f149ca 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
@@ -384,7 +384,6 @@ public class FacesConfigGenerator extends AbstractGenerator {
}
}
-
private org.jdom2.Element createElementExtension(
final TypeElement typeElement, final UIComponentTag uiComponentTag,
final Namespace namespace) {
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
index b51681dcce..5a33996730 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
@@ -147,7 +147,7 @@ public class TaglibGenerator extends AbstractGenerator {
if ("http://myfaces.apache.org/tobago/component".equals(taglibAnnotation.uri())) {
for (int i = 1; i < 10; i++) {
addFunction(document, taglib, "format" + i, "org.apache.myfaces.tobago.util.MessageFormat",
- "java.lang.String format(java.lang.String"+ StringUtils.repeat(", java.lang.Object", i) +")");
+ "java.lang.String format(java.lang.String" + StringUtils.repeat(", java.lang.Object", i) + ")");
}
}
@@ -160,11 +160,11 @@ public class TaglibGenerator extends AbstractGenerator {
// writing the XML document
- String target = targetTaglib;
- target = StringUtils.isNotBlank(target) ? target + '/' : "";
- final String name = target + taglibAnnotation.name() + ".taglib.xml";
- final FileObject resource = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", name);
- info("Writing to file: " + resource.toUri());
+ String target = targetTaglib;
+ target = StringUtils.isNotBlank(target) ? target + '/' : "";
+ final String name = target + taglibAnnotation.name() + ".taglib.xml";
+ final FileObject resource = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", name);
+ info("Writing to file: " + resource.toUri());
try (Writer writer = resource.openWriter()) {
final TransformerFactory transFactory = TransformerFactory.newInstance();
[myfaces-tobago] 01/03: style(editorconfig): optimize autolayout
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit a014ee5d6becf641a58066dd0fc78fbabff683a0
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Nov 17 13:55:22 2022 +0100
style(editorconfig): optimize autolayout
* adjust editorconfig
* fix "indent size" and "and continuation size" in Java
* remove >2 empty lines
* remove empty parameter/return/throws in java doc
* update checkstyle-rules
---
.editorconfig | 14 +++++++++++---
pom.xml | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 6d778e907c..6360eeff01 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,11 +21,19 @@ root = true
[*]
charset = utf-8
indent_style = space
-indent_size = 2
+tab_width = 2
+indent_size = tab
+ij_continuation_indent_size = 4
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
+ij_any_keep_blank_lines_in_declarations = 1
+ij_any_keep_blank_lines_in_code = 1
+ij_any_for_brace_force = always
+ij_any_if_brace_force = always
-# Ignore indent_size for java files
[*.java]
-indent_size = unset
+ij_java_method_parameters_new_line_after_left_paren = true
+ij_java_doc_keep_empty_parameter_tag = false
+ij_java_doc_keep_empty_return_tag = false
+ij_java_doc_keep_empty_throws_tag = false
diff --git a/pom.xml b/pom.xml
index 30533068ed..937d76a7a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<junit-jupiter.version>5.9.1</junit-jupiter.version>
<testcontainers.version>1.17.5</testcontainers.version>
- <checkstyle-rules.version>19</checkstyle-rules.version>
+ <checkstyle-rules.version>20-SNAPSHOT</checkstyle-rules.version>
<!-- Note: defined here in master pom, because of problems with enforcer plugin -->
<jetty.version>9.4.49.v20220914</jetty.version>